diff --git a/src/App.js b/src/App.js
index 9da8918..b84913a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,4 +1,4 @@
-import "./App.css";
+import styles from "./App.module.css";
 import { Taskbar } from "./components/TaskBar.js";
 import { WindowsManagerProvider } from "./hooks/WindowsManagerContext.js";
 import { WindowsView } from "./components/WindowsView.js";
@@ -9,7 +9,7 @@ function App() {
 	return (
 		<VirtualRootProvider>
 			<WindowsManagerProvider>
-				<div className="App" style={{ backgroundImage: `url(${SETTINGS.wallpaper})` }}>
+				<div className={styles.App} style={{ backgroundImage: `url(${SETTINGS.wallpaper})` }}>
 					<Taskbar/>
 					<WindowsView/>
 				</div>
diff --git a/src/App.css b/src/App.module.css
similarity index 100%
rename from src/App.css
rename to src/App.module.css
diff --git a/src/components/TaskBar.js b/src/components/TaskBar.js
index 1c54842..cb98ab5 100644
--- a/src/components/TaskBar.js
+++ b/src/components/TaskBar.js
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import "./TaskBar.css";
+import styles from "./TaskBar.module.css";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faBatteryFull, faSearch, faVolumeHigh, faWifi } from "@fortawesome/free-solid-svg-icons";
 import ApplicationsManager from "../features/applications/applications.js";
@@ -15,8 +15,8 @@ export function Taskbar() {
 	}, []);
 
 	return (
-		<div className="Task-bar">
-			<div className="Program-icons">
+		<div className={styles["Task-bar"]}>
+			<div className={styles["Program-icons"]}>
 				<button>
 					<FontAwesomeIcon icon={faSearch}/>
 				</button>
@@ -24,7 +24,7 @@ export function Taskbar() {
 					<AppButton app={app} key={app.id}/>
 				)}
 			</div>
-			<div className="Util-icons">
+			<div className={styles["Util-icons"]}>
 				<button>
 					<FontAwesomeIcon icon={faBatteryFull}/>
 				</button>
diff --git a/src/components/TaskBar.css b/src/components/TaskBar.module.css
similarity index 100%
rename from src/components/TaskBar.css
rename to src/components/TaskBar.module.css
diff --git a/src/components/Window.js b/src/components/Window.js
index 60faa66..d03e5ff 100644
--- a/src/components/Window.js
+++ b/src/components/Window.js
@@ -1,5 +1,5 @@
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import "./Window.css";
+import styles from "./Window.module.css";
 import { faMinus, faXmark } from "@fortawesome/free-solid-svg-icons";
 import { faSquare } from "@fortawesome/free-regular-svg-icons";
 import { ReactSVG } from "react-svg";
@@ -25,11 +25,11 @@ export function Window({ id, app, size, position, focused = false }) {
         resizeObserver.observe(document.getElementById("root"));
     });
 
-	const classNames = ["Window-container"];
+	const classNames = [styles["Window-container"]];
 	if (maximized)
-		classNames.push("Maximized");
+		classNames.push(styles.Maximized);
 	if (minimized)
-		classNames.push("Minimized");
+		classNames.push(styles.Minimized);
 
 	return (
 		<Draggable
@@ -56,8 +56,8 @@ export function Window({ id, app, size, position, focused = false }) {
 					height: maximized ? screenHeight : size.y,
 				}}
 			>
-				<div className="Header">
-					<ReactSVG className="Window-icon" src={process.env.PUBLIC_URL + `/media/applications/icons/${app.id}.svg`}/>
+				<div className={styles["Header"]}>
+					<ReactSVG className={styles["Window-icon"]} src={process.env.PUBLIC_URL + `/media/applications/icons/${app.id}.svg`}/>
 					<p>{app.name}</p>
 					<button onClick={() => setMinimized(!minimized)}>
 						<FontAwesomeIcon icon={faMinus}/>
@@ -69,7 +69,7 @@ export function Window({ id, app, size, position, focused = false }) {
 						<FontAwesomeIcon icon={faXmark}/>
 					</button>
 				</div>
-				<div className="Window-content">
+				<div className={styles["Window-content"]}>
 					{app.windowContent}
 				</div>
 			</div>
diff --git a/src/components/Window.css b/src/components/Window.module.css
similarity index 100%
rename from src/components/Window.css
rename to src/components/Window.module.css
diff --git a/src/components/task-bar/AppButton.js b/src/components/task-bar/AppButton.js
index fb6a476..69bc5f6 100644
--- a/src/components/task-bar/AppButton.js
+++ b/src/components/task-bar/AppButton.js
@@ -3,6 +3,7 @@ import { useEffect, useState } from "react";
 import { useWindows } from "../../hooks/WindowsContext.js";
 import { useWindowsManager } from "../../hooks/WindowsManagerContext.js";
 import { ReactSVG } from "react-svg";
+import styles from "../TaskBar.module.css";
 
 export function AppButton({ app }) {
 	const [active, setActive] = useState(false);
@@ -13,7 +14,7 @@ export function AppButton({ app }) {
 		setActive(windowsManager.isAppActive(app.id));
 	}, [windows]);
 
-	return (<button className={active ? "App-icon Active" : "App-icon"} key={app.id} onClick={() => { windowsManager.open(app.id); }}>
+	return (<button className={active ? `${styles["App-icon"]} ${styles["Active"]}` : styles["App-icon"]} key={app.id} onClick={() => { windowsManager.open(app.id); }}>
 		<ReactSVG src={process.env.PUBLIC_URL + `/media/applications/icons/${app.id}.svg`}/>
 	</button>);
 }
\ No newline at end of file
diff --git a/src/logo.svg b/src/logo.svg
deleted file mode 100644
index 9dfc1c0..0000000
--- a/src/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
\ No newline at end of file