diff --git a/release/eSixCafe.user.css b/release/eSixCafe.user.css
index 029a345..1679a33 100644
--- a/release/eSixCafe.user.css
+++ b/release/eSixCafe.user.css
@@ -1,7 +1,7 @@
 /* ==UserStyle==
 @name           eSix Café
 @namespace      mandorinn
-@version        2.1.5
+@version        2.2.0
 @description    A muted and easy on the eyes style for e621. Big credits to Faucet for the bug reports so far, thank you!
 @author         mandorinn [(www.mandorinn.dev)], faucet [(https://e621.net/users/601225)]
 @preprocessor stylus
@@ -1431,8 +1431,8 @@ if themep == classic {
 	ul.backtrace {
 		background: var(--bg);
 	}
-/* Header */
-	header#top {
+/*Old Header styling */
+	/*header#top {
 		background-color: var(--bg)!important;
 		background-image: none!important;
 		margin: 0!important;
@@ -1576,16 +1576,17 @@ if themep == classic {
 		background-color: var(--bg-400)!important;
 		border: 2px solid var(--bg-300)!important;
 		padding: 0 .5rem;
-	}
+	}*/
 	/* Nav Logo */
-	menu.logo {
+	 menu.nav-logo {
+		margin-top: .25rem;
 		display: flex;
 		width: 10%;
 	}
-	nav .logo #text {
+	nav .nav-logo #text {
 		display:none;
 	}
-	nav .logo {
+	nav .nav-logo {
 		position: relative;
 		height: 100%;
 		left:.5rem;
@@ -1595,17 +1596,25 @@ if themep == classic {
 		font-size: 1px;
 		color:var(--logo);
 	}
-	body:not([re621="true"]) nav .logo {
+	body:not([re621="true"]) nav .nav-logo {
 		top:.35rem;
-		/*feels kinda magic number-ey again blehhhhh*/
 	}
-	nav .logo {
+	nav.navigation menu.nav-logo a.nav-logo-link {
+		display:flex !important;
+		align-items:center !important;
+		justify-content: center !important;
+		position:relative !important;
+		width: 200px !important;
+		margin-right:0 !important;
+	}
+	nav .nav-logo {
 		color: rgb(0,0,0,0);
-		font-size:0;
 	}
-	nav .logo::before {
+	nav .nav-logo::before {
 		content:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='0.4in' height='0.4in' viewBox='0 0 36 36'%3E%3Cpath id='Ear Tops' fill='%2300000055' d='M 26.73,13.88 C 26.73,13.88 29.44,13.24 29.92,14.20 30.30,14.98 28.55,16.43 28.55,16.43 28.55,16.43 30.06,18.45 30.06,18.45 30.06,18.45 32.06,16.97 33.02,16.18 34.09,15.28 35.85,13.73 35.10,12.43 33.62,9.88 26.95,11.43 25.27,11.96 25.27,11.96 26.73,13.88 26.73,13.88 Z M 14.61,8.32 C 14.61,8.32 15.74,5.77 16.79,5.97 17.65,6.13 17.75,8.41 17.75,8.41 17.75,8.41 20.26,8.41 20.26,8.41 20.26,8.41 20.30,5.92 20.23,4.68 20.16,3.29 19.98,0.94 18.50,0.76 15.57,0.41 12.79,6.68 12.20,8.33 12.20,8.33 14.61,8.32 14.61,8.32 Z' /%3E%3Cpath id='Ear Bottoms' fill='%23ffffff33' d='M 14.61,8.32 C 14.61,8.32 15.74,5.77 16.79,5.97 17.65,6.13 17.75,8.41 17.75,8.41 17.75,8.41 20.26,8.41 20.26,8.41 20.26,8.41 20.30,7.43 20.27,6.17 19.54,4.37 16.52,3.18 15.03,3.00 14.27,3.83 12.79,6.68 12.20,8.33 12.20,8.33 14.61,8.32 14.61,8.32 Z M 26.73,13.88 C 26.73,13.88 29.44,13.24 29.92,14.20 30.30,14.98 28.55,16.43 28.55,16.43 28.55,16.43 30.06,18.45 30.06,18.45 30.06,18.45 31.41,17.50 32.36,16.70 31.56,16.69 32.70,13.48 30.75,11.02 29.57,10.99 26.95,11.43 25.27,11.96 25.27,11.96 26.73,13.88 26.73,13.88 Z' /%3E%3Cpath id='Head' fill='%2300000055' d='M 8.17,9.97 C 10.27,9.96 19.20,10.03 22.22,10.03 22.88,11.15 28.57,20.96 29.24,22.17 28.50,23.45 22.29,34.12 22.22,34.21 21.22,34.25 8.25,34.29 8.25,34.29 8.15,34.13 1.88,23.32 1.17,22.10 1.80,21.20 7.24,11.57 8.17,9.97 Z' /%3E%3Cpath id='e' fill='%23ffffff33' d='M 14.90,14.62 C 21.12,14.31 22.95,19.43 22.81,23.04 22.69,23.05 11.69,23.93 11.53,23.93 14.80,28.95 18.63,25.34 18.81,25.20 18.95,25.34 19.39,25.75 20.85,27.10 17.10,31.38 8.78,30.54 8.02,21.83 8.53,15.14 14.90,14.62 14.90,14.62 Z M 11.21,20.81 C 11.21,20.81 17.95,20.38 19.47,20.28 17.02,15.62 12.25,17.69 11.21,20.81 Z' /%3E%3C/svg%3E%0A");
-		position:relative;
+		position:absolute;
+		display:grid;
+		place-items:center;
 		margin-inline: auto;
 		z-index: 2;
 		background-color: var(--bg-300);
@@ -1614,9 +1623,37 @@ if themep == classic {
 		border-radius: 50%;
 		transition:200ms;
 	}
-	nav .logo:hover::before {
+	nav .nav-logo:hover::before {
 		outline: solid 2px var(--base-text);
 	}
+	
+	
+	/* New Header styling */
+	
+	nav.navigation, nav.navigation menu.nav-logo {
+		background-color: var(--bg);
+	}
+	nav menu.nav-primary, nav menu.nav-help  {
+		border-bottom:1px solid var(--header-link) !important;
+	}
+	menu.nav-help {
+		width: fit-content;
+	}
+	nav.navigation .nav-secondary {
+		background-color: var(--bg);
+	}
+	nav.navigation i, nav.navigation a:is([id*="nav"], [id*="blacklist"]) {
+		color: var(--header-link) !important;
+	}
+	nav.navigation i:hover, nav.navigation a:is([id*="nav"], [id*="blacklist"]):hover {
+		color: var(--header-link-hover) !important;
+	}
+	nav.navigation menu.nav-tools {
+		background-color: var(--bg-400) !important;
+		border-radius: 0 0 4px 4px;
+		border: 2px solid var(--bg-300);
+		border-top: 0px solid transparent;
+	}
 	/* Re621 menus */
 	.ui-widget-content.ui-widget-content {
 		color: var(--base-text)!important;
@@ -3975,6 +4012,11 @@ if themep == classic {
 		background-color: rgba(255,255,255,.035)!important;
 	}
 /* Settings Page */
+	.simple_form {
+		background: var(--bg) !important;
+		border-radius: 8px;
+		border: 4px solid var(--bg-400);
+	}
 	a#delete-account {
 		color: var(--remove-favorite)!important;
 	}