diff --git a/README.md b/README.md
index c204d55..6651d0f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 
 <div align="center">
-<img src="https://armcord.vercel.app/armcord_full_logo.png" width="520">
+<img src="https://armcord.vercel.app/armcord_full_logo.png" width="720">
  <br>ArmCord is a custom client designed to enhance your Discord experience while keeping everything lightweight. 
 </div>
 
@@ -72,8 +72,7 @@ ArmCord is also available on the Snap store [here](https://snapcraft.io/armcord)
 [GooseMod Extension](https://github.com/GooseMod/extension)    
 [electron-discord-webapp](https://github.com/SpacingBat3/electron-discord-webapp)    
 [custom-electron-titlebar (css only)](https://github.com/AlexTorresSk/custom-electron-titlebar)    
-[electron-builder](https://electron.build)  
-[OpenAsar (~~stole~~ borrowed code for adding custom build info seemlessly)](https://github.com/GooseMod/OpenAsar)     
+[electron-builder](https://electron.build)    
 # Sponsors
  [![JetBrains supports ArmCord with free licenses to their software to core developers](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://jb.gg/OpenSourceSupport)
 
diff --git a/assets/ac_plug_colored.png b/assets/ac_plug.png
similarity index 100%
rename from assets/ac_plug_colored.png
rename to assets/ac_plug.png
diff --git a/assets/ac_white_plug_filled.png b/assets/ac_white_plug_filled.png
deleted file mode 100644
index 7e13a19..0000000
Binary files a/assets/ac_white_plug_filled.png and /dev/null differ
diff --git a/package.json b/package.json
index ced4f9e..4659317 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "ArmCord is a custom client designed to enhance your Discord experience while keeping everything lightweight.",
   "main": "ts-out/main.js",
   "scripts": {
-    "build": "tsc && copyfiles -u 1 src/**/*.html src/**/**/*.css ts-out/ && copyfiles package.json ts-out/ && copyfiles assets/**/** ts-out/",
+    "build": "tsc && copyfiles -u 1 src/**/*.html src/**/**/*.css ts-out/ && copyfiles package.json ts-out/ && copyfiles assets/** ts-out/",
     "watch": "tsc -w",
     "start": "npm run build && electron ./ts-out/main.js",
     "package": "npm run build && electron-builder",
@@ -26,7 +26,7 @@
     "@types/node": "^17.0.35",
     "@types/ws": "^8.5.3",
     "copyfiles": "^2.4.1",
-    "electron": "^18.2.4",
+    "electron": "^18.2.3",
     "electron-builder": "^23.0.3",
     "husky": "^8.0.1",
     "prettier": "^2.5.1",
diff --git a/src/content/css/discord.css b/src/content/css/discord.css
index 51cd2d9..70e11a0 100644
--- a/src/content/css/discord.css
+++ b/src/content/css/discord.css
@@ -1,43 +1,15 @@
+.info-3pQQBb:last-child:before {
+    content: "ArmCord Version: 3.1.0" !important;
+    height: auto;
+    line-height: 16px;
+    text-align: center;
+    color: var(--text-muted);
+    font-size: 12px;
+    text-transform: none;
+}
 .notice-2HEN-u {
     display: none;
 }
 .sidebar-1tnWFu {
-    border-top-left-radius: 8px;
-}
-.scroller-3X7KbA {
-    padding: 0;
-    padding-top: 4px;
-}
-
-[class^="socialLinks-"] + [class^="info-"] {
-    padding-right: 0;
-}
-#ac-ver {
-    text-transform: none;
-    cursor: pointer;
-    color: var(--text-muted);
-}
-#ac-ver:hover {
-    text-decoration: underline;
-    color: var(--text-normal);
-}
-
-/* Server List Scrollbar - https://github.com/kckarnige/server-scroll */
-.none-2-_0dP {
-    scrollbar-width: auto !important;
-    overflow-y: scroll !important;
-    overflow-x: hidden !important;
-    margin-right: 2px;
-}
-
-.none-2-_0dP:hover::-webkit-scrollbar {
-    width: 0.29em !important;
-    border-radius: 25px;
-    height: 0px !important;
-    background: transparent !important;
-}
-
-.none-2-_0dP::-webkit-scrollbar-thumb {
-    background: var(--background-accent);
-    border-radius: 25px;
+    border-top-left-radius: 8px !important;
 }
diff --git a/src/content/css/logos.css b/src/content/css/logos.css
deleted file mode 100644
index 45ab5b4..0000000
--- a/src/content/css/logos.css
+++ /dev/null
@@ -1,4 +0,0 @@
-:root {
-    --wordmark-svg: url("data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDk2IDE0IiB3aWR0aD0iOTYiIGhlaWdodD0iMTQiPjxzdHlsZT4uYXtmaWxsOiM3Mjc2N2R9PC9zdHlsZT48cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsYXNzPSJhIiBkPSJtMTUuNiAxMy44aC0zLjdsLTEuMS0yLjdoLTYuMWwtMS4xIDIuN2gtMy42bDUuNi0xMy43aDMuOXptLTgtMTAuNWwtMiA1LjRoNC4yem0xNC45LTMuM2MxLjMgMCAyLjUgMCAzLjYgMC42IDAuOCAwLjUgMS44IDEuNyAxLjggMy4zIDAgMi4zLTEuNyAzLjEtMi4zIDMuNCAxIDAuNSAxLjYgMS45IDEuOSAyLjYgMC40IDAuNyAxIDIgMS40IDIuOGwwLjQgMWgtMy43Yy0wLjMtMC42LTEuNS0zLjMtMS44LTMuOS0wLjktMS43LTEuNi0xLjctMi42LTEuN2gtMC41djUuNmgtMy41di0xMy43em0tMS44IDIuNXYzLjFoMS41YzAuOCAwIDEuMSAwIDEuNC0wLjIgMC41LTAuMyAwLjgtMC44IDAuOC0xLjQgMC0xLjUtMS42LTEuNS0xLjktMS41em0yNSAxMS4yaC0zLjV2LTguNGwtMy43IDQuNGgtMC41bC0zLjYtNC40djguNGgtMy41di0xMy43aDNsNC40IDUuMiA0LjQtNS4yaDN6bTguOS0xMy45YzAuNiAwLjEgMS4zIDAuMiAxLjcgMC4zIDAuMyAwLjEgMC45IDAuNSAxLjIgMC43IDAuNCAwLjMgMC45IDAuOSAxLjIgMS4zIDAuMyAwLjQgMC41IDAuOCAwLjQgMC44IDAgMC4xLTAuNiAwLjQtMi43IDEuMmwtMC40LTAuM2MtMC4yLTAuMi0wLjUtMC41LTAuNy0wLjUtMC4yLTAuMS0wLjctMC4yLTEtMC4yLTAuMyAwLTAuOCAwLjEtMSAwLjMtMC4zIDAuMS0wLjYgMC4zLTAuNyAwLjUtMC4xIDAuMy0wLjEgMS0wLjEgMi45IDAgMi40IDAgMi42IDAuMiAyLjkgMC4xIDAuMiAwLjQgMC41IDAuNiAwLjYgMC4yIDAuMSAwLjcgMC4yIDEgMC4yIDAuMyAwIDAuNy0wLjEgMS0wLjMgMC4yLTAuMSAwLjUtMC4zIDAuNi0wLjUgMC4xLTAuMiAwLjMtMC40IDAuNC0wLjQgMCAwIDAuNyAwLjMgMS41IDAuNyAwLjcgMC40IDEuNCAwLjcgMS40IDAuOCAwIDAtMC4xIDAuMy0wLjMgMC41LTAuMSAwLjItMC40IDAuNi0wLjcgMC45LTAuMyAwLjMtMSAwLjctMS40IDEtMC40IDAuMi0xLjEgMC40LTEuNSAwLjUtMC40IDAuMS0xLjEgMC4xLTEuNSAwLjEtMC41LTAuMS0xLjMtMC4yLTEuNy0wLjQtMC40LTAuMS0xLTAuNS0xLjQtMC43LTAuMy0wLjItMC43LTAuNy0wLjktMS0wLjMtMC4zLTAuNS0wLjgtMC42LTEuMi0wLjItMC40LTAuMi0xLjQtMC4yLTMuOCAwLTIuOCAwLTMuMyAwLjItMy44IDAuMi0wLjQgMC41LTEgMC45LTEuNCAwLjQtMC40IDAuOC0wLjggMS40LTEgMC41LTAuMyAxLjItMC41IDEuNS0wLjYgMC4zLTAuMSAxLTAuMSAxLjYtMC4xem0xMS40IDBjMC44IDAuMSAxLjQgMC4yIDIgMC40IDAuNCAwLjEgMS4xIDAuNCAxLjQgMC43IDAuNCAwLjIgMC45IDAuNiAxLjEgMC45IDAuMiAwLjMgMC41IDAuOSAwLjYgMS4yIDAuMiAwLjUgMC4yIDEuMSAwLjIgMy44IDAgMi43IDAgMy4zLTAuMiAzLjgtMC4xIDAuMy0wLjQgMC44LTAuNiAxLjItMC4yIDAuMy0wLjcgMC43LTEuMSAxLTAuMyAwLjItMSAwLjUtMS40IDAuNy0wLjUgMC4xLTEuMiAwLjItMS44IDAuMy0wLjUgMC0xLjMgMC0xLjgtMC4xLTAuNC0wLjEtMS4yLTAuMy0xLjYtMC41LTAuNC0wLjItMS0wLjYtMS40LTAuOS0wLjMtMC40LTAuNy0wLjktMS4zLTIuMnYtMy4xYy0wLjEtMi44LTAuMS0zLjEgMC4yLTMuOSAwLjItMC42IDAuNC0xIDAuOC0xLjUgMC40LTAuMyAxLTAuOCAxLjQtMS4xIDAuNS0wLjIgMS4yLTAuNSAxLjYtMC41IDAuNC0wLjEgMS4yLTAuMiAxLjktMC4yem0tMiAzLjlsLTAuNCAwLjN2NS42YzAuNyAwLjYgMS4xIDAuOCAxLjUgMC45IDAuNCAwLjEgMC44IDAuMSAxLjMgMCAwLjUtMC4yIDAuOC0wLjMgMS4xLTAuNmwwLjQtMC40YzAtNS40IDAtNS40LTAuNC01LjdxLTAuMy0wLjQtMC45LTAuNmMtMC40LTAuMS0wLjgtMC4yLTEtMC4yLTAuMSAwLTAuNSAwLjEtMC44IDAuMi0wLjMgMC4xLTAuNiAwLjMtMC44IDAuNXptMjEuNC0zLjhoMy4xYzIuNSAwIDMuMiAwIDMuOSAwLjIgMC41IDAuMiAxLjEgMC40IDEuNiAwLjcgMC40IDAuMyAwLjkgMC44IDEuMSAxLjIgMC4zIDAuMyAwLjUgMC44IDAuNiAxIDAuMSAwLjMgMC4yIDEuNyAwLjIgMy4yIDAgMS45IDAgMy4xLTAuMSAzLjctMC4xIDAuNS0wLjMgMS4xLTAuNCAxLjMtMC4xIDAuMy0wLjUgMC43LTAuOCAxLTAuMiAwLjMtMC44IDAuNy0xLjIgMC45LTAuNCAwLjItMS4xIDAuNC0xLjYgMC41LTAuNCAwLTIuMSAwLjEtNi40IDAuMXYtMy40aDIuNmMxLjUgMCAyLjkgMCAzLjEtMC4xIDAuMy0wLjEgMC43LTAuMiAwLjgtMC40IDAuNC0wLjMgMC40LTAuNCAwLjQtMi45IDAtMiAwLTIuNi0wLjItMi45LTAuMS0wLjItMC4zLTAuNS0wLjUtMC42LTAuMy0wLjEtMC44LTAuMS0yLjYtMC4xdjIuNWMwIDEuNS0wLjEgMi43LTAuMSAyLjctMC4xIDAuMS0wLjktMC43LTMuNS0zLjN6bS0xMi4zIDAuMWw3LjIgMC4xIDAuOCAwLjNjMC40IDAuMiAwLjkgMC42IDEuMiAwLjggMC4zIDAuMyAwLjYgMC43IDAuOCAxIDAuMSAwLjQgMC4zIDAuOSAwLjQgMS4zIDAuMSAwLjMgMC4xIDAuOSAwLjEgMS4yIDAgMC4zIDAgMC44LTAuMSAxLjItMC4xIDAuMy0wLjMgMC45LTAuNCAxLjItMC4yIDAuMy0wLjUgMC43LTAuNyAxLTAuMyAwLjItMC42IDAuNS0wLjkgMC42LTAuMiAwLjEtMC40IDAuMi0wLjQgMC4zIDAgMCAwLjggMSAxLjcgMi4yIDAuOSAxLjEgMS43IDIuMSAxLjcgMi4yIDAuMiAwLjEtMC4yIDAuMi00LjMgMC4xbC0xLjUtMmMtMS4xLTEuNS0xLjYtMi4xLTEuOC0yLjEtMC4yLTAuMS0wLjItMC4xLTAuMiA0LjFoLTMuNnptMy42IDYuM2MxLjkgMCAyLjQtMC4xIDIuNy0wLjIgMC4yLTAuMSAwLjUtMC40IDAuNi0wLjZxMC4yLTAuNCAwLjEtMC45YzAtMC4zLTAuMi0wLjYtMC4zLTAuNy0wLjEtMC4yLTAuNC0wLjQtMC42LTAuNC0wLjMtMC4xLTAuOS0wLjItMS41LTAuMmgtMXoiLz48L3N2Zz4=");
-    --logo-svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1977 596' width='1977' height='596'%3E%3Ctitle%3Earmcord_full_logo-svg%3C/title%3E%3Cstyle%3E .s0 %7B fill: %232c2f33 %7D .s1 %7B fill: %2395a7b3 %7D .s2 %7B fill: %237289da;stroke: %232c2f33;stroke-width: 17;stroke-dasharray: 0 %7D .s3 %7B fill: %2399aab5 %7D .s4 %7B fill: %232c2f33;stroke: %232c2f33;stroke-width: 3.5;stroke-dasharray: 0 %7D .s5 %7B fill: %237289da %7D %3C/style%3E%3Cg id='Arm + Cord'%3E%3Cpath id='Path 0' class='s0' d='m821 0.6c1.9 0.2 10.5 0.8 19 1.4c8.5 0.7 15.9 1.4 16.5 1.8c0.5 0.3 4.8 0.9 9.5 1.3c4.7 0.4 11.4 1.4 15 2.2c3.6 0.8 9.9 2.2 14 3c4.1 0.9 11.5 3 16.5 4.7c4.9 1.7 11.2 4.2 14 5.5c2.7 1.2 7.5 3.4 10.5 4.8c3 1.4 8.4 4.3 12 6.3c3.6 2 10.3 6.2 15 9.3c4.7 3.1 11.9 8.3 16 11.5c4.1 3.3 9.7 8 12.5 10.5c2.8 2.4 10.1 9.7 16.4 16c6.2 6.4 14.8 15.8 19 20.9c4.2 5.1 10.6 13.7 14.4 19c3.7 5.3 10.2 15.3 14.5 22.2c4.3 6.9 10.8 18.6 14.4 26c3.6 7.4 7.7 16.2 9.1 19.5c1.4 3.3 4.1 10 6.1 15c1.9 4.9 3.5 9.4 3.6 10c0 0.5 1.1 4.4 2.5 8.5c1.3 4.1 3.1 10.6 3.9 14.5c0.8 3.8 2.2 9.9 3.1 13.5c0.9 3.6 2.1 10.5 2.6 15.5c0.5 4.9 1.3 16.4 1.7 25.5c0.4 9.1 0.4 19.4 0 23c-0.4 3.6-1 9.4-1.4 13c-0.3 3.6-1.5 10.1-2.6 14.5c-1.1 4.4-2.4 9.6-2.8 11.5c-0.5 1.9-2.5 7.8-4.5 13c-2 5.2-5.7 13.3-8.2 18c-2.6 4.7-5.3 9.8-6.1 11.5c-0.8 1.6-4.9 7.7-9.1 13.5c-4.1 5.8-10 13.2-13.1 16.5c-3 3.3-8.4 8.9-12 12.5c-3.6 3.6-9.8 9.5-13.8 13c-4.1 3.6-8.1 6.9-9 7.4c-1 0.5-1.9 1.2-2.2 1.5c-0.3 0.4-3.7 2.9-7.5 5.7c-3.9 2.9-11.7 8-17.5 11.6c-5.8 3.5-17 9.6-25 13.6c-8 3.9-18.3 8.7-23 10.6c-4.7 1.9-14.1 5.2-21 7.4c-6.9 2.2-15.4 4.7-19 5.5c-3.6 0.9-7.9 1.8-9.5 2.1c-1.7 0.4-6.6 1.3-11 2.1c-4.4 0.9-13.4 2-20 2.6c-7 0.6-19.7 0.8-30.5 0.4c-16.6-0.6-19.9-1-32.5-4.2c-9.1-2.3-15.9-4.6-19.3-6.6c-2.9-1.8-6.4-4.6-7.6-6.2c-1.3-1.7-3.1-5.9-4-9.5c-1.5-5.8-1.6-7.1-0.3-11.5c0.8-2.7 2.2-6.3 3.3-8c1-1.6 3-4 4.4-5.2c1.4-1.2 4.5-3.2 7-4.4c3-1.5 6.3-2.1 10-2.1c3 0 6.8 0.6 8.5 1.2c1.6 0.6 6.8 2 11.5 3.1c6.6 1.6 12.4 2 26 2.2c11.8 0.1 21.4-0.4 29.5-1.6c6.6-0.9 16.3-2.8 21.5-4.1c5.2-1.3 13.8-3.9 19-5.6c5.2-1.8 13.3-4.8 18-6.7c4.7-1.9 13.2-5.9 19-8.7c5.8-2.9 14.3-7.7 19-10.6c4.7-2.9 11.6-7.6 15.5-10.4c3.8-2.7 10.1-7.8 14-11.1c3.8-3.4 10-9.3 13.7-13.1c3.6-3.8 7.8-8.5 9.3-10.4c1.5-1.9 4.6-6.2 7-9.5c2.5-3.3 6.7-10.1 9.4-15c2.7-5 6.3-12.6 8-17c1.6-4.4 4.2-13.6 5.5-20.5c2.1-10.1 2.6-15.4 2.6-27.5c0-8.3-0.4-17.5-1-20.5c-0.5-3-1.7-9.8-2.6-15c-0.9-5.2-2.5-12.7-3.6-16.5c-1-3.9-2.6-9.4-3.4-12.3c-0.8-2.8-3.5-10.5-6-17c-2.5-6.4-7.1-16.9-10.2-23.2c-3.1-6.3-8.2-15.8-11.2-21c-3.1-5.2-8.3-13.3-11.5-18c-3.2-4.7-10-13.7-15-20c-5.1-6.3-14.6-16.7-21.1-23c-6.6-6.4-13.7-12.9-15.9-14.5c-2.2-1.7-4.2-3.2-4.5-3.5c-0.3-0.3-3-2.4-6-4.5c-3-2.2-9.3-6.3-14-9c-4.7-2.8-10.1-5.8-12-6.7c-1.9-0.9-6.2-2.8-9.5-4.3c-3.3-1.4-10.1-3.9-15-5.5c-5-1.6-14.4-4.1-21-5.4c-6.6-1.4-18.1-3.1-25.5-3.7c-8.5-0.7-21.1-0.9-34-0.4c-11.3 0.3-23.4 1-27 1.5c-3.6 0.5-11.5 1.6-17.5 2.5c-6.1 0.8-13 2-15.5 2.4c-2.5 0.5-7.9 1.7-12 2.6c-4.1 0.9-9.3 2-11.5 2.4c-2.2 0.4-7.2 1.7-11 2.8c-3.9 1.2-9.5 2.7-12.5 3.3c-3 0.7-7.3 1.8-9.5 2.5c-2.2 0.7-10.1 3.2-17.5 5.5c-7.4 2.3-16.7 5.4-20.5 6.7c-3.9 1.4-10.8 4-15.5 5.8c-4.7 1.8-14.6 5.6-22 8.5c-7.4 2.9-15.8 6.3-18.5 7.6c-2.8 1.2-9.7 4.3-15.5 6.7c-5.8 2.5-14.8 6.5-20 9c-5.2 2.4-15.1 7.2-22 10.5c-6.9 3.3-14.8 6.9-17.5 8c-2.8 1.1-7.3 3-10 4.2c-2.8 1.2-6.4 2.8-8 3.6c-1.7 0.7-5.3 2.3-8 3.4c-2.8 1.2-7.9 3.2-11.5 4.5c-3.6 1.3-11.7 4.1-18 6.4c-6.3 2.3-14 4.8-17 5.7c-3 0.8-9.3 2.6-14 3.9c-4.7 1.3-11 3.1-14 4c-3 1-6.9 1.9-8.5 2.2c-1.7 0.2-7.5 1.5-13 2.8c-5.5 1.3-15.4 3.5-22 4.9c-6.6 1.4-18.5 3.5-26.5 4.6c-8 1.2-20.1 2.8-27 3.6c-6.9 0.8-17.2 1.9-23 2.4c-5.8 0.5-19.1 1.7-29.5 2.6c-14.4 1.3-33.9 1.8-80.5 2.2c-41 0.2-67.2 0-78.5-0.8c-9.4-0.6-21.1-1.6-26-2.2c-5-0.5-14.2-1.3-20.5-1.8c-6.3-0.5-16.2-1.5-22-2.4c-5.8-0.8-14.1-2-18.5-2.6c-4.4-0.6-9.8-2-12-3c-2.2-1-5.5-3.2-7.3-4.9c-1.7-1.7-4.1-4.9-5.2-7.1c-1.4-2.8-2-6-2-10.5c0-4.1 0.7-8.1 1.8-10.8c1-2.3 3.3-5.7 5-7.5c1.8-1.7 5.1-4.2 7.4-5.5c3.3-1.7 5.9-2.2 11.3-2.1c3.8 0 9.7 0.5 13 1.2c3.3 0.6 11.8 1.8 19 2.6c7.1 0.8 17 2 22 2.5c4.9 0.6 24.5 1.8 43.5 2.7c26.4 1.2 44.7 1.5 78 1c23.9-0.4 53.8-1.3 66.5-2.1c12.6-0.8 29.3-2.1 37-2.9c7.7-0.8 17.1-1.9 21-2.5c3.8-0.6 10.8-1.7 15.5-2.6c4.7-0.9 12.1-2 16.5-2.5c4.4-0.5 10.7-1.7 14-2.6c3.3-0.9 8.5-2 11.5-2.5c3-0.4 8.2-1.5 11.5-2.3c3.3-0.8 10.9-2.8 17-4.5c6-1.6 14.8-4.1 19.5-5.4c4.7-1.4 15.5-4.9 24-8c8.5-3 18.4-6.7 22-8.2c3.6-1.5 7.8-3.3 9.5-4c1.6-0.7 10.2-4.5 19-8.5c8.8-4 20-9.2 25-11.5c4.9-2.3 12.1-5.7 16-7.5c3.8-1.7 14.4-6.3 23.5-10.2c9.1-3.8 19-8 22-9.2c3-1.3 8.9-3.6 13-5.1c4.1-1.5 10.6-4 14.5-5.5c3.8-1.6 14.4-5.3 23.5-8.3c9.1-3 21-6.8 26.5-8.5c5.5-1.8 13.6-4.1 18-5.2c4.4-1.2 13.2-3.4 19.5-5c6.3-1.6 16.9-3.9 23.5-5.1c6.6-1.2 15.1-2.8 19-3.6c3.8-0.7 11-1.8 16-2.3c4.9-0.5 13.3-1.3 18.5-1.9c5.2-0.6 14.7-1.5 21-2c6.3-0.5 13.1-0.7 15-0.5z' /%3E%3Cpath id='ARM' fill-rule='evenodd' class='s1' d='m410.9 428h-71.9l-22.1-53.1h-119.9l-20.1 53.1h-70.8l108.2-268.3h77.4zm-156.9-203.7l-39.3 103.8h82.6zm291-64.5c24.4 0 48.8 0 70.5 13.4c14.1 9.4 35 31.5 35 63.3c0 44.9-34.7 60.6-46.1 66.1c19.3 9.4 32.7 36.6 38.6 50.4c7.5 15.3 18.9 40.5 25.9 55.8l9.1 19.3h-73.6c-5.9-11.8-29.1-64.9-34.6-75.5c-18.1-33.9-31.4-33.9-50.3-33.9h-9.9v109.4h-67.6v-268.3zm-35.4 48.8v61.4h27.9c17.3-0.8 21.7-0.8 28.7-4.8c9.9-5.1 14.6-14.9 14.6-25.9c0-30.7-29.9-30.7-37.4-30.7zm488.5 219.5h-67.6v-164l-72 86.5h-9.8l-72-86.5v164h-67.7v-268.3h59.4l85 101.9l86.1-101.9h58.6z' /%3E%3Cpath id='Path 0' class='s0' d='m1051.7 321.8c0.8 0.4 5.7 6.5 10.7 13.7c5 7.1 10.7 15.6 12.6 19c2 3.3 5.5 8.5 7.8 11.5c2.3 3 4.1 6.4 4.1 7.5c0 1.1-1.8 5.4-4.1 9.5c-2.3 4.1-4.8 8.8-5.6 10.5c-0.8 1.6-4.9 7.7-9.1 13.5c-4.1 5.8-10 13.2-13.1 16.5c-3 3.3-8.4 8.9-12 12.5c-3.6 3.6-9.8 9.5-13.8 13c-4.1 3.6-8.1 6.9-9 7.4c-1 0.5-1.9 1.2-2.2 1.5c-0.3 0.4-3.7 2.9-7.5 5.7c-3.9 2.9-11.7 8-17.5 11.6c-5.8 3.5-17 9.6-25 13.6c-8 3.9-18.3 8.7-23 10.6c-4.7 1.9-14.1 5.2-21 7.4c-6.9 2.2-15.4 4.7-19 5.5c-3.6 0.9-7.9 1.8-9.5 2.1c-1.7 0.4-6.6 1.3-11 2.1c-4.4 0.9-13.4 2-20 2.6c-7 0.6-19.7 0.8-30.5 0.4c-16.6-0.6-19.9-1-32.5-4.2c-9.1-2.3-15.9-4.6-19.3-6.6c-2.9-1.8-6.4-4.6-7.6-6.2c-1.3-1.7-3.1-5.9-4-9.5c-1.5-5.8-1.6-7.1-0.3-11.5c0.8-2.8 2.2-6.3 3.3-8c1-1.6 3-4 4.4-5.2c1.4-1.2 4.5-3.2 7-4.4c3-1.5 6.3-2.1 10-2.1c3 0 6.8 0.6 8.5 1.2c1.6 0.6 6.8 2 11.5 3.1c6.6 1.6 12.4 2 26 2.2c11.8 0.1 21.4-0.4 29.5-1.6c6.6-0.9 16.3-2.8 21.5-4.1c5.2-1.3 13.8-3.9 19-5.6c5.2-1.8 13.3-4.8 18-6.7c4.7-1.9 13.2-5.9 19-8.7c5.8-2.9 14.3-7.7 19-10.6c4.7-2.9 11.6-7.6 15.5-10.4c3.8-2.7 10.1-7.8 14-11.1c3.8-3.4 10-9.3 13.7-13.1c3.6-3.8 7.8-8.5 9.3-10.4c1.5-1.9 4.6-6.2 7-9.5c2.5-3.3 6.7-10.1 9.4-15c2.7-5 6.3-12.6 7.9-17c1.7-4.4 3.8-11.5 4.7-15.7c1.3-6.3 1.8-7.6 3.2-7z' /%3E%3Cg id='Plug'%3E%3Cpath id='Layer' class='s2' d='m647.6 329l63.5 22.6l15.9-36.7l55.2 19c58.9 20.3 92.8 79.8 80.1 139.7l-15.5 41.3c-31.2 56.7-101.4 82.8-163.1 57.4l-57.8-23.8l17.9-41.2l-65.5-26.2c-10.6-4.2-15.1-16.5-10.1-27.3c4.9-10.8 17.4-16.2 28-12l65 25.2l33.6-77.8l-64-23.5c-10.5-3.8-15.1-15.1-10.4-25.2c4.7-10 16.7-15.2 27.2-11.5z' /%3E%3Cpath id='Layer' class='s3' d='m639.7 334.2c1.6 0 17.5 5 35.3 11.3c17.8 6.2 32.5 11.3 32.7 11.4c0.2 0.1-0.8 5.4-2.2 11.8c-1.4 6.4-3.2 12.6-4.1 13.7c-1.2 1.7-7.7-0.3-36-10.6c-23.9-8.7-35.4-13.6-37.2-15.9c-1.4-1.8-2.6-5.1-2.6-7.3c0.1-2.3 0.8-5.4 1.6-7c0.8-1.6 3.3-3.9 5.5-5.1c2.2-1.2 5.4-2.2 7-2.3zm-52.2 113.3c3.1-0.1 18.9 5.2 39.7 13.2c19 7.3 34.7 13.6 34.9 14c0.2 0.4-3.3 6.5-15.9 26.4l-34.1-13.5c-23.2-9.2-35-14.6-36.8-16.9c-1.5-1.9-2.6-5.2-2.6-7.4c0-2.3 0.8-5.6 1.7-7.4c0.9-1.8 3.1-4.4 4.8-5.8c1.7-1.4 5.5-2.6 8.3-2.6z' /%3E%3Cpath id='Line' class='s4' d='m710.5 346.9l8.5 4.1l-19.8 45.8l-8.5-4.5z' /%3E%3Cpath id='Line' class='s4' d='m658.5 466.9l8.5 4.1l-19.8 45.8l-8.5-4.5z' /%3E%3C/g%3E%3C/g%3E%3Cpath id='Path 0' fill-rule='evenodd' class='s5' d='m1171 158.6c12.4 0.5 25.3 2.6 32.7 5.4c6.6 2.5 17.9 8.9 25.1 14.2c7.4 5.5 17.1 15.9 22.5 24.2c5.2 8 9 15.6 8.5 16.9c-0.5 1.4-12.8 7.1-53.7 23.2l-7.3-7.2c-4-3.9-10.5-8.4-14.5-10c-4-1.5-12.4-2.6-18.8-2.5c-6.3 0.1-15.4 2.1-20.3 4.4c-4.8 2.3-10.3 7.2-12.1 10.9c-2.4 4.9-3.3 19.5-3.4 56.9c0 46.8 0.3 50.7 4.9 56.9c2.7 3.6 8.2 8.3 12.2 10.3c4 2 12.1 3.6 18.1 3.6c6 0 15-1.9 19.9-4.2c4.9-2.4 10.7-7.3 12.7-10.9c2.1-3.7 4.8-6.6 6.2-6.6c1.3 0 14.7 5.7 29.7 12.7c15 6.9 27.3 13.7 27.2 15c0 1.4-2.1 5.7-4.5 9.7c-2.4 4-9.3 12.2-15.2 18.2c-5.9 6-17.8 14.4-26.4 18.8c-8.6 4.3-21.7 9.1-29 10.6c-7.3 1.5-21 2.1-30.3 1.3c-9.3-0.7-23.8-3.8-32.2-6.9c-8.5-3.1-20.4-9.5-26.6-14.1c-6.1-4.7-14.8-13.4-19.3-19.4c-4.5-6-9.7-16.3-11.7-23c-2.6-9.1-3.4-27.5-3.4-74.4c0-55.7 0.5-63.7 4.7-75.1c2.6-7.1 9.9-18.5 16.3-25.7c8-8.8 17.1-15.6 28.7-21.2c9.3-4.5 21.8-9.3 27.8-10.5c6-1.3 20.2-1.9 31.5-1.5zm222.7-0.1c15.7 0.6 28 2.6 38.8 6.3c8.6 3 21.4 9.1 28.4 13.6c7 4.6 16.3 13.2 20.6 19.3c4.3 6 9.7 16.1 12 22.3c3.5 9.7 4.1 21.1 4.1 74.4c0 53.3-0.6 64.7-4.1 74.3c-2.3 6.3-7.7 16.3-12 22.4c-4.3 6.1-13.6 14.9-20.6 19.5c-7 4.7-19.8 10.8-28.4 13.6c-8.7 2.7-23.9 5.5-33.9 6.3c-10 0.7-25.8 0-35.1-1.5c-9.4-1.6-23.8-6-32.1-10c-8.3-4-20.3-12-26.7-17.8c-7.1-6.5-14.2-16.5-26-41.5l-0.7-60.5c-0.7-55.3-0.3-61.9 4.2-76.9c3.8-12.4 7.8-19.3 16.7-29c6.6-7.1 18.6-16.3 27.3-20.9c8.5-4.6 22-9.7 30-11.5c8.6-1.9 24-2.9 37.5-2.4zm-39.3 74.7l-6.7 6.7v109c12.8 11.9 20.3 15.7 27.9 17.3c9.2 2 15.3 1.9 25.4-0.5c9.4-2.2 15.6-5.5 21.2-11.2l7.8-8.1c0-104 0-104.1-6-111.3c-4-4.8-10.5-8.6-18.8-10.9c-7-2.1-15.4-3.6-18.7-3.4c-3.4 0.1-10.4 1.4-15.8 2.9c-5.3 1.5-12.7 5.8-16.3 9.5zm417-73.2h60.6c49 0 63.6 0.8 76.8 4.1c10 2.6 22 8 30.9 14c8.7 5.8 17.7 14.6 22.5 21.9c4.4 6.6 9.2 15.9 10.6 20.5c1.5 4.7 3.2 33 3.8 63c0.9 36.9 0.3 59.9-1.7 71.4c-1.6 9.3-5 21-7.6 26c-2.5 5-9.2 13.7-14.9 19.3c-5.6 5.6-16.8 13.1-24.8 16.8c-8 3.7-21.6 7.8-30.3 9.2c-8.6 1.4-40.5 2.5-125.9 2.5v-65.3l51.5-0.1c28.3 0 55.8-1.1 61.1-2.3c5.3-1.3 12.4-5.1 15.8-8.5c6-6.1 6-6.5 6.6-55.8c0.5-40.1-0.1-50.9-3-56.8c-2-4-6.9-8.9-10.9-10.9c-4.8-2.4-14.5-3.6-50.9-3.6l0.1 50.2c0.1 27.7-0.8 51.1-1.8 52.2c-1 1-16.9-13.2-68.5-64.9zm-239.4 2.2l141.4 1.4l14.5 6.8c8 3.8 18.7 10.8 23.8 15.8c5.1 4.9 11.8 13.8 14.8 19.8c3.1 6 6.8 16.6 8.3 23.6c1.5 7 2.7 17.6 2.7 23.6c0 6-1.2 16.6-2.7 23.6c-1.5 7-5 17.6-7.8 23.6c-2.9 6-9.1 14.7-13.8 19.4c-4.8 4.6-12.2 10.1-16.5 12.1c-4.3 2-7.7 4.5-7.7 5.5c0.1 0.9 14.4 20 32 42.3c17.5 22.3 33 42 34.5 43.7c2.1 2.5-5.6 3.1-84.6 2.7l-29.2-40.4c-20.8-28.9-30.7-40.7-34.5-41.1c-5.2-0.6-5.3-0.3-5.3 81.7h-70.2zm70 121.3c38.6 0 48.3-1.1 53.2-3.6c4-2 9.1-7.2 11.2-11.5c2.7-5.4 3.5-10.9 2.5-17.5c-0.8-5.4-3.4-11.8-5.8-14.3c-2.3-2.5-7.8-6-12.1-7.9c-4.6-1.9-16.5-3.3-28.5-3.3h-20.5z' /%3E%3C/svg%3E");
-}
diff --git a/src/content/css/setup.css b/src/content/css/setup.css
index 6f1e1b8..fd49cf4 100644
--- a/src/content/css/setup.css
+++ b/src/content/css/setup.css
@@ -4,10 +4,8 @@
 :root {
     --background-primary: #282b30;
     --background-secondary: rgba(255, 255, 255, 0.1);
-    --background-modifier-hover: rgba(106, 116, 128, 0.16);
     --brand-experiment: #7289da;
-    --interactive-normal: #b9bbbe;
-    --interactive-hover: #dcddde;
+    --header-primary: #fff;
     --text-muted: #72767d;
     --font-primary: "Whitney";
 }
@@ -22,11 +20,14 @@
 html,
 body {
     overflow: hidden;
+
     margin: 0;
     padding-top: 30px;
     width: 100%;
     height: 100%;
+
     background: var(--background-primary);
+
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -96,20 +97,21 @@ body {
     flex-direction: row;
     justify-content: center;
     align-items: center;
-    content: var(--logo-svg);
-    width: 292px;
 }
-
-.titlebar #window-controls-container #maximize {
-    display: none;
+#logo p:first-child {
+    color: #7289da;
+    margin: 0;
+    font-weight: normal;
+    font-family: Helvetica, sans-serif;
+    font-size: 32px;
 }
-
-.titlebar #window-controls-container #spacer {
-    float: left;
-    height: 100%;
-    width: 33%;
+#logo p:last-child {
+    color: white;
+    margin: 0;
+    font-weight: normal;
+    font-family: Discordinated;
+    font-size: 32px;
 }
-
 /* }}} */
 
 /* Buttons {{{ */
@@ -119,16 +121,19 @@ body {
     justify-content: center;
     align-items: center;
     gap: 1rem;
+
     user-select: all !important;
+
     margin-top: 10px;
     margin-bottom: 10px;
 }
 button {
     background: var(--brand-experiment);
     color: var(--header-primary);
-    outline: none;
+
     border: none;
     border-radius: 4px;
+
     padding: 8px 20px;
 }
 button:hover {
diff --git a/src/content/css/splash.css b/src/content/css/splash.css
index 1cbd1a0..88af543 100644
--- a/src/content/css/splash.css
+++ b/src/content/css/splash.css
@@ -112,7 +112,3 @@ video {
     color: var(--text-muted);
     white-space: pre;
 }
-
-img.logo {
-    width: 272px;
-}
diff --git a/src/content/css/tabs.css b/src/content/css/tabs.css
index d8f10cb..353c38b 100644
--- a/src/content/css/tabs.css
+++ b/src/content/css/tabs.css
@@ -1,3 +1,10 @@
+@import url("https://armcord.smartfridge.space/logofont.css");
+:root {
+    --window-buttons: var(--header-secondary);
+    --cord-color: var(--header-primary);
+    --armcord-color: #7289da;
+    --titlebar-color: var(--background-tertiary);
+}
 .tabs {
     display: block;
     top: 0;
diff --git a/src/content/css/titlebar.css b/src/content/css/titlebar.css
index cd09989..d29f54f 100644
--- a/src/content/css/titlebar.css
+++ b/src/content/css/titlebar.css
@@ -1,3 +1,10 @@
+@import url("https://armcord.smartfridge.space/logofont.css");
+:root {
+    --window-buttons: var(--header-secondary);
+    --cord-color: var(--header-primary);
+    --armcord-color: #7289da;
+    --titlebar-color: var(--background-tertiary);
+}
 .titlebar {
     display: block;
     top: 0;
@@ -11,6 +18,7 @@
     clear: both;
     height: 30px;
     line-height: 30px;
+    background-color: #202225;
     -webkit-app-region: drag;
     width: 100%;
     user-select: none;
@@ -18,10 +26,12 @@
     position: fixed;
     z-index: 99999;
 }
-
-.container-2RRFHK {
-    padding-top: 30px;
-    top: -30px;
+.titlebar #window-title {
+    width: 30%;
+    height: 100%;
+    line-height: 30px;
+    float: left;
+    padding: 0 0 0 1em;
 }
 
 .titlebar #window-controls-container {
@@ -29,6 +39,7 @@
     width: 150px;
     height: 100%;
     line-height: 30px;
+    background-color: #202225;
     -webkit-app-region: no-drag;
 }
 
@@ -37,115 +48,61 @@
 .titlebar #window-controls-container #quit {
     float: left;
     height: 100%;
-    width: 33.1%;
+    width: 33%;
     text-align: center;
-    color: var(--interactive-normal);
+    color: #f7f7f7;
     cursor: default;
 }
-.titlebar #window-controls-container #spacer {
-    pointer-events: none;
-}
 
-/* ArmCord on Linux */
-[armcord-platform="linux"] .titlebar #window-controls-container #minimize:hover {
+.titlebar #window-controls-container #minimize:hover {
     background-color: #99aab5;
 }
-[armcord-platform="linux"] .titlebar #window-controls-container #maximize:hover {
+.titlebar #window-controls-container #maximize:hover {
     background-color: #99aab5;
 }
-[armcord-platform="linux"] .titlebar #window-controls-container #quit:hover {
+.titlebar #window-controls-container #quit:hover {
     background-color: #f04747;
 }
-
-/* ArmCord on Windows */
-[armcord-platform="win32"] .titlebar #window-controls-container #minimize:hover {
-    background-color: var(--background-modifier-hover);
-    transition: 0.2s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #maximize:hover {
-    background-color: var(--background-modifier-hover);
-    transition: 0.2s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #minimize:hover #minimize-icon {
-    background-color: var(--interactive-hover);
-    transition: 0.2s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #maximize:hover #maximize-icon {
-    background-color: var(--interactive-hover);
-    transition: 0.2s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #quit:hover {
-    background-color: #e81123;
-    transition: 0.2s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #quit:hover #quit-icon {
-    background-color: #ffffff;
-    transition: 0.1s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #minimize {
-    background-color: transparent;
-    transition: 0.1s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #maximize {
-    background-color: transparent;
-    transition: 0.1s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #quit {
-    background-color: transparent;
-    transition: 0.1s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #quit:active {
-    background-color: #f1707a;
-    transition: 0.1s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #quit:active #quit-icon {
-    background-color: #000000cc;
-    transition: 0.1s ease;
-}
-
-.titlebar #window-controls-container #quit-icon {
-    background-color: var(--interactive-normal);
-    display: list-item;
+.titlebar #window-controls-container #quit {
+    background-color: #f7f7f7;
     -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
     mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
 }
-.titlebar #window-controls-container #minimize-icon {
-    background-color: var(--interactive-normal);
-    display: list-item;
+.titlebar #window-controls-container #minimize {
+    background-color: #f7f7f7;
     -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 4.399V5.5H0V4.399h11z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
     mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 4.399V5.5H0V4.399h11z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
 }
-.titlebar #window-controls-container #maximize-icon {
-    background-color: var(--interactive-normal);
-    display: list-item;
+.titlebar #window-controls-container #maximize {
+    background-color: #f7f7f7;
     -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 0v11H0V0h11zM9.899 1.101H1.1V9.9h8.8V1.1z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
     mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 0v11H0V0h11zM9.899 1.101H1.1V9.9h8.8V1.1z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
 }
-
-[isMaximized] .titlebar #window-controls-container #maximize-icon {
-    background-color: var(--interactive-normal);
-    display: list-item;
-    -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30' width='11' height='11'%3E%3Cstyle%3E%3C/style%3E%3Cpath fill-rule='evenodd' d='m6 0h24v24h-6v6h-24v-24h6zm3 6h15v15h3v-18h-18zm-6 21h18v-18h-18z'/%3E%3C/svg%3E")
-        no-repeat 50% 50%;
-    mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30' width='11' height='11'%3E%3Cstyle%3E%3C/style%3E%3Cpath fill-rule='evenodd' d='m6 0h24v24h-6v6h-24v-24h6zm3 6h15v15h3v-18h-18zm-6 21h18v-18h-18z'/%3E%3C/svg%3E")
-        no-repeat 50% 50%;
+.window-title:after {
+    content: "Cord";
+    color: var(--cord-color) !important;
+    font-weight: normal;
+    font-size: 14px;
+    font-family: Discordinated;
+}
+.window-title:before {
+    content: "ARM";
+    color: var(--armcord-color);
+    font-weight: normal;
+    font-size: 14px;
+    font-family: Helvetica, sans-serif;
 }
-
 .window-title {
-    content: var(--wordmark-svg);
-    height: 10px;
-    margin-left: initial;
-    transform: translate(9px, 9.5px);
-    float: left;
-    padding: 0;
+    font-size: 0px !important;
+    margin-left: initial !important;
+    transform: translate(10px, 0px);
 }
-
 .withFrame-haYltI {
     height: 30px !important;
 }
diff --git a/src/content/setup.html b/src/content/setup.html
index 6ed4c94..e02c49e 100644
--- a/src/content/setup.html
+++ b/src/content/setup.html
@@ -15,7 +15,10 @@
                 <p>You appear to be offline. Please connect to the internet and restart ArmCord Setup.</p>
             </div>
             <div id="setup">
-                <div id="logo" class="hidden"></div>
+                <div id="logo" class="hidden">
+                    <p>ARM</p>
+                    <p>Cord</p>
+                </div>
                 <div id="page1" class="hidden">
                     <p>Select the type of setup you want to perform.</p>
                     <div id="buttons">
@@ -55,7 +58,7 @@
                             <option value="flicker">Flicker (Heavily WIP)</option>
                         </select>
                     </div>
-                    <p class="text-center">
+                    <p>
                         Why not all of them? Having many client mods at the same time can cause issues. If you really
                         want to do it though, check our documentation ;)
                     </p>
@@ -67,9 +70,6 @@
         </div>
 
         <script>
-            document.onload = function () {
-                ipcRenderer.send("win-unmaximize");
-            };
             // Accessors {{{
             let options = {};
 
diff --git a/src/main.ts b/src/main.ts
index ec61b77..38dfa46 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -14,7 +14,7 @@ export var tabs: boolean;
 
 if (process.platform == "linux") {
     if (process.env.$XDG_SESSION_TYPE == "wayland") {
-        console.log("Wayland specific patches applied.");
+        console.log("Wayland specific patches applied.")
         app.commandLine.appendSwitch("ozone-platform=wayland");
         if (process.env.$XDG_CURRENT_DESKTOP == "GNOME") {
             app.commandLine.appendSwitch("enable-features=UseOzonePlatform,WaylandWindowDecorations");
diff --git a/src/preload/preload.ts b/src/preload/preload.ts
index 2d3fd71..6d3bbec 100644
--- a/src/preload/preload.ts
+++ b/src/preload/preload.ts
@@ -7,8 +7,6 @@ import {injectTitlebar} from "./titlebar";
 import {sleep, addStyle, injectJS} from "../utils";
 import {ipcRenderer} from "electron";
 import {injectTabs} from "./tabs";
-var version = ipcRenderer.sendSync("get-app-version", "app-version");
-
 declare global {
     interface Window {
         armcord: any;
@@ -50,17 +48,3 @@ if (window.location.href.indexOf("splash.html") > -1) {
         }
     });
 }
-
-// Settings info version injection (Stolen and modified from OpenAsar, mwuh ha ha ha ha >:D)
-setInterval(() => {
-    const host = document.getElementsByClassName("info-3pQQBb")[0];
-    if (!host || document.querySelector("#ac-ver")) return;
-    const el = document.createElement("span");
-    el.id = "ac-ver";
-    el.classList.add("text-xs-normal-3SiVjE", "line-18uChy");
-
-    el.textContent = `\nArmCord Version: ${version}`;
-    el.onclick = () => ipcRenderer.send("openSettingsWindow");
-
-    host.append(el);
-}, 2000);
diff --git a/src/preload/titlebar.ts b/src/preload/titlebar.ts
index 3c58fc1..5e103ef 100644
--- a/src/preload/titlebar.ts
+++ b/src/preload/titlebar.ts
@@ -2,17 +2,15 @@ import {ipcRenderer} from "electron";
 import {addStyle} from "../utils";
 import * as fs from "fs";
 import * as path from "path";
-import {platform} from "node:process";
 export function injectTitlebar() {
     document.addEventListener("DOMContentLoaded", function (event) {
         var elem = document.createElement("div");
         elem.innerHTML = `<nav class="titlebar">
           <div class="window-title" id="window-title"></div>
           <div id="window-controls-container">
-              <div id="spacer"></div>
-              <div id="minimize"><div id="minimize-icon"></div></div>
-              <div id="maximize"><div id="maximize-icon"></div></div>
-              <div id="quit"><div id="quit-icon"></div></div>
+              <div id="minimize"></div>
+              <div id="maximize"></div>
+              <div id="quit"></div>
           </div>
         </nav>`;
         elem.classList.add("withFrame-haYltI");
@@ -21,11 +19,8 @@ export function injectTitlebar() {
         } else {
             document.getElementById("app-mount")!.prepend(elem);
         }
-        const titlebarcssPath = path.join(__dirname, "../", "/content/css/titlebar.css");
-        const wordmarkcssPath = path.join(__dirname, "../", "/content/css/logos.css");
-        addStyle(fs.readFileSync(titlebarcssPath, "utf8"));
-        addStyle(fs.readFileSync(wordmarkcssPath, "utf8"));
-        document.body.setAttribute("armcord-platform", platform);
+        const cssPath = path.join(__dirname, "../", "/content/css/titlebar.css");
+        addStyle(fs.readFileSync(cssPath, "utf8"));
 
         var minimize = document.getElementById("minimize");
         var maximize = document.getElementById("maximize");
@@ -38,10 +33,8 @@ export function injectTitlebar() {
         maximize!.addEventListener("click", () => {
             if (ipcRenderer.sendSync("win-isMaximized") == true) {
                 ipcRenderer.send("win-unmaximize");
-                document.body.removeAttribute("isMaximized");
             } else {
                 ipcRenderer.send("win-maximize");
-                document.body.setAttribute("isMaximized", "");
             }
         });
 
diff --git a/src/socket.ts b/src/socket.ts
index d55f673..0c2e0a9 100644
--- a/src/socket.ts
+++ b/src/socket.ts
@@ -118,68 +118,65 @@ export default async function startServer() {
         ["Discord PTB", new URL("https://ptb.discord.com/app")],
         ["Fosscord", new URL("https://dev.fosscord.com/app")]
     ] as const;
-
-    let wss = null,
-        wsPort = 6463;
-    for (const port of range(6463, 6472)) {
+    
+    let wss = null, wsPort = 6463;
+    for(const port of range(6463, 6472)) {
         wss = await getServer(port);
-        if (wss !== null) {
-            void wsLog("ArmCord is listening at " + port.toString());
+        if(wss !== null) {
+            void wsLog("ArmCord is listening at " + (port.toString()));
             wsPort = port;
             break;
         }
     }
-    if (wss === null) return;
+    if(wss === null) return;
     let lock = false;
-    wss.on("connection", (wss, request) => {
-        const origin = request.headers.origin ?? "https://discord.com";
+    wss.on('connection', (wss, request) => {
+        const origin = request.headers.origin??'https://discord.com';
         let known = false;
-        for (const instance of knownInstancesList) {
-            if (instance[1].origin === origin) known = true;
+        for(const instance of knownInstancesList) {
+            if(instance[1].origin === origin)
+                known = true;
         }
-        if (!known) return;
+        if(!known) return;
         wss.send(JSON.stringify(messages.handShake));
-        wss.once("message", (data, isBinary) => {
-            if (lock) return;
+        wss.once('message', (data, isBinary) => {
+            if(lock) return;
             lock = true;
-            let parsedData: unknown = data;
-            if (!isBinary) parsedData = data.toString();
-            if (isJsonSyntaxCorrect(parsedData as string)) parsedData = JSON.parse(parsedData as string);
-            if (isInviteResponse(parsedData)) {
+            let parsedData:unknown = data;
+            if(!isBinary)
+                parsedData = data.toString();
+            if(isJsonSyntaxCorrect(parsedData as string))
+                parsedData = JSON.parse(parsedData as string);
+            if(isInviteResponse(parsedData)) {
                 // Replies to browser, so it finds the communication successful.
-                wss.send(
-                    JSON.stringify({
-                        cmd: parsedData.cmd,
-                        data: {
-                            invite: null,
-                            code: parsedData.args.code
-                        },
-                        evt: null,
-                        nonce: parsedData.nonce
-                    })
-                );
-                createInviteWindow();
+                wss.send(JSON.stringify({
+                    cmd: parsedData.cmd,
+                    data: {
+                        invite: null,
+                        code: parsedData.args.code
+                    },
+                    evt: null,
+                    nonce: parsedData.nonce
+                }));
+                createInviteWindow()
                 const child = inviteWindow;
-                if (child === undefined) return;
-                void child.loadURL(origin + "/invite/" + parsedData.args.code);
+                if(child === undefined) return;
+                void child.loadURL(origin+'/invite/'+parsedData.args.code);
                 child.webContents.once("did-finish-load", () => {
                     child.show();
                 });
                 child.webContents.once("will-navigate", () => {
                     lock = false;
                     child.close();
-                });
+                })
                 child.on("close", (e) => {
                     lock = false;
-                });
+                })
                 // Blocks requests to ArmCord's WS, to prevent loops.
-                child.webContents.session.webRequest.onBeforeRequest(
-                    {
-                        urls: ["ws://127.0.0.1:" + wsPort.toString() + "/*"]
-                    },
-                    (_details, callback) => callback({cancel: true})
-                );
+                child.webContents.session.webRequest.onBeforeRequest({
+                    urls: ['ws://127.0.0.1:'+wsPort.toString()+'/*']
+                }, (_details,callback) => callback({cancel: true}));
             }
-        });
-    });
+        })
+    })
 }
diff --git a/src/tray.ts b/src/tray.ts
index 6129949..e4395ca 100644
--- a/src/tray.ts
+++ b/src/tray.ts
@@ -1,11 +1,11 @@
-import {app, Menu, Tray} from "electron";
-import {mainWindow} from "./window";
-import {getConfig} from "./utils";
+import { app, Menu, Tray } from "electron";
+import { mainWindow } from "./window";
+import { getConfig } from "./utils";
 import * as path from "path";
-import {createSettingsWindow} from "./settings/main";
+import { createSettingsWindow } from "./settings/main";
 let tray: any = null;
 app.whenReady().then(async () => {
-    if ((await getConfig("windowStyle")) == "discord") {
+    if (await getConfig("windowStyle") == "discord") {
         tray = new Tray(path.join(__dirname, "../", "/assets/dsc-tray.png"));
         const contextMenu = Menu.buildFromTemplate([
             {
@@ -25,11 +25,10 @@ app.whenReady().then(async () => {
         tray.setToolTip("Discord");
         tray.setContextMenu(contextMenu);
     } else {
-        var trayIcon = (await getConfig("trayIcon")) ?? "ac_plug_colored";
-        tray = new Tray(path.join(__dirname, "../", `/assets/${trayIcon}.png`));
+        tray = new Tray(path.join(__dirname, "../", "/assets/ac_plug.png"));
         const contextMenu = Menu.buildFromTemplate([
             {
-                label: "ArmCord"
+                label: "ArmCord",
             },
             {
                 type: "separator"
diff --git a/src/utils.ts b/src/utils.ts
index e331a96..9144b12 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -139,7 +139,7 @@ export async function checkIfConfigExists() {
             contentPath = path.join(__dirname, "/ts-out/content/setup.html");
         }
     } else {
-        if ((await getConfig("doneSetup")) == false) {
+        if (await getConfig("doneSetup") == false) {
             console.log("First run of the ArmCord. Starting setup.");
             setup();
             isSetup = true;
diff --git a/src/window.ts b/src/window.ts
index ddcdb33..d6b1296 100644
--- a/src/window.ts
+++ b/src/window.ts
@@ -6,7 +6,7 @@ import {BrowserWindow, shell, app, ipcMain, dialog, clipboard} from "electron";
 import path from "path";
 import {checkIfConfigIsBroken, firstRun, getConfig, contentPath, isSetup} from "./utils";
 import {registerIpc} from "./ipc";
-import startServer from "./socket";
+import startServer from "./socket"
 import contextMenu from "electron-context-menu";
 import os from "os";
 export var icon: string;
@@ -23,7 +23,8 @@ contextMenu({
 async function doAfterDefiningTheWindow() {
     checkIfConfigIsBroken();
     registerIpc();
-    mainWindow.webContents.userAgent = `Mozilla/5.0 (X11; ${os.type()} ${os.arch()}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36`; //fake useragent for screenshare to work
+    mainWindow.webContents.userAgent =
+        `Mozilla/5.0 (X11; ${os.type()} ${os.arch()}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36`; //fake useragent for screenshare to work
     mainWindow.webContents.setWindowOpenHandler(({url}) => {
         shell.openExternal(url);
         return {action: "deny"};
@@ -42,10 +43,10 @@ async function doAfterDefiningTheWindow() {
         }
     });
     console.log(contentPath);
-    if ((await getConfig("inviteWebsocket")) == true) {
-        startServer();
+    if (await getConfig("inviteWebsocket") == true) {
+        startServer()
     }
-
+    
     try {
         mainWindow.loadFile(contentPath);
         if (isSetup) {
@@ -190,5 +191,5 @@ export function createInviteWindow() {
             spellcheck: true
         }
     });
-    inviteWindow.hide();
-}
+    inviteWindow.hide()
+}
\ No newline at end of file