diff --git a/config.toml b/config.toml
index c5830826..3f65308c 100644
--- a/config.toml
+++ b/config.toml
@@ -25,16 +25,6 @@ useEmbedded = "fallback"
 [markup.highlight]
 noClasses = false
 
-[[menu.main]]
-identifier = "version"
-name       = "Latest git"
-url        = "https://wiki.hypr.land/version-selector/"
-weight     = 1
-[[menu.main.params]]
-type     = "version"
-outdated = false  # set for any version that isn't the current one
-version  = ""     # only change when setting the version, otherwise it is "Latest git" by default
-
 [[menu.main]]
 identifier = "Home"
 name       = "Home"
@@ -79,6 +69,12 @@ displayUpdatedDate = true
 dateFormat         = "January 2, 2006"
 keywords           = ["hyprland", "wiki", "hypr", "land"]
 
+[params.version]
+name       = "Latest git"
+url        = "/version-selector/"
+outdated   = false  # set for any version that isn't the current one
+version    = ""     # only change when setting the version, otherwise it is "Latest git" by default
+
 [params.navbar]
 displayTitle = true
 displayLogo  = true
diff --git a/layouts/partials/navbar-title.html b/layouts/partials/navbar-title.html
new file mode 100644
index 00000000..93b35480
--- /dev/null
+++ b/layouts/partials/navbar-title.html
@@ -0,0 +1,19 @@
+{{- $logoPath := .Site.Params.navbar.logo.path | default "images/logo.svg" -}}
+{{- $logoLink := .Site.Params.navbar.logo.link | default .Site.Home.RelPermalink -}}
+{{- $logoWidth := .Site.Params.navbar.logo.width | default "20" -}}
+{{- $logoHeight := .Site.Params.navbar.logo.height | default "20" -}}
+{{- $logoDarkPath := .Site.Params.navbar.logo.dark | default $logoPath -}}
+
+<a class="hx:flex hx:items-center hx:hover:opacity-75 hx:rtl:ml-auto" href="{{ $logoLink }}">
+  {{- $displayTitle := (.Site.Params.navbar.displayTitle | default true) }}
+  {{- if (.Site.Params.navbar.displayLogo | default true) }}
+    <img class="hx:mr-2 hx:block hx:dark:hidden" src="{{ $logoPath | relURL }}" alt="{{ cond $displayTitle `Logo` .Site.Title }}" height="{{ $logoHeight }}" width="{{ $logoWidth }}" />
+    <img class="hx:mr-2 hx:hidden hx:dark:block" src="{{ $logoDarkPath | relURL }}" alt="{{ cond $displayTitle `Dark Logo` .Site.Title }}" height="{{ $logoHeight }}" width="{{ $logoWidth }}" />
+  {{- end }}
+  {{- if $displayTitle }}
+    <span class="hx:mr-2 hx:font-extrabold hx:inline hx:select-none" title="{{ .Site.Title }}">{{ .Site.Title }}</span>
+  {{- end }}
+
+</a>
+
+{{- partial "version.html" (dict "params" .Site.Params.version) -}}
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
deleted file mode 100644
index 9472cdfe..00000000
--- a/layouts/partials/navbar.html
+++ /dev/null
@@ -1,72 +0,0 @@
-{{- $logoPath := .Site.Params.navbar.logo.path | default "images/logo.svg" -}}
-{{- $logoLink := .Site.Params.navbar.logo.link | default .Site.Home.RelPermalink -}}
-{{- $logoWidth := .Site.Params.navbar.logo.width | default "20" -}}
-{{- $logoHeight := .Site.Params.navbar.logo.height | default "20" -}}
-{{- $logoDarkPath := .Site.Params.navbar.logo.dark | default $logoPath -}}
-
-{{- $navWidth := "hx-max-w-[90rem]" -}}
-{{- with .Site.Params.navbar.width -}}
-  {{ if eq . "normal" -}}
-    {{ $navWidth = "hx-max-w-screen-xl" -}}
-  {{ else if eq . "full" -}}
-    {{ $navWidth = "max-w-full" -}}
-  {{ end -}}
-{{- end -}}
-
-<div class="nav-container hx-sticky hx-top-0 hx-z-20 hx-w-full hx-bg-transparent print:hx-hidden">
-  <div class="nav-container-blur hx-pointer-events-none hx-absolute hx-z-[-1] hx-h-full hx-w-full hx-bg-white dark:hx-bg-dark hx-shadow-[0_2px_4px_rgba(0,0,0,.02),0_1px_0_rgba(0,0,0,.06)] contrast-more:hx-shadow-[0_0_0_1px_#000] dark:hx-shadow-[0_-1px_0_rgba(255,255,255,.1)_inset] contrast-more:dark:hx-shadow-[0_0_0_1px_#fff]"></div>
-
-  <nav class="hx-mx-auto hx-flex hx-items-center hx-justify-end hx-gap-2 hx-h-16 hx-px-6 {{ $navWidth }}">
-    <a class="hx-flex hx-items-center hover:hx-opacity-75" href="{{ $logoLink }}">
-      {{- if (.Site.Params.navbar.displayLogo | default true) }}
-        <img class="hx-mr-2 hx-block dark:hx-hidden" src="{{ $logoPath | relURL }}" alt="{{ .Site.Title }}" height="{{ $logoHeight }}" width="{{ $logoWidth }}" />
-        <img class="hx-mr-2 hx-hidden dark:hx-block" src="{{ $logoDarkPath | relURL }}" alt="{{ .Site.Title }}" height="{{ $logoHeight }}" width="{{ $logoWidth }}" />
-      {{- end }}
-      {{- if (.Site.Params.navbar.displayTitle | default true) }}
-        <span class="hx-mr-2 hx-font-extrabold hx-inline hx-select-none" title="{{ .Site.Title }}">{{- .Site.Title -}}</span>
-      {{- end }}
-    </a>
-
-    {{- $currentPage := . -}}
-    {{- range .Site.Menus.main -}}
-      {{- if eq .Params.type "search" -}}
-        {{- partial "search.html" (dict "params" .Params) -}}
-      {{- else if eq .Params.type "version" -}}
-        {{- partial "version.html" (dict "params" .Params) -}}
-      {{- else -}}
-        {{- $link := .URL -}}
-        {{- $external := strings.HasPrefix $link "http" -}}
-        {{- with .PageRef -}}
-          {{- if hasPrefix . "/" -}}
-            {{- $link = relLangURL (strings.TrimPrefix "/" .) -}}
-          {{- end -}}
-        {{- end -}}
-
-        {{/* Display icon menu item */}}
-        {{- if .Params.icon -}}
-          {{- $rel := cond (eq .Params.icon "mastodon") "noreferrer me" "noreferrer" }}
-          <a class="hx-p-2 hx-text-current" {{ if $external }}target="_blank" rel="{{ $rel }}"{{ end }} href="{{ $link }}" title="{{ or (T .Identifier) .Name | safeHTML }}">
-            {{- partial "utils/icon.html" (dict "name" .Params.icon "attributes" "height=24") -}}
-            <span class="hx-sr-only">{{ or (T .Identifier) .Name | safeHTML }}</span>
-          </a>
-        {{- else -}}
-          {{- $active := or ($currentPage.HasMenuCurrent "main" .) ($currentPage.IsMenuCurrent "main" .) -}}
-          {{- $activeClass := cond $active "hx-font-medium" "hx-text-gray-600 hover:hx-text-gray-800 dark:hx-text-gray-400 dark:hover:hx-text-gray-200" -}}
-          <a
-            title="{{ or (T .Identifier) .Name | safeHTML }}"
-            href="{{ $link }}"
-            {{ if $external }}target="_blank" rel="noreferrer"{{ end }}
-            class="hx-text-sm contrast-more:hx-text-gray-700 contrast-more:dark:hx-text-gray-100 hx-relative -hx-ml-2 hx-hidden hx-whitespace-nowrap hx-p-2 md:hx-inline-block {{ $activeClass }}"
-          >
-            <span class="hx-text-center">{{ or (T .Identifier) .Name | safeHTML }}</span>
-          </a>
-        {{- end -}}
-      {{- end -}}
-    {{- end -}}
-
-
-    <button type="button" aria-label="Menu" class="hamburger-menu -hx-mr-2 hx-rounded hx-p-2 active:hx-bg-gray-400/20 md:hx-hidden">
-      {{- partial "utils/icon.html" (dict "name" "hamburger-menu" "attributes" "height=24") -}}
-    </button>
-  </nav>
-</div>
diff --git a/layouts/partials/version.html b/layouts/partials/version.html
index 0ba3003f..f91d890d 100644
--- a/layouts/partials/version.html
+++ b/layouts/partials/version.html
@@ -1,11 +1,10 @@
-{{- $version := .params.version | default "Latest git" -}}
-{{- $url := .url | default "https://wiki.hypr.land/version-selector" -}}
+{{- $version := .params.version | default .params.name -}}
 
 {{- $outdated := "" -}}
 {{- if .params.outdated -}}
   {{- $outdated = "outdated" -}}
 {{- end -}}
 
-<a href="{{ $url }}" rel="noreferer" class="{{ $outdated }} hx-text-sm contrast-more:hx-text-gray-700 contrast-more:dark:hx-text-gray-100 hx-relative -hx-ml-2 hx-hidden hx-whitespace-nowrap hx-p-2 md:hx-inline-block hx-text-gray-600 hover:hx-text-gray-800 dark:hx-text-gray-400 dark:hover:hx-text-gray-200 ltr:hx-mr-auto rtl:hx-ml-auto">
-  <span class="hx-text-center">{{ $version }}</span>
+<a href="{{ .params.url }}" rel="noreferer" class="{{ $outdated }} hx:flex hx:items-center hx:hover:opacity-75 hx:ltr:mr-auto hx:rtl:ml-auto">
+  <span class="hx:text-center">{{ $version }}</span>
 </a>