diff --git a/src/App.js b/src/App.js
index 9721887..66b6dc8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,8 +1,9 @@
 import React, { useState } from "react";
-import { ThemeProvider, createMuiTheme } from "@material-ui/core/styles";
+import { ThemeProvider } from "@material-ui/core/styles";
+import webqueueTheme from "./theme";
 import { Box, makeStyles } from "@material-ui/core";
 import CustomAppBar from "./CustomAppBar";
-import ItemTable from "./ItemTable";
+import ItemTable from "./components/ItemTable/";
 import ItemViewAppBar from "./ItemViewAppBar";
 import ItemView from "./ItemView";
 import clsx from "clsx";
@@ -14,11 +15,7 @@ function App(){
 	const [activeItem, setActiveItem] = useState(testItem);
 	const [sidebarOpen, setSidebarOpen] = useState(true);
 
-	const theme = createMuiTheme({
-		"palette": {
-			"type": darkMode ? "dark" : "light",
-		}
-	});
+	const theme = webqueueTheme(darkMode);
 
 	const transitionWidth = theme.transitions.create(["width"], {
 		duration: theme.transitions.duration.enteringScreen,
@@ -59,7 +56,7 @@ function App(){
 			<Box display="flex">
 				<Box className={classes.leftCol}>
 					<CustomAppBar title="webqueue2" darkMode={darkMode} setDarkMode={setDarkMode} theme={theme}/>
-					<ItemTable activeItem={activeItem} setActiveItem={setActiveItem} setSidebarOpen={setSidebarOpen}/>
+					<ItemTable setActiveItem={setActiveItem} setSidebarOpen={setSidebarOpen}/>
 				</Box>
 				<Box className={clsx(classes.rightCol, sidebarOpen && classes.rightColShift)}>
 					<ItemViewAppBar title={activeItem["queue"] + " " + activeItem["number"]} setSidebarOpen={setSidebarOpen} />