diff --git a/public/css/index.css b/public/css/index.css
index 245400f..6553438 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -9,28 +9,18 @@
 :root {
 	/* Colors */
 	--color-gray-20: #e0e0e0;
-	--color-gray-50: #C0C0C0;
 	--color-gray-90: #333333;
+
+	--card-color: white;
 	--contrast-color: #027860;
-
 	--background-color: #FAF5F5;
-
 	--text-color: var(--color-gray-90);
 	--text-color-link: var(--text-color);
-	--text-color-link-active: rgba(3,144,116,1);
-	--text-color-link-visited: var(--color-gray-90);
-
-	--nav-pill-background-color-active: rgba(3,144,116,1);
-	--nav-pill-background-color-inactive: rgba(71,71,71,1);
-
-	--nav-pill-text-color: rgba(255,255,255,1);
-	--nav-pill-text-color-link-visited: rgba(255,255,255,1);
-	--nav-pill-text-color-link-active: rgba(255,255,255,1);
+	--text-color-tag: rgba(255,255,255,1);
 
 	/* Space & Size */
 	--syntax-tab-size: 2;
-	--pill-radius: 5rem;
-	--card-radius: .3rem;
+	--corner-radius: .3rem;
 
 	/* Spacing */
 	--single-gap: 1rem;
@@ -51,20 +41,23 @@
 	--weight-extraheavy: 700;
 	--weight-heavy: 500;
 	--weight-normal: 300;
+
+	/* Borders */
+	--border-nav: 1px solid var(--text-color);
+	--border-nav-currentpage: 20px solid var(--contrast-color);
+	--border-nav-hover: 20px solid var(--text-color);
+	--border-thin: 1px solid var(--color-gray-20);
 }
 
 @media (prefers-color-scheme: dark) {
 	:root {
 		--color-gray-20: #e0e0e0;
-		--color-gray-50: #C0C0C0;
 		--color-gray-90: #dad8d8;
 		--card-color: #333333;
 		--contrast-color: #04c49e;
 
 		/* --text-color is assigned to --color-gray-_ above */
 		--text-color-link: var(--contrast-color);
-		--text-color-link-active: var(--contrast-color);
-		--text-color-link-visited: var(--contrast-color);
 
 		--background-color: #15202b;
 	}
@@ -106,7 +99,6 @@ a {
 	text-decoration-thickness: .1rem;
 	transition: all .5s;
 }
-
 /* https://www.a11yproject.com/posts/how-to-hide-content/ */
 .visually-hidden {
 	clip: rect(0 0 0 0);
@@ -117,22 +109,34 @@ a {
 	white-space: nowrap;
 	width: 1px;
 }
-
+h1, h2, h3 {
+	color: var(--text-color);
+}
 h1 {
 	font-family: var(--font-family-headline);
 	font-weight: var(--weight-extraheavy);
 	font-size: var(--font-xxl);
 	font-style: normal;
 	line-height: 4rem;
-	padding-top: 3rem;
+	margin-top: 3rem;
 	margin-bottom: 0;
 }
-
+h2 {
+	font-size: var(--font-xl);
+	font-weight: var(--weight-extraheavy);
+	margin-top: var(--double-gap);
+}
 h3 {
 	font-size: var(--font-l);
 	line-height: 1.25;
 }
-
+main {
+	padding: var(--single-gap);
+}
+main > p > img, main > p > a > img {
+	width: 100%;
+	padding-top: var(--double-gap);
+}
 p:last-child {
 	margin-bottom: 0;
 }
@@ -140,63 +144,34 @@ p, li {
 	line-height: 1.5;
 	font-size: var(--font-n);
 }
-
-main > p > img, main > p > a > img {
-	width: 100%;
-	padding-top: var(--double-gap);
-}
-
 figure {
 	margin: 0;
 	padding: 0 0 2em 0;
 	width: 100%;
 }
-
 figure > a > img {
 	padding: 0;
 	width: 100%;
 	box-shadow: .75em .75em 0 0 var(--contrast-color);
 }
-
 figcaption {
 	text-align: center;
 	padding-top: var(--single-gap);
 }
-
 .page-block {
 	margin-top: 3rem;
 	margin-bottom: 3rem;
 }
-
 a[href] {
 	color: var(--text-color-link);
 }
 a[href]:visited {
-	color: var(--text-color-link-visited);
+	color: var(--text-color-link);
 }
 a[href]:hover,
 a[href]:active {
-	color: var(--text-color-link-active);
+	color: var(--contrast-color);
 }
-
-main {
-	padding: var(--single-gap);
-}
-
-main h2 {
-	font-weight: var(--weight-extraheavy);
-	font-size: 2rem;
-	margin-top: var(--double-gap);
-}
-
-main :first-child {
-	margin-top: 0;
-}
-
-header {
-	border-bottom: 1px solid var(--color-gray-20);
-}
-
 .links-nextprev {
 	list-style: none;
 	border-top: 1px solid var(--color-gray-20);
@@ -212,6 +187,7 @@ table th {
 	padding-right: 1em;
 }
 
+/* Code Fences */
 pre,
 code {
 	font-family: var(--font-family-monospace);
@@ -237,18 +213,19 @@ code {
 
 /* Header */
 header {
-	display: flex;
-	gap: 1em .5em;
-	flex-wrap: wrap;
 	align-items: end;
+	border-bottom: var(--border-thin);
+	display: flex;
+	flex-wrap: wrap;
+	gap: 1em .5em;
 	padding: 1em;
 }
 .home-link {
-	font-size: var(--font-n); /* 16px /16 */
-	font-weight: var(--weight-extraheavy);
-	margin-right: 2em;
-	display: flex;
 	align-items: end;
+	display: flex;
+	font-size: var(--font-n);
+	font-weight: var(--weight-extraheavy);
+	margin-right: var(--double-gap);
 }
 .home-link:link:not(:hover) {
 	text-decoration: none;
@@ -264,59 +241,61 @@ header {
 	list-style: none;
 }
 nav ul {
-	display: flex;
 	align-items: end;
+	display: flex;
 	justify-content: space-between;
 	width: 20rem;
 }
 .nav-icon {
-	width: var(--single-gap);
+	fill: var(--color-gray-90);
 	height: .8rem;
 	margin-right: .25rem;
-	fill: var(--color-gray-90);
 	padding-bottom: .3rem;
 	transition: all .5s;
+	width: var(--single-gap);
 }
 .nav-item {
 	display: inline-block;
 	text-decoration: none;
 }
 .nav-item li {
-	display: flex;
 	align-items: end;
+	border-top: var(--border-nav);
+	color: var(--text-color);
+	display: flex;
+	font-size: var(--font-xs);
+	font-weight: var(--weight-heavy);
 	height: 2.8rem;
 	margin-right: .5em;
 	margin-bottom: 0;
 	text-transform: uppercase;
-	letter-spacing: .15rem;
-	font-size: var(--font-xs);
-	font-weight: var(--weight-heavy);
-	color: var(--color-gray-90);
-	border-top: 1px solid var(--color-gray-90);
 	transition: all .5s;
+	letter-spacing: .15rem;
 }
 .nav-item li:hover {
-	border-top: 20px solid var(--contrast-color);
-}
-.subscribe:hover {
-	color: var(--color-gray-90);
+	border-top: var(--border-nav-hover);
 }
 .nav-item a[href]:visited {
-	color: var(--color-gray-90);
+	color: var(--text-color);
 }
 .nav-item a[href]:hover {
+	color: var(--text-color);
 	text-decoration: none;
-	color: var(--color-gray-90);
+
 }
 .nav-item a[href]:not(:hover) {
+	color: var(--text-color);
 	text-decoration: none;
-	color: var(--color-gray-90);
 }
-.nav-item[data-currentpage="true"] {
+.nav-item li[data-currentpage="true"] {
+	border-top: var(--border-nav-currentpage);
+	color: var(--contrast-color);
 }
-
 .nav a[href][aria-current="page"] {
-	color: var(--color-gray-90);
+	color: var(--text-color);
+}
+.subscribe:hover {
+	color: var(--text-color);
 }
 
 /* Posts list */
@@ -328,28 +307,27 @@ nav ul {
 	flex-flow: column nowrap;
 }
 .postlist-item {
+	align-items: flex-start;
+	background-color: var(--card-color);
+	border-radius: var(--corner-radius);
+	box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
 	display: flex;
 	flex-flow: row nowrap;
-	align-items: flex-start;
 	justify-content: flex-start;
 	margin-bottom: 1em;
-	width: 100%;
-	box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
 	padding: var(--single-gap) 1.1rem var(--single-gap) 1.1rem;
-	border-radius: var(--card-radius);
-	background-color: white;
+	width: 100%;
 }
-
 .post-image-container {
-	border-radius: var(--card-radius);
+	border-radius: var(--corner-radius);
 	margin-right: var(--single-gap);
-	overflow: hidden;
 	max-height: 15rem;
+	overflow: hidden;
 }
 .postlist-date,
 .postlist-item:before {
-	font-size: var(--font-s); /* 13px /16 */
 	color: var(--color-gray-90);
+	font-size: var(--font-s); /* 13px /16 */
 }
 .postlist-date {
 	word-spacing: -0.5px;
@@ -380,75 +358,67 @@ nav ul {
 
 /* Tags */
 .post-tag, a.post-tag, .taglist li a {
-	display: inline-flex;
 	align-items: center;
-	color: var(--nav-pill-text-color);
-	justify-content: center;
-	text-transform: capitalize;
-	background-color: var(--nav-pill-background-color-inactive);
-	text-decoration: none;
-	padding: .2rem .4rem .2rem .4rem;
-	border-radius: var(--pill-radius);
+	color: var(--text-color-tag);
+	display: inline-flex;
 	font-size: .75rem;
+	justify-content: center;
+	padding: .2rem .4rem .2rem .4rem;
+	text-decoration: none;
+	text-transform: capitalize;
 }
 
 a.post-tag:visited {
-	color: var(--nav-pill-text-color);
+	color: var(--text-color-tag);
 }
 
 a.post-tag:hover {
-	color: var(--nav-pill-text-color);
+	color: var(--text-color-tag);
 }
 
 .taglist {
-	list-style-type: none;
-	padding-left: 0;
 	display: flex;
 	flex-flow: row wrap;
+	list-style-type: none;
+	padding-left: 0;
 }
 .taglist li {
 	margin: 0em .5em 1.25em 0em;
 }
 .taglist li a {
 	font-size: var(--font-l);
+	font-weight: var(--weight-extraheavy);
+	padding: .4rem .8rem .4rem .8rem;
 	text-decoration-color: var(--contrast-color);
 	text-decoration-thickness: .1rem;
 	text-decoration-skip: none;
 	transition: all .5s;
-	font-weight: var(--weight-extraheavy);
-	padding: .4rem .8rem .4rem .8rem;
 }
 .postlist-item > .post-tag {
 	align-self: center;
 }
-@media(max-width: 556px) {
-	.taglist {
-		flex-flow: column nowrap;
-	}
-}
 
 /* Tags list */
 .post-metadata {
+	align-items: center;
 	display: inline-flex;
 	flex-wrap: wrap;
-	align-items: center;
+	font-size: var(--font-s);
 	gap: .5em;
 	list-style: none;
-	padding: 0 0 0 .4em;
-	font-size: var(--font-s);
 	margin-bottom: 5em;
+	padding: 0 0 0 .4em;
 }
 .post-metadata time {
-	margin-right: .5em;
 	font-size: var(--font-n);
+	margin-right: .5em;
 }
 
 /* Direct Links / Markdown Headers */
 a.header-anchor {
-	text-decoration: none;
 	font-style: normal;
-	/* font-size: var(--font-n); */
 	margin-left: .1em;
+	text-decoration: none;
 }
 a[href].header-anchor,
 a[href].header-anchor:visited {
@@ -462,17 +432,10 @@ a[href].header-anchor:focus,
 :hover > a[href].header-anchor {
 	color: #aaa;
 }
-
 h2 + .header-anchor {
 	font-size: var(--font-l);
 }
 
-@media (prefers-color-scheme: dark) {
-	.postlist-item {
-		background-color: var(--card-color);
-	}
-}
-
 /* Mobile Styles */
 @media(max-width: 556px) {
 	body {
@@ -493,15 +456,38 @@ h2 + .header-anchor {
 	h3, .post-copy a h3 {
 		font-size: 1rem;
 	}
+
+	/* Header */
+	header {
+		padding: 0rem .5rem var(--single-gap) .5rem;
+		margin-bottom: var(--single-gap);
+	}
+	.home-link {
+		max-width: 1rem;
+		margin-top: var(--single-gap);
+	}
+
+	/* Nav */
+	.nav {
+		flex-flow: row wrap;
+	}
+	.nav-item {
+		margin-right: .5rem;
+	}
 	.nav-item li {
 		height: 2rem;
 	}
+	.nav-item li:hover {
+		border-top: 2px solid var(--contrast-color);
+	}
 	nav ul {
 		display: flex;
 		align-items: end;
 		justify-content: auto;
 		width: auto;
 	}
+
+	/* Posts List */
 	.post-copy a h3 {
 		margin-top: .5em;
 	}
@@ -528,23 +514,7 @@ h2 + .header-anchor {
 	.post-metadata {
 		margin-bottom: var(--single-gap);
 	}
-	header {
-		padding: 0rem .5rem var(--single-gap) .5rem;
-		margin-bottom: var(--single-gap);
-	}
-	.home-link {
-		max-width: 1rem;
-		margin-top: var(--single-gap);
-	}
-	.nav {
-		flex-flow: row wrap;
-	}
-	.nav-item {
-		margin-right: .5rem;
-	}
-	.nav-item li:hover {
-		border-top: 2px solid var(--contrast-color);
-	}
+
 	p, p.nodropcap.page-block, .post-copy p {
 		font-size: var(--font-n);
 		line-height: 1.25rem;
@@ -556,4 +526,7 @@ h2 + .header-anchor {
 	.post-tag, a.post-tag, .taglist li a {
 		font-size: var(--font-xs);
 	}
+	.taglist {
+		flex-flow: column nowrap;
+	}
 }