diff --git a/deluge-torrent.org/htdocs/deluge_header_nav.css b/deluge-torrent.org/htdocs/deluge_header_nav.css
index db9947e22..c3be165a1 100644
--- a/deluge-torrent.org/htdocs/deluge_header_nav.css
+++ b/deluge-torrent.org/htdocs/deluge_header_nav.css
@@ -34,7 +34,7 @@ body {
 .deluge-nav .deluge-nav-logo a {
   text-decoration: none;
   color: #DBE1E8;
-  font-size: 1.7rem;
+  font-size: 1.25rem;
   font-weight: 600;
   display: flex;
   flex-wrap: wrap;
diff --git a/deluge-torrent.org/htdocs/deluge_header_nav.html b/deluge-torrent.org/htdocs/deluge_header_nav.html
index f37a04569..378b34142 100644
--- a/deluge-torrent.org/htdocs/deluge_header_nav.html
+++ b/deluge-torrent.org/htdocs/deluge_header_nav.html
@@ -1,7 +1,10 @@
 <div class="deluge-nav">
   <div class="deluge-nav-logo">
     <a href="https://dev.deluge-torrent.org/">
-      <img src="https://deluge-torrent.org/images/deluge_logo.png" alt="" />Deluge
+      <img
+        src="https://deluge-torrent.org/images/deluge_logo.png"
+        alt=""
+      />Deluge
     </a>
   </div>
 
@@ -13,32 +16,15 @@
     </div>
 
     <ul id="deluge-nav-lists">
-      <li class="close"><span onclick="hide()">×</span></li>
-      <li>
-        <a href="https://dev.deluge-torrent.org/wiki/Download">Download</a>
-      </li>
-      <li><a href="https://dev.deluge-torrent.org/wiki/Plugins">Plugins</a></li>
+      <li class="close"><span onclick="hide_nav_menu()">×</span></li>
+      <li><a href="https://deluge-torrent.org/download">Download</a></li>
+      <li><a href="https://deluge-torrent.org/plugins">Plugins</a></li>
       <li><a href="https://forum.deluge-torrent.org/">Forum</a></li>
-      <li>
-        <a href="https://dev.deluge-torrent.org/wiki/UserGuide">Support</a>
-      </li>
+      <li><a href="https://deluge-torrent.org/userguide">Support</a></li>
       <li><a href="https://dev.deluge-torrent.org/roadmap">Bugs</a></li>
-      <li>
-        <a href="https://dev.deluge-torrent.org/wiki/Development"
-          >Development</a
-        >
-      </li>
+      <li><a href="https://deluge-torrent.org/development">Development</a></li>
     </ul>
   </div>
 </div>
 
-<script>
-  const navList = document.getElementById("deluge-nav-lists");
-  function show() {
-    navList.classList.add("menus-show");
-  }
-
-  function hide() {
-    navList.classList.remove("menus-show");
-  }
-</script>
+<script src="js/deluge_nav.js" defer></script>
diff --git a/deluge-torrent.org/htdocs/deluge_header_nav.html.new b/deluge-torrent.org/htdocs/deluge_header_nav.html.new
deleted file mode 100644
index 745106528..000000000
--- a/deluge-torrent.org/htdocs/deluge_header_nav.html.new
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="deluge-nav">
-  <div class="deluge-nav-logo">
-    <a href="https://dev.deluge-torrent.org/">
-      <img src="./images/deluge_logo.png" alt="" />Deluge
-    </a>
-  </div>
-
-  <div class="deluge-navbar">
-    <div class="icon-bar" onclick="show()">
-      <i></i>
-      <i></i>
-      <i></i>
-    </div>
-
-    <ul id="deluge-nav-lists">
-      <li class="close"><span onclick="hide()">×</span></li>
-      <li>
-        <a href="https://dev.deluge-torrent.org/wiki/Download">Download</a>
-      </li>
-      <li><a href="https://dev.deluge-torrent.org/wiki/Plugins">Plugins</a></li>
-      <li><a href="https://forum.deluge-torrent.org/">Forum</a></li>
-      <li>
-        <a href="https://dev.deluge-torrent.org/wiki/UserGuide">Support</a>
-      </li>
-      <li><a href="https://dev.deluge-torrent.org/roadmap">Bugs</a></li>
-      <li>
-        <a href="https://dev.deluge-torrent.org/wiki/Development"
-          >Development</a
-        >
-      </li>
-    </ul>
-  </div>
-</div>
-
-<script>
-  const navList = document.getElementById("deluge-nav-lists");
-  function show() {
-    navList.classList.add("menus-show");
-  }
-
-  function hide() {
-    navList.classList.remove("menus-show");
-  }
-</script>
diff --git a/deluge-torrent.org/htdocs/deluge_header_nav.html.old b/deluge-torrent.org/htdocs/deluge_header_nav.html.old
deleted file mode 100644
index 8c2c6b39c..000000000
--- a/deluge-torrent.org/htdocs/deluge_header_nav.html.old
+++ /dev/null
@@ -1,35 +0,0 @@
-<script type="text/javascript" src="https://code.jquery.com/jquery-1.7.min.js"></script>
-<script type="text/javascript">
-    $(function(){
-    if ( location.hostname.match('forum.deluge-torrent.org') )
-        {
-        $('ul#deluge-navbar li a[href="https://forum.deluge-torrent.org/"]').attr('class', 'currenttab');
-        }
-    else if ( location.hostname.match('git.deluge-torrent.org') )
-        {
-        $('ul#deluge-navbar li a[href$="Development"]').attr('class', 'currenttab');
-        }
-    else if ( location.hostname.match('dev.deluge-torrent.org') )
-        {
-        var path = location.pathname.split("/");    
-        selected_tab = path[1].match('wiki') ? path[2] : 'roadmap';
-        $('ul#deluge-navbar li a[href$="' + selected_tab + '"]').attr('class', 'currenttab');
-        }
-    });
-</script>
-
-<div id="deluge-header">
-    <div id="deluge-header-inner">
-        <div id="delugelogo">
-            <h1 id="delugetext"><a href="https://dev.deluge-torrent.org/">Deluge</a></h1>
-        </div>
-        <ul id="deluge-navbar">
-        <li><a href="https://dev.deluge-torrent.org/wiki/Download">Download</a></li>
-        <li><a href="https://dev.deluge-torrent.org/wiki/Plugins">Plugins</a></li>
-        <li><a href="https://forum.deluge-torrent.org/">Forum</a></li>
-        <li><a href="https://dev.deluge-torrent.org/wiki/UserGuide">Support</a></li>
-        <li><a href="https://dev.deluge-torrent.org/roadmap">Bugs</a></li>
-        <li><a href="https://dev.deluge-torrent.org/wiki/Development">Development</a></li>
-        </ul>
-    </div>
-</div>
diff --git a/deluge-torrent.org/htdocs/js/deluge_nav.js b/deluge-torrent.org/htdocs/js/deluge_nav.js
new file mode 100644
index 000000000..30bf2be05
--- /dev/null
+++ b/deluge-torrent.org/htdocs/js/deluge_nav.js
@@ -0,0 +1,8 @@
+const navList = document.getElementById("deluge-nav-lists");
+function show_nav_menu() {
+  navList.classList.add("menus-show");
+}
+
+function hide_nav_menu() {
+  navList.classList.remove("menus-show");
+}
diff --git a/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav_phpbb.html b/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav_phpbb.html
index 4d6b9d318..891496966 100644
--- a/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav_phpbb.html
+++ b/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav_phpbb.html
@@ -1,25 +1,25 @@
 <div class="deluge-nav">
-    <div class="deluge-nav-logo">
-        <a href="https://deluge-torrent.org/">
-            <img src="{T_THEME_PATH}/images/deluge_logo.png" alt="">Deluge
-        </a>
+  <div class="deluge-nav-logo">
+    <a href="https://deluge-torrent.org/">
+      <img src="{T_THEME_PATH}/images/deluge_logo.png" alt="" />Deluge
+    </a>
+  </div>
+
+  <div class="deluge-navbar">
+    <div class="icon-bar" onclick="show_nav_menu()">
+      <i></i>
+      <i></i>
+      <i></i>
     </div>
 
-    <div class="deluge-navbar">
-        <div class="icon-bar" onclick="show_nav_menu()">
-            <i></i>
-            <i></i>
-            <i></i>
-        </div>
-
-        <ul id="deluge-nav-lists">
-            <li class="close"><span onclick="hide_nav_menu()">×</span></li>
-            <li><a href="https://dev.deluge-torrent.org/wiki/Download">Download</a></li>
-            <li><a href="https://dev.deluge-torrent.org/wiki/Plugins">Plugins</a></li>
-            <li><a href="https://forum.deluge-torrent.org/">Forum</a></li>
-            <li><a href="https://dev.deluge-torrent.org/wiki/UserGuide">Support</a></li>
-            <li><a href="https://dev.deluge-torrent.org/roadmap">Bugs</a></li>
-            <li><a href="https://dev.deluge-torrent.org/wiki/Development">Development</a></li>
-        </ul>
-    </div>
+    <ul id="deluge-nav-lists">
+      <li class="close"><span onclick="hide_nav_menu()">×</span></li>
+      <li><a href="https://deluge-torrent.org/download">Download</a></li>
+      <li><a href="https://deluge-torrent.org/plugins">Plugins</a></li>
+      <li><a href="https://forum.deluge-torrent.org/">Forum</a></li>
+      <li><a href="https://deluge-torrent.org/userguide">Support</a></li>
+      <li><a href="https://dev.deluge-torrent.org/roadmap">Bugs</a></li>
+      <li><a href="https://deluge-torrent.org/development">Development</a></li>
+    </ul>
+  </div>
 </div>
diff --git a/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/theme/deluge_nav_phpbb.css b/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/theme/deluge_nav_phpbb.css
index 0ae14a5e4..29009c313 100644
--- a/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/theme/deluge_nav_phpbb.css
+++ b/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/theme/deluge_nav_phpbb.css
@@ -33,7 +33,7 @@ body {
 .deluge-nav .deluge-nav-logo a {
   text-decoration: none;
   color: #DBE1E8;
-  font-size: 1.7rem;
+  font-size: 1.25rem;
   font-weight: 600;
   display: flex;
   flex-wrap: wrap;