diff --git a/src/footer.html b/src/footer.html
index b34c145..815d79f 100644
--- a/src/footer.html
+++ b/src/footer.html
@@ -5,7 +5,7 @@
             <h3>Projects</h3>
             <a href="/projects">View all</a>
             <a href="/projects/storagemanager">StorageManager</a>
-            <a href="/projects/qrscanner">QR & Barcode Insight</a>
+            <a href="/projects/qrscanner">QR &amp; Barcode Insight</a>
             <a href="/projects/libreevent">libreǝvent</a>
             <a href="/projects/musicplayer">MusicPlayer</a>
             <a href="/projects/biogascontrollerapp">BiogasControllerApp</a>
@@ -25,8 +25,8 @@
         </div>
         <div class="footer-category">
             <h3>Support</h3>
-            <a href="https://support.janishutz.com">Get support</a>
-            <a href="https://support.janishutz.com/knowledgebase.php">Knowledgebase</a>
+            <a href="/support">Get support</a>
+            <a href="/support/knowledgebase">Knowledgebase</a>
             <a href="/support/support-status">Support status</a>
         </div>
         <div class="footer-category">
@@ -35,40 +35,9 @@
             <a href="/legal/tos">Terms of Service</a>
             <a href="/legal/returns">Return policy</a>
             <a href="/support/support-status">Support Status</a>
-            <div onclick="showAnalytics()" style="cursor: pointer;">Analytics</div>
-        </div>
-
-        <div class="analytics-notice" id="analytics">
-            <h2>Analytics</h2>
-            <p>This website uses privacy preserving product analytics allowing me to analyze aggregated statistics for this website. All data collected will not allow me to uniquely identify you. <br><a href="/legal/privacy">Privacy Policy</a></p>
-            <!-- Matomo stuff -->
-            <div id="matomo-opt-out">
-                Loading...
-            </div>
-            <script defer src="https://analytics.janishutz.com/index.php?module=CoreAdminHome&action=optOutJS&divId=matomo-opt-out&language=auto&fontColor=000000&fontSize=12px&fontFamily=monospace&showIntro=1"></script>
-            <!-- Matomo Image Tracker-->
-            <img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.janishutz.com/matomo.php?idsite=2&amp;rec=1" style="border:0" alt="" loading="lazy" />
-            <!-- End Matomo -->
-
-            <button class="analytics-button" onclick="closeAnalytics()"><span class="material-symbols-outlined">close</span></button>
-
-            <div class="small-symbol" onclick="showAnalytics()" title="Change your analytics preferences"><span class="material-symbols-outlined">Analytics</span></div>
         </div>
     </div>
     <script>
-        function closeAnalytics () {
-            document.getElementById( 'analytics' ).classList.remove( 'show' );
-            localStorage.setItem( 'analytics-dismissed', 'true' );
-        }
-
-        function showAnalytics () {
-            document.getElementById( 'analytics' ).classList.add( 'show' );
-        }
-
-        if ( !localStorage.getItem( 'analytics-dismissed' ) ) {
-            document.getElementById( 'analytics' ).classList.add( 'show' );
-        }
-
         // Show which theme is loaded
         document.getElementById( 'theme-select' ).value = loadedTheme;
     </script>
diff --git a/src/support/knowledgebase/foss/index.html b/src/support/knowledgebase/foss/index.html
new file mode 100644
index 0000000..3c2464a
--- /dev/null
+++ b/src/support/knowledgebase/foss/index.html
@@ -0,0 +1,50 @@
+<!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>Free and Open Source Software | 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="privacy-policy" />
+    <meta name="description" content="Remarks and troubleshooting guides for my open source software" />
+    <meta name="og:type" content="website" />
+    <meta name="og:url" content="https://janishutz.com" />
+    <meta name="og:locale" content="en_GB" />
+    <meta name="theme-color" content="#152b5c">
+    <style>
+        .info {
+            font-weight: normal;
+        }
+    </style>
+</head>
+
+<body>
+    <nav></nav>
+    <div class="content">
+        <h1 class="title">Free and Open Source Software</h1>
+
+        <a href=".." class="back">&leftarrow; Back to knowledgebase</a>
+
+        <p></p>
+
+        <div class="topic">
+            <button></button>
+        </div>
+    </div>
+    <footer></footer>
+</body>
+
+</html>
diff --git a/src/support/knowledgebase/index.html b/src/support/knowledgebase/index.html
index af4f275..74cf87c 100644
--- a/src/support/knowledgebase/index.html
+++ b/src/support/knowledgebase/index.html
@@ -1,46 +1,51 @@
 <!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>
+<head>
+    <!-- CSS -->
+    <link rel="stylesheet" href="https://cdn.janishutz.com/css/slider.css">
+    <link rel="stylesheet" href="/css/style.css">
 
-			<p class="text-center;">Ran into issues with Software? Have suggestions for features?</p>
+    <!-- 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>
+
+        <a href="/support" class="back">&leftarrow; Back to support</a>
+
+        <p class="text-center;">Frequently Asked Questions and solutions to potential issues</p>
+
+        <div class="inline-elements">
+            <a class="button" href="musicplayer">MusicPlayer</a>
+            <a class="button" href="storagemanager">StorageManager</a>
+            <a class="button" href="qrbarcodeinsight">QR &amp; Barcode Insight</a>
+            <a class="button" href="store">Store</a>
+        </div>
+    </div>
+    <footer></footer>
+</body>
 
-			<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>
diff --git a/src/support/knowledgebase/musicplayer/index.html b/src/support/knowledgebase/musicplayer/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/support/knowledgebase/qrbarcodeinsight/index.html b/src/support/knowledgebase/qrbarcodeinsight/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/support/knowledgebase/storagemanager/index.html b/src/support/knowledgebase/storagemanager/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/support/knowledgebase/store/index.html b/src/support/knowledgebase/store/index.html
new file mode 100644
index 0000000..e69de29