diff --git a/_includes/components/blog-sidebar.njk b/_includes/components/blog-sidebar.njk
index 8bba7b4..c98a913 100644
--- a/_includes/components/blog-sidebar.njk
+++ b/_includes/components/blog-sidebar.njk
@@ -35,16 +35,16 @@
     {% elif widget.type == "recent-comments" %}
       {% include "components/widgets/recent-comments.njk" %}
     {% elif widget.type == "search" %}
-      <div class="sidebar-widget">
-        <h3 class="text-sm font-semibold text-surface-600 dark:text-surface-400 uppercase tracking-wide mb-3">Search</h3>
+      <div class="widget">
+        <h3 class="widget-title">Search</h3>
         <div id="blog-sidebar-search"></div>
         <script>initPagefind("#blog-sidebar-search");</script>
       </div>
     {% elif widget.type == "custom-html" %}
       {% set wConfig = widget.config or {} %}
-      <div class="sidebar-widget">
+      <div class="widget">
         {% if wConfig.title %}
-        <h3 class="text-sm font-semibold text-surface-600 dark:text-surface-400 uppercase tracking-wide mb-3">{{ wConfig.title }}</h3>
+        <h3 class="widget-title">{{ wConfig.title }}</h3>
         {% endif %}
         {% if wConfig.content %}
         <div class="prose dark:prose-invert prose-sm max-w-none">
diff --git a/_includes/components/cv-sidebar.njk b/_includes/components/cv-sidebar.njk
index ff83e8e..a54011d 100644
--- a/_includes/components/cv-sidebar.njk
+++ b/_includes/components/cv-sidebar.njk
@@ -18,8 +18,8 @@
     {% elif widget.type == "categories" %}
       {% include "components/widgets/categories.njk" %}
     {% elif widget.type == "search" %}
-      <div class="sidebar-widget">
-        <h3 class="text-sm font-semibold text-surface-600 dark:text-surface-400 uppercase tracking-wide mb-3">Search</h3>
+      <div class="widget">
+        <h3 class="widget-title">Search</h3>
         <div id="sidebar-search"></div>
         <script>initPagefind("#sidebar-search");</script>
       </div>
@@ -28,9 +28,9 @@
     {% elif widget.type == "custom-html" %}
       {# Custom content widget #}
       {% set wConfig = widget.config or {} %}
-      <div class="sidebar-widget">
+      <div class="widget">
         {% if wConfig.title %}
-        <h3 class="text-sm font-semibold text-surface-600 dark:text-surface-400 uppercase tracking-wide mb-3">{{ wConfig.title }}</h3>
+        <h3 class="widget-title">{{ wConfig.title }}</h3>
         {% endif %}
         {% if wConfig.content %}
         <div class="prose dark:prose-invert prose-sm max-w-none">
diff --git a/_includes/components/homepage-sidebar.njk b/_includes/components/homepage-sidebar.njk
index 5ff63db..f05c80c 100644
--- a/_includes/components/homepage-sidebar.njk
+++ b/_includes/components/homepage-sidebar.njk
@@ -18,8 +18,8 @@
     {% elif widget.type == "categories" %}
       {% include "components/widgets/categories.njk" %}
     {% elif widget.type == "search" %}
-      <div class="sidebar-widget">
-        <h3 class="text-sm font-semibold text-surface-600 dark:text-surface-400 uppercase tracking-wide mb-3">Search</h3>
+      <div class="widget">
+        <h3 class="widget-title">Search</h3>
         <div id="sidebar-search"></div>
         <script>initPagefind("#sidebar-search");</script>
       </div>
@@ -30,9 +30,9 @@
     {% elif widget.type == "custom-html" %}
       {# Custom content widget #}
       {% set wConfig = widget.config or {} %}
-      <div class="sidebar-widget">
+      <div class="widget">
         {% if wConfig.title %}
-        <h3 class="text-sm font-semibold text-surface-600 dark:text-surface-400 uppercase tracking-wide mb-3">{{ wConfig.title }}</h3>
+        <h3 class="widget-title">{{ wConfig.title }}</h3>
         {% endif %}
         {% if wConfig.content %}
         <div class="prose dark:prose-invert prose-sm max-w-none">
diff --git a/_includes/components/sidebar.njk b/_includes/components/sidebar.njk
index 11b3d48..9a10180 100644
--- a/_includes/components/sidebar.njk
+++ b/_includes/components/sidebar.njk
@@ -29,8 +29,8 @@
     {% elif widget.type == "recent-comments" %}
       {% include "components/widgets/recent-comments.njk" %}
     {% elif widget.type == "search" %}
-      <div class="sidebar-widget">
-        <h3 class="text-sm font-semibold text-surface-600 dark:text-surface-400 uppercase tracking-wide mb-3">Search</h3>
+      <div class="widget">
+        <h3 class="widget-title">Search</h3>
         <div id="listing-sidebar-search"></div>
         <script>initPagefind("#listing-sidebar-search");</script>
       </div>
@@ -38,9 +38,9 @@
       {% include "components/widgets/webmentions.njk" %}
     {% elif widget.type == "custom-html" %}
       {% set wConfig = widget.config or {} %}
-      <div class="sidebar-widget">
+      <div class="widget">
         {% if wConfig.title %}
-        <h3 class="text-sm font-semibold text-surface-600 dark:text-surface-400 uppercase tracking-wide mb-3">{{ wConfig.title }}</h3>
+        <h3 class="widget-title">{{ wConfig.title }}</h3>
         {% endif %}
         {% if wConfig.content %}
         <div class="prose dark:prose-invert prose-sm max-w-none">