format: rename main-dark & main-light colors to main-hard & main-soft

12 files changed, 71 insertions, 71 deletions

diff --git a/internal/glightbox/html_renderer.go b/internal/glightbox/html_renderer.go
index 8974ab4..deafb4d 100644
--- a/internal/glightbox/html_renderer.go
+++ b/internal/glightbox/html_renderer.go
@@ -134,12 +134,12 @@ func (r *GLightboxHTMLRenderer) renderGLightbox(w util.BufWriter, source []byte,
 
 		w.WriteString(fmt.Sprintf(`
 <div class="justify-content-center display-block m-1">
-	<hr class="border-t-3 border-dotted border-main-dark mt-1 mb-2 w-[80%%] ml-auto mr-auto">
+	<hr class="border-t-3 border-dotted border-main-hard mt-1 mb-2 w-[80%%] ml-auto mr-auto">
 	<div class="grid masonry-grid-%s mx-auto">
 		<div class="grid-sizer grid-sizer-%s"></div>
 		%s
 	</div>
-	<hr class="border-t-3 border-dotted border-main-dark mt-1 mb-2 w-[80%%] ml-auto mr-auto">
+	<hr class="border-t-3 border-dotted border-main-hard mt-1 mb-2 w-[80%%] ml-auto mr-auto">
 </div>`, galleryID, galleryID, strings.Join(elements, "\n")))
 
 		w.WriteString(fmt.Sprintf(`
diff --git a/internal/tailwind/transformer.go b/internal/tailwind/transformer.go
index d4d908c..c53ded1 100644
--- a/internal/tailwind/transformer.go
+++ b/internal/tailwind/transformer.go
@@ -20,9 +20,9 @@ func (t *TailwindTransformer) Transform(node *ast.Document, reader text.Reader,
 		switch node := n.(type) {
 		case *ast.Heading:
 			classes := map[int]string{
-				1: "font-andika text-4xl font-bold text-main-dark mb-3 tracking-[.0125rem]",
-				2: "font-andika text-3xl font-bold text-main-dark mb-1 tracking-[.0125rem]",
-				3: "font-andika text-2xl font-medium text-main-dark mb-0.8 tracking-[.0125rem]",
+				1: "font-andika text-4xl font-bold text-main-hard mb-3 tracking-[.0125rem]",
+				2: "font-andika text-3xl font-bold text-main-hard mb-1 tracking-[.0125rem]",
+				3: "font-andika text-2xl font-medium text-main-hard mb-0.8 tracking-[.0125rem]",
 				4: "font-andika text-xl font-medium text-main-medium mb-0.5 tracking-[.0125rem]",
 				5: "font-andika text-base font-medium text-main-medium mb-0.5 italic tracking-[.0125rem]",
 				6: "font-andika text-base font-medium text-secondary mb-0.5",
@@ -58,7 +58,7 @@ func (t *TailwindTransformer) Transform(node *ast.Document, reader text.Reader,
 				onclickAttr := fmt.Appendf(make([]byte, 0, 21+len(node.Destination)), "return changeUrl('%s');", node.Destination)
 				node.SetAttribute([]byte("onclick"), onclickAttr)
 			}
-			node.SetAttribute([]byte("class"), []byte("text-secondary hover:text-main-dark underline"))
+			node.SetAttribute([]byte("class"), []byte("text-secondary hover:text-main-hard underline"))
 
 		case *ast.Image:
 			node.SetAttribute([]byte("class"), []byte("max-w-full h-auto rounded-lg shadow-lg mb-4"))
diff --git a/static/input.css b/static/input.css
index 2a3b96f..6e5cf3f 100644
--- a/static/input.css
+++ b/static/input.css
@@ -36,18 +36,18 @@ html {
 }
 
 [data-theme="olive"] {
-    --main-dark-color: #4b513a;
+    --main-hard-color: #4b513a;
     --main-medium-color: #8a9d8a;
-    --main-light-color: #a5b8a5;
+    --main-soft-color: #a5b8a5;
     --background-dark-color: #ffffdd;
     --background-medium-color: var(--background-dark-color);
     --background-light-color: #fffff0;
     --sidebar-text-color: var(--background-dark-color);
-    --sidebar-stroke-color: var(--main-dark-color);
-    --secondary-color: var(--main-light-color);
-    --leaflet-text-color: var(--main-dark-color);
+    --sidebar-stroke-color: var(--main-hard-color);
+    --secondary-color: var(--main-soft-color);
+    --leaflet-text-color: var(--main-hard-color);
     --leaflet-link-color: var(--main-medium-color);
-    --leaflet-link-hover-color: var(--main-light-color);
+    --leaflet-link-hover-color: var(--main-soft-color);
     --interlocked-hexagons-background: url("data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22100%22%20height%3D%22100%22%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20fill%3D%22%23ffffdb%22%2F%3E%3Cpath%20fill%3D%22%23777e63%22%20d%3D%22m33.64%200-.17.25h-33L4.3%206h33.07l4-6zm8.33%200-4.33%206.5h-33l3.83%205.75h33.06L49.7%200zm8.34%200-8.5%2012.75h-33l3.83%205.75H45.7L58.03%200zm8.33%200L45.97%2019h-33l3.83%205.75h33.06L66.36%200zm-8.5%2025.25L33.63%2050l3.86%205.8L54.03%2031h33l-3.83-5.75zm4.16%206.25L37.8%2056.25l3.87%205.8%2016.53-24.8h33l-3.84-5.75zm4.17%206.25L41.97%2062.5l3.86%205.8%2016.54-24.8h33l-3.84-5.75zM62.63%2044l-16.5%2024.75%203.87%205.8%2016.53-24.8h33L95.7%2044zM100%2050.45l-3.87%205.8%203.87%205.81v-11.6zM0%2050.46v11.6L12.5%2080.8l3.86-5.8zm95.83%206.25-3.87%205.8L100%2074.55v-11.6zm-4.17%206.24-3.86%205.8%2012.2%2018.3v-11.6zM0%2062.96v11.6l8.33%2012.49%203.86-5.8zm87.5%206.24L83.63%2075%20100%2099.54V87.96zM50%2075.45%2033.64%20100h7.72l12.5-18.75zm-50%200v11.6l4.16%206.24%203.87-5.8zm54.17%206.25L41.97%20100h7.73l8.33-12.5zm4.17%206.25L50.3%20100h7.73l4.17-6.25zM0%2087.95v11.59l3.86-5.8zm62.5%206.25-3.87%205.8h7.73z%22%2F%3E%3Cpath%20fill%3D%22%23a0a182%22%20d%3D%22M66.8.25%2062.97%206h33l4.03%206.05V.45l-.14-.2zM0%20.45v11.61L12.5%2030.8l3.86-5.8zM62.63%206.5l-3.83%205.75h33l8.2%2012.3v-11.6L95.7%206.5zm-4.16%206.25-3.84%205.75h33L100%2037.06v-11.6l-8.47-12.71zM0%2012.96v11.6l8.33%2012.49%203.86-5.8zM54.3%2019l-3.84%205.75h33L100%2049.55l.01-.01V37.96L87.36%2019zm-4.77%206.25H41.8L25.3%2050l16.66%2025-16.5%2024.75h7.74L49.7%2075%2033.03%2050zm-8.33%200h-7.74L16.96%2050l16.67%2025-16.5%2024.75h7.73L41.36%2075%2024.7%2050Zm-8.34%200h-7.73L8.63%2050%2025.3%2075%208.8%2099.75h7.73L33.03%2075%2016.36%2050zm-16.07%200L.3%2050l16.67%2025L.46%2099.75H8.2L24.7%2075%208.02%2050l16.5-24.75zM0%2025.46v11.6l4.16%206.24%203.87-5.8zm0%2012.5v11.58l3.86-5.79zm66.8%2012.29L50.3%2074.99l3.87%205.81%204.16%206.25%204.17%206.25%204.3%206.45h7.73L58.03%2075l16.5-24.75zm16.06%200h-7.73L58.63%2075l16.5%2024.75h7.73L66.36%2075zm.6%200L66.96%2075l16.5%2024.75h7.74L74.7%2075l16.5-24.75zm16.07%200H91.8L75.3%2075l16.5%2024.75h7.73L83.03%2075z%22%2F%3E%3C%2Fsvg%3E");
     --interlocked-hexagons-background-repeat: repeat;
     --interlocked-hexagons-background-size: 10dvh;
@@ -58,18 +58,18 @@ html {
 }
 
 [data-theme="lettuce"] {
-    --main-dark-color: #384a0c;
+    --main-hard-color: #384a0c;
     --main-medium-color: #9bb665;
-    --main-light-color: #bbd095;
+    --main-soft-color: #bbd095;
     --background-dark-color: #f5eee2;
     --background-medium-color: var(--background-dark-color);
     --background-light-color: #fff9ef;
-    --sidebar-text-color: var(--main-dark-color);
+    --sidebar-text-color: var(--main-hard-color);
     --sidebar-stroke-color: var(--background-dark-color);
     --secondary-color: var(--main-medium-color);
-    --leaflet-text-color: var(--main-dark-color);
+    --leaflet-text-color: var(--main-hard-color);
     --leaflet-link-color: var(--main-medium-color);
-    --leaflet-link-hover-color: var(--main-light-color);
+    --leaflet-link-hover-color: var(--main-soft-color);
     --interlocked-hexagons-background: url("data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22100%22%20height%3D%22100%22%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20fill%3D%22%23f5ede1%22%2F%3E%3Cpath%20fill%3D%22%239ab663%22%20d%3D%22m33.64%200-.17.25h-33L4.3%206h33.07l4-6zm8.33%200-4.33%206.5h-33l3.83%205.75h33.06L49.7%200zm8.34%200-8.5%2012.75h-33l3.83%205.75H45.7L58.03%200zm8.33%200L45.97%2019h-33l3.83%205.75h33.06L66.36%200zm-8.5%2025.25L33.63%2050l3.86%205.8L54.03%2031h33l-3.83-5.75zm4.16%206.25L37.8%2056.25l3.87%205.8%2016.53-24.8h33l-3.84-5.75zm4.17%206.25L41.97%2062.5l3.86%205.8%2016.54-24.8h33l-3.84-5.75zM62.63%2044l-16.5%2024.75%203.87%205.8%2016.53-24.8h33L95.7%2044zM100%2050.45l-3.87%205.8%203.87%205.81v-11.6zM0%2050.46v11.6L12.5%2080.8l3.86-5.8zm95.83%206.25-3.87%205.8L100%2074.55v-11.6zm-4.17%206.24-3.86%205.8%2012.2%2018.3v-11.6zM0%2062.96v11.6l8.33%2012.49%203.86-5.8zm87.5%206.24L83.63%2075%20100%2099.54V87.96zM50%2075.45%2033.64%20100h7.72l12.5-18.75zm-50%200v11.6l4.16%206.24%203.87-5.8zm54.17%206.25L41.97%20100h7.73l8.33-12.5zm4.17%206.25L50.3%20100h7.73l4.17-6.25zM0%2087.95v11.59l3.86-5.8zm62.5%206.25-3.87%205.8h7.73z%22%2F%3E%3Cpath%20fill%3D%22%23bbd095%22%20d%3D%22M66.8.25%2062.97%206h33l4.03%206.05V.45l-.14-.2zM0%20.45v11.61L12.5%2030.8l3.86-5.8zM62.63%206.5l-3.83%205.75h33l8.2%2012.3v-11.6L95.7%206.5zm-4.16%206.25-3.84%205.75h33L100%2037.06v-11.6l-8.47-12.71zM0%2012.96v11.6l8.33%2012.49%203.86-5.8zM54.3%2019l-3.84%205.75h33L100%2049.55l.01-.01V37.96L87.36%2019zm-4.77%206.25H41.8L25.3%2050l16.66%2025-16.5%2024.75h7.74L49.7%2075%2033.03%2050zm-8.33%200h-7.74L16.96%2050l16.67%2025-16.5%2024.75h7.73L41.36%2075%2024.7%2050Zm-8.34%200h-7.73L8.63%2050%2025.3%2075%208.8%2099.75h7.73L33.03%2075%2016.36%2050zm-16.07%200L.3%2050l16.67%2025L.46%2099.75H8.2L24.7%2075%208.02%2050l16.5-24.75zM0%2025.46v11.6l4.16%206.24%203.87-5.8zm0%2012.5v11.58l3.86-5.79zm66.8%2012.29L50.3%2074.99l3.87%205.81%204.16%206.25%204.17%206.25%204.3%206.45h7.73L58.03%2075l16.5-24.75zm16.06%200h-7.73L58.63%2075l16.5%2024.75h7.73L66.36%2075zm.6%200L66.96%2075l16.5%2024.75h7.74L74.7%2075l16.5-24.75zm16.07%200H91.8L75.3%2075l16.5%2024.75h7.73L83.03%2075z%22%2F%3E%3C%2Fsvg%3E");
     --interlocked-hexagons-background-repeat: repeat;
     --interlocked-hexagons-background-size: 10dvh;
@@ -80,15 +80,15 @@ html {
 }
 
 [data-theme="night"] {
-    --main-dark-color: var(--color-sky-100);
+    --main-hard-color: var(--color-sky-100);
     --main-medium-color: var(--color-sky-200);
-    --main-light-color: var(--color-sky-300);
+    --main-soft-color: var(--color-sky-300);
     --background-dark-color: #13131b;
     --background-medium-color: var(--background-dark-color);
     --background-light-color: #222230;
-    --sidebar-text-color: var(--main-dark-color);
+    --sidebar-text-color: var(--main-hard-color);
     --sidebar-stroke-color: var(--background-light-color);
-    --secondary-color: var(--main-light-color);
+    --secondary-color: var(--main-soft-color);
     --leaflet-text-color: var(--background-dark-color);
     --leaflet-link-color: var(--background-dark-color);
     --leaflet-link-hover-color: var(--background-light-color);
@@ -102,15 +102,15 @@ html {
 }
 
 [data-theme="ram"] {
-    --main-dark-color: #fefad8;
+    --main-hard-color: #fefad8;
     --main-medium-color: #f6e4c5;
-    --main-light-color: #e8d4b8;
+    --main-soft-color: #e8d4b8;
     --background-dark-color: #413b34;
     --background-medium-color: #62584f;
     --background-light-color: #6d6258;
-    --sidebar-text-color: var(--main-dark-color);
+    --sidebar-text-color: var(--main-hard-color);
     --sidebar-stroke-color: var(--background-light-color);
-    --secondary-color: var(--main-light-color);
+    --secondary-color: var(--main-soft-color);
     --leaflet-text-color: var(--background-dark-color);
     --leaflet-link-color: var(--background-dark-color);
     --leaflet-link-hover-color: var(--background-light-color);
@@ -129,7 +129,7 @@ a, .linklike {
 }
 
 a:hover, .linklike:hover {
-    color: var(--main-light-color) !important;
+    color: var(--main-soft-color) !important;
 }
 
 #map-container {
@@ -165,16 +165,16 @@ a:hover, .linklike:hover {
     border-color: var(--sidebar-stroke-color);
 }
 
-.text-main-dark {
-    color: var(--main-dark-color);
+.text-main-hard {
+    color: var(--main-hard-color);
 }
 
 .text-main-medium {
     color: var(--main-medium-color);
 }
 
-.text-main-light {
-    color: var(--main-light-color);
+.text-main-soft {
+    color: var(--main-soft-color);
 }
 
 .text-background-dark {
@@ -189,16 +189,16 @@ a:hover, .linklike:hover {
     color: var(--secondary-color);
 }
 
-.bg-main-dark {
-    background-color: var(--main-dark-color);
+.bg-main-hard {
+    background-color: var(--main-hard-color);
 }
 
 .bg-main-medium {
     background-color: var(--main-medium-color);
 }
 
-.bg-main-light {
-    background-color: var(--main-light-color);
+.bg-main-soft {
+    background-color: var(--main-soft-color);
 }
 
 .bg-background-dark {
@@ -209,16 +209,16 @@ a:hover, .linklike:hover {
     background-color: var(--background-light-color);
 }
 
-.border-main-dark {
-    border-color: var(--main-dark-color);
+.border-main-hard {
+    border-color: var(--main-hard-color);
 }
 
 .border-main-medium {
     border-color: var(--main-medium-color);
 }
 
-.border-main-light {
-    border-color: var(--main-light-color);
+.border-main-soft {
+    border-color: var(--main-soft-color);
 }
 
 .border-background-dark {
@@ -262,7 +262,7 @@ a:hover, .linklike:hover {
     position: fixed;
     width: 12rem;
     height: 12rem;
-    box-shadow: 0.25rem 0.25rem 0.25rem var(--main-light-color);
+    box-shadow: 0.25rem 0.25rem 0.25rem var(--main-soft-color);
     border-radius: 50%;
     opacity: 0;
     visibility: hidden;
@@ -319,9 +319,9 @@ a:hover, .linklike:hover {
 
 .theme-pin {
     position: relative;
-    background: color-mix(in srgb, var(--main-light-color) 75%, transparent);
-    box-shadow: 0rem 0rem 1rem var(--main-dark-color);
-    border: 0.5rem solid color-mix(in srgb, var(--main-light-color) 90%, transparent);
+    background: color-mix(in srgb, var(--main-soft-color) 75%, transparent);
+    box-shadow: 0rem 0rem 1rem var(--main-hard-color);
+    border: 0.5rem solid color-mix(in srgb, var(--main-soft-color) 90%, transparent);
     backdrop-filter: blur(2px);
     top: 35%;
     left: 35%;
@@ -348,7 +348,7 @@ a:hover, .linklike:hover {
 .grid-tooltip {
     position: relative;
     display: inline-block;
-    box-shadow: inset 0rem 0rem 0.5rem var(--main-light-color);
+    box-shadow: inset 0rem 0rem 0.5rem var(--main-soft-color);
     transition: box-shadow 0.5s ease-in-out;
 }
 
@@ -363,7 +363,7 @@ a:hover, .linklike:hover {
     width: 100%;
     top: 100%;
     background-color: var(--background-dark-color);
-    color: var(--main-dark-color);
+    color: var(--main-hard-color);
     text-align: center;
     padding: 0.25rem 0.25rem;
     margin-top: 0.25rem;
@@ -400,7 +400,7 @@ a:hover, .linklike:hover {
     transition: opacity 0.5s;
     top: 0%;
     left: 0%;
-    background-color: var(--main-light-color);
+    background-color: var(--main-soft-color);
     color: var(--background-dark-color);
     text-align: center;
     padding: 0.25rem 0.25rem;
@@ -460,7 +460,7 @@ a:hover, .linklike:hover {
 .glightbox-clean .gslide-title {
     font-family: var(--font-andika) !important;
     font-weight: 600 !important;
-    color: var(--main-light-color) !important;
+    color: var(--main-soft-color) !important;
     padding-bottom: 1rem !important;
     margin-bottom: 0 !important;
 }
diff --git a/views/index.html b/views/index.html
index 3f727ee..cbb4c57 100644
--- a/views/index.html
+++ b/views/index.html
@@ -52,7 +52,7 @@
     </style>
 </head>
 
-<body data-theme="night" class="font-andika text-main-dark text-2xl overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-col">
+<body data-theme="night" class="font-andika text-main-hard text-2xl overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-col">
 
     <div class="absolute star z-0">*</div>
     <div class="absolute star z-0">*</div>
diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html
index cf388de..487f63a 100644
--- a/views/layouts/general-page.html
+++ b/views/layouts/general-page.html
@@ -9,7 +9,7 @@
     <link href="/output.css" rel="stylesheet">
 </head>
 
-<body data-theme="ram" class="font-andika text-main-dark overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-col [@media(max-height:32rem)]:flex-row">
+<body data-theme="ram" class="font-andika text-main-hard overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-col [@media(max-height:32rem)]:flex-row">
 
     <script>
         let map = null;
@@ -197,7 +197,7 @@
     </div>
 
     <div class="bg-background-dark @container/main flex z-10 w-[100dvw] xs:w-[90dvw] sm:w-[80dvw] md:w-[75dvw] lg:w-[70dvw] xl:w-[65dvw] 2xl:w-[60dvw] grow-0 h-[calc(100dvh-5rem)] [@media(max-height:32rem)]:h-[100dvh] mx-auto [@media(max-height:32rem)]:mx-0">
-        <div class="bg-background-dark border-r-2 border-dashed border-main-dark"></div>
+        <div class="bg-background-dark border-r-2 border-dashed border-main-hard"></div>
 
         <div class="max-h-100% flex flex-col grow bg-background-dark relative pt-4 ml-8 pr-4">
             <div id="general-page-header" class="max-xs:hidden [@media(max-height:32rem)]:hidden flex flex-col basis-8"
@@ -205,7 +205,7 @@
             </div>
             <div id="general-page-header-trigger" hx-get="/api/v1/general-page/header{{ if .QueryString }}?{{ .QueryString }}{{ end }}" hx-trigger="popstate from:window" hx-target="#general-page-header" hx-swap="innerHTML"></div>
 
-            <hr class="max-xs:hidden [@media(max-height:32rem)]:hidden border-t-4 border-dotted border-main-dark mb-2">
+            <hr class="max-xs:hidden [@media(max-height:32rem)]:hidden border-t-4 border-dotted border-main-hard mb-2">
 
             <div id="general-page-body" class="flex flex-col grow overflow-y-auto"
                 hx-get="/api/v1/general-page/body{{ if .QueryString }}?{{ .QueryString }}{{ end }}" hx-trigger="load" hx-target="this" hx-swap="innerHTML">
@@ -217,10 +217,10 @@
             </div>
             <div id="general-page-footer-trigger" hx-get="/api/v1/general-page/footer{{ if .QueryString }}?{{ .QueryString }}{{ end }}" hx-trigger="popstate from:window" hx-target="#general-page-footer" hx-swap="innerHTML"></div>
 
-            <hr class="border-t-4 border-dotted border-main-dark mb-2">
+            <hr class="border-t-4 border-dotted border-main-hard mb-2">
         </div>
 
-        <div class="pr-[0.5dvw] bg-background-dark shadow-2xl border-l-2 border-dotted border-main-dark"></div>
+        <div class="pr-[0.5dvw] bg-background-dark shadow-2xl border-l-2 border-dotted border-main-hard"></div>
     </div>
 
     <script src="https://f003.backblazeb2.com/file/sayana-static/libs/htmx/2.0.6/htmx.min.js"></script>
diff --git a/views/pages/blog-catalogue.html b/views/pages/blog-catalogue.html
index 3845275..8c2a5fc 100644
--- a/views/pages/blog-catalogue.html
+++ b/views/pages/blog-catalogue.html
@@ -40,7 +40,7 @@
                 </div>
             </fieldset>
         </div>
-        <hr class="border-t-2 border-dotted border-main-dark my-0.5">
+        <hr class="border-t-2 border-dotted border-main-hard my-0.5">
         <div class="flex flex-row bg-background-dark my-2 p-0.5 rounded-1 justify-items-center">
             <i onclick="defaultSearchParams(); cleanHrefParams();" class="fas fa-rotate-left flex-1 text-center text-2xl hover:bg-background-light cursor-pointer transition-colors duration-300"></i>
             <div class="w-1 bg-background-light grow-0"></div>
@@ -50,7 +50,7 @@
         </div>
     </form>
 
-    <div class="w-[0.5dvh] border-r-2 border-dotted border-main-dark bg-background-dark"></div>
+    <div class="w-[0.5dvh] border-r-2 border-dotted border-main-hard bg-background-dark"></div>
 
     <div hx-get="/api/v1/blog-search" hx-vals='js:{lang: "{{ .Lang }}", tz: clientTimeZone}' hx-target="this" hx-swap="innerHTML" hx-trigger="load" hx-include=".tags-list"
         class="blog-cards grow flex flex-col overflow-y-auto bg-background-light inset-shadow p-6">
diff --git a/views/pages/blog-page.html b/views/pages/blog-page.html
index 3e642fa..d4b52a6 100644
--- a/views/pages/blog-page.html
+++ b/views/pages/blog-page.html
@@ -1,14 +1,14 @@
 {{ define "body" }}
 <div class="bg-background-light flex flex-col inset-shadow px-8 py-4 overflow-y-auto">
-    <p class="max-xs:block [@media(max-height:32rem)]:block hidden font-andika text-2xl font-bold italic text-main-dark tracking-[.0125rem] mb-1">{{ .Title }}</p>
+    <p class="max-xs:block [@media(max-height:32rem)]:block hidden font-andika text-2xl font-bold italic text-main-hard tracking-[.0125rem] mb-1">{{ .Title }}</p>
     <p class="max-xs:block [@media(max-height:32rem)]:block hidden grow text-lg font-andika text-secondary">{{ .L.Metadata.Published }}: {{ .PublishedDate }}</p>
     <p class="max-xs:block [@media(max-height:32rem)]:block hidden grow text-lg font-andika text-secondary">{{ .L.Metadata.Action }}: {{ .ActionDate }}</p>
-    <hr class="max-xs:block [@media(max-height:32rem)]:block hidden border-t-2 border-dotted border-main-dark mt-1 mb-2 w-full ml-auto mr-auto">
+    <hr class="max-xs:block [@media(max-height:32rem)]:block hidden border-t-2 border-dotted border-main-hard mt-1 mb-2 w-full ml-auto mr-auto">
     {{ .ParsedMarkdown }}
 {{- if .MapLocationX }}
-    <hr class="border-t-3 border-dotted border-main-dark mt-1 mb-2 w-[80%] ml-auto mr-auto">
+    <hr class="border-t-3 border-dotted border-main-hard mt-1 mb-2 w-[80%] ml-auto mr-auto">
     <div id="map-container" class="relative p-1 flex-none ml-auto mr-auto w-[60%] ar-lt-0.8:w-[80%] h-[40dvh] ar-lt-0.8:h-[30dvh]"></div>
-    <hr class="border-t-3 border-dotted border-main-dark mt-1 mb-2 w-[80%] ml-auto mr-auto">
+    <hr class="border-t-3 border-dotted border-main-hard mt-1 mb-2 w-[80%] ml-auto mr-auto">
 
     <script>
         function initLocationMap(id, x, y, relativeErrorMeters = 0) {
diff --git a/views/pages/global-map.html b/views/pages/global-map.html
index 1801291..4b17d16 100644
--- a/views/pages/global-map.html
+++ b/views/pages/global-map.html
@@ -12,7 +12,7 @@
     <link rel="stylesheet" href="https://f003.backblazeb2.com/file/sayana-static/libs/leaflet.markercluster/1.4.1/MarkerCluster.Default.css">
 </head>
 
-<body data-theme="ram" class="font-andika text-main-dark overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-row ar-lt-0.8:flex-col">
+<body data-theme="ram" class="font-andika text-main-hard overflow-hidden bg-interlocked-hexagons h-[100dvh] flex flex-row ar-lt-0.8:flex-col">
 
     <script>
         function switchTheme(theme) {
@@ -200,7 +200,7 @@
         var map;
         var markers = L.markerClusterGroup();
 
-        function createCustomIcon(color, borderColor = "var(--main-light-color)") {
+        function createCustomIcon(color, borderColor = "var(--main-soft-color)") {
             const svgIcon = `
                 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                     <path d="M12 1C7.5 1 4 4.5 4 9c0 6.5 8 14 8 14s8-7.5 8-14c0-4.5-3.5-8-8-8zm0 11c-1.5 0-3-1.5-3-3s1.5-3 3-3 3 1.5 3 3-1.5 3-3 3z"
diff --git a/views/pages/home-page.html b/views/pages/home-page.html
index b39b65c..0ebc86e 100644
--- a/views/pages/home-page.html
+++ b/views/pages/home-page.html
@@ -5,7 +5,7 @@
             <p class="text-3xl/[2] sm:text-4xl/[2] lg:text-5xl/[2] ml-4 tracking-widest uppercase w-full font-andika italic text-left
                 border-l-1.5 border-solid border-(--background-dark-color)
                 bg-gradient-to-r from-(--background-dark-color) to-(--background-light-color)">{{ .L.HomePage.Hymn1 }}</p>
-            <hr class="w-full border-t-2 border-dotted border-main-dark mb-1">
+            <hr class="w-full border-t-2 border-dotted border-main-hard mb-1">
             <p class="text-xl/[2] sm:text-2xl/[2] lg:text-3xl/[2] -indent-8 ml-12 p-1">{{ .L.HomePage.Hymn2 }}</p>
             <p class="text-xl/[2] sm:text-2xl/[2] lg:text-3xl/[2] -indent-8 ml-12 p-1">{{ .L.HomePage.Hymn3 }}</p>
             <p class="text-xl/[2] sm:text-2xl/[2] lg:text-3xl/[2] -indent-8 ml-12 p-1">{{ .L.HomePage.Hymn4 }}</p>
@@ -15,7 +15,7 @@
             <p class="text-xl sm:text-2xl lg:text-3xl p-1 w-full font-andika italic text-left
                 border-l-1.5 border-solid border-(--background-dark-color)
                 bg-gradient-to-r from-(--background-dark-color) to-(--background-light-color)">{{ .L.HomePage.DidYouKnowThat }}</p>
-            <hr class="w-full border-t-2 border-dotted border-main-dark mb-1">
+            <hr class="w-full border-t-2 border-dotted border-main-hard mb-1">
             <ul class="w-full text-left list-[circle]">
                 <li class="ml-4 mb-1">{{ index .FunFacts 0 }}</li>
                 <li class="ml-4 mb-1">{{ index .FunFacts 1 }}</li>
@@ -103,16 +103,16 @@
             <p class="text-xl sm:text-2xl lg:text-3xl p-1 w-full font-andika italic text-left
                 border-l-1.5 border-solid border-(--background-dark-color)
                 bg-gradient-to-r from-(--background-dark-color) to-(--background-light-color)">{{ .L.HomePage.SidebarDescription }}</p>
-            <hr class="w-full border-t-2 border-dotted border-main-dark mb-1">
+            <hr class="w-full border-t-2 border-dotted border-main-hard mb-1">
             <div class="w-full grid grid-cols-[1fr_4fr] content-center items-center
                 [&>*:nth-child(4n+2)]:bg-(--background-medium-color) [&>*:nth-child(4n+3)]:bg-(--background-medium-color)" style="container-type: inline-size;">
-                <i class="fas fa-home w-full h-full text-[10cqi] content-center text-center text-main-dark"></i>
+                <i class="fas fa-home w-full h-full text-[10cqi] content-center text-center text-main-hard"></i>
                 <p class="p-1">{{ .L.HomePage.HomePageDescription }}</p>
-                <i class="fas fa-search w-full h-full text-[10cqi] content-center text-center text-main-dark"></i>
+                <i class="fas fa-search w-full h-full text-[10cqi] content-center text-center text-main-hard"></i>
                 <p class="p-1">{{ .L.HomePage.BlogSearchDescription }}</p>
-                <i class="fas fa-map w-full h-full text-[10cqi] content-center text-center text-main-dark"></i>
+                <i class="fas fa-map w-full h-full text-[10cqi] content-center text-center text-main-hard"></i>
                 <p class="p-1">{{ .L.HomePage.MarkerMapDescription }}</p>
-                <i class="fas fa-swatchbook w-full h-full text-[10cqi] content-center text-center text-main-dark"></i>
+                <i class="fas fa-swatchbook w-full h-full text-[10cqi] content-center text-center text-main-hard"></i>
                 <p class="p-1">{{ .L.HomePage.ThemeSwitchDescription }}</p>
             </div>
         </div>
diff --git a/views/partials/blog-page-like-button.html b/views/partials/blog-page-like-button.html
index bcf3d0b..8d555da 100644
--- a/views/partials/blog-page-like-button.html
+++ b/views/partials/blog-page-like-button.html
@@ -1,6 +1,6 @@
 <button 
     hx-put="/api/v1/like" hx-vals='{"like": {{ not .Liked }}}' hx-target="this" hx-swap="outerHTML" hx-trigger="click"
-    class="text-sm/[0.9] shrink-0 font-andika text-left px-1 py-0.5 {{ if .Liked }}bg-main-light hover:bg-main-medium text-background-dark border-inset{{ else }}bg-main-dark hover:bg-main-medium text-background-light border-outset{{ end }} cursor-pointer border-2 border-background-dark">
+    class="text-sm/[0.9] shrink-0 font-andika text-left px-1 py-0.5 {{ if .Liked }}bg-main-soft hover:bg-main-medium text-background-dark border-inset{{ else }}bg-main-hard hover:bg-main-medium text-background-light border-outset{{ end }} cursor-pointer border-2 border-background-dark">
     <i class="fas fa-thumbs-up w-3 h-3"></i>
     <span class="italic ml-0.5 text-background-light">({{ .LikedCount }})</span>
 </button>
\ No newline at end of file
diff --git a/views/partials/catalogue-blog-cards.html b/views/partials/catalogue-blog-cards.html
index 5c3bb95..9bc5a30 100644
--- a/views/partials/catalogue-blog-cards.html
+++ b/views/partials/catalogue-blog-cards.html
@@ -1,5 +1,5 @@
 {{- range .BlogPages }}
-<hr class="first-of-type:hidden my-1 border-t-2 border-dotted border-main-dark">
+<hr class="first-of-type:hidden my-1 border-t-2 border-dotted border-main-hard">
 <div class="m-1 flex flex-row justify-center justify-items-center">
     <a href="{{ .ArticleLink }}" class="w-24 h-24 basis-24 shrink-0 my-2.5 mr-2">
         <img onclick="return changeUrl('{{ .ArticleLink }}');" class="w-full h-full aspect-square cursor-pointer object-cover rounded-lg select-none" src="https://f003.backblazeb2.com/file/sayana-photos/webp-320p/{{ .Thumbnail }}.webp">
@@ -13,7 +13,7 @@
             </a>
             <p class="basis-56 text-base italic text-secondary text-right">{{ .PublishedTime }}</p>
         </div>
-        <p class="text-base text-main-dark">{{ .ShortDescription }}</p>
+        <p class="text-base text-main-hard">{{ .ShortDescription }}</p>
         <p class="text-base text-secondary italic">
             <i class="fas fa-thumbs-up w-4 h-4"></i>
             <span>{{ .LikeCount }}</span>
diff --git a/views/partials/general-page-header.html b/views/partials/general-page-header.html
index d74c5c9..df75bb3 100644
--- a/views/partials/general-page-header.html
+++ b/views/partials/general-page-header.html
@@ -1,7 +1,7 @@
 <div {{ if .PublishedDate }} hx-get="/api/v1/tz" hx-vals='js:{timestamp: "{{ .PublishedDate }}", tz: clientTimeZone}' hx-target="#published-date" hx-swap="innerHTML" hx-trigger="load" {{ end }}
     class="flex flex-row mb-2">
     <a href="./" class="w-(--text-4xl) h-(--text-4xl) mx-1 my-auto">
-        <i onclick="return changeUrl('/../', true);" class="fas fa-circle-left hover:bg-main-dark hover:bg-opacity-10 cursor-pointer transition-colors duration-300 rounded-md text-4xl"></i>
+        <i onclick="return changeUrl('/../', true);" class="fas fa-circle-left hover:bg-main-hard hover:bg-opacity-10 cursor-pointer transition-colors duration-300 rounded-md text-4xl"></i>
     </a>
     <p class="text-4xl font-andika italic font-extrabold select-none my-auto pl-3 pr-3">//</p>
     <p class="text-4xl font-andika italic text-left mt-auto">{{ .Title }}</p>