diff --git a/README.md b/README.md
index f19b7d0..f6bfa44 100644
--- a/README.md
+++ b/README.md
@@ -9,3 +9,8 @@ As any custom website is, this one is also written entirely in HTML, CSS and Jav
 
 # Building
 cd to the site directory and run `node build.js`
+
+
+# TODOs
+For support, I will be discontinuing the use of a support system and thus my knowledgebase will have to move here.
+That is not complete yet however.
diff --git a/src/presentations/auth/index.html b/src/presentations/auth/index.html
index 9cd49da..aca45cc 100644
--- a/src/presentations/auth/index.html
+++ b/src/presentations/auth/index.html
@@ -3,8 +3,8 @@
 
 <head>
     <!-- CSS -->
-    <link rel="stylesheet" href="/css/style.css">
-    <link rel="stylesheet" href="/css/side-by-side.css">
+    <link rel="stylesheet" href="https://janishutz.com/css/style.css">
+    <link rel="stylesheet" href="https://janishutz.com/css/side-by-side.css">
 
     <!-- FAVICON -->
     <link rel="icon" href="/favicon.ico">
diff --git a/src/support/index.html b/src/support/index.html
index d07742c..b24534d 100644
--- a/src/support/index.html
+++ b/src/support/index.html
@@ -2,7 +2,6 @@
 <html lang="en">
 	<head>
 		<!-- CSS -->
-        <link rel="stylesheet" href="https://cdn.janishutz.com/css/slider.css">
         <link rel="stylesheet" href="/css/style.css">
 
         <!-- FAVICON -->
@@ -35,10 +34,9 @@
 			<p class="text-center;">Ran into issues with Software? Have suggestions for features?</p>
 
 			<div class="inline-elements">
-				<a class="button" href="https://support.janishutz.com/index.php?a=add">Get support</a>
+				<a class="button" href="mailto:support@janishutz.com">Get support</a>
 				<a class="button" href="/support/support-status">Support Status</a>
-				<a class="button" href="https://support.janishutz.com/index.php?a=add&category=6">Feature request</a>
-				<a class="button" href="https://support.janishutz.com/knowledgebase.php">Knowledgebase</a>
+				<a class="button" href="/support/knowledgebase">Knowledgebase</a>
 				<a class="button" href="/support/old">Old websites</a>
 			</div>
 		</div>
diff --git a/src/support/knowledgebase/index.html b/src/support/knowledgebase/index.html
new file mode 100644
index 0000000..af4f275
--- /dev/null
+++ b/src/support/knowledgebase/index.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<!-- CSS -->
+        <link rel="stylesheet" href="https://cdn.janishutz.com/css/slider.css">
+        <link rel="stylesheet" href="/css/style.css">
+
+        <!-- FAVICON -->
+        <link rel="icon" href="/favicon.ico">
+        <link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
+        <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+        <link rel="shortcut icon" href="/favicon.ico" />
+        <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+        
+        <!-- SEO -->
+        <title>Knowledgebase | janishutz.com</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <meta charset="UTF-8" />
+        <meta http-equiv="X-UA-Compatible" content="IE=7" />
+        <meta name="keywords" content="" />
+        <meta name="og:locale" content="en_GB" />
+        <meta name="theme-color" content="#152b5c">
+		<style>
+			.support-icon {
+				font-size: 10rem;
+			}
+		</style>
+	</head>
+	<body>
+		<nav></nav>
+		<div class="content">
+			<span class="material-symbols-outlined support-icon">support_agent</span>
+			<h1 class="title">Knowledgebase</h1>
+
+			<p class="text-center;">Ran into issues with Software? Have suggestions for features?</p>
+
+			<div class="inline-elements">
+				<a class="button" href="mailto:support@janishutz.com">Get support</a>
+				<a class="button" href="/support/support-status">Support Status</a>
+				<a class="button" href="/support/knowledgebase">Knowledgebase</a>
+				<a class="button" href="/support/old">Old websites</a>
+			</div>
+		</div>
+		<footer></footer>
+	</body>
+</html>