diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js
index d9852bf..9163315 100644
--- a/docs/.vitepress/config.js
+++ b/docs/.vitepress/config.js
@@ -26,7 +26,7 @@ export default defineConfig({
           { text: 'Open Source', link: '/opensource' },
           { text: 'Links', link: '/links' },
           { text: 'Interviews', link: '/interviews/' },
-          { text: 'Wiki', link: 'https://mume.org/wiki/' }
+          { text: 'Wiki', link: 'https://docs.mume.org/wiki/' }
         ]
       }
     ]
diff --git a/docs/.vitepress/theme/Layout.vue b/docs/.vitepress/theme/Layout.vue
index 3fea18b..fab5928 100644
--- a/docs/.vitepress/theme/Layout.vue
+++ b/docs/.vitepress/theme/Layout.vue
@@ -10,6 +10,22 @@ import './mume.css'
 const { site, page, frontmatter } = useData()
 const vpRoute = useRoute()
 
+const isActive = (path, exact = false) => {
+  const target = withBase(path)
+  const current = vpRoute.path
+
+  if (exact) {
+    return current === target || (target === '/' && (current === '/' || current === '/index.html'))
+  }
+
+  if (target === '/') return current === '/' || current === '/index.html'
+
+  const normalizedTarget = target.endsWith('/') ? target : target + '/'
+  const normalizedCurrent = current.endsWith('/') ? current : current + '/'
+
+  return normalizedCurrent.startsWith(normalizedTarget)
+}
+
 const isMenuOpen = ref(false)
 const navbarRef = ref(null)
 const gandalfRef = ref(null)
@@ -70,14 +86,14 @@ onUnmounted(() => {
           <a href="https://mume.org/play/">Play<img alt="Play" height="16" width="16" style="padding-left:4px; vertical-align:-10%;" :src="withBase('/favicon.ico')"></a>
         </li>
         <li class="has_children">
-          <a :href="withBase('/')" :class="{ current: vpRoute.path === '/' || vpRoute.path === '/index.html' || vpRoute.path.startsWith(withBase('/opensource')) || vpRoute.path.startsWith(withBase('/links')) || vpRoute.path.startsWith(withBase('/interviews')) }">Community<span class="caret down"></span></a>
+          <a :href="withBase('/')" :class="{ current: isActive('/', true) }">Community<span class="caret down"></span></a>
           <ul>
             <li><a href="https://discord.gg/XkZN55am9a" target="_blank" rel="noopener">Discord <i class="fa fa-external-link" aria-hidden="true"></i></a></li>
             <li><a href="https://elvenrunes.com" target="_blank" rel="noopener">Elvenrunes <i class="fa fa-external-link" aria-hidden="true"></i></a></li>
-            <li><a :href="withBase('/opensource')" :class="{ current: vpRoute.path.startsWith(withBase('/opensource')) }">Open Source</a></li>
-            <li><a :href="withBase('/links')" :class="{ current: vpRoute.path.startsWith(withBase('/links')) }">Links</a></li>
-            <li><a :href="withBase('/interviews')" :class="{ current: vpRoute.path.startsWith(withBase('/interviews')) }">Interviews</a></li>
-            <li><a href="https://mume.org/wiki/">Wiki</a></li>
+            <li><a :href="withBase('/opensource')" :class="{ current: isActive('/opensource') }">Open Source</a></li>
+            <li><a :href="withBase('/links')" :class="{ current: isActive('/links') }">Links</a></li>
+            <li><a :href="withBase('/interviews')" :class="{ current: isActive('/interviews') }">Interviews</a></li>
+            <li><a href="https://docs.mume.org/wiki/" target="_self" rel="external">Wiki</a></li>
           </ul>
         </li>
         <li class="has_children">
diff --git a/docs/index.md b/docs/index.md
index 5055a9a..61eecff 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -49,7 +49,7 @@ You can trust us to stick to you through thick and thin&mdash;to the bitter end.
 <p>
 The official Wiki contains tips, hints, and all sorts of useful information for newcomers and veterans alike.
 </p>
-<a href="https://mume.org/wiki/" class="read-more">Visit the Wiki <i class="fa fa-external-link" aria-hidden="true"></i></a>
+<a href="https://docs.mume.org/wiki/" target="_self" rel="external" class="read-more">Visit the Wiki <i class="fa fa-external-link" aria-hidden="true"></i></a>
 </div>
 </div>
 </section>