diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 9ce4b46..c8e3bbb 100755
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -12,11 +12,12 @@ import {
   createTheme, CssBaseline,
   Divider,
   IconButton, List,
-  ListItemIcon, ListItemText, styled, Toolbar,
+  ListItemIcon, ListItemText, Toolbar,
   Typography
 } from "@mui/material";
-import MuiAppBar, { AppBarProps as MuiAppBarProps } from '@mui/material/AppBar';
-import MuiDrawer from '@mui/material/Drawer';
+import { grey } from "@mui/material/colors";
+
+
 import ListItemButton from '@mui/material/ListItemButton';
 import { useEffect, useMemo, useState } from "react";
 import { Provider, useSelector } from "react-redux";
@@ -26,63 +27,12 @@ import {
 } from 'react-router-dom';
 import { io } from "socket.io-client";
 import ArchivedDownloads from "./Archived";
+import { AppBar } from "./components/AppBar";
+import { Drawer } from "./components/Drawer";
 import Home from "./Home";
 import Settings from "./Settings";
 import { RootState, store } from './stores/store';
-
-const drawerWidth: number = 240;
-
-const socket = io(
-  `${window.location.protocol}//${localStorage.getItem('server-addr') || window.location.hostname}:${localStorage.getItem('server-port') || window.location.port}`
-)
-
-interface AppBarProps extends MuiAppBarProps {
-  open?: boolean;
-}
-
-const AppBar = styled(MuiAppBar, {
-  shouldForwardProp: (prop) => prop !== 'open',
-})<AppBarProps>(({ theme, open }) => ({
-  zIndex: theme.zIndex.drawer + 1,
-  transition: theme.transitions.create(['width', 'margin'], {
-    easing: theme.transitions.easing.sharp,
-    duration: theme.transitions.duration.leavingScreen,
-  }),
-  ...(open && {
-    marginLeft: drawerWidth,
-    width: `calc(100% - ${drawerWidth}px)`,
-    transition: theme.transitions.create(['width', 'margin'], {
-      easing: theme.transitions.easing.sharp,
-      duration: theme.transitions.duration.enteringScreen,
-    }),
-  }),
-}));
-
-const Drawer = styled(MuiDrawer, { shouldForwardProp: (prop) => prop !== 'open' })(
-  ({ theme, open }) => ({
-    '& .MuiDrawer-paper': {
-      position: 'relative',
-      whiteSpace: 'nowrap',
-      width: drawerWidth,
-      transition: theme.transitions.create('width', {
-        easing: theme.transitions.easing.sharp,
-        duration: theme.transitions.duration.enteringScreen,
-      }),
-      boxSizing: 'border-box',
-      ...(!open && {
-        overflowX: 'hidden',
-        transition: theme.transitions.create('width', {
-          easing: theme.transitions.easing.sharp,
-          duration: theme.transitions.duration.leavingScreen,
-        }),
-        width: theme.spacing(7),
-        [theme.breakpoints.up('sm')]: {
-          width: theme.spacing(9),
-        },
-      }),
-    },
-  }),
-);
+import { getWebSocketEndpoint } from "./utils";
 
 function AppContent() {
   const [open, setOpen] = useState(false);
@@ -91,12 +41,17 @@ function AppContent() {
   const settings = useSelector((state: RootState) => state.settings)
   const status = useSelector((state: RootState) => state.status)
 
+  const socket = useMemo(() => io(getWebSocketEndpoint()), [])
+
   const mode = settings.theme
 
   const theme = useMemo(() =>
     createTheme({
       palette: {
-        mode,
+        mode: settings.theme,
+        background: {
+          default: settings.theme === 'light' ? grey[50] : '#121212'
+        },
       },
     }), [settings.theme]
   );
@@ -151,7 +106,7 @@ function AppContent() {
                     alignItems: 'center',
                     flexWrap: 'wrap',
                   }}>
-                    <Storage></Storage>
+                    <Storage />
                     <span>&nbsp;{freeDiskSpace}&nbsp;</span>
                   </div>
                   : null
@@ -161,7 +116,7 @@ function AppContent() {
                 alignItems: 'center',
                 flexWrap: 'wrap',
               }}>
-                <SettingsEthernet></SettingsEthernet>
+                <SettingsEthernet />
                 <span>&nbsp;{status.connected ? settings.serverAddr : 'not connected'}</span>
               </div>
             </Toolbar>
diff --git a/frontend/src/components/AppBar.tsx b/frontend/src/components/AppBar.tsx
new file mode 100644
index 0000000..7510de3
--- /dev/null
+++ b/frontend/src/components/AppBar.tsx
@@ -0,0 +1,26 @@
+import { styled } from '@mui/material';
+import MuiAppBar, { AppBarProps as MuiAppBarProps } from '@mui/material/AppBar';
+
+interface AppBarProps extends MuiAppBarProps {
+  open?: boolean
+}
+
+const drawerWidth = 240;
+
+export const AppBar = styled(MuiAppBar, {
+  shouldForwardProp: (prop) => prop !== 'open',
+})<AppBarProps>(({ theme, open }) => ({
+  zIndex: theme.zIndex.drawer + 1,
+  transition: theme.transitions.create(['width', 'margin'], {
+    easing: theme.transitions.easing.sharp,
+    duration: theme.transitions.duration.leavingScreen,
+  }),
+  ...(open && {
+    marginLeft: drawerWidth,
+    width: `calc(100% - ${drawerWidth}px)`,
+    transition: theme.transitions.create(['width', 'margin'], {
+      easing: theme.transitions.easing.sharp,
+      duration: theme.transitions.duration.enteringScreen,
+    }),
+  }),
+}));
\ No newline at end of file
diff --git a/frontend/src/components/Drawer.tsx b/frontend/src/components/Drawer.tsx
new file mode 100644
index 0000000..32bfa8a
--- /dev/null
+++ b/frontend/src/components/Drawer.tsx
@@ -0,0 +1,30 @@
+import { styled } from '@mui/material';
+import MuiDrawer from '@mui/material/Drawer';
+
+const drawerWidth = 240;
+
+export const Drawer = styled(MuiDrawer, { shouldForwardProp: (prop) => prop !== 'open' })(
+  ({ theme, open }) => ({
+    '& .MuiDrawer-paper': {
+      position: 'relative',
+      whiteSpace: 'nowrap',
+      width: drawerWidth,
+      transition: theme.transitions.create('width', {
+        easing: theme.transitions.easing.sharp,
+        duration: theme.transitions.duration.enteringScreen,
+      }),
+      boxSizing: 'border-box',
+      ...(!open && {
+        overflowX: 'hidden',
+        transition: theme.transitions.create('width', {
+          easing: theme.transitions.easing.sharp,
+          duration: theme.transitions.duration.leavingScreen,
+        }),
+        width: theme.spacing(7),
+        [theme.breakpoints.up('sm')]: {
+          width: theme.spacing(9),
+        },
+      }),
+    },
+  }),
+);
diff --git a/frontend/src/utils.ts b/frontend/src/utils.ts
index e01e772..4206bf4 100644
--- a/frontend/src/utils.ts
+++ b/frontend/src/utils.ts
@@ -103,4 +103,8 @@ export function toFormatArgs(codes: string[]): string {
         return ` -f ${codes[0]}`;
     }
     return '';
+}
+
+export function getWebSocketEndpoint() {
+    return `${window.location.protocol}//${localStorage.getItem('server-addr') || window.location.hostname}:${localStorage.getItem('server-port') || window.location.port}`
 }
\ No newline at end of file