diff --git a/css/layout.css b/css/layout.css
index 4b4f0c8..73e5e81 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -54,7 +54,7 @@ body > nav {
                 text-decoration: none;
                 color: var(--on-background);
 
-                &[href] {
+                &[href]:not([aria-current="page"]) {
                     font-weight: 200;
                     transition: color 0.2s;
 
@@ -63,7 +63,7 @@ body > nav {
                     }
                 }
 
-                &:not([href]) {
+                &[aria-current="page"] {
                     padding-bottom: 8px;
                     color: var(--primary);
                     border-bottom: 2px solid var(--primary);
diff --git a/html/layout.templ b/html/layout.templ
index 4508436..715b92b 100644
--- a/html/layout.templ
+++ b/html/layout.templ
@@ -180,12 +180,10 @@ templ layout(activePage string) {
 
 templ Link(activePage, targetPage, title string) {
 	<a
-		if activePage != targetPage {
-			if targetPage == "index" {
-				href="/"
-			} else {
-				href={ fmt.Sprint("/", targetPage, "/") }
-			}
+		if targetPage == "index" {
+			href="/"
+		} else {
+			href={ fmt.Sprint("/", targetPage, "/") }
 		}
 		if activePage == targetPage {
 			aria-current="page"
@@ -195,12 +193,10 @@ templ Link(activePage, targetPage, title string) {
 
 templ GreenLink(activePage, targetPage, title string) {
 	<a
-		if activePage != targetPage {
-			if targetPage == "index" {
-				href="/"
-			} else {
-				href={ fmt.Sprint("/", targetPage, "/") }
-			}
+		if targetPage == "index" {
+			href="/"
+		} else {
+			href={ fmt.Sprint("/", targetPage, "/") }
 		}
 		if activePage == targetPage {
 			aria-current="page"