diff --git a/src/components/menu/BottomNav.tsx b/src/components/menu/BottomNav.tsx
index 9212d5ac..5d4ecc5f 100644
--- a/src/components/menu/BottomNav.tsx
+++ b/src/components/menu/BottomNav.tsx
@@ -18,6 +18,8 @@ import {
RiArrowUpLine,
} from 'react-icons/ri';
+import { BottomNavItem } from '@components/menu/BottomNavItem';
+import { VersionInfo } from '@components/modals/VersionInfo';
import {
connType,
openConnectionModal,
@@ -28,9 +30,6 @@ import { useAppDispatch } from '@hooks/useAppDispatch';
import { useAppSelector } from '@hooks/useAppSelector';
import { Protobuf, Types } from '@meshtastic/meshtasticjs';
-import { VersionInfo } from '../modals/VersionInfo';
-import { BottomNavItem } from './BottomNavItem';
-
export const BottomNav = (): JSX.Element => {
const [showVersionInfo, setShowVersionInfo] = useState(false);
const dispatch = useAppDispatch();
diff --git a/src/components/modals/VersionInfo.tsx b/src/components/modals/VersionInfo.tsx
index 938f4ea0..7a965e4d 100644
--- a/src/components/modals/VersionInfo.tsx
+++ b/src/components/modals/VersionInfo.tsx
@@ -4,14 +4,13 @@ import { useEffect } from 'react';
import { MdUpgrade } from 'react-icons/md';
import useSWR from 'swr';
-import { connectionUrl } from '@app/core/connection.js';
-import { setUpdateAvaliable } from '@app/core/slices/appSlice';
-import { fetcher } from '@app/core/utils/fetcher';
-import { useAppDispatch } from '@app/hooks/useAppDispatch';
-import { useAppSelector } from '@app/hooks/useAppSelector';
+import { IconButton } from '@components/generic/button/IconButton';
import { Modal } from '@components/generic/Modal';
-
-import { IconButton } from '../generic/button/IconButton';
+import { connectionUrl } from '@core/connection';
+import { setUpdateAvaliable } from '@core/slices/appSlice';
+import { fetcher } from '@core/utils/fetcher';
+import { useAppDispatch } from '@hooks/useAppDispatch';
+import { useAppSelector } from '@hooks/useAppSelector';
export interface Commit {
sha: string;
diff --git a/src/core/slices/mapSlice.ts b/src/core/slices/mapSlice.ts
index 102a6ed8..1b5ea269 100644
--- a/src/core/slices/mapSlice.ts
+++ b/src/core/slices/mapSlice.ts
@@ -1,6 +1,6 @@
import { LngLat } from 'mapbox-gl';
-import type { MapStyleName } from '@pages/Map/styles';
+import type { MapStyleName } from '@core/mapStyles';
import type { PayloadAction } from '@reduxjs/toolkit';
import { createSlice } from '@reduxjs/toolkit';
diff --git a/src/pages/Extensions/Debug.tsx b/src/pages/Extensions/Debug.tsx
index 9c6a64f5..95180bd8 100644
--- a/src/pages/Extensions/Debug.tsx
+++ b/src/pages/Extensions/Debug.tsx
@@ -1,8 +1,8 @@
import type React from 'react';
-import { Button } from '@app/components/generic/button/Button';
-import { Card } from '@app/components/generic/Card';
-import { connection } from '@app/core/connection.js';
+import { Button } from '@components/generic/button/Button';
+import { Card } from '@components/generic/Card';
+import { connection } from '@core/connection';
import { useAppSelector } from '@hooks/useAppSelector';
export const Debug = (): JSX.Element => {
diff --git a/src/pages/Extensions/FileBrowser.tsx b/src/pages/Extensions/FileBrowser.tsx
index c9774b46..2c3ed2aa 100644
--- a/src/pages/Extensions/FileBrowser.tsx
+++ b/src/pages/Extensions/FileBrowser.tsx
@@ -4,8 +4,8 @@ import { AnimatePresence, m } from 'framer-motion';
import { FiFilePlus } from 'react-icons/fi';
import useSWR from 'swr';
-import { Button } from '@app/components/generic/button/Button';
-import { Card } from '@app/components/generic/Card';
+import { Button } from '@components/generic/button/Button';
+import { Card } from '@components/generic/Card';
import { fetcher } from '@core/utils/fetcher';
import { useAppSelector } from '@hooks/useAppSelector';
diff --git a/src/pages/Extensions/Index.tsx b/src/pages/Extensions/Index.tsx
index 9282c873..1af05883 100644
--- a/src/pages/Extensions/Index.tsx
+++ b/src/pages/Extensions/Index.tsx
@@ -8,12 +8,11 @@ import { VscDebug, VscExtensions } from 'react-icons/vsc';
import { ExternalSection } from '@components/generic/Sidebar/ExternalSection';
import { Layout } from '@components/layout';
+import { Debug } from '@pages/Extensions/Debug';
import { FileBrowser } from '@pages/Extensions/FileBrowser';
import { Info } from '@pages/Extensions/Info';
import { Logs } from '@pages/Extensions/Logs';
-import { Debug } from './Debug';
-
export const Extensions = (): JSX.Element => {
const [selectedExtension, setSelectedExtension] = useState<
'info' | 'logs' | 'fileBrowser' | 'rangeTest' | 'debug'
@@ -24,7 +23,7 @@ export const Extensions = (): JSX.Element => {
title="Extensions"
icon={
}
sidebarContents={
-
+
{
setSelectedExtension('info');
diff --git a/src/pages/Extensions/Info.tsx b/src/pages/Extensions/Info.tsx
index 52a488cc..432a467a 100644
--- a/src/pages/Extensions/Info.tsx
+++ b/src/pages/Extensions/Info.tsx
@@ -3,9 +3,9 @@ import type React from 'react';
import { FiRefreshCw } from 'react-icons/fi';
import JSONPretty from 'react-json-pretty';
-import { IconButton } from '@app/components/generic/button/IconButton';
-import { Card } from '@app/components/generic/Card';
-import { CopyButton } from '@app/components/menu/buttons/CopyButton';
+import { IconButton } from '@components/generic/button/IconButton';
+import { Card } from '@components/generic/Card';
+import { CopyButton } from '@components/menu/buttons/CopyButton';
import { Hashicon } from '@emeraldpay/hashicon-react';
import { useAppSelector } from '@hooks/useAppSelector';
diff --git a/src/pages/Extensions/Logs.tsx b/src/pages/Extensions/Logs.tsx
index 72cca889..343e9da1 100644
--- a/src/pages/Extensions/Logs.tsx
+++ b/src/pages/Extensions/Logs.tsx
@@ -3,10 +3,10 @@ import type React from 'react';
import { AnimatePresence, m } from 'framer-motion';
import { FiArrowRight, FiPaperclip, FiTrash } from 'react-icons/fi';
-import { IconButton } from '@app/components/generic/button/IconButton';
-import { Card } from '@app/components/generic/Card';
-import { clearLogs } from '@app/core/slices/meshtasticSlice';
-import { useAppDispatch } from '@app/hooks/useAppDispatch';
+import { IconButton } from '@components/generic/button/IconButton';
+import { Card } from '@components/generic/Card';
+import { clearLogs } from '@core/slices/meshtasticSlice';
+import { useAppDispatch } from '@hooks/useAppDispatch';
import { useAppSelector } from '@hooks/useAppSelector';
import { Protobuf, Types } from '@meshtastic/meshtasticjs';
diff --git a/src/pages/Nodes/NodeCard.tsx b/src/pages/Nodes/NodeCard.tsx
index 34758b63..ae7a2e22 100644
--- a/src/pages/Nodes/NodeCard.tsx
+++ b/src/pages/Nodes/NodeCard.tsx
@@ -15,10 +15,10 @@ import { IoTelescope } from 'react-icons/io5';
import { MdGpsFixed, MdGpsNotFixed, MdGpsOff } from 'react-icons/md';
import JSONPretty from 'react-json-pretty';
-import { Tooltip } from '@app/components/generic/Tooltip';
import { IconButton } from '@components/generic/button/IconButton';
import { CollapsibleSection } from '@components/generic/Sidebar/CollapsibleSection';
import { SidebarOverlay } from '@components/generic/Sidebar/SidebarOverlay';
+import { Tooltip } from '@components/generic/Tooltip';
import { SidebarItem } from '@components/layout/Sidebar/SidebarItem';
import { CopyButton } from '@components/menu/buttons/CopyButton';
import type { Node } from '@core/slices/meshtasticSlice';
diff --git a/src/pages/Nodes/index.tsx b/src/pages/Nodes/index.tsx
index 997af6ff..787d18ce 100644
--- a/src/pages/Nodes/index.tsx
+++ b/src/pages/Nodes/index.tsx
@@ -8,8 +8,8 @@ import { BiCrown } from 'react-icons/bi';
import { FiSettings } from 'react-icons/fi';
import { RiMindMap } from 'react-icons/ri';
-import { Tooltip } from '@app/components/generic/Tooltip';
import { IconButton } from '@components/generic/button/IconButton';
+import { Tooltip } from '@components/generic/Tooltip';
import { Layout } from '@components/layout';
import { SidebarItem } from '@components/layout/Sidebar/SidebarItem';
import { Hashicon } from '@emeraldpay/hashicon-react';
diff --git a/src/pages/NotFound.tsx b/src/pages/NotFound.tsx
index b8cb6a93..d9c362d9 100644
--- a/src/pages/NotFound.tsx
+++ b/src/pages/NotFound.tsx
@@ -1,6 +1,6 @@
import type React from 'react';
-import { Card } from '@app/components/generic/Card';
+import { Card } from '@components/generic/Card';
export const NotFound = (): JSX.Element => {
return (