diff --git a/Makefile b/Makefile
index 35f6c15..dd415ef 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Argon Theme
 LUCI_DEPENDS:=
-PKG_VERSION:=2.01
-PKG_RELEASE:=20200203
+PKG_VERSION:=2.1
+PKG_RELEASE:=20200206
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/luasrc/view/themes/argon/footer.htm b/luasrc/view/themes/argon/footer.htm
index 615620f..8b58ab0 100644
--- a/luasrc/view/themes/argon/footer.htm
+++ b/luasrc/view/themes/argon/footer.htm
@@ -16,27 +16,11 @@
 	Licensed to the public under the Apache License 2.0 
 -%>
 
-<%
-	local ver = require "luci.version"
-	local disp = require "luci.dispatcher"
-	local request  = disp.context.path
-	local category = request[1]
-	local tree = disp.node()
-	local categories = disp.node_childs(tree)
-%>
+<% local ver = require "luci.version" %>
 	</div>
 	<footer class="mobile-hide">
 	<a href="https://github.com/openwrt/luci">Powered by <%= ver.luciname %> (<%= ver.luciversion %>)</a> / <%= ver.distversion %>
-	<% if #categories > 1 then %>
-		<ul class="breadcrumb pull-right" id="modemenu">
-		<% for i, r in ipairs(categories) do %>
-		<li<% if request[1] == r then %> class="active"<%end%>>
-			<a href="<%=controller%>/<%=r%>/"><%=striptags(translate(tree.nodes[r].title))%></a>
-			<span class="divider">|</span>
-		</li>
-		<% end %>
-		</ul>
-	<% end %>
+	<ul class="breadcrumb pull-right" id="modemenu" style="display:none"></ul>
 	</footer>
 	</div>
 </div>
@@ -44,8 +28,8 @@
 	// thanks for Jo-Philipp Wich <jow@openwrt.org>
 	var luciLocation = <%= luci.http.write_json(luci.dispatcher.context.path) %>;
 </script>
-<script src="<%=media%>/js/jquery.min.js?v=git-20.029.45734-adbbd5c"></script>
-<script src="<%=media%>/js/script.js?v=git-20.029.45734-adbbd5c"></script>
+<script src="<%=media%>/js/jquery.min.js"></script>
+<script src="<%=media%>/js/script.js"></script>
 </body>
 </html>
 
diff --git a/luasrc/view/themes/argon/header.htm b/luasrc/view/themes/argon/header.htm
index 7b6cce5..d71bcb3 100644
--- a/luasrc/view/themes/argon/header.htm
+++ b/luasrc/view/themes/argon/header.htm
@@ -17,146 +17,24 @@
 -%>
 
 <%
-	local sys  = require "luci.sys"
+    local sys  = require "luci.sys"
 	local util = require "luci.util"
 	local http = require "luci.http"
 	local disp = require "luci.dispatcher"
-	local fs	= require "nixio.fs"
-	local nutil = require "nixio.util"
 
 	local boardinfo = util.ubus("system", "board")
 
-	local request  = disp.context.path
-	local request2 = disp.context.request
-
-	local category = request[1]
-	local cattree  = category and disp.node(category)
-
-	local leaf = request2[#request2]
-
-	local tree = disp.node()
 	local node = disp.context.dispatched
-
-	local categories = disp.node_childs(tree)
-
-	local c = tree
-	local i, r
-
-	-- tag all nodes leading to this page
-	for i, r in ipairs(request) do
-		if c.nodes and c.nodes[r] then
-			c = c.nodes[r]
-			c._menu_selected = true
-		end
-	end
-
+    
+    local fs	= require "nixio.fs"
+	local nutil = require "nixio.util"
+    
+    
+    
 	-- send as HTML5
 	http.prepare_content("text/html")
-
-	local function nodeurl(prefix, name, query)
-		local u = url(prefix, name)
-		if query then
-			u = u .. http.build_querystring(query)
-		end
-		return pcdata(u)
-	end
-
-	local function render_tabmenu(prefix, node, level)
-		if not level then
-			level = 1
-		end
-
-		local childs = disp.node_childs(node)
-		if #childs > 0 then
-			if level > 2 then
-				write('<ul class="tabs">')
-			end
-
-			local selected_node
-			local selected_name
-			local i, v
-
-			for i, v in ipairs(childs) do
-				local nnode = node.nodes[v]
-				if nnode._menu_selected then
-					selected_node = nnode
-					selected_name = v
-				end
-
-				if level > 2 then
-					write('<li class="tabmenu-item-%s %s"><a href="%s">%s</a></li>' %{
-						v, (nnode._menu_selected or (node.leaf and v == leaf)) and 'active' or '',
-						nodeurl(prefix, v, nnode.query),
-						striptags(translate(nnode.title))
-					})
-				end
-			end
-
-			if level > 2 then
-				write('</ul>')
-			end
-
-			if selected_node then
-				render_tabmenu(prefix .. "/" .. selected_name, selected_node, level + 1)
-			end
-		end
-	end
-
-	local function render_submenu(prefix, node)
-		local childs = disp.node_childs(node)
-		if #childs > 0 then
-			write('<ul class="slide-menu">')
-
-			for i, r in ipairs(childs) do
-				local nnode = node.nodes[r]
-				local title = striptags(translate(nnode.title))
-
-				write('<li><a data-title="%s" href="%s">%s</a></li>' %{
-					title,
-					nodeurl(prefix, r, nnode.query),
-					title
-				})
-			end
-
-			write('</ul>')
-		end
-	end
-
-	local function render_topmenu()
-		local childs = disp.node_childs(cattree)
-		if #childs > 0 then
-			write('<ul class="nav">')
-
-			for i, r in ipairs(childs) do
-				local nnode = cattree.nodes[r]
-				local grandchildren = disp.node_childs(nnode)
-
-				if #grandchildren > 0 then
-					local title = striptags(translate(nnode.title))
-					local en_title = pcdata(striptags(string.gsub(nnode.title," ","_")))
-					write('<li class="slide"><a class="menu" data-title="%s" href="#">%s</a>' %{
-						en_title,
-						title
-					})
-
-					render_submenu(category .. "/" .. r, nnode)
-					write('</li>')
-				else
-					local title = striptags(translate(nnode.title))
-					local en_title = pcdata(striptags(nnode.title))
-					write('<li class="lg"><a class="logout" data-title="%s" href="%s">%s</a></li>' %{
-						en_title,
-						nodeurl(category, r, nnode.query),
-						title
-					})
-				end
-			end
-
-			write('</ul>')
-		end
-	end
-
-	math.randomseed(os.time())
+    
+    math.randomseed(os.time())
 	function glob(...)
 		local iter, code, msg = fs.glob(...)
 		if iter then
@@ -170,13 +48,18 @@
 	for f in ipairs(glob("/www/luci-static/argon/img/*")) do
 		bgcount = bgcount + 1
 	end
+    
+
 -%>
 <!DOCTYPE html>
 <html lang="<%=luci.i18n.context.lang%>">
+
 <head>
 	<meta charset="utf-8">
-	<title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
-	<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport"/>
+	<title>
+		<%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %>
+		- LuCI</title>
+	<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="theme-color" content="#09c">
@@ -184,82 +67,219 @@
 	<meta name="msapplication-TileColor" content="#09c">
 	<meta name="application-name" content="<%=striptags( (boardinfo.hostname or "?") ) %> - LuCI">
 	<meta name="apple-mobile-web-app-title" content="<%=striptags( (boardinfo.hostname or "?") ) %> - LuCI">
-	<meta name="msapplication-TileImage" content="<%=media%>/logo.png"/>
-    <link rel="icon" href="<%=media%>/logo.png" sizes="144x144">
-    <link rel="apple-touch-icon-precomposed" href="<%=media%>/logo.png" sizes="144x144">
-	<link rel="stylesheet" href="<%=media%>/cascade.css?v=<%=math.random(1,100000)%>">
+	<meta name="msapplication-TileImage" content="<%=media%>/logo.png" />
+	<link rel="icon" href="<%=media%>/logo.png" sizes="144x144">
+	<link rel="apple-touch-icon-precomposed" href="<%=media%>/logo.png" sizes="144x144">
+	<link rel="stylesheet" href="<%=media%>/cascade.css">
 	<link rel="shortcut icon" href="<%=media%>/favicon.ico">
 	<% if node and node.css then %>
-		<link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
+	<link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
 	<% end -%>
 	<% if css then %>
-		<style title="text/css"><%= css %></style>
+	<style title="text/css">
+		<%=css %>
+	</style>
 	<% end -%>
-	<script src="<%=url('admin/translations', luci.i18n.context.lang)%>?v=git-20.029.45734-adbbd5c"></script>
-	<script src="<%=resource%>/cbi.js?v=git-20.029.45734-adbbd5c"></script>
-	<script src="<%=resource%>/xhr.js?v=git-20.029.45734-adbbd5c"></script>
-</head>
-<body class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><% end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>" data-page="<%= table.concat(disp.context.requestpath, "-") %>">
+	<script src="<%=url('admin/translations', luci.i18n.context.lang)%><%# ?v=PKG_VERSION %>"></script>
+	<script src="<%=resource%>/cbi.js"></script>
+	<script src="<%=resource%>/xhr.js"></script>
+	<script type="text/javascript">//<![CDATA[
+		(function () {
+			function get_children(node) {
+				var children = [];
 
-<div class="main">
-	<div style="" class="loading">
-        <div class="sk-folding-cube">
-            <div class="sk-cube1 sk-cube"></div>
-            <div class="sk-cube2 sk-cube"></div>
-            <div class="sk-cube4 sk-cube"></div>
-            <div class="sk-cube3 sk-cube"></div>
-        </div>
-    </div>
-	<div class="main-left">
-		<div class="sidenav-header d-flex align-items-center">
-            <a class="brand" href="#"><%=boardinfo.hostname or "?"%> ™</a> 
-            <div class="ml-auto">
-                <!-- Sidenav toggler -->
-                <div class="sidenav-toggler d-none d-xl-block active" data-action="sidenav-unpin" data-target="#sidenav-main">
-                    <div class="sidenav-toggler-inner">
-                        <i class="sidenav-toggler-line"></i>
-                        <i class="sidenav-toggler-line"></i>
-                        <i class="sidenav-toggler-line"></i>
-                    </div>
-                </div>
-            </div>
-        </div>
-		<% render_topmenu() %>
-	</div>
-	<div class="main-right">
-		<header class="bg-primary">
-            <div class="fill">
-                <div class="container">
-                    <a class="showSide"></a>
-                    <a class="brand" href="#"><%=boardinfo.hostname or "?"%> ™</a>
-                    <div class="pull-right">
-                        <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
-						<span class="label success" id="xhr_poll_status_on"><span class="mobile-hide"><%:Auto Refresh%></span> <%:on%></span>
-						<span class="label" id="xhr_poll_status_off" style="display:none"><span class="mobile-hide"><%:Auto Refresh%></span> <%:off%></span>
-					</span>
-                    </div>
-                </div>
-            </div>
-        </header>
-		<div class="darkMask"></div>
-		<div class="login-bg" style="background-image:url(<%=media%>/img/bg<%=math.random(1,bgcount)%>.jpg)"></div>
-		<div id="maincontent">
-			<div class="container">
-				<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
+				for (var k in node.children) {
+					if (!node.children.hasOwnProperty(k))
+						continue;
+
+					if (!node.children[k].satisfied)
+						continue;
+
+					if (!node.children[k].hasOwnProperty('title'))
+						continue;
+
+					children.push(Object.assign(node.children[k], { name: k }));
+				}
+
+				return children.sort(function (a, b) {
+					return ((a.order || 1000) - (b.order || 1000));
+				});
+			}
+
+			function render_mainmenu(tree, url, level) {
+				var l = (level || 0) + 1,
+					ul = E('ul', { 'class': level ? 'slide-menu' : 'nav' }),
+					children = get_children(tree);
+				if (children.length == 0 || l > 2)
+					return E([]);
+
+				for (var i = 0; i < children.length; i++) {
+					var submenu = render_mainmenu(children[i], url + '/' + children[i].name, l),
+						hasChildren = submenu.children.length;
+						isLogout = (children[i].name == 'logout');
+					ul.appendChild(E('li', { 'class': hasChildren ? 'slide' : isLogout ? 'lg' : null }, [
+						E('a', {
+							'href': hasChildren ? '#' : L.url(url, children[i].name),
+							'class': hasChildren ? 'menu' : isLogout?"logout":null,
+							'data-title': children[i].title,
+						}, [_(children[i].title)]),
+						submenu
+					]));
+			}
+
+			if (l == 1) {
+				var container = document.querySelector('#mainmenu');
+
+				container.appendChild(ul);
+				container.style.display = '';
+			}
+
+			return ul;
+		}
+
+			function render_modemenu(tree) {
+			var ul = document.querySelector('#modemenu'),
+				children = get_children(tree);
+
+			for (var i = 0; i < children.length; i++) {
+				var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0);
+
+				ul.appendChild(E('li', {}, [
+					E('a', {
+						'href': L.url(children[i].name),
+						'class': isActive ? 'active' : null
+					}, [_(children[i].title)])
+				]));
+
+				if (isActive)
+					render_mainmenu(children[i], children[i].name);
+			}
+
+			if (ul.children.length > 1)
+				ul.style.display = '';
+		}
+
+		function render_tabmenu(tree, url, level) {
+			var container = document.querySelector('#tabmenu'),
+				l = (level || 0) + 1,
+				ul = E('ul', { 'class': 'tabs' }),
+				children = get_children(tree),
+				activeNode = null;
+
+			if (children.length == 0)
+				return E([]);
+
+			for (var i = 0; i < children.length; i++) {
+				var isActive = (L.env.dispatchpath[l + 2] == children[i].name),
+					activeClass = isActive ? ' active' : '',
+					className = 'tabmenu-item-%s %s'.format(children[i].name, activeClass);
+
+				ul.appendChild(E('li', { 'class': className }, [
+					E('a', { 'href': L.url(url, children[i].name) }, [_(children[i].title)])
+				]));
+
+				if (isActive)
+					activeNode = children[i];
+			}
+
+			container.appendChild(ul);
+			container.style.display = '';
+
+			if (activeNode)
+				container.appendChild(render_tabmenu(activeNode, url + '/' + activeNode.name, l));
+
+			return ul;
+		}
+
+		document.addEventListener('luci-loaded', function (ev) {
+			var tree = <%= luci.http.write_json(luci.dispatcher.menu_json() or { }) %>,
+			node = tree,
+			url = '';
+
+		render_modemenu(tree);
+
+		if (L.env.dispatchpath.length >= 3) {
+			for (var i = 0; i < 3 && node; i++) {
+				node = node.children[L.env.dispatchpath[i]];
+				url = url + (url ? '/' : '') + L.env.dispatchpath[i];
+			}
+
+			if (node)
+				render_tabmenu(node, url);
+		}
+		});
+		}) ();
+	//]]></script>
+</head>
+
+<body
+	class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><% end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>"
+	data-page="<%= table.concat(disp.context.requestpath, "-") %>">
+
+	<div class="main">
+		<div style="" class="loading">
+			<div class="sk-folding-cube">
+				<div class="sk-cube1 sk-cube"></div>
+				<div class="sk-cube2 sk-cube"></div>
+				<div class="sk-cube4 sk-cube"></div>
+				<div class="sk-cube3 sk-cube"></div>
+			</div>
+		</div>
+		<div class="main-left" id="mainmenu" style="display:none">
+			<div class="sidenav-header d-flex align-items-center">
+				<a class="brand" href="#"><%=boardinfo.hostname or "?"%> ™</a>
+				<div class="ml-auto">
+					<!-- Sidenav toggler -->
+					<div class="sidenav-toggler d-none d-xl-block active" data-action="sidenav-unpin"
+						data-target="#sidenav-main">
+						<div class="sidenav-toggler-inner">
+							<i class="sidenav-toggler-line"></i>
+							<i class="sidenav-toggler-line"></i>
+							<i class="sidenav-toggler-line"></i>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="main-right">
+			<header class="bg-primary">
+				<div class="fill">
+					<div class="container">
+						<a class="showSide"></a>
+						<a class="brand" href="#"><%=boardinfo.hostname or "?"%> ™</a>
+						<div class="pull-right">
+							<span id="xhr_poll_status" style="display:none"
+								onclick="XHR.running() ? XHR.halt() : XHR.run()">
+								<span class="label success" id="xhr_poll_status_on"><span
+										class="mobile-hide"><%:Auto Refresh%></span> <%:on%></span>
+								<span class="label" id="xhr_poll_status_off" style="display:none"><span
+										class="mobile-hide"><%:Auto Refresh%></span> <%:off%></span>
+							</span>
+						</div>
+					</div>
+				</div>
+			</header>
+			<div class="darkMask"></div>
+			<div class="login-bg" style="background-image:url(<%=media%>/img/bg<%=math.random(1,bgcount)%>.jpg)"></div>
+			<div id="maincontent">
+				<div class="container">
+					<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
 					<div class="alert-message error">
 						<h4><%:No password set!%></h4>
-						<p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p>
+						<p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>
+						</p>
 						<% if disp.lookup("admin/system/admin") then %>
-							<div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
+						<div class="right"><a class="btn"
+								href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
 						<% end %>
 					</div>
-				<%- end -%>
+					<%- end -%>
 
-				<noscript>
-					<div class="alert-message error">
-						<h4><%:JavaScript required!%></h4>
-						<p><%:You must enable JavaScript in your browser or LuCI will not work properly.%></p>
-					</div>
-				</noscript>
+					<noscript>
+						<div class="alert-message error">
+							<h4><%:JavaScript required!%></h4>
+							<p><%:You must enable JavaScript in your browser or LuCI will not work properly.%></p>
+						</div>
+					</noscript>
 
-				<% if category then render_tabmenu(category, cattree) end %>
+					<div id="tabmenu" style="display:none"></div>
\ No newline at end of file