diff --git a/.github/workflows/hugo.yml b/.github/workflows/hugo.yml
index de53a57..8332edc 100644
--- a/.github/workflows/hugo.yml
+++ b/.github/workflows/hugo.yml
@@ -12,7 +12,6 @@ permissions:
   pages: write
   id-token: write
 
-
 # Environment variables available to all jobs and steps in this workflow
 env:
   HUGO_ENV: production
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 79d51d5..344f03f 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,3 +1,7 @@
 {
-  "recommendations": ["bradlc.vscode-tailwindcss", "budparr.language-hugo-vscode", "tamasfe.even-better-toml"]
+  "recommendations": [
+    "bradlc.vscode-tailwindcss",
+    "budparr.language-hugo-vscode",
+    "tamasfe.even-better-toml"
+  ]
 }
diff --git a/assets/scss/buttons.scss b/assets/scss/buttons.scss
index 42b4dce..e75043f 100755
--- a/assets/scss/buttons.scss
+++ b/assets/scss/buttons.scss
@@ -7,9 +7,9 @@
 }
 
 .btn-primary {
-  @apply border-primary bg-primary text-white dark:border-darkmode-primary dark:bg-white dark:text-dark;
+  @apply border-primary bg-primary dark:border-darkmode-primary dark:text-dark text-white dark:bg-white;
 }
 
 .btn-outline-primary {
-  @apply border-dark bg-transparent text-dark hover:bg-dark hover:text-white dark:border-white dark:text-white dark:hover:bg-white dark:hover:text-dark;
+  @apply border-dark text-dark hover:bg-dark dark:hover:text-dark bg-transparent hover:text-white dark:border-white dark:text-white dark:hover:bg-white;
 }
diff --git a/assets/scss/utilities.scss b/assets/scss/utilities.scss
index 52b1186..154570e 100755
--- a/assets/scss/utilities.scss
+++ b/assets/scss/utilities.scss
@@ -1,5 +1,5 @@
 .bg-gradient {
-  @apply bg-gradient-to-b from-[rgba(249,249,249,1)] from-[0.53%] to-white to-[83.28%] dark:from-darkmode-theme-light dark:to-darkmode-body;
+  @apply dark:from-darkmode-theme-light dark:to-darkmode-body bg-gradient-to-b from-[rgba(249,249,249,1)] from-[0.53%] to-white to-[83.28%];
 }
 
 .rounded-sm {
diff --git a/exampleSite/assets/scss/custom.scss b/exampleSite/assets/scss/custom.scss
index 37f722e..9685904 100755
--- a/exampleSite/assets/scss/custom.scss
+++ b/exampleSite/assets/scss/custom.scss
@@ -1 +1 @@
-// Add your own custom styles here
\ No newline at end of file
+// Add your own custom styles here
diff --git a/exampleSite/content/english/pages/elements.md b/exampleSite/content/english/pages/elements.md
index 85fce8d..89c8e06 100755
--- a/exampleSite/content/english/pages/elements.md
+++ b/exampleSite/content/english/pages/elements.md
@@ -224,6 +224,7 @@ print s
 ### Gallery
 
 {{< gallery dir="images/gallery" class="" height="400" width="400" webp="true" command="Fit" option="" zoomable="true" >}}
+
 <hr>
 
 ### Slider
diff --git a/exampleSite/content/english/search.md b/exampleSite/content/english/search.md
index 74423bf..1c4b6fd 100644
--- a/exampleSite/content/english/search.md
+++ b/exampleSite/content/english/search.md
@@ -1,4 +1,4 @@
 ---
 title: search
 layout: search
----
\ No newline at end of file
+---
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 37acd93..9a463bc 100755
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -7,7 +7,6 @@
     <!-- head (don't cache it) -->
     {{ partial "essentials/head.html" . }}
 
-
     <!-- style (always cache it) -->
     {{ partialCached "essentials/style.html" . }}
   </head>
diff --git a/layouts/_default/contact.html b/layouts/_default/contact.html
index 911ea51..c7fb93d 100755
--- a/layouts/_default/contact.html
+++ b/layouts/_default/contact.html
@@ -1,7 +1,6 @@
 {{ define "main" }}
   {{ partial "page-header" . }}
 
-
   <section class="section-sm">
     <div class="container">
       <div class="row">
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index ec083f8..aff801f 100755
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,7 +1,6 @@
 {{ define "main" }}
   {{ partial "page-header" . }}
 
-
   <section class="section">
     <div class="container">
       <div class="row gx-5">
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 5e2cb0f..0d1481a 100755
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,7 +1,6 @@
 {{ define "main" }}
   {{ partial "page-header" . }}
 
-
   <section class="section-sm">
     <div class="container">
       <div class="row justify-center">
diff --git a/layouts/authors/list.html b/layouts/authors/list.html
index e45cd39..08f6f93 100644
--- a/layouts/authors/list.html
+++ b/layouts/authors/list.html
@@ -1,7 +1,6 @@
 {{ define "main" }}
   {{ partial "page-header" . }}
 
-
   <section class="section">
     <div class="container">
       <div class="row">
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 84b56e9..4b1777d 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -1,7 +1,6 @@
 {{ define "main" }}
   {{ partial "page-header" . }}
 
-
   <section class="section">
     <div class="container">
       <div class="row gx-5">
diff --git a/layouts/partials/call-to-action.html b/layouts/partials/call-to-action.html
index 3421436..dce0837 100644
--- a/layouts/partials/call-to-action.html
+++ b/layouts/partials/call-to-action.html
@@ -18,9 +18,9 @@
               </p>
               {{ with .Params.button }}
                 {{ if .enable }}
-                  <a class="btn btn-primary" href="{{ .link | absURL }}"
-                    >{{ .label }}</a
-                  >
+                  <a class="btn btn-primary" href="{{ .link | absURL }}">
+                    {{ .label }}
+                  </a>
                 {{ end }}
               {{ end }}
             </div>
diff --git a/layouts/partials/components/tw-size-indicator.html b/layouts/partials/components/tw-size-indicator.html
index 9a4496d..38e54cf 100644
--- a/layouts/partials/components/tw-size-indicator.html
+++ b/layouts/partials/components/tw-size-indicator.html
@@ -1,5 +1,5 @@
 <div
-  class="fixed top-0 left-0 z-50 flex w-[30px] items-center justify-center bg-gray-200 py-[2.5px] text-[12px] uppercase text-black sm:bg-red-200 md:bg-yellow-200 lg:bg-green-200 xl:bg-blue-200 2xl:bg-pink-200">
+  class="fixed left-0 top-0 z-50 flex w-[30px] items-center justify-center bg-gray-200 py-[2.5px] text-[12px] uppercase text-black sm:bg-red-200 md:bg-yellow-200 lg:bg-green-200 xl:bg-blue-200 2xl:bg-pink-200">
   <span class="block sm:hidden">all</span>
   <span class="hidden sm:block md:hidden">sm</span>
   <span class="hidden md:block lg:hidden">md</span>
diff --git a/layouts/partials/essentials/head.html b/layouts/partials/essentials/head.html
index d6a8554..9f4deaa 100755
--- a/layouts/partials/essentials/head.html
+++ b/layouts/partials/essentials/head.html
@@ -12,30 +12,27 @@
 <!-- favicon -->
 {{ partialCached "favicon" . }}
 
-
 <!-- manifest -->
 {{ partialCached "manifest" . }}
 
-
 <!-- site verifications -->
 {{ partialCached "site-verifications.html" . }}
 
-
 <!-- opengraph and twitter card -->
 {{ partial "basic-seo.html" . }}
 
-
 <!-- custom script -->
 {{ partialCached "custom-script.html" . }}
 
-
 <!-- google analytics -->
 {{ template "_internal/google_analytics.html" . }}
 
-
 <!-- google tag manager -->
 {{ partialCached "gtm.html" . }}
 
+<!-- search index -->
+{{ partial "search-index.html" . }}
+
 
 <!-- matomo analytics -->
 {{/* {{ partialCached "matomo-analytics.html" . }} */}}
@@ -51,6 +48,3 @@
 
 <!-- Crisp Chat -->
 {{/* {{ partialCached "crisp-chat.html" . }} */}}
-
-<!-- search index -->
-{{ partial "search-index.html" . }}
diff --git a/layouts/partials/widgets/categories.html b/layouts/partials/widgets/categories.html
index b187f7a..2acd197 100755
--- a/layouts/partials/widgets/categories.html
+++ b/layouts/partials/widgets/categories.html
@@ -10,7 +10,7 @@
               <a
                 class="hover:text-primary dark:hover:text-darkmode-primary {{ if (and (eq $.Page.Kind `term`) (eq $.Page.Type `categories`) (eq $.Page.Title .Page.Title)) }}
                   active
-                {{ end }} flex  justify-between"
+                {{ end }} flex justify-between"
                 href="{{ .Page.RelPermalink }}">
                 {{ .Page.Title }} <span>( {{ len $items }} )</span>
               </a>
diff --git a/package.json b/package.json
index 44e3803..6d3333d 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "autoprefixer": "^10.4.14",
     "postcss": "^8.4.24",
     "postcss-cli": "^10.1.0",
-    "prettier": "^3.0.0",
+    "prettier": "^2.8.8",
     "prettier-plugin-go-template": "0.0.13",
     "prettier-plugin-tailwindcss": "^0.3.0",
     "tailwind-bootstrap-grid": "^5.0.1",
diff --git a/readme.md b/readme.md
index 8f3102e..8f8d551 100755
--- a/readme.md
+++ b/readme.md
@@ -86,13 +86,11 @@ npm run dev
 npm run build
 ```
 
-<!-- reporting issue -->
 ## 🐞 Reporting Issues
 
 We use GitHub Issues as the official bug tracker for this Template. Please Search [existing issues](https://github.com/zeon-studio/hugoplate/issues). It’s possible someone has already reported the same problem.
 If your problem or idea has not been addressed yet, feel free to [open a new issue](https://github.com/zeon-studio/hugoplate/issues).
 
-<!-- licence -->
 ## 📝 License
 
 Copyright (c) 2023 - Present, Designed & Developed by [Zeon Studio](https://zeon.studio/)