diff --git a/src/_includes/partials/footer.html b/src/_includes/partials/footer.html
index b733ca4..335274f 100644
--- a/src/_includes/partials/footer.html
+++ b/src/_includes/partials/footer.html
@@ -1,6 +1,6 @@
 {% set socialLinks = meta.social | entries %}
-<footer class="[ footer ][ mt-1.5 py-1.5 ]">
-    <div class="[ footer-grid wrapper ][ gap-0.5 ]">
+<footer class="[ footer ] [ mt-1.5 py-1.5 ]">
+    <div class="[ footer-grid ] [ wrapper gap-0.5 ]">
         <p>&copy; {{ meta.author }} 2018-2024.</p>
         <nav class="[ footer-pages ]">
             <ul class="[ flex-col list-none p-0 m-0 gap-0.5 ]">
@@ -14,7 +14,7 @@
         <nav class="[ footer-socials ]">
             <ul class="[ flex list-none gap-0.5 m-0 p-0 ]">
                 <li>
-                    <span class="visually-hidden">RSS</span>
+                    <span class="[ visually-hidden ]">RSS</span>
                     <a href="#" target="_blank">{% include "svgs/rss.svg" %}</a>
                 </li>
                 {% for link in socialLinks %}
@@ -22,7 +22,7 @@
                     {% set url = link | last %}
                     {% set alt = key | capitalize %}
                     <li>
-                        <span class="visually-hidden">{{ alt }}</span>
+                        <span class="[ visually-hidden ]">{{ alt }}</span>
                         <a href="{{ url }}" target="_blank" rel="external noreferrer noopener">{% include "svgs/social-" + key + ".svg" %}</a>
                     </li>
                 {% endfor %}
diff --git a/src/_includes/partials/header.html b/src/_includes/partials/header.html
index a2d864a..07b7002 100644
--- a/src/_includes/partials/header.html
+++ b/src/_includes/partials/header.html
@@ -1,10 +1,11 @@
 <header class="[ navbar ]">
     <nav class="[ wrapper flex items-center justify-between ]">
-        <div class="[ flex items-center ] [ site-logo ]">
-            <a class="[ flex items-center justify-center ] [ logo ]" href="#">
+        <div class="[ site-logo ] [ flex items-center ]">
+            <a class="[ logo ] [ flex items-center justify-center ]"
+               href="{{ meta.url }}">
                 <img src="/assets/images/logo.svg" width="32" height="32" alt="" />
             </a>
-            <a class="[ flex ] [ wordmark ]" href="#">
+            <a class="[ wordmark ] [ flex ]" href="#">
                 <span>wonderful</span>
                 <span>frog</span>
             </a>
diff --git a/src/_includes/partials/menu.html b/src/_includes/partials/menu.html
index c951741..3a40d15 100644
--- a/src/_includes/partials/menu.html
+++ b/src/_includes/partials/menu.html
@@ -1,7 +1,7 @@
-<ul class="[ flex ] [ links ]">
+<ul class="[ links ] [ flex ]">
     {% for item in navigation.top %}
         <li>
-            <a class="nav" href="{{ item.url }}" {{ helpers.getLinkActiveState(item.url, page.url) | safe }}>{{ item.text }}</a>
+            <a href="{{ item.url }}" {{ helpers.getLinkActiveState(item.url, page.url) | safe }}>{{ item.text }}</a>
         </li>
     {% endfor %}
 </ul>
diff --git a/src/_layouts/base.html b/src/_layouts/base.html
index 6bd019c..cd5746c 100644
--- a/src/_layouts/base.html
+++ b/src/_layouts/base.html
@@ -23,7 +23,7 @@
     </head>
     <body>
         {% include "partials/header.html" %}
-        <main id="main" class="wrapper flow">
+        <main id="main" class="[ flow wrapper ]">
             {{ content | safe }}
         </main>
         {% include "partials/footer.html" %}
diff --git a/src/_layouts/post.html b/src/_layouts/post.html
index 0f7b981..8d88c2e 100644
--- a/src/_layouts/post.html
+++ b/src/_layouts/post.html
@@ -2,11 +2,11 @@
 layout: base
 ---
 
-<article class="flow">
-    <header class="flow" style="--flow-space: 1rem">
-        <time class="date" datetime="{{ date }}">{{ date | formatDate("MMMM D, YYYY") }}</time>
+<article class="[ flow ]">
+    <header class="[ flow ]" style="--flow-space: 1rem">
+        <time class="[ date ]" datetime="{{ date }}">{{ date | formatDate("MMMM D, YYYY") }}</time>
         <h1>{{ title }}</h1>
-        <ul class="categories">
+        <ul class="[ categories ]">
             {% for category in categories %}<li>{{ category }}</li>{% endfor %}
         </ul>
     </header>
