From 72d0cbb37bf3250f17d0e278a95f03b1392d6295 Mon Sep 17 00:00:00 2001
From: dakrk <dark@darkok.xyz>
Date: Fri, 5 Apr 2024 17:16:20 +0100
Subject: [PATCH 1/4] Fix indentation (consistent formatting CHALLENGE)

You people have a prettierrc yet never run prettier

tabs or spaces. WHICH IS IT
2 width or 4 width WHICH IS IT

(i'd make index.html 4 width tab but there's more that uses space there)
---
 Config.ts                         |  26 +++---
 src/html/index.html               | 128 +++++++++++++++---------------
 src/ts/StringLike.ts              |   3 +-
 src/ts/i18n.ts                    |   6 +-
 src/ts/main.ts                    |   2 +-
 src/ts/protocol/CollabVMClient.ts |   2 +-
 src/ts/protocol/Permissions.ts    |   6 +-
 src/ts/tests/format.test.ts       |   2 +-
 static/lang/languages.json        |   2 +-
 9 files changed, 88 insertions(+), 89 deletions(-)

diff --git a/Config.ts b/Config.ts
index 439af6b..f751f99 100644
--- a/Config.ts
+++ b/Config.ts
@@ -1,14 +1,14 @@
 export const Config = {
-    ChatSound: "//computernewb.com/collab-vm/notify.ogg",
-    ServerAddresses: [
-        "wss://computernewb.com/collab-vm/vm0",
-        "wss://computernewb.com/collab-vm/vm1",
-        "wss://computernewb.com/collab-vm/vm2",
-        "wss://computernewb.com/collab-vm/vm3",
-        "wss://computernewb.com/collab-vm/vm4",
-        "wss://computernewb.com/collab-vm/vm5",
-        "wss://computernewb.com/collab-vm/vm6",
-        "wss://computernewb.com/collab-vm/vm7",
-        "wss://computernewb.com/collab-vm/vm8",
-    ]
-}
\ No newline at end of file
+	ChatSound: '//computernewb.com/collab-vm/notify.ogg',
+	ServerAddresses: [
+		'wss://computernewb.com/collab-vm/vm0',
+		'wss://computernewb.com/collab-vm/vm1',
+		'wss://computernewb.com/collab-vm/vm2',
+		'wss://computernewb.com/collab-vm/vm3',
+		'wss://computernewb.com/collab-vm/vm4',
+		'wss://computernewb.com/collab-vm/vm5',
+		'wss://computernewb.com/collab-vm/vm6',
+		'wss://computernewb.com/collab-vm/vm7',
+		'wss://computernewb.com/collab-vm/vm8'
+	]
+};
diff --git a/src/html/index.html b/src/html/index.html
index e3a7d4d..de8809c 100644
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -35,51 +35,51 @@
                 </div>
             </div>
         </div>
-	<div class="modal fade" id="welcomeModal" tabindex="-1" data-bs-backdrop="static" data-bs-keyboard="false" aria-labelledby="welcomeModalLabel" aria-hidden="true">
-		<div class="modal-dialog modal-lg">
-			<div class="modal-content bg-dark text-light">
-				<div class="modal-header">
-					<h1>Welcome to CollabVM</h1>
-				</div>
-				<div class="modal-body">
-					<p>Before continuing, please familiarize yourself with our rules:</p>
-					<h3>R1. Don't break the law.</h3>
-					Do not use CollabVM or CollabVM's network to violate United States federal law, New York state law, or international law. If CollabVM becomes aware a crime has been committed through its service, you will be immediately banned, and your activities may be reported to the authorities if necessary.<br><br>CollabVM is required by law to notify law enforcement agencies if it becomes aware of the presence of child pornography on, or being transmitted through its network.<br><br>COPPA is also enforced, please do not use CollabVM if you are under the age of 13 years old.
-					<h3>R2. No running DoS/DDoS tools.</h3>
-					Do not use CollabVM to DoS/DDoS an indivdiual, business, company, or anyone else.
-					<h3>R3. No spam distribution.</h3>
-					Do not spam any emails using this service or push spam in general.
-					<h3>R4. Do not abuse any exploits.</h3>
-					Do not abuse any exploits, additionally if you see someone abusing exploits or you need to report one, please contact me at: computernewbab@gmail.com
-					<h3>R5. Don't impersonate other users.</h3>
-					Do not impersonate other members of CollabVM. If caught, you'll be temporarily disconnected, and banned if necessary.
-					<h3>R6. One vote per person.</h3>
-					Do not use any methods or tools to bypass the vote restriction. Only one vote per person is allowed, no matter what. Anybody who is caught doing this will be banned.
-					<h3>R7. No Remote Administration Tools.</h3>
-					Do not use any remote administration tools (ex: DarkComet, NanoCore, Anydesk, TeamViewer, Orcus, etc.)
-					<h3>R8. No bypassing CollabNet.</h3>
-					Do not attempt to bypass the blocking provided by CollabNet, especially if it is being used to break Rule 1, Rule 2, or Rule 7 (or run stupid over-used things).
-					<h3>R9. No performing destructive actions constantly.</h3>
-					Any user may not destroy the VM (rendering it unusable constantly), install/reinstall the operating system (except on VM7 or VM8), or run bots that do such. This includes bots that spam massive amounts of keyboard/mouse input ("kitting").
-					<h3>R10. No Cryptomining</h3>
-					Attempting to mine cryptocurrency on the VMs will result in a kick, and then a permanent ban if you keep attempting. Besides, it's not like you're gonna make any money off it.
-					<h3>NSFW Warning</h3>
-					Please note that NSFW content is allowed on our anarchy VM (VM0b0t), and is viewed regularly. In addition, while we give a good effort to keep NSFW off the main VMs, people will occasionally slip it through.
-				</div>
-				<div class="modal-footer">
-				        <button type="button" id="welcomeModalDismiss" class="btn btn-primary" data-bs-dismiss="modal">Understood</button>
-				</div>
-			</div>
-		</div>
-	</div>
+    <div class="modal fade" id="welcomeModal" tabindex="-1" data-bs-backdrop="static" data-bs-keyboard="false" aria-labelledby="welcomeModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content bg-dark text-light">
+                <div class="modal-header">
+                    <h1>Welcome to CollabVM</h1>
+                </div>
+                <div class="modal-body">
+                    <p>Before continuing, please familiarize yourself with our rules:</p>
+                    <h3>R1. Don't break the law.</h3>
+                    Do not use CollabVM or CollabVM's network to violate United States federal law, New York state law, or international law. If CollabVM becomes aware a crime has been committed through its service, you will be immediately banned, and your activities may be reported to the authorities if necessary.<br><br>CollabVM is required by law to notify law enforcement agencies if it becomes aware of the presence of child pornography on, or being transmitted through its network.<br><br>COPPA is also enforced, please do not use CollabVM if you are under the age of 13 years old.
+                    <h3>R2. No running DoS/DDoS tools.</h3>
+                    Do not use CollabVM to DoS/DDoS an indivdiual, business, company, or anyone else.
+                    <h3>R3. No spam distribution.</h3>
+                    Do not spam any emails using this service or push spam in general.
+                    <h3>R4. Do not abuse any exploits.</h3>
+                    Do not abuse any exploits, additionally if you see someone abusing exploits or you need to report one, please contact me at: computernewbab@gmail.com
+                    <h3>R5. Don't impersonate other users.</h3>
+                    Do not impersonate other members of CollabVM. If caught, you'll be temporarily disconnected, and banned if necessary.
+                    <h3>R6. One vote per person.</h3>
+                    Do not use any methods or tools to bypass the vote restriction. Only one vote per person is allowed, no matter what. Anybody who is caught doing this will be banned.
+                    <h3>R7. No Remote Administration Tools.</h3>
+                    Do not use any remote administration tools (ex: DarkComet, NanoCore, Anydesk, TeamViewer, Orcus, etc.)
+                    <h3>R8. No bypassing CollabNet.</h3>
+                    Do not attempt to bypass the blocking provided by CollabNet, especially if it is being used to break Rule 1, Rule 2, or Rule 7 (or run stupid over-used things).
+                    <h3>R9. No performing destructive actions constantly.</h3>
+                    Any user may not destroy the VM (rendering it unusable constantly), install/reinstall the operating system (except on VM7 or VM8), or run bots that do such. This includes bots that spam massive amounts of keyboard/mouse input ("kitting").
+                    <h3>R10. No Cryptomining</h3>
+                    Attempting to mine cryptocurrency on the VMs will result in a kick, and then a permanent ban if you keep attempting. Besides, it's not like you're gonna make any money off it.
+                    <h3>NSFW Warning</h3>
+                    Please note that NSFW content is allowed on our anarchy VM (VM0b0t), and is viewed regularly. In addition, while we give a good effort to keep NSFW off the main VMs, people will occasionally slip it through.
+                </div>
+                <div class="modal-footer">
+                        <button type="button" id="welcomeModalDismiss" class="btn btn-primary" data-bs-dismiss="modal">Understood</button>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="modal fade" id="loginModal" tabindex="-1" aria-labelledby="loginModalLabel" aria-hidden="true">
-		<div class="modal-dialog modal-md">
-			<div class="modal-content bg-dark text-light">
-				<div class="modal-header">
-					<h5 class="modal-title">Login</h5>
+        <div class="modal-dialog modal-md">
+            <div class="modal-content bg-dark text-light">
+                <div class="modal-header">
+                    <h5 class="modal-title">Login</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-				</div>
-				<div class="modal-body">
+                </div>
+                <div class="modal-body">
                     <div class="alert alert-danger alert-dismissible" id="badPasswordAlert" role="alert">
                         Incorrect password.
                         <button type="button" class="btn-close" aria-label="Close" id="incorrectPasswordDismissBtn"></button>
@@ -90,13 +90,13 @@
                         <input id="adminPassword" type="password" class="form-control bg-dark text-light" placeholder="Password" name="password"/>   
                     </div>
 
-				</div>
-				<div class="modal-footer">
-				    <button type="button" id="loginButton" class="btn btn-primary">Login</button>
-				</div>
-			</div>
-		</div>
-	</div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" id="loginButton" class="btn btn-primary">Login</button>
+                </div>
+            </div>
+        </div>
+    </div>
         <div class="modal fade" id="hcaptchaModal" tabindex="-1" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content bg-dark text-light">
@@ -123,16 +123,16 @@
                         <li class="nav-item">
                             <a href="https://computernewb.com/collab-vm/rules" class="nav-link"><i class="fa-solid fa-clipboard-check"></i> <span id="rulesBtnText"></span></a>
                         </li>
-			            <li class="nav-item">
+                        <li class="nav-item">
                             <a href="https://discord.gg/a4kqb4mGyX" class="nav-link"><i class="fa-brands fa-discord"></i> Discord</a>
                         </li>
-			            <li class="nav-item">
+                        <li class="nav-item">
                             <a href="https://reddit.com/r/collabvm" class="nav-link"><i class="fa-brands fa-reddit"></i> Subreddit</a>
                         </li>
                         <li class="nav-item">
                             <a rel="me" class="nav-link" href="https://fedi.computernewb.com/@collabvm"><i class="fa-brands fa-mastodon"></i> Mastodon</a>
                         </li>
-			            <li class="nav-item">
+                        <li class="nav-item">
                             <a href="https://computernewb.com/collab-vm/user-vm" class="nav-link"><i class="fa-solid fa-user"></i> UserVM</a>
                         </li>
                     </ul>
@@ -171,19 +171,19 @@
                     <button class="btn btn-secondary" id="qemuMonitorBtn" data-bs-toggle="modal" data-bs-target="#qemuMonitorModal"><i class="fa-solid fa-terminal"></i> QEMU Monitor</button>
                 </div>
             </div>
-			<div class="osk-container d-none" id="osk-container">
-			  <div class="osk-main"></div>
+            <div class="osk-container d-none" id="osk-container">
+                <div class="osk-main"></div>
 
-			  <div class="controlArrows">
-				<div class="osk-control"></div>
-				<div class="osk-arrows"></div>
-			  </div>
+                <div class="controlArrows">
+                    <div class="osk-control"></div>
+                    <div class="osk-arrows"></div>
+                </div>
 
-			  <div class="numPad">
-				<div class="osk-numpad"></div>
-				<div class="osk-numpadEnd"></div>
-			  </div>
-			</div>
+                <div class="numPad">
+                    <div class="osk-numpad"></div>
+                    <div class="osk-numpadEnd"></div>
+                </div>
+            </div>
             <div class="row">
                 <div class="col-md-4">
                     <div class="table-responsive username-table">
diff --git a/src/ts/StringLike.ts b/src/ts/StringLike.ts
index 2ed941b..ecc6989 100644
--- a/src/ts/StringLike.ts
+++ b/src/ts/StringLike.ts
@@ -1,4 +1,3 @@
-
 // TODO: `Object` has a toString(), but we should probably gate that off
 /// Interface for things that can be turned into strings
 export interface ToStringable {
@@ -6,4 +5,4 @@ export interface ToStringable {
 }
 
 /// A type for strings, or things that can (in a valid manner) be turned into strings
-export type StringLike = string | ToStringable;
\ No newline at end of file
+export type StringLike = string | ToStringable;
diff --git a/src/ts/i18n.ts b/src/ts/i18n.ts
index 4db684e..a8128f7 100644
--- a/src/ts/i18n.ts
+++ b/src/ts/i18n.ts
@@ -42,7 +42,7 @@ export enum I18nStringKey {
 
 	kError_UsernameTaken = 'kError_UsernameTaken',
 	kError_UsernameInvalid = 'kError_UsernameInvalid',
-	kError_UsernameBlacklisted = 'kError_UsernameBlacklisted',
+	kError_UsernameBlacklisted = 'kError_UsernameBlacklisted'
 }
 
 // This models the JSON structure.
@@ -68,7 +68,7 @@ type LanguagesJson = {
 
 	// The default language (set if a invalid language not in the languages array is set, or no language is set)
 	defaultLanguage: string;
-}
+};
 
 // ID for fallback language
 const fallbackId = '!!fallback';
@@ -77,7 +77,7 @@ const fallbackId = '!!fallback';
 const fallbackLanguage: Language = {
 	languageName: 'Fallback',
 	translatedLanguageName: 'Fallback',
-	flag: "no",
+	flag: 'no',
 	author: 'Computernewb',
 
 	stringKeys: {
diff --git a/src/ts/main.ts b/src/ts/main.ts
index e2d549d..d13243e 100644
--- a/src/ts/main.ts
+++ b/src/ts/main.ts
@@ -368,7 +368,7 @@ async function openVM(vm: VM): Promise<void> {
 		throw new Error('Failed to connect to node');
 	}
 	// Set the title
-	document.title = Format("{0} - {1}", vm.id, TheI18n.GetString(I18nStringKey.kGeneric_CollabVM));
+	document.title = Format('{0} - {1}', vm.id, TheI18n.GetString(I18nStringKey.kGeneric_CollabVM));
 	// Append canvas
 	elements.vmDisplay.appendChild(VM!.canvas);
 	// Switch to the VM view
diff --git a/src/ts/protocol/CollabVMClient.ts b/src/ts/protocol/CollabVMClient.ts
index 46c81d2..82afe96 100644
--- a/src/ts/protocol/CollabVMClient.ts
+++ b/src/ts/protocol/CollabVMClient.ts
@@ -438,7 +438,7 @@ export default class CollabVMClient {
 		this.connectedToVM = false;
 
 		// call all unsubscribe callbacks explicitly
-		for(let cb of this.unsubscribeCallbacks) {
+		for (let cb of this.unsubscribeCallbacks) {
 			cb();
 		}
 		this.unsubscribeCallbacks = [];
diff --git a/src/ts/protocol/Permissions.ts b/src/ts/protocol/Permissions.ts
index 9d3e63b..c5f15c2 100644
--- a/src/ts/protocol/Permissions.ts
+++ b/src/ts/protocol/Permissions.ts
@@ -11,10 +11,10 @@ export class Permissions {
 	xss: boolean = false;
 
 	constructor(mask: number) {
-        this.set(mask);
+		this.set(mask);
 	}
 
-    set(mask: number) {
+	set(mask: number) {
 		this.restore = (mask & 1) !== 0;
 		this.reboot = (mask & 2) !== 0;
 		this.ban = (mask & 4) !== 0;
@@ -25,7 +25,7 @@ export class Permissions {
 		this.rename = (mask & 128) !== 0;
 		this.grabip = (mask & 256) !== 0;
 		this.xss = (mask & 512) !== 0;
-    }
+	}
 }
 
 export enum Rank {
diff --git a/src/ts/tests/format.test.ts b/src/ts/tests/format.test.ts
index 165792c..716970b 100644
--- a/src/ts/tests/format.test.ts
+++ b/src/ts/tests/format.test.ts
@@ -1,7 +1,7 @@
 import { Format } from '../format';
 
 test('a string without any format specifiers in it is unaltered', () => {
-    expect(Format("Hello World")).toBe("Hello World");
+	expect(Format('Hello World')).toBe('Hello World');
 });
 
 test('formatting a string works', () => {
diff --git a/static/lang/languages.json b/static/lang/languages.json
index 2d9b66a..3e03b62 100644
--- a/static/lang/languages.json
+++ b/static/lang/languages.json
@@ -1,4 +1,4 @@
 {
 	"languages": ["en-us", "pirate"],
-    "defaultLanguage": "en-us"
+	"defaultLanguage": "en-us"
 }

From 52499b8c6ec55ca5f510ea732eb048a4440c905b Mon Sep 17 00:00:00 2001
From: dakrk <dark@darkok.xyz>
Date: Fri, 5 Apr 2024 17:18:51 +0100
Subject: [PATCH 2/4] Introduce editorconfig

---
 .editorconfig | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..89897b8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = tab
+indent_size = 4
+
+# why
+[*.{html,css}]
+indent_style = space
+
+# WHY
+[*.css]
+indent_size = 2
\ No newline at end of file

From d3ad9a35858eb775d818a718a436b7c6b5d26a64 Mon Sep 17 00:00:00 2001
From: dakrk <dark@darkok.xyz>
Date: Fri, 5 Apr 2024 17:20:30 +0100
Subject: [PATCH 3/4] Indent CSS

some things aren't. WHY
---
 src/css/style.css | 132 +++++++++++++++++++++++-----------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/src/css/style.css b/src/css/style.css
index 9cac47e..fd422e9 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -125,128 +125,128 @@ tr.user-waiting > td {
 
 /* Start OSK */
 .osk-container {
-display: flex;
-justify-content: center;
-width: 1024px;
-margin: 0 auto;
-margin-bottom: 10px;
-border-radius: 5px;
+  display: flex;
+  justify-content: center;
+  width: 1024px;
+  margin: 0 auto;
+  margin-bottom: 10px;
+  border-radius: 5px;
 }
 
 .simple-keyboard.hg-theme-default {
-display: inline-block;
+  display: inline-block;
 }
 
 .osk-main.simple-keyboard {
-width: 640px;
-min-width: 640px;
-background: none;
+  width: 640px;
+  min-width: 640px;
+  background: none;
 }
 
 .osk-main.simple-keyboard .hg-row:first-child {
-margin-bottom: 8.51px;
+  margin-bottom: 8.51px; /* wtf? */
 }
 
 .osk-arrows.simple-keyboard {
-align-self: flex-end;
-background: none;
+  align-self: flex-end;
+  background: none;
 }
 
 .simple-keyboard .hg-button.selectedButton {
-background: rgba(5, 25, 70, 0.53);
-color: white;
+  background: rgba(5, 25, 70, 0.53);
+  color: white;
 }
 
 .simple-keyboard .hg-button.emptySpace {
-pointer-events: none;
-background: none;
-border: none;
-box-shadow: none;
+  pointer-events: none;
+  background: none;
+  border: none;
+  box-shadow: none;
 }
 
 .osk-arrows .hg-row {
-justify-content: center;
+  justify-content: center;
 }
 
 .osk-arrows .hg-button {
-width: 50px;
-flex-grow: 0 !important;
-justify-content: center !important;
-display: flex !important;
-align-items: center !important;
+  width: 50px;
+  flex-grow: 0 !important;
+  justify-content: center !important;
+  display: flex !important;
+  align-items: center !important;
 }
 
 .controlArrows {
-display: flex;
-align-items: center;
-justify-content: space-between;
-flex-flow: column;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-flow: column;
 }
 
 .osk-control.simple-keyboard {
-background: none;
+  background: none;
 }
 
 .osk-control.simple-keyboard .hg-row:first-child {
-margin-bottom: 8.51px;
+  margin-bottom: 8.51px;
 }
 
 .osk-control .hg-button {
-width: 50px;
-flex-grow: 0 !important;
-justify-content: center !important;
-display: flex !important;
-align-items: center !important;
+  width: 50px;
+  flex-grow: 0 !important;
+  justify-content: center !important;
+  display: flex !important;
+  align-items: center !important;
 }
 
 .numPad {
-display: flex;
-align-items: flex-end;
+  display: flex;
+  align-items: flex-end;
 }
 
 .osk-numpad.simple-keyboard {
-background: none;
+  background: none;
 }
 
 .osk-numpad.simple-keyboard {
-width: 160px;
+  width: 160px;
 }
 
 .osk-numpad.simple-keyboard .hg-button {
-width: 50px;
-justify-content: center;
-display: flex;
-align-items: center;
+  width: 50px;
+  justify-content: center;
+  display: flex;
+  align-items: center;
 }
 
 .osk-numpadEnd.simple-keyboard {
-width: 50px;
-background: none;
-margin: 0;
-padding: 5px 5px 5px 0;
+  width: 50px;
+  background: none;
+  margin: 0;
+  padding: 5px 5px 5px 0;
 }
 
 .osk-numpadEnd.simple-keyboard .hg-button {
-align-items: center;
-justify-content: center;
-display: flex;
+  align-items: center;
+  justify-content: center;
+  display: flex;
 }
 
 .osk-numpadEnd .hg-button.hg-standardBtn.hg-button-plus {
-height: 85px;
+  height: 85px;
 }
 
 .osk-numpadEnd.simple-keyboard .hg-button.hg-button-enter {
-height: 85px;
+  height: 85px;
 }
 
 .simple-keyboard.hg-theme-default .hg-button.hg-selectedButton {
-background: rgba(5, 25, 70, 0.53);
-color: white;
+  background: rgba(5, 25, 70, 0.53);
+  color: white;
 }
 
 .hg-button.hg-functionBtn.hg-button-space {
-width: 350px;
+  width: 350px;
 }
 
 /*
@@ -254,28 +254,28 @@ Theme: cvmDark
 */
 
 .simple-keyboard.cvmDark .hg-button {
-border-bottom: none;
-background: rgba(0, 0, 0, 0.5);
-color: white;
+  border-bottom: none;
+  background: rgba(0, 0, 0, 0.5);
+  color: white;
 }
 
 .simple-keyboard.cvmDark .hg-button:active {
-background: #1c4995;
-color: white;
+  background: #1c4995;
+  color: white;
 }
 
 #root .simple-keyboard.cvmDark + .simple-keyboard-preview {
-background: #1c4995;
+  background: #1c4995;
 }
 
 /*
 Theme: cvmDisabled
 */
 .simple-keyboard.cvmDisabled .hg-button {
-border-bottom: none;
-pointer-events: none;
-background: gray;
-color: white;
+  border-bottom: none;
+  pointer-events: none;
+  background: gray;
+  color: white;
 }
 
 /* End OSK */

From e1b8bfcebbd39cc19799e63e92b7c983a728067f Mon Sep 17 00:00:00 2001
From: dakrk <dark@darkok.xyz>
Date: Fri, 5 Apr 2024 17:27:53 +0100
Subject: [PATCH 4/4] Actually do bootstrap theme properly

why was it like this in the first place

(i ought to just complete the bootstrapless branch at this point)
---
 src/html/index.html | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/html/index.html b/src/html/index.html
index de8809c..41085c1 100644
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML>
-<html prefix="og: https://ogp.me/ns#">
+<html prefix="og: https://ogp.me/ns#" data-bs-theme="dark">
     <head>
         <title>CollabVM</title>
         <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -17,19 +17,19 @@
         <meta property="og:site_name" content="Computernewb"/>
         <meta property="og:image" content="https://computernewb.com/collab-vm/desktop.png"/>
     </head>
-    <body class="bg-dark">
+    <body>
         <div class="modal fade" id="qemuMonitorModal" tabindex="-1" aria-hidden="true">
             <div class="modal-dialog">
-                <div class="modal-content bg-dark text-light">
+                <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title">QEMU Monitor</h5>
                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                     </div>
                     <div class="modal-body">
-                        <textarea id="qemuMonitorOutput" readonly="" class="form-control bg-dark text-light"></textarea>
+                        <textarea id="qemuMonitorOutput" readonly="" class="form-control"></textarea>
                         <div class="input-group">
-                            <input type="text" id="qemuMonitorInput" class="form-control bg-dark text-light" placeholder="Command"/>
-                            <button class="btn btn-outline-secondary btn-primary text-light" type="button" id="qemuMonitorSendBtn">Send</button>
+                            <input type="text" id="qemuMonitorInput" class="form-control" placeholder="Command"/>
+                            <button class="btn btn-outline-secondary btn-primary" type="button" id="qemuMonitorSendBtn">Send</button>
                         </div>
                     </div>
                 </div>
@@ -37,7 +37,7 @@
         </div>
     <div class="modal fade" id="welcomeModal" tabindex="-1" data-bs-backdrop="static" data-bs-keyboard="false" aria-labelledby="welcomeModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-lg">
-            <div class="modal-content bg-dark text-light">
+            <div class="modal-content">
                 <div class="modal-header">
                     <h1>Welcome to CollabVM</h1>
                 </div>
@@ -74,7 +74,7 @@
     </div>
     <div class="modal fade" id="loginModal" tabindex="-1" aria-labelledby="loginModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-md">
-            <div class="modal-content bg-dark text-light">
+            <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title">Login</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
@@ -86,8 +86,8 @@
                     </div>
                     <div class="input-group">
                         <input type="hidden" name="username" id="adminInputVMID"/>
-                        <span class="input-group-text bg-dark text-light">Password</span>
-                        <input id="adminPassword" type="password" class="form-control bg-dark text-light" placeholder="Password" name="password"/>   
+                        <span class="input-group-text">Password</span>
+                        <input id="adminPassword" type="password" class="form-control" placeholder="Password" name="password"/>   
                     </div>
 
                 </div>
@@ -99,14 +99,14 @@
     </div>
         <div class="modal fade" id="hcaptchaModal" tabindex="-1" aria-hidden="true">
             <div class="modal-dialog">
-                <div class="modal-content bg-dark text-light">
+                <div class="modal-content">
                     <div class="modal-body">
                         <div id="captcha-box"></div>
                     </div>
                 </div>
             </div>
         </div>
-        <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+        <nav class="navbar navbar-expand-lg">
             <div class="container-fluid">
                 <a class="navbar-brand" href="#"><span id="siteNameText"></span></a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
@@ -144,8 +144,8 @@
         </div>
         <div class="container-fluid" id="vmview">
             <div id="vmDisplay"></div>
-            <p id="turnstatus" class="text-light"></p>
-            <div id="voteResetPanel" class="bg-dark text-light" style="display:none;">
+            <p id="turnstatus"></p>
+            <div id="voteResetPanel" style="display:none;">
                 <span id="voteResetHeaderText"></span><br/>
                 <button class="btn btn-success" id="voteYesBtn"><i class="fa-solid fa-check"></i> <span id="voteYesBtnText"></span><span class="badge bg-secondary" id="voteYesLabel"></span></button> <button class="btn btn-danger" id="voteNoBtn"><i class="fa-solid fa-ban"></i> <span id="voteNoBtnText"></span><span class="badge bg-secondary" id="voteNoLabel"></span></button><br/>
                 <span id="voteTimeText"></span>
@@ -187,9 +187,9 @@
             <div class="row">
                 <div class="col-md-4">
                     <div class="table-responsive username-table">
-                        <table class="table table-hover table-dark table-borderless">
+                        <table class="table table-hover table-borderless">
                             <thead>
-                                <th><i class="fa-solid fa-user"></i> <span id="usersOnlineText"></span> (<span id="onlineusercount"></span>)</th>
+                                <th class="bg-body-tertiary"><i class="fa-solid fa-user"></i> <span id="usersOnlineText"></span> (<span id="onlineusercount"></span>)</th>
                             </thead>
                             <tbody id="userlist"></tbody>
                         </table>
@@ -197,20 +197,20 @@
                 </div>
                 <div class="col-md-8">
                     <div class="table-responsive chat-table" id="chatListDiv">
-                        <table class="table table-hover table-dark table-borderless">
+                        <table class="table table-hover table-borderless">
                             <tbody id="chatList">
 
                             </tbody>
                         </table>
                     </div>
                     <div class="input-group">
-                        <span class="input-group-text bg-dark text-light" id="username">Username</span>
-                        <input type="text" class="form-control bg-dark text-light" id="chat-input"/>
-                        <div class="input-group-text bg-dark text-light" id="xssCheckboxContainer">
+                        <span class="input-group-text" id="username">Username</span>
+                        <input type="text" class="form-control" id="chat-input"/>
+                        <div class="input-group-text" id="xssCheckboxContainer">
                             <input class="form-check-input" type="checkbox" value="" id="xssCheckbox"/>
                             <label class="form-check-label" for="xssCheckbox">XSS</label>
                         </div>
-                        <button class="btn btn-primary text-light" type="button" id="sendChatBtn"><i class="fa-solid fa-paper-plane"></i></button>
+                        <button class="btn btn-primary" type="button" id="sendChatBtn"><i class="fa-solid fa-paper-plane"></i></button>
                     </div>
                 </div>
             </div>