diff --git a/.gitignore b/.gitignore
index 786253e..7a21a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -688,7 +688,7 @@ FodyWeavers.xsd
 dist
 
 tools/syncConfig.js
-tools/deploy.js
+tools/parse.js
 tools/v2.js
 tools/clean.js
 package-lock.json
diff --git a/LICENSE b/LICENSE
index 0404ba7..79f09ef 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Jonas Pfalzgraf
+Copyright (c) 2024 Jonas Pfalzgraf
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/package.json b/package.json
index 47f41da..f3c6f1b 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,9 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "deploy-v3": "npm run build-tooling && node ./tools/deploy.js && npm run sync && npm run build-js && npm run build-css && node ./tools/clean.js",
+    "deploy-v3": "npx rimraf ./dist/ && npm run build-tooling && npm run sync && npm run build && node ./tools/parse.js",
     "deploy-v2": "npm run deploy-v3 && node ./tools/v2.js",
-    "build-js": "vite build --config ./vite.config.js && vite build --config ./vite.config.settings.js && vite build --config ./vite.config.background.js",
-    "build-css": "sass ./src/sass/:./dist/css/",
+    "build": "vite build",
     "build-tooling": "tsc --project ./tooling.tsconfig.json",
     "watch-ts": "tsc -w -p tsconfig.json",
     "watch-sass": "sass --watch ./src/sass/:./dist/css/",
diff --git a/public/manifest.json b/public/manifest.json
index 2f57490..42ee42b 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -21,15 +21,6 @@
     "notifications"
   ],
   "background": {
-    "service_worker": "js/background.js"
-  },
-  "commands": {
-    "_execute_browser_action": {
-      "suggested_key": {
-        "default": "Ctrl+Shift+F",
-        "mac": "MacCtrl+Shift+F"
-      },
-      "description": "Opens popup.html"
-    }
+    "service_worker": "background.js"
   }
 }
\ No newline at end of file
diff --git a/public/options.html b/public/options.html
index 161fb1a..9456208 100644
--- a/public/options.html
+++ b/public/options.html
@@ -6,7 +6,6 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="./favicon.ico">
     <title>{{BET}} Options</title>
-    <link rel="stylesheet" href="css/app.css">
   </head>
   <body>
     <noscript>
@@ -20,7 +19,7 @@
       </div>
     </div>
     <footer>
-      <script type="module" src="./js/settings.js"></script>
+      <script type="module" src="./settings.js"></script>
     </footer>
   </body>
 </html>
diff --git a/public/popup.html b/public/popup.html
index e467626..28cdf54 100644
--- a/public/popup.html
+++ b/public/popup.html
@@ -6,7 +6,6 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="./favicon.ico">
     <title>{{BET}}</title>
-    <link rel="stylesheet" href="css/app.css">
   </head>
   <body>
     <noscript>
@@ -20,7 +19,7 @@
       </div>
     </div>
     <footer>
-      <script type="module" src="./js/app.js"></script>
+      <script type="module" src="./app.js"></script>
     </footer>
   </body>
 </html>
diff --git a/src/app.ts b/src/app.ts
index 3dc1fa6..b1d8653 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -1,4 +1,5 @@
 import { Session } from "./classes/session"
+import "./sass/app.sass"
 
 class App {
 
diff --git a/src/background.ts b/src/background.ts
index 197f02f..4941b1c 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -1,12 +1,9 @@
 class Background {
+	constructor() {
+		this.main();
+	}
 
-    constructor() {
-        this.main();
-    }
-
-    async main(): Promise<void> {
-
-    }
+	async main(): Promise<void> {}
 }
 
-new Background();
\ No newline at end of file
+new Background();
diff --git a/src/settings.ts b/src/settings.ts
index 24d6bb8..10065b7 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -1,5 +1,6 @@
 import { Session } from "./classes/session";
 import { BasicButton } from "./components/button";
+import "./sass/app.sass";
 
 class Settings {
 
diff --git a/tooling.tsconfig.json b/tooling.tsconfig.json
index 84ac8bc..72730da 100644
--- a/tooling.tsconfig.json
+++ b/tooling.tsconfig.json
@@ -1,6 +1,9 @@
 {
     "compilerOptions": {
         "target": "ESNext",
+        "lib": [
+            "ESNext"
+        ],
         "module": "ESNext",
         "outDir": "./tools/",
         "rootDir": "./tools/",
diff --git a/tools/clean.ts b/tools/clean.ts
deleted file mode 100644
index caba573..0000000
--- a/tools/clean.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import * as fs from "fs";
-
-function removeExport(file: string) {
-	let content = fs.readFileSync(file, "utf8");
-	content = content.replace("export {};", "");
-	fs.writeFileSync(file, content);
-}
-
-removeExport("./dist/js/background.js");
diff --git a/tools/deploy.ts b/tools/deploy.ts
deleted file mode 100644
index a12bf54..0000000
--- a/tools/deploy.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import * as fs from 'fs';
-import * as path from 'path';
-const appConfig = JSON.parse(fs.readFileSync('./app.config.json', 'utf8'));
-const DEPLOY_ENTRY = "./public/";
-const DEPLOY_TARGET = "./dist/";
-
-function deleteFolderRecursive(path: string) {
-  if (fs.existsSync(path)) {
-    fs.readdirSync(path).forEach(function (file: string) {
-      const curPath = path + "/" + file;
-      if (fs.lstatSync(curPath).isDirectory()) {
-        deleteFolderRecursive(curPath);
-      } else {
-        fs.unlinkSync(curPath);
-      }
-    });
-    fs.rmdirSync(path);
-  }
-}
-
-function findHtmlFilesRecursive(source: string): string[] {
-  let files: string[] = [];
-  const dir = fs.readdirSync(source);
-  dir.forEach(function (file: string) {
-    const sourceFile = path.join(source, file);
-    const stat = fs.lstatSync(sourceFile);
-    if (stat.isDirectory()) {
-      files = files.concat(findHtmlFilesRecursive(sourceFile));
-    } else {
-      if (path.extname(sourceFile) == '.html') {
-        files.push(sourceFile);
-      }
-    }
-  });
-  return files;
-}
-
-function replaceKeywordsInHtmlFile(file: string) {
-  let content = fs.readFileSync(file, 'utf8');
-  const pairs = appConfig.htmlTemplatePairs;
-  pairs.forEach(function (pair: object) {
-    // @ts-ignore
-    content = content.replaceAll(pair.key, pair.value);
-  });
-  file = file.replace("public\\", DEPLOY_TARGET);
-  fs.writeFileSync(file, content);
-}
-
-function buildHtmlFiles(source: string) {
-  const files = findHtmlFilesRecursive(source);
-  files.forEach(function (file: string) {
-    replaceKeywordsInHtmlFile(file);
-  });
-}
-
-function mkdirSync(path: string) {
-  try {
-    fs.mkdirSync(path);
-  } catch (e: any) {
-    if (e.code != 'EEXIST') throw e;
-  }
-}
-
-function copyFiles(source: string, target: string) {
-  const files = fs.readdirSync(source);
-  files.forEach(function (file: string) {
-    const sourceFile = path.join(source, file);
-    const targetFile = path.join(target, file);
-    const stat = fs.lstatSync(sourceFile);
-    if (stat.isDirectory()) {
-      mkdirSync(targetFile);
-      copyFiles(sourceFile, targetFile);
-    } else {
-      fs.writeFileSync(targetFile, fs.readFileSync(sourceFile));
-    }
-  });
-}
-
-deleteFolderRecursive(DEPLOY_TARGET);
-mkdirSync(DEPLOY_TARGET);
-copyFiles(DEPLOY_ENTRY, DEPLOY_TARGET);
-buildHtmlFiles(DEPLOY_ENTRY);
-
-console.log("Deployed to " + DEPLOY_TARGET);
\ No newline at end of file
diff --git a/tools/parse.ts b/tools/parse.ts
new file mode 100644
index 0000000..cbca746
--- /dev/null
+++ b/tools/parse.ts
@@ -0,0 +1,43 @@
+import * as fs from 'fs';
+import * as path from 'path';
+const appConfig = JSON.parse(fs.readFileSync('./app.config.json', 'utf8'));
+const DEPLOY_TARGET = "./dist/";
+
+function findHtmlFilesRecursive(source: string): string[] {
+  let files: string[] = [];
+  const dir = fs.readdirSync(source);
+  dir.forEach(function (file: string) {
+    const sourceFile = path.join(source, file);
+    const stat = fs.lstatSync(sourceFile);
+    if (stat.isDirectory()) {
+      files = files.concat(findHtmlFilesRecursive(sourceFile));
+    } else {
+      if (path.extname(sourceFile) == '.html') {
+        files.push(sourceFile);
+      }
+    }
+  });
+  return files;
+}
+
+function replaceKeywordsInHtmlFile(file: string) {
+  let content = fs.readFileSync(file, 'utf8');
+  const pairs: { key: string, value: string }[] = appConfig.htmlTemplatePairs;
+  pairs.forEach(function (pair: { key: string, value: string }) {
+    //@ts-ignore
+    content = content.replaceAll(pair.key, pair.value);
+  });
+  file = file.replace("public\\", DEPLOY_TARGET);
+  fs.writeFileSync(file, content);
+}
+
+function buildHtmlFiles(source: string) {
+  const files = findHtmlFilesRecursive(source);
+  files.forEach(function (file: string) {
+    replaceKeywordsInHtmlFile(file);
+  });
+}
+
+buildHtmlFiles(DEPLOY_TARGET);
+
+console.log("Parsed Files: ", findHtmlFilesRecursive(DEPLOY_TARGET));
diff --git a/tsconfig.json b/tsconfig.json
index 3e8038b..83b9bb7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,7 @@
         // "incremental": true,                         /* Enable incremental compilation */
         "target": "ESNext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */,
         "module": "ESNext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
-        // "lib": ["ESNext"],                                   /* Specify library files to be included in the compilation. */
+        "lib": ["ESNext"],                                   /* Specify library files to be included in the compilation. */
         // "allowJs": true,                             /* Allow javascript files to be compiled. */
         // "checkJs": true,                             /* Report errors in .js files. */
         // "jsx": "preserve",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
diff --git a/vite.config.background.js b/vite.config.background.js
deleted file mode 100644
index 3f0daf4..0000000
--- a/vite.config.background.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { defineConfig } from "vite";
-import { resolve } from "path";
-import tsconfigPaths from "vite-tsconfig-paths";
-
-export default defineConfig({
-	build: {
-		rollupOptions: {
-			input: resolve(__dirname, "src/background.ts"),
-			output: {
-				entryFileNames: "background.js",
-				dir: resolve(__dirname, "dist/js"),
-			},
-		},
-		sourcemap: true,
-	},
-	plugins: [tsconfigPaths()],
-	resolve: {
-		extensions: [".tsx", ".ts"],
-	},
-	esbuild: {
-		include: /.*\.tsx?$/,
-		exclude: [/node_modules/, /dist/, /src\/app\.ts/, /src\/settings\.ts/],
-	},
-});
diff --git a/vite.config.js b/vite.config.js
index 44d2f87..fb93c29 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,29 +1,43 @@
-import { defineConfig } from "vite";
-import { resolve } from "path";
-import tsconfigPaths from "vite-tsconfig-paths";
+import { defineConfig } from 'vite';
+import { resolve } from 'path';
+import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
-	build: {
-		rollupOptions: {
-			input: resolve(__dirname, "src/app.ts"),
-			output: {
-				entryFileNames: "app.js",
-				dir: resolve(__dirname, "dist/js"),
-			},
-		},
-		sourcemap: true,
-	},
-	plugins: [tsconfigPaths()],
-	resolve: {
-		extensions: [".tsx", ".ts"],
-	},
-	esbuild: {
-		include: /.*\.tsx?$/,
-		exclude: [
-			/node_modules/,
-			/dist/,
-			/src\/background\.ts/,
-			/src\/settings\.ts/,
-		],
-	},
+  build: {
+    rollupOptions: {
+      input: {
+        app: resolve(__dirname, 'src/app.ts'),
+        settings: resolve(__dirname, 'src/settings.ts'),
+        background: resolve(__dirname, 'src/background.ts'),
+      },
+      output: {
+        entryFileNames: '[name].js',
+        dir: resolve(__dirname, 'dist'),
+      },
+    },
+    sourcemap: true,
+  },
+  plugins: [
+    tsconfigPaths(),
+  ],
+  resolve: {
+    extensions: ['.tsx', '.ts', '.scss', '.sass'],
+  },
+  css: {
+    preprocessorOptions: {
+      sass: {
+        additionalData: `@import "@/src/sass/app.sass"`, // optional
+      },
+    },
+  },
+  esbuild: {
+    include: /.*\.tsx?$/,
+    exclude: [
+      /node_modules/,
+      /dist/,
+    //   /src\/background\.ts/,
+    //   /src\/settings\.ts/,
+    //   /src\/app\.ts/,
+    ],
+  },
 });
diff --git a/vite.config.settings.js b/vite.config.settings.js
deleted file mode 100644
index 0508763..0000000
--- a/vite.config.settings.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { defineConfig } from "vite";
-import { resolve } from "path";
-import tsconfigPaths from "vite-tsconfig-paths";
-
-export default defineConfig({
-	build: {
-		rollupOptions: {
-			input: resolve(__dirname, "src/settings.ts"),
-			output: {
-				entryFileNames: "settings.js",
-				dir: resolve(__dirname, "dist/js"),
-			},
-		},
-		sourcemap: true,
-	},
-	plugins: [tsconfigPaths()],
-	resolve: {
-		extensions: [".tsx", ".ts"],
-	},
-	esbuild: {
-		include: /.*\.tsx?$/,
-		exclude: [
-			/node_modules/,
-			/dist/,
-			/src\/background\.ts/,
-			/src\/app\.ts/,
-		],
-	},
-});
