diff --git a/src/webpage/home.html b/src/webpage/home.html
index 4aa979f..ac50c0f 100644
--- a/src/webpage/home.html
+++ b/src/webpage/home.html
@@ -11,9 +11,10 @@
 		<meta content="#4b458c" data-react-helmet="true" name="theme-color">
 		<link href="/style.css" rel="stylesheet">
 		<link href="/themes.css" rel="stylesheet" id="lightcss">
+		<style>body.no-theme{background:#16191b;}@media(prefers-color-scheme:light){body.no-theme{background:#9397bd;}}</style>
 	</head>
 
-	<body class="Dark-theme" style="overflow-y: scroll;">
+	<body class="no-theme" style="overflow-y: scroll;">
 		<div id="titleDiv">
 			<img src="/logo.svg" width="40">
 			<h1 id="pageTitle">Jank Client</h1>
diff --git a/src/webpage/index.html b/src/webpage/index.html
index 1324436..fcf0797 100644
--- a/src/webpage/index.html
+++ b/src/webpage/index.html
@@ -11,11 +11,11 @@
 		<meta content="#4b458c" data-react-helmet="true" name="theme-color">
 		<link href="/style.css" rel="stylesheet">
 		<link href="/themes.css" rel="stylesheet" id="lightcss">
-		<style>body,#loading{background:#16191b;}@media(prefers-color-scheme:light){body,#loading{background:#9397bd;}}</style>
+		<style>body.no-theme,#loading{background:#16191b;}@media(prefers-color-scheme:light){body.no-theme,#loading{background:#9397bd;}}</style>
 		<link rel="manifest" href="/manifest.json">
 	</head>
 
-	<body>
+	<body class="no-theme">
 		<script src="/index.js" type="module"></script>
 
 		<div id="loading" class="loading">
diff --git a/src/webpage/invite.html b/src/webpage/invite.html
index 6b13c11..5a2c3d7 100644
--- a/src/webpage/invite.html
+++ b/src/webpage/invite.html
@@ -1,4 +1,5 @@
-<body class="Dark-theme">
+<!DOCTYPE html>
+<html lang="en">
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -10,14 +11,17 @@
 		<meta content="#4b458c" data-react-helmet="true" name="theme-color">
 		<link href="/style.css" rel="stylesheet">
 		<link href="/themes.css" rel="stylesheet" id="lightcss">
+		<style>body.no-theme{background:#16191b;}@media(prefers-color-scheme:light){body.no-theme{background:#9397bd;}}</style>
 	</head>
-	<div>
-		<div id="invitebody">
-			<div id="inviteimg"></div>
-			<h1 id="invitename">Server Name</h1>
-			<p id="invitedescription">Someone invited you to Server Name</p>
-			<button id="AcceptInvite">Accept Invite</button>
+	<body class="no-theme">
+		<div>
+			<div id="invitebody">
+				<div id="inviteimg"></div>
+				<h1 id="invitename">Server Name</h1>
+				<p id="invitedescription">Someone invited you to Server Name</p>
+				<button id="AcceptInvite">Accept Invite</button>
+			</div>
 		</div>
-	</div>
-	<script type="module" src="/invite.js"></script>
-</body>
+		<script type="module" src="/invite.js"></script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/src/webpage/login.html b/src/webpage/login.html
index 50bf7db..dcaf1d1 100644
--- a/src/webpage/login.html
+++ b/src/webpage/login.html
@@ -1,4 +1,5 @@
-<body class="Dark-theme">
+<!DOCTYPE html>
+<html lang="en">
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -12,46 +13,49 @@
 		<meta content="#4b458c" data-react-helmet="true" name="theme-color">
 		<link href="/style.css" rel="stylesheet">
 		<link href="/themes.css" rel="stylesheet" id="lightcss">
+		<style>body.no-theme{background:#16191b;}@media(prefers-color-scheme:light){body.no-theme{background:#9397bd;}}</style>
 	</head>
-	<div id="logindiv">
-		<h1>Login</h1>
-		<form id="form" submit="check(e)">
-			<label for="instance"><b>Instance:</b></label>
-			<p id="verify"></p>
-			<input
-				type="search"
-				list="instances"
-				placeholder="Instance URL"
-				name="instance"
-				id="instancein"
-				value=""
-				required
-			>
+	<body class="no-theme">
+		<div id="logindiv">
+			<h1>Login</h1>
+			<form id="form" submit="check(e)">
+				<label for="instance"><b>Instance:</b></label>
+				<p id="verify"></p>
+				<input
+					type="search"
+					list="instances"
+					placeholder="Instance URL"
+					name="instance"
+					id="instancein"
+					value=""
+					required
+				>
 
-			<label for="uname"><b>Email:</b></label>
-			<input
-				type="text"
-				placeholder="Enter email address"
-				name="uname"
-				id="uname"
-				required
-			>
+				<label for="uname"><b>Email:</b></label>
+				<input
+					type="text"
+					placeholder="Enter email address"
+					name="uname"
+					id="uname"
+					required
+				>
 
-			<label for="psw"><b>Password:</b></label>
-			<input
-				type="password"
-				placeholder="Enter Password"
-				name="psw"
-				id="psw"
-				required
-			>
-			<p class="wrongred" id="wrong"></p>
+				<label for="psw"><b>Password:</b></label>
+				<input
+					type="password"
+					placeholder="Enter Password"
+					name="psw"
+					id="psw"
+					required
+				>
+				<p class="wrongred" id="wrong"></p>
 
-			<div id="h-captcha"></div>
-			<button type="submit">Login</button>
-		</form>
-		<a href="/register.html" id="switch">Don't have an account?</a>
-	</div>
-	<datalist id="instances"></datalist>
-	<script src="/login.js" type="module"></script>
-</body>
+				<div id="h-captcha"></div>
+				<button type="submit">Login</button>
+			</form>
+			<a href="/register.html" id="switch">Don't have an account?</a>
+		</div>
+		<datalist id="instances"></datalist>
+		<script src="/login.js" type="module"></script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/src/webpage/oauth2/authorize.html b/src/webpage/oauth2/authorize.html
index 00d8a51..b2d61d7 100644
--- a/src/webpage/oauth2/authorize.html
+++ b/src/webpage/oauth2/authorize.html
@@ -1,4 +1,5 @@
-<body class="Dark-theme">
+<!DOCTYPE html>
+<html lang="en">
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -9,15 +10,18 @@
 		<meta content="#4b458c" data-react-helmet="true" name="theme-color">
 		<link href="/style.css" rel="stylesheet">
 		<link href="/themes.css" rel="stylesheet" id="lightcss">
+		<style>body.no-theme{background:#16191b;}@media(prefers-color-scheme:light){body.no-theme{background:#9397bd;}}</style>
 	</head>
-	<div>
-		<div id="invitebody">
-			<img id="inviteimg" class="pfp"/>
-			<h1 id="invitename">Bot Name</h1>
-			<p id="invitedescription">Add Bot</p>
-			<div id="permissions"><h1>This will allow the bot to:</h1></div>
-			<button id="AcceptInvite">Add to server</button>
+	<body class="no-theme">
+		<div>
+			<div id="invitebody">
+				<img id="inviteimg" class="pfp"/>
+				<h1 id="invitename">Bot Name</h1>
+				<p id="invitedescription">Add Bot</p>
+				<div id="permissions"><h1>This will allow the bot to:</h1></div>
+				<button id="AcceptInvite">Add to server</button>
+			</div>
 		</div>
-	</div>
-	<script type="module" src="/oauth2/auth.js"></script>
-</body>
+		<script type="module" src="/oauth2/auth.js"></script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/src/webpage/register.html b/src/webpage/register.html
index 6abace8..8d8b3fd 100644
--- a/src/webpage/register.html
+++ b/src/webpage/register.html
@@ -1,5 +1,5 @@
-<body class="Dark-theme">
-
+<!DOCTYPE html>
+<html lang="en">
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -10,52 +10,55 @@
 		<meta content="#4b458c" data-react-helmet="true" name="theme-color">
 		<link href="/style.css" rel="stylesheet">
 		<link href="/themes.css" rel="stylesheet" id="lightcss">
+		<style>body.no-theme{background:#16191b;}@media(prefers-color-scheme:light){body.no-theme{background:#9397bd;}}</style>
 	</head>
-	<div id="logindiv">
-		<h1>Create an account</h1>
-		<form id="register" submit="registertry(e)">
-			<div>
-				<label for="instance"><b>Instance:</b></label>
-				<p id="verify"></p>
-				<input type="search" list="instances" placeholder="Instance URL" id="instancein" name="instance" value="" required>
-			</div>
-			<div>
-				<label for="uname"><b>Email:</b></label>
-				<input type="text" placeholder="Enter Email" name="uname" id="uname" required>
-			</div>
+	<body class="no-theme">
+		<div id="logindiv">
+			<h1>Create an account</h1>
+			<form id="register" submit="registertry(e)">
+				<div>
+					<label for="instance"><b>Instance:</b></label>
+					<p id="verify"></p>
+					<input type="search" list="instances" placeholder="Instance URL" id="instancein" name="instance" value="" required>
+				</div>
+				<div>
+					<label for="uname"><b>Email:</b></label>
+					<input type="text" placeholder="Enter Email" name="uname" id="uname" required>
+				</div>
 
-			<div>
-				<label for="uname"><b>Username:</b></label>
-				<input type="text" placeholder="Enter Username" name="username" id="username" required>
-			</div>
-			<div>
-				<label for="psw"><b>Password:</b></label>
-				<input type="password" placeholder="Enter Password" name="psw" id="psw" required>
-			</div>
+				<div>
+					<label for="uname"><b>Username:</b></label>
+					<input type="text" placeholder="Enter Username" name="username" id="username" required>
+				</div>
+				<div>
+					<label for="psw"><b>Password:</b></label>
+					<input type="password" placeholder="Enter Password" name="psw" id="psw" required>
+				</div>
 
-			<div>
-				<label for="psw2"><b>Enter password again:</b></label>
-				<input type="password" placeholder="Enter Password Again" name="psw2" id="psw2" required>
-			</div>
+				<div>
+					<label for="psw2"><b>Enter password again:</b></label>
+					<input type="password" placeholder="Enter Password Again" name="psw2" id="psw2" required>
+				</div>
 
-			<div>
-				<label for="date"><b>Date of birth:</b></label>
-				<input type="date" id="date" name="date">
-			</div>
+				<div>
+					<label for="date"><b>Date of birth:</b></label>
+					<input type="date" id="date" name="date">
+				</div>
 
-			<div>
-				<b id="TOSbox">I agree to the <a href="" id="TOSa">Terms of Service</a>:</b>
-				<input type="checkbox" id="TOS" name="TOS">
-			</div>
+				<div>
+					<b id="TOSbox">I agree to the <a href="" id="TOSa">Terms of Service</a>:</b>
+					<input type="checkbox" id="TOS" name="TOS">
+				</div>
 
-			<p class="wrongred" id="wrong"></p>
-			<div id="h-captcha">
+				<p class="wrongred" id="wrong"></p>
+				<div id="h-captcha">
 
-			</div>
-			<button type="submit" class="dontgrow">Create account</button>
-		</form>
-		<a href="/login.html" id="switch">Already have an account?</a>
-	</div>
-	<datalist id="instances"></datalist>
-	<script src="/register.js" type="module"></script>
-</body>
\ No newline at end of file
+				</div>
+				<button type="submit" class="dontgrow">Create account</button>
+			</form>
+			<a href="/login.html" id="switch">Already have an account?</a>
+		</div>
+		<datalist id="instances"></datalist>
+		<script src="/register.js" type="module"></script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/src/webpage/style.css b/src/webpage/style.css
index 07f0e4a..03a8eb0 100644
--- a/src/webpage/style.css
+++ b/src/webpage/style.css
@@ -1,5 +1,6 @@
 /* General */
 body {
+	height: 100%;
 	margin: 0;
 	background: var(--secondary-bg);
 	font-family: var(--font);
