diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 7de6089ee..c6b56263b 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -53,9 +53,9 @@
 			<p class="text-muted mb-md-2">No email address required.</p>
 			{% endif %}
 
-			<div class="max-w-md w-full space-y-8">
+			<div class="max-w-2xl w-full space-y-8 px-6 py-5 bg-gray-200 rounded shadow-sm">
 
-				<form action="/signup" method="post" class="mt-md-3" id="signup">
+				<form action="/signup" method="post" class="mt-8 space-y-6" id="signup">
 
 					{% if error %}<span class="text-danger">{{error}}</span><br>{% endif %}
 
@@ -68,7 +68,7 @@
 
 					<label for="username-register" class="mt-3">Username</label>
 
-					<input class="form-control" id="username-register"
+					<input class="form-input" id="username-register"
 					aria-describedby="usernameHelpRegister" type="text" name="username" pattern="[a-zA-Z0-9_\-]{3,25}" min="3" max="25" required="">
 					<small id="usernameHelpRegister"></small>
 
@@ -76,12 +76,12 @@
 
 					<small class="d-inline-block text-muted ml-1">(optional)</small>
 
-					<input class="form-control" id="email-register"
+					<input class="form-input" id="email-register"
 					aria-describedby="emailHelpRegister" type="text" name="email">
 
 					<label for="password-register" class="mt-3">Password</label>
 
-					<input class="form-control" id="password-register"
+					<input class="form-input" id="password-register"
 					aria-describedby="passwordHelpReigster" type="password" name="password" required="">
 					<small id="passwordHelpRegister" class="form-text font-weight-bold text-muted d-none mt-1">Minimum of 8
 						characters
@@ -91,7 +91,7 @@
 
 					<label for="password_confirm" class="mt-3">Confirm Password</label>
 
-					<input class="form-control" id="password_confirm" aria-describedby="passwordConfirmHelp" type="password" name="password_confirm" required="">
+					<input class="form-input" id="password_confirm" aria-describedby="passwordConfirmHelp" type="password" name="password_confirm" required="">
 					<div class="custom-control custom-checkbox mt-4">
 						<input type="checkbox" class="custom-control-input" id="termsCheck" required>
 						<label class="custom-control-label terms" for="termsCheck">I accept the