diff --git a/luci-theme-argone/Makefile b/luci-theme-argone/Makefile
index 52096d7d..21c8244c 100644
--- a/luci-theme-argone/Makefile
+++ b/luci-theme-argone/Makefile
@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Argone kenzo
 LUCI_DEPENDS:=+curl +jsonfilter
-PKG_VERSION:=1.7.7
-PKG_RELEASE:=4
+PKG_VERSION:=1.8.3
+PKG_RELEASE:=5
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/luci-theme-argone/htdocs/luci-static/argone/css/cascade.css b/luci-theme-argone/htdocs/luci-static/argone/css/cascade.css
index ec785049..85f3f174 100644
--- a/luci-theme-argone/htdocs/luci-static/argone/css/cascade.css
+++ b/luci-theme-argone/htdocs/luci-static/argone/css/cascade.css
@@ -2,6 +2,7 @@
  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template
  *
  *  luci-theme-argone
+ *      Copyright 2020 Jerryk
  *
  *  Have a bug? Please create an issue here on GitHub!
  *      https://github.com/kenzok78/luci-theme-argone/issues
@@ -17,7 +18,7 @@
  *  luci-theme-material:
  *      https://github.com/LuttyYang/luci-theme-material/
  *
- *  Argon Theme
+ *  Argone Theme
  *	    https://demos.creative-tim.com/argon-dashboard/index.html
  *
  *  Login background
@@ -46,7 +47,7 @@
   --warning: #fb6340;
   --footer-color: #aaa;
   --menubar-background: #fff;
-  --menubar-scrollbar-thumb: #f6f9fc;
+  --menubar-scrollbar-thumb: #eee;
   --menubar-text-color: #4c4c4c;
   --blue: #5e72e4;
   --indigo: #5603ad;
@@ -154,13 +155,35 @@ body {
   color: #ffffff;
   color: var(--white);
 }
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+::-webkit-scrollbar,
+::-webkit-scrollbar-corner {
+  background: transparent;
+}
+::-webkit-scrollbar-thumb {
+  background: #9e9e9e;
+}
+::-webkit-scrollbar-thumb:hover {
+  background: #757575;
+}
+::-webkit-scrollbar-thumb:active {
+  background: #424242;
+}
 a:link,
 a:visited,
 a:active {
-  color: #5e72e4;
   color: var(--primary);
   text-decoration: none;
 }
+a:-webkit-any-link:not(li a, .main-left a, .brand, .pull-right a, .alert-message a, .login-container footer a, .cbi-button) {
+  color: -webkit-link;
+  cursor: pointer;
+  color: var(--primary);
+  text-shadow: 1px 1px 2px #ccc;
+}
 a:hover {
   text-decoration: underline;
 }
@@ -220,7 +243,8 @@ li {
 }
 .login-page .video video {
   width: 100%;
-  height: auto;
+  height: 100%;
+  object-fit: cover;
 }
 .login-page .volume-control {
   position: fixed;
@@ -277,30 +301,41 @@ li {
   max-width: 420px;
   background-color: #fff;
   background-color: var(--white);
+  overflow:hidden;
 }
 .login-page .login-container .login-form .brand {
   display: flex;
   -webkit-box-align: center;
   align-items: center;
-  margin: 50px auto 100px 50px;
+  margin: 50px auto 15px auto;
   color: #525461;
   color: var(--default);
 }
 .login-page .login-container .login-form .brand .icon {
   width: 50px;
   height: auto;
-  margin-right: 25px;
 }
-.login-page .login-container .login-form .brand .brand-text {
-  font-size: 1.25rem;
+.login-page .login-container .login-form .brand-text {
+  font-size: 1.8rem;
   font-weight: 700;
+  letter-spacing: 1px;
+  margin-bottom: 85px;
   font-family: "TypoGraphica";
+  width: 420px;
+  padding: 0 0.5rem 0.1rem 0.5rem;
+  text-align: center;
+  word-break: break-word;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
 }
 .login-page .login-container .login-form .brand:hover {
   text-decoration: none;
 }
 .login-page .login-container .login-form .form-login {
-  width: 100%;
+  width: 420px;
   padding: 20px 50px;
   box-sizing: border-box;
 }
@@ -416,6 +451,10 @@ li {
   position: absolute;
   bottom: 0;
 }
+.login-page .login-container footer,
+.login-page .login-container footer a {
+  color: var(--default);
+}
 .login-page .login-container footer .ftc {
   position: absolute;
   bottom: 30px;
@@ -495,13 +534,9 @@ header .fill .container .brand {
 footer {
   text-align: right;
   padding: 1rem;
-  color: #aaa;
-  color: var(--footer-color);
   font-size: 0.8rem;
 }
 footer a {
-  color: #aaa;
-  color: var(--footer-color);
   text-decoration: none;
 }
 /***********************
@@ -541,6 +576,7 @@ footer a {
   position: fixed;
   z-index: 100;
   transition: width 0.2s ease-in-out;
+  overflow-y: scroll;
 }
 .main .main-left::-webkit-scrollbar {
   width: 5px;
@@ -551,8 +587,7 @@ footer a {
   background-color: var(--menubar-scrollbar-thumb);
 }
 .main .main-left::-webkit-scrollbar-track {
-  background-color: #fff;
-  background-color: var(--menubar-background);
+  background-color: transparent;
 }
 .main .main-left .sidenav-header {
   padding: 1.5rem;
@@ -672,6 +707,7 @@ footer a {
   color: #fff;
   background: #5e72e4;
   background: var(--primary);
+  box-shadow: 0 0 1px #ccc;
 }
 .main .main-left .nav li.slide .menu:hover a,
 .main .main-left .nav li.slide .menu.active a {
@@ -763,6 +799,7 @@ footer a {
   background-color: #5e72e4;
   background-color: var(--primary);
   transition: all 0.2s;
+  box-shadow: 0 0 1px #ccc;
 }
 .main .main-left .nav li.slide .slide-menu li a:hover::after {
   color: #000;
@@ -929,9 +966,6 @@ form.inline + form.inline,
   border-color: #5e72e4 !important;
   border-color: var(--primary) !important;
 }
-.cbi-button-add {
-  margin-left: 1.5rem;
-}
 .node-services-vssr .ssr-button {
   margin-left: 0.3rem;
 }
@@ -1000,13 +1034,20 @@ select {
   text-align: center;
 }
 /*textarea*/
-.cbi-input-textarea {
-  width: 100%;
-  min-height: 14rem;
-  padding: 0.8rem;
-  font-size: 0.8rem;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+textarea {
+  border: 1px solid #dee2e6 !important;
+  outline: none;
+  min-height: 14rem !important;
+  padding: 0.8rem !important;
+  background-color: #fff;
+  font-family: var(--font-family-monospace) !important;
+  font-size: inherit;
   color: black;
+  border-radius: 0.375rem !important;
+  vertical-align: middle;
+}
+.cbi-value .cbi-value-field textarea {
+  margin: 0.25rem;
 }
 /* change */
 .uci-change-list {
@@ -1091,8 +1132,6 @@ input[type="checkbox"] {
   vertical-align: middle;
 }
 input[type="checkbox"]:checked {
-  border: 1px solid #5e72e4;
-  border: 1px solid var(--primary);
   background-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 8 8\'%3e%3cpath fill=\'%23fff\' d=\'M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z\'/%3e%3c/svg%3e') !important;
   background-color: #5e72e4;
   background-color: var(--primary);
@@ -1117,8 +1156,6 @@ ul li .cbi-input-checkbox {
   margin: 0.25rem 0;
 }
 .cbi-input-radio:checked {
-  border: 1px solid #5e72e4;
-  border: 1px solid var(--primary);
   background-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'-4 -4 8 8\'%3e%3ccircle r=\'3\' fill=\'%23fff\'/%3e%3c/svg%3e') !important;
   background-color: #5e72e4;
   background-color: var(--primary);
@@ -1228,7 +1265,8 @@ div.cbi-value var,
 td.cbi-value-field var,
 .td.cbi-value-field var {
   font-style: italic;
-  color: #0069D6;
+  color: var(--primary);
+  text-shadow: 1px 1px 2px #ccc;
 }
 small {
   font-size: 90%;
@@ -1382,7 +1420,15 @@ input[name="nslookup"] {
   background-color: var(--primary) !important;
   background-image: url(../img/trafficbar.png);
   background-position: left top;
-  animation: sparkle 1500ms linear infinite;
+  animation: sparkle 1000ms linear infinite;
+}
+#swaptotal > div > div > div > small,
+#swapfree > div > div > div > small,
+#memfree > div > div > div > small,
+#membuff > div > div > div > small,
+#conns > div > div > div > small,
+#memtotal > div > div > div > small {
+  text-shadow: 1px 1px 2px #ccc;
 }
 /* fix multiple table */
 table table,
@@ -1629,10 +1675,6 @@ th h5, td h5,
 th h6, td h6 {
   background: var(--lighter);
 }
-/* OCD: Change the background color of the "now in use" node in PassWall  */
-.cbi-section-table > tbody > ._now_use {
-  background: #5e72e473 !important;
-}
 /* language fix */
 body.lang_pl.node-main-login .cbi-value-title {
   width: 12rem;
@@ -1746,7 +1788,7 @@ body.lang_pl.node-main-login .cbi-value-title {
 }
 .cbi-rowstyle-2 .cbi-button-up,
 .cbi-rowstyle-2 .cbi-button-down {
-  background-color: #FFF !important;
+  background-color: var(--lighter);
 }
 .cbi-button-up,
 .cbi-button-down,
@@ -1788,7 +1830,8 @@ input {
   transition: box-shadow 0.15s ease;
   margin: 0.25rem;
 }
-select:not([multiple="multiple"]):focus,
+select:not([multiple="multiple"]):hover,
+input:hover,
 input:focus {
   border-color: #5e72e4;
   border-color: var(--primary);
@@ -2023,7 +2066,7 @@ h3 {
   letter-spacing: 0.1rem;
   padding: 1rem 1.5rem;
   border-radius: 0.375rem;
-  background: #fff;
+  background: var(--lighter);
   box-shadow: 0 4px 8px rgba(0, 0, 0, 0.03);
 }
 fieldset {
@@ -2065,6 +2108,8 @@ fieldset.cbi-section p {
   letter-spacing: 0.1rem;
   color: #32325d;
   font-weight: 600;
+  position: sticky;
+  left: 0;
 }
 table {
   border-spacing: 0;
@@ -2131,15 +2176,25 @@ td > table > tbody > tr > td {
   white-space: nowrap;
   overflow-x: auto;
 }
-.tabs::-webkit-scrollbar {
-  width: 1px;
+.tabs::-webkit-scrollbar,
+.cbi-section::-webkit-scrollbar,
+.cbi-section > *::-webkit-scrollbar,
+textarea::-webkit-scrollbar,
+div::-webkit-scrollbar {
+  width: 5px;
   height: 5px;
 }
 .tabs::-webkit-scrollbar-thumb {
-  background-color: #f6f9fc;
+  background-color: #9e9e9e;
+}
+.tabs::-webkit-scrollbar-thumb:hover {
+  background: #757575;
+}
+.tabs::-webkit-scrollbar-thumb:active {
+  background: #424242;
 }
 .tabs::-webkit-scrollbar-track {
-  background-color: #fff;
+  background-color: transparent;
 }
 .tabs li[class~="active"],
 .tabs li:hover {
@@ -2148,7 +2203,7 @@ td > table > tbody > tr > td {
   border-bottom: 0.18751rem solid var(--primary);
   color: #5e72e4;
   color: var(--primary);
-  background-color: #dce1fe;
+  background-color: var(--light-subtabs-background);
   margin-bottom: 0;
   border-radius: 0;
 }
@@ -2184,13 +2239,19 @@ td > table > tbody > tr > td {
   height: 5px;
 }
 .cbi-tabmenu::-webkit-scrollbar-thumb {
-  background-color: #f6f9fc;
+  background-color: #9e9e9e;
+}
+.cbi-tabmenu::-webkit-scrollbar-thumb:hover {
+  background: #757575;
+}
+.cbi-tabmenu::-webkit-scrollbar-thumb:active {
+  background: #424242;
 }
 .cbi-tabmenu::-webkit-scrollbar-track {
-  background-color: #fff;
+  background-color: transparent;
 }
 .cbi-tabmenu li {
-  background: #dce3e9;
+  background: #e3e3e3;
   display: inline-block;
   font-size: 0.875rem;
   border-top-left-radius: 0.25rem;
@@ -2209,7 +2270,7 @@ td > table > tbody > tr > td {
   border-bottom: 0.18751rem solid var(--primary);
   color: #5e72e4;
   color: var(--primary);
-  background-color: #dce1fe;
+  background-color: var(--light-subtabs-background);
   margin-bottom: 0;
 }
 .cbi-tabmenu li:hover a {
@@ -2219,7 +2280,7 @@ td > table > tbody > tr > td {
   border-bottom: 0.18751rem solid #5e72e4;
   border-bottom: 0.18751rem solid var(--primary);
   color: var(--primary);
-  background-color: #dce1fe;
+  background-color: var(--light-subtabs-background);
   margin-bottom: 0;
 }
 .cbi-tabmenu li[class~="cbi-tab"] a {
@@ -2442,7 +2503,8 @@ select[multiple="multiple"] {
 .cbi-section-node .cbi-value {
   padding: 0.5rem 1rem 0.5rem 1rem !important;
 }
-.cbi-tabcontainer > .cbi-value:nth-of-type(2n) {
+.cbi-tabcontainer > .cbi-value:nth-of-type(2n),
+.cbi-tabcontainer > .cbi-value:nth-of-type(2n)>textarea {
   background-color: #f9f9f9;
 }
 .cbi-value-field,
@@ -2470,8 +2532,9 @@ form > .cbi-map > .cbi-section > .cbi-section-node > .cbi-value > .cbi-value-fie
   content: "\f059";
 }
 .cbi-value-description {
+  color: #8d8d8d;
+  opacity: 0.8;
   font-size: small;
-  opacity: 0.5;
   padding: 0.5rem;
 }
 .cbi-value-title {
@@ -2540,23 +2603,11 @@ td > .ifacebadge {
   float: right;
   margin: 0 0.3rem;
 }
-/*textarea*/
-.cbi-input-textarea {
-  width: 100%;
-  border: 0;
-  outline: none;
-  min-height: 14rem;
-  padding: 0.8rem;
-  font-size: 0.8rem;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  color: black;
-}
 #syslog {
   width: 100%;
   min-height: 15rem;
   padding: 1rem;
   line-height: 1.4em;
-  font-size: small;
   color: #1e1e1e;
   border-radius: 0;
   background-color: #fff;
@@ -2580,7 +2631,7 @@ td > .ifacebadge,
 .ifacebadge > img {
   display: inline-block;
   margin: 0 0.3rem;
-  align-self: flex-start;
+  align-self: center;
 }
 .ifacebadge span {
   line-height: 1.6em;
@@ -2710,16 +2761,6 @@ td > .ifacebadge,
 .cbi-section-remove {
   padding: 0.5rem;
 }
-div.cbi-value var,
-td.cbi-value-field var {
-  font-style: italic;
-  color: #0069D6;
-}
-small {
-  font-size: 90%;
-  white-space: normal;
-  line-height: 1.42857143;
-}
 .cbi-optionals {
   padding: 1rem 1rem 0 1rem;
   border-top: 1px solid #CCC;
@@ -2812,7 +2853,7 @@ input[name="nslookup"] {
   height: 100% !important;
   background-image: url(../img/trafficbar.png);
   background-position: left top;
-  animation: sparkle 1500ms linear infinite;
+  animation: sparkle 1000ms linear infinite;
 }
 .node-system-leds .cbi-section em {
   display: block;
@@ -2829,14 +2870,13 @@ input[name="nslookup"] {
   overflow-y: hidden;
 }
 .cbi-section em {
-  padding: 0.75rem 1.5rem;
   font-size: 0.7rem;
   font-weight: 600;
-  color: #525f7f;
+  color: var(--primary);
+  text-shadow: 1px 1px 2px #ccc;
   text-align: center;
 }
 .cbi-section h4 {
-  padding: 0.75rem 1.5rem;
   font-size: 0.7rem;
   font-weight: 600;
   color: #525f7f;
@@ -2865,6 +2905,12 @@ input[name="nslookup"] {
 .node-system-flashops fieldset {
   margin-top: 0;
 }
+.node-system-flashops fieldset > ul {
+  padding: 1rem;
+}
+.node-system-flashops fieldset + .cbi-page-actions {
+  margin-top: 1rem;
+}
 .node-status-iptables .cbi-tabmenu,
 .node-system-packages .cbi-tabmenu,
 .node-system-flashops .cbi-tabmenu {
@@ -2909,6 +2955,95 @@ input[name="nslookup"] {
 .node-nas-usb_printer em {
   display: block;
 }
+/* luci-app-passwall */
+#cbi-passwall #add_link_div,
+#cbi-passwall #set_node_div {
+  background: #fffffff0;
+}
+#cbi-passwall .cbi-section-table tbody ._now_use {
+  background: #5e72e473 !important;
+}
+/* luci-app-commands */
+.commandbox h3 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.commandbox code {
+  word-break: break-word;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+div.commandbox {
+  height: 16em;
+}
+/* luci-app-ssr-plus */
+#cbi-shadowsocksr .cbi-map-descr h3 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+/* luci-app-mwan3 */
+.node-status-mwan .cbi-tabmenu {
+  padding: 3rem 0.5rem 0 0.5rem;
+}
+/* luci-app-openclash */
+.node-services-openclash .cbi-tabmenu {
+  font-size: 0;
+}
+.node-services-openclash .cbi-tabmenu > li {
+  margin-right: 4px;
+}
+.node-services-openclash .cbi-tabmenu > li:last-child {
+  margin-right: 0;
+}
+/* luci-app-ddnsto */
+.node-services-ddnsto .cbi-section-node .cbi-value div {
+  display: table-cell;
+  line-height: 1.6;
+  font-size: 0.875rem;
+}
+
+/* luci-app-dockerman */
+#cbi-dockerd > .cbi-section > br,
+#cbi-docker > .cbi-section > br {
+  display: none;
+}
+
+/* luci-app-diskman */
+#cbi-diskman > .cbi-section > br {
+  display: none;
+}
+
+/* luci-app-istorex (Quick Start) */
+#app #main #page .app-container_body .btn-f,
+#app #main #page .app-container_body .btn-r {
+  -webkit-user-select: none; /* Safari */
+  -moz-user-select: none; /* Firefox */
+  -ms-user-select: none; /* IE10+/Edge */
+  user-select: none; /* Standard */
+  width: 30px;
+}
+
+/* luci-app-ttyd */
+.TTYD.node-system-terminal .main {
+  height: 100%!important;
+}
+.TTYD.node-system-terminal .main .main-right,
+.TTYD.node-system-terminal .main .main-right #maincontent,
+.TTYD.node-system-terminal .main .main-right #maincontent .container .cbi-map {
+  height: 100%!important;
+  display: flex!important;
+  flex-direction: column!important;
+}
+.TTYD.node-system-terminal .main .main-right #maincontent,
+.TTYD.node-system-terminal .main .main-right #maincontent .container,
+.TTYD.node-system-terminal .main .main-right #maincontent .container .cbi-map #terminal {
+  flex: 1!important;
+}
+
 @media screen and (max-width: 1600px) {
   .main .main-left {
     width: calc(0% + 13rem);
@@ -2916,7 +3051,7 @@ input[name="nslookup"] {
   .main .main-right {
     width: calc(100% - 13rem);
   }
-  .cbi-button {
+  .cbi-button:not(.cbi-button-up, .cbi-button-down) {
     /*padding: 0.3rem 1.5rem;*/
     font-size: 0.8rem;
   }
@@ -2933,9 +3068,6 @@ input[name="nslookup"] {
   fieldset {
     padding: 0;
   }
-  .cbi-input-textarea {
-    font-size: small;
-  }
   .node-status-iptables > .main fieldset li > a {
     padding: 0.3rem 0.6rem;
   }
@@ -2971,25 +3103,6 @@ input[name="nslookup"] {
     font-size: 0.7rem;
   }
 }
-@media screen and (min-width: 600px) {
-  ::-webkit-scrollbar {
-    width: 10px;
-    height: 10px;
-  }
-  ::-webkit-scrollbar,
-  ::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-  ::-webkit-scrollbar-thumb {
-    background: #9e9e9e;
-  }
-  ::-webkit-scrollbar-thumb:hover {
-    background: #757575;
-  }
-  ::-webkit-scrollbar-thumb:active {
-    background: #424242;
-  }
-}
 @media screen and (max-width: 992px) {
   .main .main-left {
     width: 0;
@@ -3034,6 +3147,15 @@ input[name="nslookup"] {
     font-size: 1rem;
   }
 }
+@media screen and (max-width: 500px) {
+  .login-page .login-container {
+    margin-left: 0rem !important;
+    width: 500px;
+  }
+  .login-page .login-container .login-form {
+    max-width: 500px;
+  }
+}
 @media screen and (max-width: 480px) {
   body {
     font-size: 0.8rem;
@@ -3042,17 +3164,10 @@ input[name="nslookup"] {
     float: right;
     margin-top: 0rem !important;
   }
-  .login-page .video video {
-    width: auto !important;
-    height: 100% !important;
-  }
   .login-page .login-container {
     margin-left: 0rem !important;
     width: 100%;
   }
-  .login-page .login-container .login-form {
-    max-width: 480px;
-  }
   .login-page .login-container .login-form .form-login .input-group::before {
     color: #525461;
   }
@@ -3124,10 +3239,9 @@ input[name="nslookup"] {
   .cbi-page-actions > div > input {
     display: none;
   }
-  .tabs::-webkit-scrollbar,
-  .cbi-tabmenu::-webkit-scrollbar {
-    width: 0px;
-    height: 0px;
+  ::-webkit-scrollbar {
+    width: 0px !important;
+    height: 0px  !important;
   }
   .tabs > li > a {
     font-size: 0.9rem;
@@ -3218,4 +3332,4 @@ input[name="nslookup"] {
     width: 2.3rem !important;
     height: auto;
   }
-}
\ No newline at end of file
+}
diff --git a/luci-theme-argone/htdocs/luci-static/argone/css/dark.css b/luci-theme-argone/htdocs/luci-static/argone/css/dark.css
index 370cbcd0..085c7f63 100644
--- a/luci-theme-argone/htdocs/luci-static/argone/css/dark.css
+++ b/luci-theme-argone/htdocs/luci-static/argone/css/dark.css
@@ -15,6 +15,10 @@ body {
   color: #adb5bd;
 }
 
+.login-page .login-container .login-form .form-login .input-group .border {
+  border-bottom: 1px var(--dark-primary) solid;
+}
+
 .login-page .login-container .login-form .form-login .input-group input {
   background-color: transparent !important;
   color: #adb5bd;
@@ -42,7 +46,8 @@ body {
   opacity: .9;
 }
 
-.login-page .login-container footer {
+.login-page .login-container footer,
+.login-page .login-container footer a {
   color: #adb5bd;
 }
 
@@ -60,29 +65,36 @@ header::after {
 }
 
 .main .main-left .nav .slide .slide-menu .active a {
-  color: #cccccc;
-}
-
-.main .main-left .nav .slide .slide-menu .active a::after {
-  background-color: #cccccc !important;
+  color: #fff !important;
 }
 
 .main .main-left .nav .slide .slide-menu li a {
   color: #cccccc;
 }
 
+.main .main-left .nav .slide .slide-menu li a::after {
+  background-color: var(--dark-primary) !important;
+  box-shadow: 0 0 1px #000  !important;
+}
+
 .main .main-left .nav .slide .slide-menu li a:hover {
   background: none !important;
 }
 
+.main .main-left .nav .slide .menu:hover,
 .main .main-left .nav .slide .menu.active {
   background-color: #483d8b !important;
   background-color: var(--dark-primary) !important;
-  color: #cccccc !important;
+  color: #fff !important;
+  box-shadow: 0 0 1px #000 !important;
 }
 
-.main .main-left .nav .slide .menu.active a::after {
-  background-color: #cccccc !important;
+.main .main-left .nav .slide .menu[data-title=Status]:before {
+  color: var(--dark-primary) !important;
+}
+
+.main .main-left .nav .slide .menu[data-title=Control]:before {
+  color: var(--dark-primary) !important;
 }
 
 .main .main-left .nav li a {
@@ -92,17 +104,13 @@ header::after {
 .main .main-left .nav li a:hover {
   background-color: #483d8b !important;
   background-color: var(--dark-primary) !important;
-  color: #cccccc !important;
+  color: #fff !important;
 }
 
 .main .main-left::-webkit-scrollbar-thumb {
   background-color: #252526 !important;
 }
 
-.main .main-left::-webkit-scrollbar-track {
-  background-color: #333;
-}
-
 .main .main-right {
   background-color: #1e1e1e;
 }
@@ -118,17 +126,31 @@ h3 {
   background: #333333;
 }
 
-a:-webkit-any-link {
-  color: -webkit-link;
-  cursor: pointer;
-  color: #483d8b;
-  color: var(--dark-primary);
+a:link,
+a:visited,
+a:active {
+  color: var(--dark_webkit-any-link);
+}
+
+a:-webkit-any-link:not(li a, .main-left a, .brand, .pull-right a, .alert-message a, .login-container footer a, .cbi-button) {
+  color: var(--dark_webkit-any-link) !important;
+  text-shadow: 1px 1px 2px #000 !important;
 }
 
 input:-webkit-autofill {
   background-color: #3c3c3c !important;
 }
 
+input[type="checkbox"]:checked {
+  background-color: #483d8b !important;
+  background-color: var(--dark-primary) !important;
+}
+
+.cbi-input-radio:checked {
+  background-color: #483d8b !important;
+  background-color: var(--dark-primary) !important;
+}
+
 .cbi-value-field .cbi-input-apply,
 .cbi-button-apply,
 .cbi-button-edit {
@@ -140,8 +162,8 @@ input:-webkit-autofill {
 }
 
 .cbi-section em {
-  color: #483d8b;
-  color: var(--dark-primary);
+  color: var(--dark_webkit-any-link);
+  text-shadow: 1px 1px 2px #000;
 }
 
 header.bg-primary {
@@ -196,6 +218,7 @@ table>thead>tr>td {
 #conns>div>div>div>small,
 #memtotal>div>div>div>small {
   color: #ccc !important;
+  text-shadow: 1px 1px 2px #000 !important;
 }
 
 .node-system-packages>.main .cbi-section-node:first-child .cbi-value-last {
@@ -216,6 +239,7 @@ table>tbody>tr>th,
 table>tfoot>tr>th,
 table>thead>tr>th {
   background-color: #252526;
+  border-top: none;
   border-bottom: black 1px solid !important;
 }
 
@@ -254,8 +278,7 @@ table>thead>tr>th {
 }
 
 abbr {
-  color: #483d8b;
-  color: var(--dark-primary);
+  color: #8898aa;
 }
 
 div>table>tbody>tr:nth-of-type(2n),
@@ -319,16 +342,6 @@ th h6, td h6 {
   background-color: #00ff0a45 !important;
 }
 
-/* OCD: Compatible the background color of the "Add the node via the link" & "USE(node)" pop-up window in PassWall (dark mode only) */
-#add_link_div,
-#set_node_div {
-  background-color: #333333f0 !important;
-  box-shadow: #00000094 10px 10px 30px 5px !important;
-}
-#add_link_div>.cbi-value>.cbi-value-field>#nodes_link {
-  background: #ccc;
-}
-
 #content_syslog {
   box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35);
 }
@@ -350,26 +363,26 @@ th h6, td h6 {
   background-color: #252526;
 }
 
-.tabs>li[class~="active"]>a {
-  color: #ccc;
-}
-
+.tabs>li:hover,
 .tabs>li[class~="active"],
-.tabs>li:hover {
-  border-bottom: .18751rem solid #483d8b;
+.cbi-tabmenu>li:hover,
+.cbi-tabmenu>li[class~="cbi-tab"] {
   border-bottom: .18751rem solid var(--dark-primary);
-  color: #ccc;
-  background-color: #181819;
+  background-color: #3c3c3c;
 }
 
-.cbi-tabmenu>li>a,
-.tabs>li>a {
-  color: #ccc;
+.tabs>li>a,
+.cbi-tabmenu>li>a {
+  color: #ccc !important;
 }
 
 .cbi-tabmenu>li>a:hover,
-.tabs>li>a:hover {
-  color: #ccc;
+.cbi-tabmenu>li:hover>a,
+.cbi-tabmenu>.cbi-tab>a,
+.tabs>li>a:hover,
+.tabs>li:hover>a,
+.tabs>li[class~="active"]>a {
+  color: #fff !important;
 }
 
 .cbi-tabmenu>li {
@@ -380,20 +393,12 @@ th h6, td h6 {
   border-bottom: 0 solid #ddd !important;
 }
 
-.cbi-tabmenu li[class~="cbi-tab"] a {
+.cbi-tab-descr {
   color: #ccc;
 }
 
-.cbi-tabmenu>li:hover {
-  color: #ccc;
-  background: #2d2d2d;
-}
-
-.cbi-tabmenu>li[class~="cbi-tab"] {
-  background-color: #181819;
-}
-
-.cbi-tabcontainer>.cbi-value:nth-of-type(2n) {
+.cbi-tabcontainer>.cbi-value:nth-of-type(2n),
+.cbi-tabcontainer>.cbi-value:nth-of-type(2n)>textarea {
   background-color: #252526;
 }
 
@@ -409,7 +414,8 @@ input {
   box-shadow: 0 3px 2px rgba(0,0,0,0.05);
 }
 
-select:not([multiple="multiple"]):focus,
+select:not([multiple="multiple"]):hover,
+input:hover,
 input:focus {
   border-color: #483d8b !important;
   border-color: var(--dark-primary) !important;
@@ -444,7 +450,9 @@ select {
   color: #ccc;
 }
 
-.cbi-input-textarea {
+/*textarea for dark mode*/
+textarea {
+  border: 1px solid #3c3c3c !important;
   background-color: #1e1e1e;
   color: #ccc;
 }
@@ -512,9 +520,11 @@ img[src="/luci-static/resources/icons/loading.gif"] {
 }
 
 div.cbi-value var,
-td.cbi-value-field var {
+td.cbi-value-field var,
+.td.cbi-value-field var {
   color: #483d8b;
-  color: var(--dark-primary);
+  color: var(--dark_webkit-any-link);
+  text-shadow: 1px 1px 2px #000;
 }
 
 #diag-rc-output>pre {
@@ -524,7 +534,7 @@ td.cbi-value-field var {
 
 .node-services-vssr .block {
   background-color: #1e1e1e !important;
-  box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35);
+  box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35) !important;
 }
 
 .node-services-vssr .block h4 {
@@ -533,8 +543,8 @@ td.cbi-value-field var {
 
 .node-services-vssr .status-bar {
   color: #ccc;
-  box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35);
-  background-color: #1e1e1e;
+  background: #333333f0;
+  box-shadow: #00000094 10px 10px 30px 5px;
 }
 
 .node-services-vssr .cbi-section-table-row {
@@ -666,6 +676,150 @@ fieldset[id^="cbi-apply-"] {
   color: #ccc !important;
 }
 
+/* luci-app-passwall */
+#cbi-passwall #add_link_div,
+#cbi-passwall #set_node_div {
+  background: #333333f0 !important;
+  box-shadow: #00000094 10px 10px 30px 5px !important;
+}
+
+/* luci-app-bypass */
+#cbi-bypass .status-bar {
+  color: #ccc;
+  background: #333333f0;
+  box-shadow: #00000094 10px 10px 30px 5px;
+}
+
+/* luci-app-clash */
+#cbi-clash .cbi-section .pure-u-1-4 .pure-g,
+#cbi-clash .cbi-section .siz .pure-g {
+  background-color: #1e1e1e !important;
+  box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35) !important;
+}
+
+/* luci-app-openclash */
+#cbi-openclash #eye-icon,
+#cbi-openclash img[title="刷新"] {
+  filter: invert(100%);
+}
+#cbi-openclash #cbi-openclash-config fieldset[control-id="ControlID-46"],
+#cbi-openclash .CodeMirror-merge-copybuttons-right,
+.CodeMirror-scroll {
+  background-color: #333333 !important;
+}
+#cbi-openclash .cbi-section .cbi-tabmenu li {
+  border-right: 1px solid #3c3c3c !important;
+}
+#cbi-openclash .CodeMirror-merge {
+  border: 1px solid transparent !important;
+}
+#cbi-openclash-config-clog .cbi-section {
+  border: 1px solid #3c3c3c !important;
+}
+#cbi-openclash .CodeMirror-gutters {
+  border-right: 1px solid #3c3c3c !important;
+  background-color: #1e1e1e !important;
+}
+
+/* luci-app-dockerman */
+#cbi-dockerd .img-con img {
+  filter: invert(0.4);
+}
+
+/* luci-app-istorex (interface config[NetworkPort]) */
+#cbi-nfs-mount  .app-container_status-label_bg {
+  background: #333333;
+}
+#cbi-nfs-mount td svg {
+  filter: invert(0.3);
+}
+#actioner .actioner-dns {
+  background-color: #333333;
+}
+#actioner .actioner-dns_header,
+#actioner .actioner-container_header {
+  border-bottom: 1px solid #cbcbcb !important;
+}
+#actioner .actioner-dns_footer {
+  border-top: 1px solid #cbcbcb !important;
+}
+
+/* luci-app-istorex (Network Guide) */
+#app #main #page .title,
+#app #main #page .desc {
+  color: #cccccc;
+  background-color: #333333;
+}
+#app #main #page .network-message li:not(span):not(a) {
+  color: #8d8d8d;
+}
+#app #main #page code {
+  background-color: #333333;
+}
+
+/* luci-app-istorex (Quick Start) */
+#app #main #page .network-container_flow-container,
+#app #main #page .app-container_status-container,
+#app #main #page .nas-container .nas-container_card .app-container,
+#app #main #page .app-container {
+  background-color: #333333;
+}
+#app #main #page .flow-data span,
+#app #main #page .app-container_status-label_block span,
+#app #main #page .app-container .item-label span:not(#app #main #page .app-container .progress-value span) {
+  color: #cccccc;
+}
+#app #main #page .app-container_status-info span,
+#app #main #page .app-container_status-info span,
+#app #main #page .app-container_title span {
+  color: #dddddd;
+}
+.app-container_body .app-container_status-label_bg {
+  background-color: #282828 !important;
+}
+#app #main #page .item-label_value .progress {
+  background-color: rgb(118, 118, 118);
+}
+#app #main #page .app-container_nas-menu button[class=""] {
+  background-color: #8b8b8b;
+}
+#app #main #page .app-container_nas-menu button[class="on"] {
+  background-color: #555555;
+}
+#app #main #page .app-container_title .DeviceBlock ul {
+  background-color: #cccccc;
+}
+#actioner div.action,
+#actioner div.actioner-container {
+  background-color: #3c3c3c;
+}
+#actioner div.action .title {
+  color: #cccccc;
+}
+#actioner div.action .desc {
+  color: #cbcbcb;
+}
+#actioner div.action div.roots span,
+#actioner div.action div.move span:not(span.tip),
+#actioner div.action div.left span,
+#actioner div.action div.input_row span,
+#actioner div.label-item label span {
+  color: #cbcbcb;
+}
+#actioner div.action span.tooltip-trigger svg path {
+  fill: #cbcbcb;
+}
+#actioner div.actioner-dns_body div.label-item_value select {
+  height: 43px;
+}
+#actioner div.actioner-container_footer div.close {
+  color: #ffffff;
+}
+#app #main div.app-container div.app-container_title span a svg path,
+#app #main #page span.disk_infoicon svg g {
+  fill: #8b8b8b;
+}
+
 @supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) {
   .login-page .login-container .login-form {
     -webkit-backdrop-filter: blur(var(--blur-radius-dark));
diff --git a/luci-theme-argone/htdocs/luci-static/argone/css/fonts.css b/luci-theme-argone/htdocs/luci-static/argone/css/fonts.css
index 1f42a79f..918586d1 100644
--- a/luci-theme-argone/htdocs/luci-static/argone/css/fonts.css
+++ b/luci-theme-argone/htdocs/luci-static/argone/css/fonts.css
@@ -2,6 +2,7 @@
  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template
  *
  *  luci-theme-argone
+ *      Copyright 2020 Jerryk
  *
  *  Have a bug? Please create an issue here on GitHub!
  *      https://github.com/kenzok78/luci-theme-argone/issues
diff --git a/luci-theme-argone/htdocs/luci-static/argone/css/pure-min.css b/luci-theme-argone/htdocs/luci-static/argone/css/pure-min.css
index 81dbb150..e898cf2c 100644
--- a/luci-theme-argone/htdocs/luci-static/argone/css/pure-min.css
+++ b/luci-theme-argone/htdocs/luci-static/argone/css/pure-min.css
@@ -8,4 +8,4 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
 normalize.css v | MIT License | git.io/normalize
 Copyright (c) Nicolas Gallagher and Jonathan Neal
 */
-/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{-webkit-box-sizing:border-box;box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none}html{font-family:sans-serif}.hidden,[hidden]{display:none!important}.pure-img{max-width:100%;height:auto}.pure-g{letter-spacing:-.31em;text-rendering:optimizespeed;font-family:FreeSans,Arimo,"Droid Sans",Helvetica,Arial,sans-serif;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-line-pack:start;align-content:flex-start}@media all and (-ms-high-contrast:none),(-ms-high-contrast:active){table .pure-g{display:block}}.opera-only :-o-prefocus,.pure-g{word-spacing:-.43em}.pure-u{display:inline-block;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-g [class*=pure-u]{font-family:sans-serif}.pure-u-1,.pure-u-1-1,.pure-u-1-12,.pure-u-1-2,.pure-u-1-24,.pure-u-1-3,.pure-u-1-4,.pure-u-1-5,.pure-u-1-6,.pure-u-1-8,.pure-u-10-24,.pure-u-11-12,.pure-u-11-24,.pure-u-12-24,.pure-u-13-24,.pure-u-14-24,.pure-u-15-24,.pure-u-16-24,.pure-u-17-24,.pure-u-18-24,.pure-u-19-24,.pure-u-2-24,.pure-u-2-3,.pure-u-2-5,.pure-u-20-24,.pure-u-21-24,.pure-u-22-24,.pure-u-23-24,.pure-u-24-24,.pure-u-3-24,.pure-u-3-4,.pure-u-3-5,.pure-u-3-8,.pure-u-4-24,.pure-u-4-5,.pure-u-5-12,.pure-u-5-24,.pure-u-5-5,.pure-u-5-6,.pure-u-5-8,.pure-u-6-24,.pure-u-7-12,.pure-u-7-24,.pure-u-7-8,.pure-u-8-24,.pure-u-9-24{display:inline-block;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-u-1-24{width:4.1667%}.pure-u-1-12,.pure-u-2-24{width:8.3333%}.pure-u-1-8,.pure-u-3-24{width:12.5%}.pure-u-1-6,.pure-u-4-24{width:16.6667%}.pure-u-1-5{width:20%}.pure-u-5-24{width:20.8333%}.pure-u-1-4,.pure-u-6-24{width:25%}.pure-u-7-24{width:29.1667%}.pure-u-1-3,.pure-u-8-24{width:33.3333%}.pure-u-3-8,.pure-u-9-24{width:37.5%}.pure-u-2-5{width:40%}.pure-u-10-24,.pure-u-5-12{width:41.6667%}.pure-u-11-24{width:45.8333%}.pure-u-1-2,.pure-u-12-24{width:50%}.pure-u-13-24{width:54.1667%}.pure-u-14-24,.pure-u-7-12{width:58.3333%}.pure-u-3-5{width:60%}.pure-u-15-24,.pure-u-5-8{width:62.5%}.pure-u-16-24,.pure-u-2-3{width:66.6667%}.pure-u-17-24{width:70.8333%}.pure-u-18-24,.pure-u-3-4{width:75%}.pure-u-19-24{width:79.1667%}.pure-u-4-5{width:80%}.pure-u-20-24,.pure-u-5-6{width:83.3333%}.pure-u-21-24,.pure-u-7-8{width:87.5%}.pure-u-11-12,.pure-u-22-24{width:91.6667%}.pure-u-23-24{width:95.8333%}.pure-u-1,.pure-u-1-1,.pure-u-24-24,.pure-u-5-5{width:100%}.pure-button{display:inline-block;line-height:normal;white-space:nowrap;vertical-align:middle;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-button::-moz-focus-inner{padding:0;border:0}.pure-button-group{letter-spacing:-.31em;text-rendering:optimizespeed}.opera-only :-o-prefocus,.pure-button-group{word-spacing:-.43em}.pure-button-group .pure-button{letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-button{font-family:inherit;font-size:100%;padding:.5em 1em;color:rgba(0,0,0,.8);border:none transparent;background-color:#e6e6e6;text-decoration:none;border-radius:2px}.pure-button-hover,.pure-button:focus,.pure-button:hover{background-image:-webkit-gradient(linear,left top,left bottom,from(transparent),color-stop(40%,rgba(0,0,0,.05)),to(rgba(0,0,0,.1)));background-image:linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.1))}.pure-button:focus{outline:0}.pure-button-active,.pure-button:active{-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.15) inset,0 0 6px rgba(0,0,0,.2) inset;box-shadow:0 0 0 1px rgba(0,0,0,.15) inset,0 0 6px rgba(0,0,0,.2) inset;border-color:#000}.pure-button-disabled,.pure-button-disabled:active,.pure-button-disabled:focus,.pure-button-disabled:hover,.pure-button[disabled]{border:none;background-image:none;opacity:.4;cursor:not-allowed;-webkit-box-shadow:none;box-shadow:none;pointer-events:none}.pure-button-hidden{display:none}.pure-button-primary,.pure-button-selected,a.pure-button-primary,a.pure-button-selected{background-color:#0078e7;color:#fff}.pure-button-group .pure-button{margin:0;border-radius:0;border-right:1px solid rgba(0,0,0,.2)}.pure-button-group .pure-button:first-child{border-top-left-radius:2px;border-bottom-left-radius:2px}.pure-button-group .pure-button:last-child{border-top-right-radius:2px;border-bottom-right-radius:2px;border-right:none}.pure-form input[type=color],.pure-form input[type=date],.pure-form input[type=datetime-local],.pure-form input[type=datetime],.pure-form input[type=email],.pure-form input[type=month],.pure-form input[type=number],.pure-form input[type=password],.pure-form input[type=search],.pure-form input[type=tel],.pure-form input[type=text],.pure-form input[type=time],.pure-form input[type=url],.pure-form input[type=week],.pure-form select,.pure-form textarea{padding:.5em .6em;display:inline-block;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 3px #ddd;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;vertical-align:middle;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-form input:not([type]){padding:.5em .6em;display:inline-block;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 3px #ddd;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-form input[type=color]{padding:.2em .5em}.pure-form input[type=color]:focus,.pure-form input[type=date]:focus,.pure-form input[type=datetime-local]:focus,.pure-form input[type=datetime]:focus,.pure-form input[type=email]:focus,.pure-form input[type=month]:focus,.pure-form input[type=number]:focus,.pure-form input[type=password]:focus,.pure-form input[type=search]:focus,.pure-form input[type=tel]:focus,.pure-form input[type=text]:focus,.pure-form input[type=time]:focus,.pure-form input[type=url]:focus,.pure-form input[type=week]:focus,.pure-form select:focus,.pure-form textarea:focus{outline:0;border-color:#129fea}.pure-form input:not([type]):focus{outline:0;border-color:#129fea}.pure-form input[type=checkbox]:focus,.pure-form input[type=file]:focus,.pure-form input[type=radio]:focus{outline:thin solid #129fea;outline:1px auto #129fea}.pure-form .pure-checkbox,.pure-form .pure-radio{margin:.5em 0;display:block}.pure-form input[type=color][disabled],.pure-form input[type=date][disabled],.pure-form input[type=datetime-local][disabled],.pure-form input[type=datetime][disabled],.pure-form input[type=email][disabled],.pure-form input[type=month][disabled],.pure-form input[type=number][disabled],.pure-form input[type=password][disabled],.pure-form input[type=search][disabled],.pure-form input[type=tel][disabled],.pure-form input[type=text][disabled],.pure-form input[type=time][disabled],.pure-form input[type=url][disabled],.pure-form input[type=week][disabled],.pure-form select[disabled],.pure-form textarea[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}.pure-form input:not([type])[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}.pure-form input[readonly],.pure-form select[readonly],.pure-form textarea[readonly]{background-color:#eee;color:#777;border-color:#ccc}.pure-form input:focus:invalid,.pure-form select:focus:invalid,.pure-form textarea:focus:invalid{color:#b94a48;border-color:#e9322d}.pure-form input[type=checkbox]:focus:invalid:focus,.pure-form input[type=file]:focus:invalid:focus,.pure-form input[type=radio]:focus:invalid:focus{outline-color:#e9322d}.pure-form select{height:2.25em;border:1px solid #ccc;background-color:#fff}.pure-form select[multiple]{height:auto}.pure-form label{margin:.5em 0 .2em}.pure-form fieldset{margin:0;padding:.35em 0 .75em;border:0}.pure-form legend{display:block;width:100%;padding:.3em 0;margin-bottom:.3em;color:#333;border-bottom:1px solid #e5e5e5}.pure-form-stacked input[type=color],.pure-form-stacked input[type=date],.pure-form-stacked input[type=datetime-local],.pure-form-stacked input[type=datetime],.pure-form-stacked input[type=email],.pure-form-stacked input[type=file],.pure-form-stacked input[type=month],.pure-form-stacked input[type=number],.pure-form-stacked input[type=password],.pure-form-stacked input[type=search],.pure-form-stacked input[type=tel],.pure-form-stacked input[type=text],.pure-form-stacked input[type=time],.pure-form-stacked input[type=url],.pure-form-stacked input[type=week],.pure-form-stacked label,.pure-form-stacked select,.pure-form-stacked textarea{display:block;margin:.25em 0}.pure-form-stacked input:not([type]){display:block;margin:.25em 0}.pure-form-aligned input,.pure-form-aligned select,.pure-form-aligned textarea,.pure-form-message-inline{display:inline-block;vertical-align:middle}.pure-form-aligned textarea{vertical-align:top}.pure-form-aligned .pure-control-group{margin-bottom:.5em}.pure-form-aligned .pure-control-group label{text-align:right;display:inline-block;vertical-align:middle;width:10em;margin:0 1em 0 0}.pure-form-aligned .pure-controls{margin:1.5em 0 0 11em}.pure-form .pure-input-rounded,.pure-form input.pure-input-rounded{border-radius:2em;padding:.5em 1em}.pure-form .pure-group fieldset{margin-bottom:10px}.pure-form .pure-group input,.pure-form .pure-group textarea{display:block;padding:10px;margin:0 0 -1px;border-radius:0;position:relative;top:-1px}.pure-form .pure-group input:focus,.pure-form .pure-group textarea:focus{z-index:3}.pure-form .pure-group input:first-child,.pure-form .pure-group textarea:first-child{top:1px;border-radius:4px 4px 0 0;margin:0}.pure-form .pure-group input:first-child:last-child,.pure-form .pure-group textarea:first-child:last-child{top:1px;border-radius:4px;margin:0}.pure-form .pure-group input:last-child,.pure-form .pure-group textarea:last-child{top:-2px;border-radius:0 0 4px 4px;margin:0}.pure-form .pure-group button{margin:.35em 0}.pure-form .pure-input-1{width:100%}.pure-form .pure-input-3-4{width:75%}.pure-form .pure-input-2-3{width:66%}.pure-form .pure-input-1-2{width:50%}.pure-form .pure-input-1-3{width:33%}.pure-form .pure-input-1-4{width:25%}.pure-form-message-inline{display:inline-block;padding-left:.3em;color:#666;vertical-align:middle;font-size:.875em}.pure-form-message{display:block;color:#666;font-size:.875em}@media only screen and (max-width :480px){.pure-form button[type=submit]{margin:.7em 0 0}.pure-form input:not([type]),.pure-form input[type=color],.pure-form input[type=date],.pure-form input[type=datetime-local],.pure-form input[type=datetime],.pure-form input[type=email],.pure-form input[type=month],.pure-form input[type=number],.pure-form input[type=password],.pure-form input[type=search],.pure-form input[type=tel],.pure-form input[type=text],.pure-form input[type=time],.pure-form input[type=url],.pure-form input[type=week],.pure-form label{margin-bottom:.3em;display:block}.pure-group input:not([type]),.pure-group input[type=color],.pure-group input[type=date],.pure-group input[type=datetime-local],.pure-group input[type=datetime],.pure-group input[type=email],.pure-group input[type=month],.pure-group input[type=number],.pure-group input[type=password],.pure-group input[type=search],.pure-group input[type=tel],.pure-group input[type=text],.pure-group input[type=time],.pure-group input[type=url],.pure-group input[type=week]{margin-bottom:0}.pure-form-aligned .pure-control-group label{margin-bottom:.3em;text-align:left;display:block;width:100%}.pure-form-aligned .pure-controls{margin:1.5em 0 0 0}.pure-form-message,.pure-form-message-inline{display:block;font-size:.75em;padding:.2em 0 .8em}}.pure-menu{-webkit-box-sizing:border-box;box-sizing:border-box}.pure-menu-fixed{position:fixed;left:0;top:0;z-index:3}.pure-menu-item,.pure-menu-list{position:relative}.pure-menu-list{list-style:none;margin:0;padding:0}.pure-menu-item{padding:0;margin:0;height:100%}.pure-menu-heading,.pure-menu-link{display:block;text-decoration:none;white-space:nowrap}.pure-menu-horizontal{width:100%;white-space:nowrap}.pure-menu-horizontal .pure-menu-list{display:inline-block}.pure-menu-horizontal .pure-menu-heading,.pure-menu-horizontal .pure-menu-item,.pure-menu-horizontal .pure-menu-separator{display:inline-block;vertical-align:middle}.pure-menu-item .pure-menu-item{display:block}.pure-menu-children{display:none;position:absolute;left:100%;top:0;margin:0;padding:0;z-index:3}.pure-menu-horizontal .pure-menu-children{left:0;top:auto;width:inherit}.pure-menu-active>.pure-menu-children,.pure-menu-allow-hover:hover>.pure-menu-children{display:block;position:absolute}.pure-menu-has-children>.pure-menu-link:after{padding-left:.5em;content:"\25B8";font-size:small}.pure-menu-horizontal .pure-menu-has-children>.pure-menu-link:after{content:"\25BE"}.pure-menu-scrollable{overflow-y:scroll;overflow-x:hidden}.pure-menu-scrollable .pure-menu-list{display:block}.pure-menu-horizontal.pure-menu-scrollable .pure-menu-list{display:inline-block}.pure-menu-horizontal.pure-menu-scrollable{white-space:nowrap;overflow-y:hidden;overflow-x:auto;padding:.5em 0}.pure-menu-horizontal .pure-menu-children .pure-menu-separator,.pure-menu-separator{background-color:#ccc;height:1px;margin:.3em 0}.pure-menu-horizontal .pure-menu-separator{width:1px;height:1.3em;margin:0 .3em}.pure-menu-horizontal .pure-menu-children .pure-menu-separator{display:block;width:auto}.pure-menu-heading{text-transform:uppercase;color:#565d64}.pure-menu-link{color:#777}.pure-menu-children{background-color:#fff}.pure-menu-disabled,.pure-menu-heading,.pure-menu-link{padding:.5em 1em}.pure-menu-disabled{opacity:.5}.pure-menu-disabled .pure-menu-link:hover{background-color:transparent}.pure-menu-active>.pure-menu-link,.pure-menu-link:focus,.pure-menu-link:hover{background-color:#eee}.pure-menu-selected>.pure-menu-link,.pure-menu-selected>.pure-menu-link:visited{color:#000}.pure-table{border-collapse:collapse;border-spacing:0;empty-cells:show;border:1px solid #cbcbcb}.pure-table caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.pure-table td,.pure-table th{border-left:1px solid #cbcbcb;border-width:0 0 0 1px;font-size:inherit;margin:0;overflow:visible;padding:.5em 1em}.pure-table thead{background-color:#e0e0e0;color:#000;text-align:left;vertical-align:bottom}.pure-table td{background-color:transparent}.pure-table-odd td{background-color:#f2f2f2}.pure-table-striped tr:nth-child(2n-1) td{background-color:#f2f2f2}.pure-table-bordered td{border-bottom:1px solid #cbcbcb}.pure-table-bordered tbody>tr:last-child>td{border-bottom-width:0}.pure-table-horizontal td,.pure-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #cbcbcb}.pure-table-horizontal tbody>tr:last-child>td{border-bottom-width:0}
\ No newline at end of file
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select{font-family:inherit;font-size:100%;line-height:1.15;margin:5px}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{-webkit-box-sizing:border-box;box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none}html{font-family:sans-serif}.hidden,[hidden]{display:none!important}.pure-img{max-width:100%;height:auto}.pure-g{letter-spacing:-.31em;text-rendering:optimizespeed;font-family:FreeSans,Arimo,"Droid Sans",Helvetica,Arial,sans-serif;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-line-pack:start;align-content:flex-start}@media all and (-ms-high-contrast:none),(-ms-high-contrast:active){table .pure-g{display:block}}.opera-only :-o-prefocus,.pure-g{word-spacing:-.43em}.pure-u{display:inline-block;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-g [class*=pure-u]{font-family:sans-serif}.pure-u-1,.pure-u-1-1,.pure-u-1-12,.pure-u-1-2,.pure-u-1-24,.pure-u-1-3,.pure-u-1-4,.pure-u-1-5,.pure-u-1-6,.pure-u-1-8,.pure-u-10-24,.pure-u-11-12,.pure-u-11-24,.pure-u-12-24,.pure-u-13-24,.pure-u-14-24,.pure-u-15-24,.pure-u-16-24,.pure-u-17-24,.pure-u-18-24,.pure-u-19-24,.pure-u-2-24,.pure-u-2-3,.pure-u-2-5,.pure-u-20-24,.pure-u-21-24,.pure-u-22-24,.pure-u-23-24,.pure-u-24-24,.pure-u-3-24,.pure-u-3-4,.pure-u-3-5,.pure-u-3-8,.pure-u-4-24,.pure-u-4-5,.pure-u-5-12,.pure-u-5-24,.pure-u-5-5,.pure-u-5-6,.pure-u-5-8,.pure-u-6-24,.pure-u-7-12,.pure-u-7-24,.pure-u-7-8,.pure-u-8-24,.pure-u-9-24{display:inline-block;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-u-1-24{width:4.1667%}.pure-u-1-12,.pure-u-2-24{width:8.3333%}.pure-u-1-8,.pure-u-3-24{width:12.5%}.pure-u-1-6,.pure-u-4-24{width:16.6667%}.pure-u-1-5{width:20%}.pure-u-5-24{width:20.8333%}.pure-u-1-4,.pure-u-6-24{width:25%}.pure-u-7-24{width:29.1667%}.pure-u-1-3,.pure-u-8-24{width:33.3333%}.pure-u-3-8,.pure-u-9-24{width:37.5%}.pure-u-2-5{width:40%}.pure-u-10-24,.pure-u-5-12{width:41.6667%}.pure-u-11-24{width:45.8333%}.pure-u-1-2,.pure-u-12-24{width:50%}.pure-u-13-24{width:54.1667%}.pure-u-14-24,.pure-u-7-12{width:58.3333%}.pure-u-3-5{width:60%}.pure-u-15-24,.pure-u-5-8{width:62.5%}.pure-u-16-24,.pure-u-2-3{width:66.6667%}.pure-u-17-24{width:70.8333%}.pure-u-18-24,.pure-u-3-4{width:75%}.pure-u-19-24{width:79.1667%}.pure-u-4-5{width:80%}.pure-u-20-24,.pure-u-5-6{width:83.3333%}.pure-u-21-24,.pure-u-7-8{width:87.5%}.pure-u-11-12,.pure-u-22-24{width:91.6667%}.pure-u-23-24{width:95.8333%}.pure-u-1,.pure-u-1-1,.pure-u-24-24,.pure-u-5-5{width:100%}.pure-button{display:inline-block;line-height:normal;white-space:nowrap;vertical-align:middle;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-button::-moz-focus-inner{padding:0;border:0}.pure-button-group{letter-spacing:-.31em;text-rendering:optimizespeed}.opera-only :-o-prefocus,.pure-button-group{word-spacing:-.43em}.pure-button-group .pure-button{letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-button{font-family:inherit;font-size:100%;padding:.5em 1em;color:rgba(0,0,0,.8);border:none transparent;background-color:#e6e6e6;text-decoration:none;border-radius:2px}.pure-button-hover,.pure-button:focus,.pure-button:hover{background-image:-webkit-gradient(linear,left top,left bottom,from(transparent),color-stop(40%,rgba(0,0,0,.05)),to(rgba(0,0,0,.1)));background-image:linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.1))}.pure-button:focus{outline:0}.pure-button-active,.pure-button:active{-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.15) inset,0 0 6px rgba(0,0,0,.2) inset;box-shadow:0 0 0 1px rgba(0,0,0,.15) inset,0 0 6px rgba(0,0,0,.2) inset;border-color:#000}.pure-button-disabled,.pure-button-disabled:active,.pure-button-disabled:focus,.pure-button-disabled:hover,.pure-button[disabled]{border:none;background-image:none;opacity:.4;cursor:not-allowed;-webkit-box-shadow:none;box-shadow:none;pointer-events:none}.pure-button-hidden{display:none}.pure-button-primary,.pure-button-selected,a.pure-button-primary,a.pure-button-selected{background-color:#0078e7;color:#fff}.pure-button-group .pure-button{margin:0;border-radius:0;border-right:1px solid rgba(0,0,0,.2)}.pure-button-group .pure-button:first-child{border-top-left-radius:2px;border-bottom-left-radius:2px}.pure-button-group .pure-button:last-child{border-top-right-radius:2px;border-bottom-right-radius:2px;border-right:none}.pure-form input[type=color],.pure-form input[type=date],.pure-form input[type=datetime-local],.pure-form input[type=datetime],.pure-form input[type=email],.pure-form input[type=month],.pure-form input[type=number],.pure-form input[type=password],.pure-form input[type=search],.pure-form input[type=tel],.pure-form input[type=text],.pure-form input[type=time],.pure-form input[type=url],.pure-form input[type=week],.pure-form select,.pure-form textarea{padding:.5em .6em;display:inline-block;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 3px #ddd;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;vertical-align:middle;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-form input:not([type]){padding:.5em .6em;display:inline-block;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 3px #ddd;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-form input[type=color]{padding:.2em .5em}.pure-form input[type=color]:focus,.pure-form input[type=date]:focus,.pure-form input[type=datetime-local]:focus,.pure-form input[type=datetime]:focus,.pure-form input[type=email]:focus,.pure-form input[type=month]:focus,.pure-form input[type=number]:focus,.pure-form input[type=password]:focus,.pure-form input[type=search]:focus,.pure-form input[type=tel]:focus,.pure-form input[type=text]:focus,.pure-form input[type=time]:focus,.pure-form input[type=url]:focus,.pure-form input[type=week]:focus,.pure-form select:focus,.pure-form textarea:focus{outline:0;border-color:#129fea}.pure-form input:not([type]):focus{outline:0;border-color:#129fea}.pure-form input[type=checkbox]:focus,.pure-form input[type=file]:focus,.pure-form input[type=radio]:focus{outline:thin solid #129fea;outline:1px auto #129fea}.pure-form .pure-checkbox,.pure-form .pure-radio{margin:.5em 0;display:block}.pure-form input[type=color][disabled],.pure-form input[type=date][disabled],.pure-form input[type=datetime-local][disabled],.pure-form input[type=datetime][disabled],.pure-form input[type=email][disabled],.pure-form input[type=month][disabled],.pure-form input[type=number][disabled],.pure-form input[type=password][disabled],.pure-form input[type=search][disabled],.pure-form input[type=tel][disabled],.pure-form input[type=text][disabled],.pure-form input[type=time][disabled],.pure-form input[type=url][disabled],.pure-form input[type=week][disabled],.pure-form select[disabled],.pure-form textarea[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}.pure-form input:not([type])[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}.pure-form input[readonly],.pure-form select[readonly],.pure-form textarea[readonly]{background-color:#eee;color:#777;border-color:#ccc}.pure-form input:focus:invalid,.pure-form select:focus:invalid,.pure-form textarea:focus:invalid{color:#b94a48;border-color:#e9322d}.pure-form input[type=checkbox]:focus:invalid:focus,.pure-form input[type=file]:focus:invalid:focus,.pure-form input[type=radio]:focus:invalid:focus{outline-color:#e9322d}.pure-form select{height:2.25em;border:1px solid #ccc;background-color:#fff}.pure-form select[multiple]{height:auto}.pure-form label{margin:.5em 0 .2em}.pure-form fieldset{margin:0;padding:.35em 0 .75em;border:0}.pure-form legend{display:block;width:100%;padding:.3em 0;margin-bottom:.3em;color:#333;border-bottom:1px solid #e5e5e5}.pure-form-stacked input[type=color],.pure-form-stacked input[type=date],.pure-form-stacked input[type=datetime-local],.pure-form-stacked input[type=datetime],.pure-form-stacked input[type=email],.pure-form-stacked input[type=file],.pure-form-stacked input[type=month],.pure-form-stacked input[type=number],.pure-form-stacked input[type=password],.pure-form-stacked input[type=search],.pure-form-stacked input[type=tel],.pure-form-stacked input[type=text],.pure-form-stacked input[type=time],.pure-form-stacked input[type=url],.pure-form-stacked input[type=week],.pure-form-stacked label,.pure-form-stacked select,.pure-form-stacked textarea{display:block;margin:.25em 0}.pure-form-stacked input:not([type]){display:block;margin:.25em 0}.pure-form-aligned input,.pure-form-aligned select,.pure-form-aligned textarea,.pure-form-message-inline{display:inline-block;vertical-align:middle}.pure-form-aligned textarea{vertical-align:top}.pure-form-aligned .pure-control-group{margin-bottom:.5em}.pure-form-aligned .pure-control-group label{text-align:right;display:inline-block;vertical-align:middle;width:10em;margin:0 1em 0 0}.pure-form-aligned .pure-controls{margin:1.5em 0 0 11em}.pure-form .pure-input-rounded,.pure-form input.pure-input-rounded{border-radius:2em;padding:.5em 1em}.pure-form .pure-group fieldset{margin-bottom:10px}.pure-form .pure-group input,.pure-form .pure-group textarea{display:block;padding:10px;margin:0 0 -1px;border-radius:0;position:relative;top:-1px}.pure-form .pure-group input:focus,.pure-form .pure-group textarea:focus{z-index:3}.pure-form .pure-group input:first-child,.pure-form .pure-group textarea:first-child{top:1px;border-radius:4px 4px 0 0;margin:0}.pure-form .pure-group input:first-child:last-child,.pure-form .pure-group textarea:first-child:last-child{top:1px;border-radius:4px;margin:0}.pure-form .pure-group input:last-child,.pure-form .pure-group textarea:last-child{top:-2px;border-radius:0 0 4px 4px;margin:0}.pure-form .pure-group button{margin:.35em 0}.pure-form .pure-input-1{width:100%}.pure-form .pure-input-3-4{width:75%}.pure-form .pure-input-2-3{width:66%}.pure-form .pure-input-1-2{width:50%}.pure-form .pure-input-1-3{width:33%}.pure-form .pure-input-1-4{width:25%}.pure-form-message-inline{display:inline-block;padding-left:.3em;color:#666;vertical-align:middle;font-size:.875em}.pure-form-message{display:block;color:#666;font-size:.875em}@media only screen and (max-width :480px){.pure-form button[type=submit]{margin:.7em 0 0}.pure-form input:not([type]),.pure-form input[type=color],.pure-form input[type=date],.pure-form input[type=datetime-local],.pure-form input[type=datetime],.pure-form input[type=email],.pure-form input[type=month],.pure-form input[type=number],.pure-form input[type=password],.pure-form input[type=search],.pure-form input[type=tel],.pure-form input[type=text],.pure-form input[type=time],.pure-form input[type=url],.pure-form input[type=week],.pure-form label{margin-bottom:.3em;display:block}.pure-group input:not([type]),.pure-group input[type=color],.pure-group input[type=date],.pure-group input[type=datetime-local],.pure-group input[type=datetime],.pure-group input[type=email],.pure-group input[type=month],.pure-group input[type=number],.pure-group input[type=password],.pure-group input[type=search],.pure-group input[type=tel],.pure-group input[type=text],.pure-group input[type=time],.pure-group input[type=url],.pure-group input[type=week]{margin-bottom:0}.pure-form-aligned .pure-control-group label{margin-bottom:.3em;text-align:left;display:block;width:100%}.pure-form-aligned .pure-controls{margin:1.5em 0 0 0}.pure-form-message,.pure-form-message-inline{display:block;font-size:.75em;padding:.2em 0 .8em}}.pure-menu{-webkit-box-sizing:border-box;box-sizing:border-box}.pure-menu-fixed{position:fixed;left:0;top:0;z-index:3}.pure-menu-item,.pure-menu-list{position:relative}.pure-menu-list{list-style:none;margin:0;padding:0}.pure-menu-item{padding:0;margin:0;height:100%}.pure-menu-heading,.pure-menu-link{display:block;text-decoration:none;white-space:nowrap}.pure-menu-horizontal{width:100%;white-space:nowrap}.pure-menu-horizontal .pure-menu-list{display:inline-block}.pure-menu-horizontal .pure-menu-heading,.pure-menu-horizontal .pure-menu-item,.pure-menu-horizontal .pure-menu-separator{display:inline-block;vertical-align:middle}.pure-menu-item .pure-menu-item{display:block}.pure-menu-children{display:none;position:absolute;left:100%;top:0;margin:0;padding:0;z-index:3}.pure-menu-horizontal .pure-menu-children{left:0;top:auto;width:inherit}.pure-menu-active>.pure-menu-children,.pure-menu-allow-hover:hover>.pure-menu-children{display:block;position:absolute}.pure-menu-has-children>.pure-menu-link:after{padding-left:.5em;content:"\25B8";font-size:small}.pure-menu-horizontal .pure-menu-has-children>.pure-menu-link:after{content:"\25BE"}.pure-menu-scrollable{overflow-y:scroll;overflow-x:hidden}.pure-menu-scrollable .pure-menu-list{display:block}.pure-menu-horizontal.pure-menu-scrollable .pure-menu-list{display:inline-block}.pure-menu-horizontal.pure-menu-scrollable{white-space:nowrap;overflow-y:hidden;overflow-x:auto;padding:.5em 0}.pure-menu-horizontal .pure-menu-children .pure-menu-separator,.pure-menu-separator{background-color:#ccc;height:1px;margin:.3em 0}.pure-menu-horizontal .pure-menu-separator{width:1px;height:1.3em;margin:0 .3em}.pure-menu-horizontal .pure-menu-children .pure-menu-separator{display:block;width:auto}.pure-menu-heading{text-transform:uppercase;color:#565d64}.pure-menu-link{color:#777}.pure-menu-children{background-color:#fff}.pure-menu-disabled,.pure-menu-heading,.pure-menu-link{padding:.5em 1em}.pure-menu-disabled{opacity:.5}.pure-menu-disabled .pure-menu-link:hover{background-color:transparent}.pure-menu-active>.pure-menu-link,.pure-menu-link:focus,.pure-menu-link:hover{background-color:#eee}.pure-menu-selected>.pure-menu-link,.pure-menu-selected>.pure-menu-link:visited{color:#000}.pure-table{border-collapse:collapse;border-spacing:0;empty-cells:show;border:1px solid #cbcbcb}.pure-table caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.pure-table td,.pure-table th{border-left:1px solid #cbcbcb;border-width:0 0 0 1px;font-size:inherit;margin:0;overflow:visible;padding:.5em 1em}.pure-table thead{background-color:#e0e0e0;color:#000;text-align:left;vertical-align:bottom}.pure-table td{background-color:transparent}.pure-table-odd td{background-color:#f2f2f2}.pure-table-striped tr:nth-child(2n-1) td{background-color:#f2f2f2}.pure-table-bordered td{border-bottom:1px solid #cbcbcb}.pure-table-bordered tbody>tr:last-child>td{border-bottom-width:0}.pure-table-horizontal td,.pure-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #cbcbcb}.pure-table-horizontal tbody>tr:last-child>td{border-bottom-width:0}
\ No newline at end of file
diff --git a/luci-theme-argone/htdocs/luci-static/argone/favicon.ico b/luci-theme-argone/htdocs/luci-static/argone/favicon.ico
index 46113368..79c8f860 100644
Binary files a/luci-theme-argone/htdocs/luci-static/argone/favicon.ico and b/luci-theme-argone/htdocs/luci-static/argone/favicon.ico differ
diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/android-icon-192x192.png b/luci-theme-argone/htdocs/luci-static/argone/icon/android-icon-192x192.png
index 7c17009d..7bfe4e5f 100644
Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/android-icon-192x192.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/android-icon-192x192.png differ
diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-144x144.png b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-144x144.png
index 5308d66b..8d523df8 100644
Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-144x144.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-144x144.png differ
diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-60x60.png b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-60x60.png
index f18dfa49..4c80656d 100644
Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-60x60.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-60x60.png differ
diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-72x72.png b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-72x72.png
index bb3e2423..07753022 100644
Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-72x72.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-72x72.png differ
diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-16x16.png b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-16x16.png
index 308843a0..88bf3297 100644
Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-16x16.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-16x16.png differ
diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-32x32.png b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-32x32.png
index bfcd0970..d524df3e 100644
Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-32x32.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-32x32.png differ
diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-96x96.png b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-96x96.png
index d0fe1ed0..6c8e8874 100644
Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-96x96.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-96x96.png differ
diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/ms-icon-144x144.png b/luci-theme-argone/htdocs/luci-static/argone/icon/ms-icon-144x144.png
index 5308d66b..8d523df8 100644
Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/ms-icon-144x144.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/ms-icon-144x144.png differ
diff --git a/luci-theme-argone/htdocs/luci-static/argone/img/argone.svg b/luci-theme-argone/htdocs/luci-static/argone/img/argone.svg
index 654e2fe2..0c8aea07 100644
--- a/luci-theme-argone/htdocs/luci-static/argone/img/argone.svg
+++ b/luci-theme-argone/htdocs/luci-static/argone/img/argone.svg
@@ -1,61 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 256 256" style="enable-background:new 0 0 256 256;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
-	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
-	.st2{fill:#FFFFFF;}
-</style>
-<g>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.1379" y1="10.6499" x2="245.5302" y2="245.0422">
-		<stop  offset="0" style="stop-color:#5E72E4"/>
-		<stop  offset="1" style="stop-color:#778AFF"/>
-	</linearGradient>
-	<path class="st0" d="M36.4,0.2h183.8c19.7,0,35.7,16,35.7,35.7v183.8c0,19.7-16,35.7-35.7,35.7H36.4c-19.7,0-35.7-16-35.7-35.7
-		V35.9C0.7,16.2,16.7,0.2,36.4,0.2z"/>
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="0.6679" y1="0.18" x2="0.6679" y2="0.18">
-		<stop  offset="0" style="stop-color:#5E72E4"/>
-		<stop  offset="1" style="stop-color:#778AFF"/>
-	</linearGradient>
-	<path class="st1" d="M0.7,0.2"/>
-</g>
-<path class="st2" d="M128.3,32.6c-43.9,0-79.4,35.6-79.4,79.4c0,35.3,23.1,65.2,55,75.6l9.9-40.1c-14-5.7-23.8-19.4-23.8-35.5
-	c0-21.2,17.2-38.3,38.3-38.3c21.2,0,38.3,17.2,38.3,38.3c0,16-9.8,29.7-23.8,35.5l9.9,40.1c31.9-10.3,55-40.2,55-75.6
-	C207.8,68.2,172.2,32.6,128.3,32.6z"/>
-<g>
-	<path class="st2" d="M48.5,234.8c-2.3,0-4.3-0.3-6.1-0.9c-1.7-0.6-3.3-1.6-4.7-3c-1.4-1.4-2.5-2.8-3.3-4.2
-		c-0.8-1.4-1.3-2.9-1.6-4.4c-0.3-1.5-0.4-3.2-0.4-4.9c0-2.3,0.3-4.3,0.8-5.9c0.5-1.7,1.1-3.1,1.8-4.3c0.7-1.2,1.8-2.4,3.1-3.6
-		c1.3-1.2,2.8-2.1,4.4-2.8c1.6-0.7,3.5-1.1,5.7-1.1c2,0,3.8,0.3,5.6,0.9c1.7,0.6,3.3,1.5,4.7,2.7c1.4,1.2,2.6,2.6,3.5,4.4
-		c1,1.7,1.6,3.4,1.9,5c0.3,1.6,0.4,3.2,0.4,4.8c-0.1,2.5-0.4,4.7-1,6.6c-0.6,1.9-1.3,3.5-2.2,4.7c-0.9,1.2-1.9,2.3-3.2,3.2
-		c-1.2,0.9-2.7,1.7-4.3,2.2C52.3,234.5,50.5,234.8,48.5,234.8z M48,227.6c1.1,0.1,2.3-0.1,3.4-0.4c1.1-0.4,2.2-1.1,3.2-2.1
-		c1-1,1.6-2.3,1.9-3.8c0.3-1.5,0.5-2.9,0.4-4.3c0-1.9-0.3-3.4-0.7-4.6c-0.4-1.2-1-2.2-1.6-3c-0.6-0.8-1.4-1.5-2.3-2
-		c-0.9-0.5-1.9-0.8-3.1-0.9c-1.1-0.1-2.2,0.1-3.2,0.4c-1,0.4-1.9,0.9-2.7,1.5c-0.8,0.6-1.5,1.5-2.2,2.5c-0.6,1-1,2.1-1.1,3.2
-		c-0.1,1.1-0.2,2.1-0.2,3c0,1.2,0.1,2.4,0.4,3.6c0.2,1.2,0.7,2.3,1.3,3.4c0.6,1,1.5,1.8,2.7,2.4C45.4,227.2,46.6,227.5,48,227.6z"/>
-	<path class="st2" d="M77,243.9h-7.2v-32.8H77l0,2c0.3-0.3,0.7-0.6,1.1-0.9c0.4-0.3,0.9-0.5,1.6-0.7c0.7-0.2,1.3-0.3,2-0.3
-		c1.4,0,2.7,0.4,4,1.1c1.3,0.8,2.3,1.8,3.2,3c0.8,1.3,1.4,2.6,1.8,4.1c0.3,1.5,0.5,2.8,0.5,4.1c0,1.3-0.2,2.7-0.7,4.1
-		c-0.5,1.7-1.4,3.1-2.5,4.3c-1.1,1.2-2.3,1.9-3.5,2.2c-1.2,0.3-2.3,0.4-3.1,0.4c-1.6,0-2.7-0.3-3.3-0.8l-1-0.7V243.9z M77,225.8
-		l0,1.7c0.2,0.5,0.5,1,0.9,1.3c0.3,0.4,1.1,0.6,2.1,0.6c1.1,0,1.9-0.3,2.5-0.9c0.5-0.5,0.8-1.3,1-2.3c0.2-1.1,0.3-2.2,0.3-3.5
-		c0-1.3-0.1-2.4-0.4-3.3c-0.3-0.8-0.7-1.5-1.2-2.1c-0.6-0.6-1.3-0.9-2.1-0.8c-0.5,0-1.1,0.2-1.7,0.6c-0.6,0.4-1,0.9-1.2,1.6
-		l-0.2,0.6V225.8z"/>
-	<path class="st2" d="M103.3,224.3c0,0.2,0,0.4,0,0.6c0,0.2,0.1,0.7,0.1,1.4c0.1,0.7,0.3,1.5,0.7,2.3c0.4,0.8,0.8,1.3,1.2,1.6
-		c0.5,0.3,0.9,0.3,1.5,0.3c0.4-0.1,0.9-0.2,1.3-0.5c0.4-0.3,0.7-0.7,0.9-1.1c0.2-0.4,0.4-0.8,0.5-1.2l0.2-1h7.4
-		c-0.1,0.5-0.2,1.1-0.3,1.7c-0.1,0.7-0.5,1.4-1,2.3c-0.5,0.8-1.1,1.6-1.9,2.2c-0.7,0.6-1.7,1.1-3,1.5c-1.3,0.4-2.7,0.6-4.3,0.5
-		c-1.6-0.1-3.2-0.4-4.6-0.9c-1.5-0.6-2.6-1.3-3.5-2.3c-0.9-1-1.5-2.2-1.9-3.5c-0.4-1.3-0.6-2.9-0.6-4.6c0-1,0.1-1.9,0.3-2.9
-		c0.2-1,0.5-2,0.9-2.9c0.4-0.9,1-1.9,1.7-2.8c0.7-0.9,1.9-1.8,3.4-2.6c1.5-0.8,3.2-1.2,4.9-1.1c0.7,0,1.7,0.2,2.8,0.5
-		c1.2,0.3,2.3,1,3.5,2c1.2,1,2.1,2.3,2.6,3.8c0.6,1.5,0.9,2.8,0.9,4l0.1,3H103.3z M110,220.2c0-0.6-0.1-1.1-0.2-1.6
-		c-0.1-0.5-0.2-1-0.5-1.6s-0.6-0.9-0.9-1.2c-0.3-0.2-0.8-0.4-1.3-0.4c-0.6,0-1.1,0.1-1.6,0.4c-0.5,0.3-0.9,0.8-1.3,1.6
-		c-0.4,0.7-0.6,1.3-0.6,1.8l-0.1,0.9H110z"/>
-	<path class="st2" d="M142.4,234.4h-7.2v-13.1c0-1-0.1-1.8-0.2-2.4c-0.1-0.6-0.4-1.1-0.9-1.6c-0.5-0.4-1.2-0.6-2.1-0.6
-		c-0.6,0.1-1.1,0.3-1.6,0.6c-0.5,0.3-0.8,0.8-1,1.3c-0.2,0.5-0.3,1.3-0.3,2.3v13.3h-7.2v-23.3h7.2v1.3c0.3-0.1,0.6-0.3,1.1-0.5
-		c0.4-0.2,1-0.4,1.6-0.6c0.6-0.2,1.5-0.2,2.5-0.2c1,0.1,1.9,0.2,2.7,0.5c0.8,0.3,1.5,0.7,2.3,1.3c0.7,0.6,1.4,1.3,1.8,2.1
-		c0.5,0.8,0.8,1.7,1,2.5c0.2,0.8,0.3,1.9,0.3,3.1V234.4z"/>
-	<path class="st2" d="M163.5,221.2l-3.7,13.3h-5.6l-6.7-23.3h7.1l2.5,11.1l3.4-11.1h6.1l3.2,11l2.3-11h7.1l-6.3,23.3h-5.6
-		L163.5,221.2z"/>
-	<path class="st2" d="M184.4,211.1h6.7v4.3c0.3-0.5,0.8-1,1.2-1.5c0.5-0.5,1.3-1.1,2.4-1.7c1.2-0.6,2.1-0.9,2.9-0.9l3.8-0.3v6.2
-		c-0.7-0.1-1.4-0.1-2-0.2c-0.6,0-1.5,0-2.5,0.1c-1.1,0.1-2.1,0.5-3.1,1c-1,0.5-1.6,1-1.9,1.6l-0.8,1.3v13.4h-6.7V211.1z"/>
-	<path class="st2" d="M218.3,211.1h5.2v4.6h-5.2v10.9c0,0.8,0.1,1.4,0.3,1.8c0.2,0.4,0.5,0.6,0.8,0.8c0.4,0.1,1,0.2,1.9,0.2h2.3
-		l-0.1,5h-5.1c-0.7,0-1.4,0-2.1-0.1c-0.7-0.1-1.4-0.3-2.1-0.7c-0.7-0.4-1.3-0.9-1.8-1.4c-0.5-0.6-0.8-1.2-1-2
-		c-0.2-0.7-0.3-1.7-0.3-2.8v-11.6h-4.8v-4.6h4.8v-7.6h7.2V211.1z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 256 256"
+	 style="enable-background:new 0 0 256 256;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#svg_2_00000009581766544743910510000007087157279682564742_);}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#svg_3_00000013155245276689480680000010334395393893521599_);}
+	.st2{fill:#FFFFFF;}
+</style>
+<g>
+	<g id="svg_1">
+		
+			<linearGradient id="svg_2_00000043442590260727270070000016472210641679865270_" gradientUnits="userSpaceOnUse" x1="11.1563" y1="247.3437" x2="245.4437" y2="13.0563" gradientTransform="matrix(1 0 0 -1 0 258)">
+			<stop  offset="0" style="stop-color:#5E72E4"/>
+			<stop  offset="1" style="stop-color:#778AFF"/>
+		</linearGradient>
+		
+			<path id="svg_2" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#svg_2_00000043442590260727270070000016472210641679865270_);" d="
+			M36.4,0.2h183.8c19.7,0,35.7,16,35.7,35.7v183.8c0,19.7-16,35.7-35.7,35.7H36.4c-19.7,0-35.7-16-35.7-35.7V35.9
+			C0.7,16.2,16.7,0.2,36.4,0.2z"/>
+		
+			<linearGradient id="svg_3_00000010280352489557108120000000938545297310085033_" gradientUnits="userSpaceOnUse" x1="0.7" y1="257.8" x2="0.7" y2="257.8" gradientTransform="matrix(1 0 0 -1 0 258)">
+			<stop  offset="0" style="stop-color:#5E72E4"/>
+			<stop  offset="1" style="stop-color:#778AFF"/>
+		</linearGradient>
+		
+			<path id="svg_3" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#svg_3_00000010280352489557108120000000938545297310085033_);" d="
+			M0.7,0.2"/>
+	</g>
+	<path id="svg_4" class="st2" d="M128.3,45.4c-46.7,0-84.4,37.8-84.4,84.4c0,32.2,18.1,60.2,44.6,74.4c6.8,3.7,15.3-0.2,17.2-7.7
+		l4.3-17.6c1.5-6.2-1-12.6-6.1-16.4c-10-7.4-16.4-19.3-16.4-32.7c0-22.5,18.3-40.7,40.7-40.7c22.5,0,40.7,18.3,40.7,40.7
+		c0,13.4-6.4,25.2-16.4,32.7c-5.1,3.8-7.6,10.2-6.1,16.5l4.4,17.6c1.9,7.5,10.3,11.4,17.2,7.7c26.6-14.2,44.6-42.2,44.6-74.5
+		C212.8,83.3,174.9,45.4,128.3,45.4L128.3,45.4z"/>
+</g>
+<circle class="st2" cx="128.3" cy="131.6" r="18.3"/>
+</svg>
diff --git a/luci-theme-argone/htdocs/luci-static/argone/js/color_calc-argone.js b/luci-theme-argone/htdocs/luci-static/argone/js/color_calc-argone.js
new file mode 100644
index 00000000..bf7d7948
--- /dev/null
+++ b/luci-theme-argone/htdocs/luci-static/argone/js/color_calc-argone.js
@@ -0,0 +1,72 @@
+/*
+ *  The background color of the [Light Mode] subtabs follow the custom primary color and reduce its transparency
+ *  Author: SpeedPartner
+ */
+
+/*
+ *  Get hex for the [Light mode] Primary Color ,then reduce it to 25% transparency and convert it to RGBA value
+ */
+	const hexColor_primary_light = getComputedStyle(document.documentElement).getPropertyValue('--primary').replace(/\s/, "");
+	const hexToRgba_primary_light = (hex) => {
+  		const r = parseInt(hex.substring(1, 3), 16);
+  		const g = parseInt(hex.substring(3, 5), 16);
+  		const b = parseInt(hex.substring(5, 7), 16);
+  		const a = 0.15
+  		return [r, g, b].map(x => x.toFixed()).concat(a);
+	};
+	const rgbaColor_primary_light = hexToRgba_primary_light(hexColor_primary_light);
+	console.log(rgbaColor_primary_light);
+
+/*
+ *  Constitute a css color variable named light-subtabs-background
+ */
+	document.documentElement.style.setProperty('--light-subtabs-background', `rgba(`+rgbaColor_primary_light+`)`);
+
+
+/*
+ *  Improved link font color that follows custom [Dark mode] Primary Color
+ *  Author: SpeedPartner
+ */
+
+/*
+ *  Get hex for the [Dark mode] Primary Color ,then reduce it to 70% transparency and convert it to RGB value
+ */
+	const hexColor_primary = getComputedStyle(document.documentElement).getPropertyValue('--dark-primary').replace(/\s/, "");
+	const hexToRgb_primary = (hex) => {
+  		const r = parseInt(hex.substring(1, 3), 16);
+  		const g = parseInt(hex.substring(3, 5), 16);
+  		const b = parseInt(hex.substring(5, 7), 16);
+  		const a = 0.7
+  		return [r*a, g*a, b*a].map(x => x.toFixed(2));
+	};
+	const rgbColor_primary = hexToRgb_primary(hexColor_primary);
+	//console.log(rgbColor_primary);
+
+/*
+ *  Constitute overlay color #cccccc, then reduce it to 30% transparency and convert it to RGB value
+ */
+	const hexColor_overlay = "#cccccc";
+	const hexToRgb_overlay = (hex) => {
+  		const r = parseInt(hex.substring(1, 3), 16);
+  		const g = parseInt(hex.substring(3, 5), 16);
+  		const b = parseInt(hex.substring(5, 7), 16);
+  		const a = 0.3
+  		return [r*a, g*a, b*a].map(x => x.toFixed(2));
+	};
+	const rgbColor_overlay = hexToRgb_overlay(hexColor_overlay);
+	//console.log(rgbColor_overlay);
+
+/*
+ *  Overlay the RGB value of two colors
+ */
+	const New_Color = [
+  		Math.round(Number(rgbColor_primary[0]) + Number(rgbColor_overlay[0])),
+  		Math.round(Number(rgbColor_primary[1]) + Number(rgbColor_overlay[1])),
+  		Math.round(Number(rgbColor_primary[2]) + Number(rgbColor_overlay[2]))
+	];
+	//console.log(New_Color);
+
+/*
+ *  Constitute a css color variable named dark_webkit-any-link
+ */
+	document.documentElement.style.setProperty('--dark_webkit-any-link', `rgb(`+New_Color+`)`);
diff --git a/luci-theme-argone/htdocs/luci-static/argone/js/menu-argone.js b/luci-theme-argone/htdocs/luci-static/argone/js/menu-argone.js
index 7547c39d..887fb082 100644
--- a/luci-theme-argone/htdocs/luci-static/argone/js/menu-argone.js
+++ b/luci-theme-argone/htdocs/luci-static/argone/js/menu-argone.js
@@ -1,7 +1,8 @@
 /**
- *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template
+ *  Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template
  *
  *  luci-theme-argone
+ *      Copyright 2023 Jerrykuku
  *
  *  Have a bug? Please create an issue here on GitHub!
  *      https://github.com/kenzok78/luci-theme-argone/issues
@@ -17,7 +18,7 @@
  *  luci-theme-material:
  *      https://github.com/LuttyYang/luci-theme-material/
  *
- *  Argone Theme
+ *  Argon Theme
  *	    https://demos.creative-tim.com/argon-dashboard/index.html
  *
  *  Login background
diff --git a/luci-theme-argone/htdocs/luci-static/argone/js/sidebar-argone.js b/luci-theme-argone/htdocs/luci-static/argone/js/sidebar-argone.js
index b8d94afb..7842e39a 100644
--- a/luci-theme-argone/htdocs/luci-static/argone/js/sidebar-argone.js
+++ b/luci-theme-argone/htdocs/luci-static/argone/js/sidebar-argone.js
@@ -1,63 +1,64 @@
-/**
- *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template
- *
- *  luci-theme-argone
- *
- *  Have a bug? Please create an issue here on GitHub!
- *      https://github.com/kenzok78/luci-theme-argone/issues
- *
- *  luci-theme-bootstrap:
- *      Copyright 2008 Steven Barth <steven@midlink.org>
- *      Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
- *      Copyright 2012 David Menting <david@nut-bolt.nl>
- *
- *  MUI:
- *      https://github.com/muicss/mui
- *
- *  luci-theme-material:
- *      https://github.com/LuttyYang/luci-theme-material/
- *
- *  Argone Theme
- *	    https://demos.creative-tim.com/argon-dashboard/index.html
- *
- *  Login background
- *      https://unsplash.com/
- *
- *  Licensed to the public under the Apache License 2.0
- */
-
-    /**
-     * Sidebar expand
-     */
-    var showSide = false;
-    $(".showSide").click(function () {
-        if (showSide) {
-            $(".darkMask").stop(true).fadeOut("fast");
-            $(".main-left").width(0);
-            $(".main-right").css("overflow-y", "auto");
-            showSide = false;
-        } else {
-            $(".darkMask").stop(true).fadeIn("fast");
-            $(".main-left").width("15rem");
-            $(".main-right").css("overflow-y", "hidden");
-            showSide = true;
-        }
-    });
-
-    $(".darkMask").click(function () {
-        if (showSide) {
-            showSide = false;
-            $(".darkMask").stop(true).fadeOut("fast");
-            $(".main-left").width(0);
-            $(".main-right").css("overflow-y", "auto");
-        }
-    });
-
-    $(window).resize(function () {
-        if ($(window).width() > 921) {
-            $(".main-left").css("width", "");
-            $(".darkMask").stop(true);
-            $(".darkMask").css("display", "none");
-            showSide = false;
-        }
-    });
+/**
+ *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template
+ *
+ *  luci-theme-argone
+ *      Copyright 2023 Jerrykuku
+ *
+ *  Have a bug? Please create an issue here on GitHub!
+ *      https://github.com/jerrykuku/luci-theme-argone/issues
+ *
+ *  luci-theme-bootstrap:
+ *      Copyright 2008 Steven Barth <steven@midlink.org>
+ *      Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
+ *      Copyright 2012 David Menting <david@nut-bolt.nl>
+ *
+ *  MUI:
+ *      https://github.com/muicss/mui
+ *
+ *  luci-theme-material:
+ *      https://github.com/LuttyYang/luci-theme-material/
+ *
+ *  Argone Theme
+ *	    https://demos.creative-tim.com/argon-dashboard/index.html
+ *
+ *  Login background
+ *      https://unsplash.com/
+ *
+ *  Licensed to the public under the Apache License 2.0
+ */
+
+    /**
+     * Sidebar expand
+     */
+    var showSide = false;
+    $(".showSide").click(function () {
+        if (showSide) {
+            $(".darkMask").stop(true).fadeOut("fast");
+            $(".main-left").width(0);
+            $(".main-right").css("overflow-y", "auto");
+            showSide = false;
+        } else {
+            $(".darkMask").stop(true).fadeIn("fast");
+            $(".main-left").width("15rem");
+            $(".main-right").css("overflow-y", "hidden");
+            showSide = true;
+        }
+    });
+
+    $(".darkMask").click(function () {
+        if (showSide) {
+            showSide = false;
+            $(".darkMask").stop(true).fadeOut("fast");
+            $(".main-left").width(0);
+            $(".main-right").css("overflow-y", "auto");
+        }
+    });
+
+    $(window).resize(function () {
+        if ($(window).width() > 921) {
+            $(".main-left").css("width", "");
+            $(".darkMask").stop(true);
+            $(".darkMask").css("display", "none");
+            showSide = false;
+        }
+    });
diff --git a/luci-theme-argone/htdocs/luci-static/argone/js/styles-argone.js b/luci-theme-argone/htdocs/luci-static/argone/js/styles-argone.js
index 459105d6..b2689e09 100644
--- a/luci-theme-argone/htdocs/luci-static/argone/js/styles-argone.js
+++ b/luci-theme-argone/htdocs/luci-static/argone/js/styles-argone.js
@@ -2,6 +2,7 @@
  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template
  *
  *  luci-theme-argone
+ *      Copyright 2023 Jerrykuku
  *
  *  Have a bug? Please create an issue here on GitHub!
  *      https://github.com/kenzok78/luci-theme-argone/issues
diff --git a/luci-theme-argone/htdocs/luci-static/argone/less/cascade.less b/luci-theme-argone/htdocs/luci-static/argone/less/cascade.less
index 5e15911f..513e23cd 100644
--- a/luci-theme-argone/htdocs/luci-static/argone/less/cascade.less
+++ b/luci-theme-argone/htdocs/luci-static/argone/less/cascade.less
@@ -1,8 +1,8 @@
-//  compress: false
 /**
  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template
  *
  *  luci-theme-argone
+ *      Copyright 2020 Jerryk
  *
  *  Have a bug? Please create an issue here on GitHub!
  *      https://github.com/kenzok78/luci-theme-argone/issues
@@ -57,7 +57,7 @@
     --warning: #fb6340;
     --footer-color: #aaa;
     --menubar-background: #fff;
-    --menubar-scrollbar-thumb: #f6f9fc;
+    --menubar-scrollbar-thumb: #eee;
     --menubar-text-color: #4c4c4c;
     --blue: #5e72e4;
     --indigo: #5603ad;
@@ -178,14 +178,42 @@ body {
     color: var(--white);
 }
 
+::-webkit-scrollbar {
+    width: 10px;
+    height: 10px;
+}
+
+::-webkit-scrollbar,
+::-webkit-scrollbar-corner {
+    background: transparent;
+}
+
+::-webkit-scrollbar-thumb {
+    background: #9e9e9e;
+}
+
+::-webkit-scrollbar-thumb:hover {
+    background: #757575;
+}
+
+::-webkit-scrollbar-thumb:active {
+    background: #424242;
+}
+
 a:link,
 a:visited,
 a:active {
-    color: #5e72e4;
     color: var(--primary);
     text-decoration: none;
 }
 
+a:-webkit-any-link:not(li a, .main-left a, .brand, .pull-right a, .alert-message a, .login-container footer a, .cbi-button) {
+    color: -webkit-link;
+    cursor: pointer;
+    color: var(--primary);
+    text-shadow: 1px 1px 2px #ccc;
+}
+
 a:hover {
     text-decoration: underline;
 }
@@ -256,7 +284,8 @@ li {
 
         video {
             width: 100%;
-            height: auto;
+            height: 100%;
+            object-fit: cover;
         }
     }
 
@@ -318,26 +347,19 @@ li {
             max-width: 420px;
             background-color: #fff;
             background-color: var(--white);
+            overflow:hidden;
 
             .brand {
                 display: flex;
                 -webkit-box-align: center;
                 align-items: center;
-                margin: 50px auto 100px 50px;
+                margin: 50px auto 15px auto;
                 color: #525461;
                 color: var(--default);
 
                 .icon {
                     width: 50px;
                     height: auto;
-                    margin-right: 25px;
-                }
-
-                .brand-text {
-                    font-size: 1.25rem;
-                    font-weight: 700;
-                    font-family: "TypoGraphica";
-
                 }
 
                 &:hover {
@@ -345,8 +367,25 @@ li {
                 }
             }
 
+            .brand-text {
+                font-size: 1.8rem;
+                font-weight: 700;
+                letter-spacing: 1px;
+                margin-bottom: 85px;
+                font-family: "TypoGraphica";
+                width: 420px;
+                padding: 0 0.5rem 0.1rem 0.5rem;
+                text-align: center;
+                word-break: break-word;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                display: -webkit-box;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
+            }
+
             .form-login {
-                width: 100%;
+                width: 420px;
                 padding: 20px 50px;
                 box-sizing: border-box;
 
@@ -361,7 +400,7 @@ li {
                     position: relative;
 
                     &::before {
-                        font-family: 'argone' !important;
+                        font-family: 'argon' !important;
                         font-style: normal;
                         font-weight: normal;
                         font-variant: normal;
@@ -486,6 +525,14 @@ li {
                 display: block;
             }
         }
+
+        footer {
+            color: var(--default);
+
+            a {
+                color: var(--default);
+            }
+        }
     }
 }
 
@@ -582,13 +629,9 @@ footer {
 
     text-align: right;
     padding: 1rem;
-    color: #aaa;
-    color: var(--footer-color);
     font-size: 0.8rem;
 
     a {
-        color: #aaa;
-        color: var(--footer-color);
         text-decoration: none;
     }
 }
@@ -635,6 +678,7 @@ footer {
         position: fixed;
         z-index: 100;
         transition: width 0.2s ease-in-out;
+        overflow-y: scroll;
 
         &::-webkit-scrollbar {
             width: 5px;
@@ -648,8 +692,7 @@ footer {
         }
 
         &::-webkit-scrollbar-track {
-            background-color: #fff;
-            background-color: var(--menubar-background);
+            background-color: transparent;
         }
 
         .sidenav-header {
@@ -744,7 +787,7 @@ footer {
                         position: relative;
 
                         &::before {
-                            font-family: 'argone' !important;
+                            font-family: 'argon' !important;
                             font-style: normal;
                             font-weight: normal;
                             font-variant: normal;
@@ -764,7 +807,7 @@ footer {
                             position: absolute;
                             right: 0.5rem;
                             top: 0.8rem;
-                            font-family: 'argone' !important;
+                            font-family: 'argon' !important;
                             font-style: normal;
                             font-weight: normal;
                             font-variant: normal;
@@ -788,6 +831,7 @@ footer {
                             color: #fff;
                             background: #5e72e4;
                             background: var(--primary);
+                            box-shadow: 0 0 1px #ccc;
 
                             a {
                                 color: #000;
@@ -902,6 +946,7 @@ footer {
                                     background-color: #5e72e4;
                                     background-color: var(--primary);
                                     transition: all 0.2s;
+                                    box-shadow: 0 0 1px #ccc;
                                 }
 
                                 &:hover::after {
@@ -1110,10 +1155,6 @@ form.inline+form.inline,
     border-color: var(--primary) !important;
 }
 
-.cbi-button-add {
-    margin-left: 1.5rem;
-}
-
 .node-services-vssr .ssr-button {
     margin-left: 0.3rem;
 
@@ -1192,23 +1233,25 @@ select {
     text-align: center;
 }
 
-
-
 /*textarea*/
-
-.cbi-input-textarea {
-    width: 100%;
-    min-height: 14rem;
-    padding: 0.8rem;
-    font-size: 0.8rem;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+textarea {
+    border: 1px solid #dee2e6 !important;
+    outline: none;
+    min-height: 14rem !important;
+    padding: 0.8rem !important;
+    background-color: #fff;
+    font-family: var(--font-family-monospace) !important;
+    font-size: inherit;
     color: black;
+    border-radius: 0.375rem !important;
+    vertical-align: middle;
 }
 
-
+.cbi-value .cbi-value-field textarea {
+    margin: 0.25rem;
+}
 
 /* change */
-
 .uci-change-list {
     font-family: monospace;
 }
@@ -1306,8 +1349,6 @@ input[type="checkbox"] {
 }
 
 input[type="checkbox"]:checked {
-    border: 1px solid #5e72e4;
-    border: 1px solid var(--primary);
     background-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 8 8\'%3e%3cpath fill=\'%23fff\' d=\'M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z\'/%3e%3c/svg%3e') !important;
     background-color: #5e72e4;
     background-color: var(--primary);
@@ -1336,8 +1377,6 @@ ul li .cbi-input-checkbox {
 }
 
 .cbi-input-radio:checked {
-    border: 1px solid #5e72e4;
-    border: 1px solid var(--primary);
     background-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'-4 -4 8 8\'%3e%3ccircle r=\'3\' fill=\'%23fff\'/%3e%3c/svg%3e') !important;
     background-color: #5e72e4;
     background-color: var(--primary);
@@ -1468,7 +1507,8 @@ div.cbi-value var,
 td.cbi-value-field var,
 .td.cbi-value-field var {
     font-style: italic;
-    color: #0069D6;
+    color: var(--primary);
+    text-shadow: 1px 1px 2px #ccc;
 }
 
 small {
@@ -1649,7 +1689,16 @@ input[name="nslookup"] {
     background-color: var(--primary) !important;
     background-image: url(../img/trafficbar.png);
     background-position: left top;
-    animation: sparkle 1500ms linear infinite;
+    animation: sparkle 1000ms linear infinite;
+}
+
+#swaptotal>div>div>div>small,
+#swapfree>div>div>div>small,
+#memfree>div>div>div>small,
+#membuff>div>div>div>small,
+#conns>div>div>div>small,
+#memtotal>div>div>div>small {
+    text-shadow: 1px 1px 2px #ccc;
 }
 
 /* fix multiple table */
@@ -1960,11 +2009,6 @@ th h6, td h6 {
     background: var(--lighter);
 }
 
-/* OCD: Change the background color of the "now in use" node in PassWall  */
-.cbi-section-table>tbody>._now_use {
-    background: #5e72e473 !important;
-}
-
 /* language fix */
 body.lang_pl.node-main-login .cbi-value-title {
     width: 12rem;
@@ -2110,7 +2154,7 @@ body.lang_pl.node-main-login .cbi-value-title {
 
 .cbi-rowstyle-2 .cbi-button-up,
 .cbi-rowstyle-2 .cbi-button-down {
-    background-color: #FFF !important;
+    background-color: var(--lighter);
 
 }
 
@@ -2119,7 +2163,7 @@ body.lang_pl.node-main-login .cbi-value-title {
 .cbi-value-helpicon,
 .showSide,
 .main>.loading>span {
-    font-family: 'argone' !important;
+    font-family: 'argon' !important;
     font-style: normal !important;
     font-weight: normal !important;
     font-variant: normal !important;
@@ -2160,7 +2204,8 @@ input {
     margin: 0.25rem;
 }
 
-select:not([multiple="multiple"]):focus,
+select:not([multiple="multiple"]):hover,
+input:hover,
 input:focus {
     border-color: #5e72e4;
     border-color: var(--primary);
@@ -2444,7 +2489,7 @@ h3 {
     letter-spacing: 0.1rem;
     padding: 1rem 1.5rem;
     border-radius: 0.375rem;
-    background: #fff;
+    background: var(--lighter);
     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.03);
 }
 
@@ -2498,6 +2543,8 @@ fieldset.cbi-section p {
     letter-spacing: 0.1rem;
     color: #32325d;
     font-weight: 600;
+    position: sticky;
+    left: 0;
 }
 
 table {
@@ -2590,16 +2637,24 @@ td>table>tbody>tr>td {
     overflow-x: auto;
 
     &::-webkit-scrollbar {
-        width: 1px;
+        width: 5px;
         height: 5px;
     }
 
     &::-webkit-scrollbar-thumb {
-        background-color: #f6f9fc
+        background-color: #9e9e9e;
+    }
+
+	&::-webkit-scrollbar-thumb:hover {
+        background-color: #757575;
+    }
+
+	&::-webkit-scrollbar-thumb:active {
+        background-color: #424242;
     }
 
     &::-webkit-scrollbar-track {
-        background-color: #fff;
+        background-color: transparent;
     }
 
     li[class~="active"],
@@ -2609,7 +2664,7 @@ td>table>tbody>tr>td {
         border-bottom: 0.18751rem solid var(--primary);
         color: #5e72e4;
         color: var(--primary);
-        background-color: #dce1fe;
+        background-color: var(--light-subtabs-background);
         margin-bottom: 0;
         border-radius: 0;
 
@@ -2638,6 +2693,14 @@ td>table>tbody>tr>td {
     }
 }
 
+.cbi-section::-webkit-scrollbar,
+.cbi-section > *::-webkit-scrollbar,
+textarea::-webkit-scrollbar,
+div::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+}
+
 .cbi-tabmenu {
     color: white;
     padding: 0.5rem 0.5rem 0 0.5rem;
@@ -2651,15 +2714,23 @@ td>table>tbody>tr>td {
     }
 
     &::-webkit-scrollbar-thumb {
-        background-color: #f6f9fc
+        background-color: #9e9e9e;
     }
 
-    &::-webkit-scrollbar-track {
-        background-color: #fff;
+    &::-webkit-scrollbar-thumb:hover {
+        background-color: #757575;
+    }
+
+    &::-webkit-scrollbar-thumb:active {
+        background-color: t#424242;
+    }
+
+	&::-webkit-scrollbar-track {
+        background-color: transparent;
     }
 
     li {
-        background: #dce3e9;
+        background: #e3e3e3;
         display: inline-block;
         font-size: 0.875rem;
         border-top-left-radius: 0.25rem;
@@ -2679,7 +2750,7 @@ td>table>tbody>tr>td {
             border-bottom: 0.18751rem solid var(--primary);
             color: #5e72e4;
             color: var(--primary);
-            background-color: #dce1fe;
+            background-color: var(--light-subtabs-background);
             margin-bottom: 0;
 
             a {
@@ -2692,7 +2763,7 @@ td>table>tbody>tr>td {
         border-bottom: 0.18751rem solid #5e72e4;
         border-bottom: 0.18751rem solid var(--primary);
         color: var(--primary);
-        background-color: #dce1fe;
+        background-color: var(--light-subtabs-background);
         margin-bottom: 0;
 
         a {
@@ -2971,7 +3042,8 @@ select[multiple="multiple"] {
 }
 
 
-.cbi-tabcontainer>.cbi-value:nth-of-type(2n) {
+.cbi-tabcontainer>.cbi-value:nth-of-type(2n),
+.cbi-tabcontainer>.cbi-value:nth-of-type(2n)>textarea {
     background-color: #f9f9f9;
 }
 
@@ -2980,7 +3052,6 @@ select[multiple="multiple"] {
     display: table-cell;
     line-height: 1.6;
     font-size: 0.875rem;
-
 }
 
 /* Fix text position of the luci-app-filebrowser running state */
@@ -3006,8 +3077,9 @@ form>.cbi-map>.cbi-section>.cbi-section-node>.cbi-value>.cbi-value-field font {
 }
 
 .cbi-value-description {
+    color: #8d8d8d;
+    opacity: 0.8;
     font-size: small;
-    opacity: 0.5;
     padding: 0.5rem;
 }
 
@@ -3098,25 +3170,11 @@ td>.ifacebadge {
     margin: 0 0.3rem;
 }
 
-/*textarea*/
-
-.cbi-input-textarea {
-    width: 100%;
-    border: 0;
-    outline: none;
-    min-height: 14rem;
-    padding: 0.8rem;
-    font-size: 0.8rem;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    color: black;
-}
-
 #syslog {
     width: 100%;
     min-height: 15rem;
     padding: 1rem;
     line-height: 1.4em;
-    font-size: small;
     color: #1e1e1e;
     border-radius: 0;
     background-color: #fff;
@@ -3125,14 +3183,6 @@ td>.ifacebadge {
 }
 
 
-
-
-
-
-
-
-
-
 .ifacebadge {
     display: inline-flex;
     border-bottom: 0px solid #CCCCCC;
@@ -3152,7 +3202,7 @@ td>.ifacebadge,
 .ifacebadge>img {
     display: inline-block;
     margin: 0 0.3rem;
-    align-self: flex-start;
+    align-self: center;
 }
 
 
@@ -3317,18 +3367,6 @@ td>.ifacebadge,
     padding: 0.5rem;
 }
 
-div.cbi-value var,
-td.cbi-value-field var {
-    font-style: italic;
-    color: #0069D6;
-}
-
-small {
-    font-size: 90%;
-    white-space: normal;
-    line-height: 1.42857143;
-}
-
 
 .cbi-optionals {
     padding: 1rem 1rem 0 1rem;
@@ -3450,7 +3488,7 @@ input[name="nslookup"] {
             height: 100% !important;
             background-image: url(../img/trafficbar.png);
             background-position: left top;
-            animation: sparkle 1500ms linear infinite;
+            animation: sparkle 1000ms linear infinite;
         }
     }
 
@@ -3473,15 +3511,14 @@ input[name="nslookup"] {
     overflow-y: hidden;
 
     em {
-        padding: 0.75rem 1.5rem;
         font-size: 0.7rem;
         font-weight: 600;
-        color: #525f7f;
+        color: var(--primary);
+        text-shadow: 1px 1px 2px #ccc;
         text-align: center;
     }
 
     h4 {
-        padding: 0.75rem 1.5rem;
         font-size: 0.7rem;
         font-weight: 600;
         color: #525f7f;
@@ -3524,6 +3561,14 @@ input[name="nslookup"] {
     margin-top: 0;
 }
 
+.node-system-flashops fieldset > ul {
+    padding: 1rem;
+}
+
+.node-system-flashops fieldset + .cbi-page-actions {
+    margin-top: 1rem;
+}
+
 .node-status-iptables .cbi-tabmenu,
 .node-system-packages .cbi-tabmenu,
 .node-system-flashops .cbi-tabmenu {
@@ -3586,6 +3631,99 @@ input[name="nslookup"] {
     display: block;
 }
 
+/* luci-app-passwall */
+#cbi-passwall #add_link_div,
+#cbi-passwall #set_node_div {
+    background: #fffffff0;
+}
+#cbi-passwall .cbi-section-table tbody ._now_use {
+    background: #5e72e473 !important;
+}
+
+/* luci-app-commands */
+.commandbox h3 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.commandbox code {
+    word-break: break-word;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+div.commandbox {
+    height: 16em;
+}
+
+/* luci-app-ssr-plus */
+#cbi-shadowsocksr .cbi-map-descr h3 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+/* luci-app-mwan3 */
+.node-status-mwan .cbi-tabmenu {
+    padding: 3rem 0.5rem 0 0.5rem;
+}
+
+/* luci-app-openclash */
+.node-services-openclash .cbi-tabmenu {
+    font-size: 0;
+}
+.node-services-openclash .cbi-tabmenu > li {
+    margin-right: 4px;
+}
+.node-services-openclash .cbi-tabmenu > li:last-child {
+    margin-right: 0;
+}
+
+/* luci-app-ddnsto */
+.node-services-ddnsto .cbi-section-node .cbi-value div {
+    display: table-cell;
+    line-height: 1.6;
+    font-size: 0.875rem;
+}
+
+/* luci-app-dockerman */
+#cbi-dockerd > .cbi-section > br,
+#cbi-docker > .cbi-section > br {
+    display: none;
+}
+
+/* luci-app-diskman */
+#cbi-diskman > .cbi-section > br {
+    display: none;
+}
+
+/* luci-app-istorex (Quick Start) */
+#app #main #page .app-container_body .btn-f,
+#app #main #page .app-container_body .btn-r {
+    -webkit-user-select: none; /* Safari */
+    -moz-user-select: none; /* Firefox */
+    -ms-user-select: none; /* IE10+/Edge */
+    user-select: none; /* Standard */
+    width: 30px;
+}
+
+/* luci-app-ttyd */
+.TTYD.node-system-terminal .main {
+    height: 100%!important;
+}
+.TTYD.node-system-terminal .main .main-right,
+.TTYD.node-system-terminal .main .main-right #maincontent,
+.TTYD.node-system-terminal .main .main-right #maincontent .container .cbi-map {
+    height: 100%!important;
+    display: flex!important;
+    flex-direction: column!important;
+}
+.TTYD.node-system-terminal .main .main-right #maincontent,
+.TTYD.node-system-terminal .main .main-right #maincontent .container,
+.TTYD.node-system-terminal .main .main-right #maincontent .container .cbi-map #terminal {
+    flex: 1!important;
+}
 
 @media screen and (max-width: 1600px) {
 
@@ -3600,7 +3738,7 @@ input[name="nslookup"] {
     }
 
 
-    .cbi-button {
+    .cbi-button:not(.cbi-button-up, .cbi-button-down) {
         /*padding: 0.3rem 1.5rem;*/
         font-size: 0.8rem;
     }
@@ -3622,10 +3760,6 @@ input[name="nslookup"] {
         padding: 0;
     }
 
-    .cbi-input-textarea {
-        font-size: small;
-    }
-
     .node-status-iptables>.main fieldset li>a {
         padding: 0.3rem 0.6rem;
     }
@@ -3678,30 +3812,6 @@ input[name="nslookup"] {
     }
 }
 
-@media screen and (min-width: 600px) {
-    ::-webkit-scrollbar {
-        width: 10px;
-        height: 10px;
-    }
-
-    ::-webkit-scrollbar,
-    ::-webkit-scrollbar-corner {
-        background: transparent;
-    }
-
-    ::-webkit-scrollbar-thumb {
-        background: #9e9e9e;
-    }
-
-    ::-webkit-scrollbar-thumb:hover {
-        background: #757575;
-    }
-
-    ::-webkit-scrollbar-thumb:active {
-        background: #424242;
-    }
-}
-
 @media screen and (max-width: 992px) {
     .main {
         .main-left {
@@ -3762,6 +3872,18 @@ input[name="nslookup"] {
 
 }
 
+@media screen and (max-width: 500px) {
+.login-page {
+    .login-container {
+        margin-left: 0rem !important;
+        width: 500px;
+
+        .login-form {
+            max-width: 500px;
+        }
+    }
+}
+
 @media screen and (max-width: 480px) {
     body {
         font-size: 0.8rem;
@@ -3772,19 +3894,11 @@ input[name="nslookup"] {
         margin-top: 0rem !important;
     }
 
-    .login-page .video {
-        video {
-            width: auto !important;
-            height: 100% !important;
-        }
-    }
-
     .login-page .login-container {
         margin-left: 0rem !important;
         width: 100%;
 
         .login-form {
-            max-width: 480px;
 
             .form-login {
                 .input-group {
@@ -3889,13 +4003,9 @@ input[name="nslookup"] {
     }
 
 
-    .tabs,
-    .cbi-tabmenu {
-        &::-webkit-scrollbar {
-            width: 0px;
-            height: 0px;
-        }
-
+    ::-webkit-scrollbar {
+        width: 0px !important;
+        height: 0px  !important;
     }
 
 
@@ -4020,4 +4130,4 @@ input[name="nslookup"] {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/luci-theme-argone/htdocs/luci-static/argone/less/dark.less b/luci-theme-argone/htdocs/luci-static/argone/less/dark.less
index e425d66b..968cada2 100644
--- a/luci-theme-argone/htdocs/luci-static/argone/less/dark.less
+++ b/luci-theme-argone/htdocs/luci-static/argone/less/dark.less
@@ -1,8 +1,8 @@
-//  compress: true
 /**
  *  Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template
  *
  *  luci-theme-argone
+ *      Copyright 2020 Jerryk
  *
  *  Have a bug? Please create an issue here on GitHub!
  *      https://github.com/kenzok78/luci-theme-argone/issues
@@ -47,6 +47,10 @@ body {
                     color: #adb5bd;
                 }
 
+                .border {
+                    border-bottom: 1px var(--dark-primary) solid;
+                }
+
                 input {
                     background-color: transparent !important;
                     color: #adb5bd;
@@ -80,6 +84,9 @@ body {
 
     footer {
         color: #adb5bd;
+        a {
+            color: #adb5bd;
+        }
     }
 
 }
@@ -102,12 +109,13 @@ header::after {
         .nav {
             .slide {
                 .slide-menu {
+
                     .active {
                         a {
-                            color: #cccccc;
+                            color: #fff !important;
 
                             &::after {
-                                background-color: #cccccc !important;
+                                background-color: var(--dark-primary) !important;
                             }
                         }
                     }
@@ -115,23 +123,34 @@ header::after {
                     li {
                         a {
                             color: #cccccc;
-                        }
 
-                        a:hover {
-                            background: none !important;
+                            &:hover {
+                                background: none !important;
+                            }
+
+                            &::after {
+                                background-color: var(--dark-primary) !important;
+                                box-shadow: 0 0 1px #000  !important;
+                            }
+
                         }
                     }
                 }
 
-                .menu.active {
-                    background-color: #483d8b !important;
-                    background-color: var(--dark-primary) !important;
-                    color: #cccccc !important;
-
-                    a::after {
-                        background-color: #cccccc !important;
+                .menu {
+                    &:hover,
+                    &.active {
+                        background-color: #483d8b !important;
+                        background-color: var(--dark-primary) !important;
+                        color: #fff !important;
+                        box-shadow: 0 0 1px #000 !important;
                     }
                 }
+
+                .menu[data-title=Status]:before,
+                .menu[data-title=Control]:before {
+                    color: var(--dark-primary) !important;
+                }
             }
 
             li {
@@ -142,7 +161,7 @@ header::after {
                 a:hover {
                     background-color: #483d8b !important;
                     background-color: var(--dark-primary) !important;
-                    color: #cccccc !important;
+                    color: #fff !important;
 
 
                 }
@@ -154,9 +173,6 @@ header::after {
             background-color: #252526 !important;
         }
 
-        &::-webkit-scrollbar-track {
-            background-color: #333;
-        }
     }
 
     .main-right {
@@ -175,18 +191,31 @@ h3 {
     background: #333333;
 }
 
-a:-webkit-any-link {
-    color: -webkit-link;
-    cursor: pointer;
-    color: #483d8b;
-    color: var(--dark-primary);
+a:link,
+a:visited,
+a:active {
+    color: var(--dark_webkit-any-link);
 }
 
+a:-webkit-any-link:not(li a, .main-left a, .brand, .pull-right a, .alert-message a, .login-container footer a, .cbi-button) {
+    color: var(--dark_webkit-any-link) !important;
+    text-shadow: 1px 1px 2px #000 !important;
+}
 
 input:-webkit-autofill {
     background-color: #3c3c3c !important;
 }
 
+input[type="checkbox"]:checked {
+    background-color: #483d8b !important;
+    background-color: var(--dark-primary) !important;
+}
+
+.cbi-input-radio:checked {
+    background-color: #483d8b !important;
+    background-color: var(--dark-primary) !important;
+}
+
 .cbi-value-field .cbi-input-apply,
 .cbi-button-apply,
 .cbi-button-edit {
@@ -197,14 +226,11 @@ input:-webkit-autofill {
     border-color: var(--dark-primary) !important;
 }
 
-
 .cbi-section em {
-    color: #483d8b;
-    color: var(--dark-primary);
+    color: var(--dark_webkit-any-link);
+    text-shadow: 1px 1px 2px #000;
 }
 
-
-
 header.bg-primary {
     background-color: #1e1e1e !important;
 }
@@ -258,8 +284,8 @@ table>thead>tr>td {
 #membuff>div>div>div>small,
 #conns>div>div>div>small,
 #memtotal>div>div>div>small {
-
     color: #ccc !important;
+    text-shadow: 1px 1px 2px #000 !important;
 }
 
 .node-system-packages>.main .cbi-section-node:first-child .cbi-value-last {
@@ -281,8 +307,8 @@ table>thead>tr>td {
 table>tbody>tr>th,
 table>tfoot>tr>th,
 table>thead>tr>th {
-
     background-color: #252526;
+    border-top: none;
     border-bottom: black 1px solid !important;
 }
 
@@ -321,9 +347,7 @@ table>thead>tr>th {
 }
 
 abbr {
-    color: #483d8b;
-    color: var(--dark-primary);
-
+    color: #8898aa;
 }
 
 div>table>tbody>tr:nth-of-type(2n),
@@ -387,16 +411,6 @@ th h6, td h6 {
     background-color: #00ff0a45 !important;
 }
 
-/* OCD: Compatible the background color of the "Add the node via the link" & "USE(node)" pop-up window in PassWall (dark mode only) */
-#add_link_div,
-#set_node_div {
-    background-color: #333333f0 !important;
-    box-shadow: #00000094 10px 10px 30px 5px !important;
-}
-#add_link_div>.cbi-value>.cbi-value-field>#nodes_link {
-    background: #ccc;
-}
-
 #content_syslog {
     box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35)
 }
@@ -418,25 +432,26 @@ th h6, td h6 {
     background-color: #252526;
 }
 
-.tabs>li[class~="active"]>a {
-    color: #ccc;
-}
-
+.tabs>li:hover,
 .tabs>li[class~="active"],
-.tabs>li:hover {
-    border-bottom: 0.18751rem solid #483d8b;
-    border-bottom: 0.18751rem solid var(--dark-primary);
-    color: #ccc;
-    background-color: #181819;
+.cbi-tabmenu>li:hover,
+.cbi-tabmenu>li[class~="cbi-tab"] {
+    border-bottom: .18751rem solid var(--dark-primary);
+    background-color: #3c3c3c;
 }
 
-.cbi-tabmenu>li>a,
-.tabs>li>a {
-    color: #ccc;
+.tabs>li>a,
+.cbi-tabmenu>li>a {
+    color: #ccc !important;
+}
 
-    &:hover {
-        color: #ccc;
-    }
+.cbi-tabmenu>li>a:hover,
+.cbi-tabmenu>li:hover>a,
+.cbi-tabmenu>.cbi-tab>a,
+.tabs>li>a:hover,
+.tabs>li:hover>a,
+.tabs>li[class~="active"]>a {
+    color: #fff !important;
 }
 
 .cbi-tabmenu>li {
@@ -447,20 +462,12 @@ th h6, td h6 {
     border-bottom: 0px solid #ddd !important;
 }
 
-.cbi-tabmenu li[class~="cbi-tab"] a {
+.cbi-tab-descr {
     color: #ccc;
 }
 
-.cbi-tabmenu>li:hover {
-    color: #ccc;
-    background: #2d2d2d;
-}
-
-.cbi-tabmenu>li[class~="cbi-tab"] {
-    background-color: #181819;
-}
-
-.cbi-tabcontainer>.cbi-value:nth-of-type(2n) {
+.cbi-tabcontainer>.cbi-value:nth-of-type(2n),
+.cbi-tabcontainer>.cbi-value:nth-of-type(2n)>textarea {
     background-color: #252526;
 }
 
@@ -476,7 +483,8 @@ input {
     box-shadow: 0 3px 2px rgba(0, 0, 0, .05);
 }
 
-select:not([multiple="multiple"]):focus,
+select:not([multiple="multiple"]):hover,
+input:hover,
 input:focus {
     border-color: #483d8b !important;
     border-color: var(--dark-primary) !important;
@@ -511,13 +519,13 @@ select {
     color: #ccc;
 }
 
-.cbi-input-textarea {
+/*textarea for dark mode*/
+textarea {
+    border: 1px solid #3c3c3c !important;
     background-color: #1e1e1e;
     color: #ccc;
 }
 
-
-
 .cbi-section-remove:nth-of-type(2n),
 .cbi-section-node:nth-of-type(2n) {
     background-color: #1e1e1e;
@@ -580,9 +588,11 @@ img[src="/luci-static/resources/icons/loading.gif"] {
 }
 
 div.cbi-value var,
-td.cbi-value-field var {
+td.cbi-value-field var,
+.td.cbi-value-field var {
     color: #483d8b;
-    color: var(--dark-primary);
+    color: var(--dark_webkit-any-link);
+    text-shadow: 1px 1px 2px #000;
 }
 
 #diag-rc-output>pre {
@@ -592,7 +602,7 @@ td.cbi-value-field var {
 
 .node-services-vssr .block {
     background-color: #1e1e1e !important;
-    box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35);
+    box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35) !important;
 }
 
 .node-services-vssr .block h4 {
@@ -601,8 +611,8 @@ td.cbi-value-field var {
 
 .node-services-vssr .status-bar {
     color: #ccc;
-    box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35);
-    background-color: #1e1e1e;
+    background: #333333f0;
+    box-shadow: #00000094 10px 10px 30px 5px;
 }
 
 .node-services-vssr .cbi-section-table-row {
@@ -738,6 +748,150 @@ fieldset[id^="cbi-apply-"] {
     color: #ccc !important;
 }
 
+/* luci-app-passwall */
+#cbi-passwall #add_link_div,
+#cbi-passwall #set_node_div {
+    background: #333333f0 !important;
+    box-shadow: #00000094 10px 10px 30px 5px !important;
+}
+
+/* luci-app-bypass */
+#cbi-bypass .status-bar {
+    color: #ccc;
+    background: #333333f0;
+    box-shadow: #00000094 10px 10px 30px 5px;
+}
+
+/* luci-app-clash */
+#cbi-clash .cbi-section .pure-u-1-4 .pure-g,
+#cbi-clash .cbi-section .siz .pure-g {
+    background-color: #1e1e1e !important;
+    box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35) !important;
+}
+
+/* luci-app-openclash */
+#cbi-openclash #eye-icon,
+#cbi-openclash img[title="刷新"] {
+    filter: invert(100%);
+}
+#cbi-openclash #cbi-openclash-config fieldset[control-id="ControlID-46"],
+#cbi-openclash .CodeMirror-merge-copybuttons-right,
+.CodeMirror-scroll {
+    background-color: #333333 !important;
+}
+#cbi-openclash .cbi-section .cbi-tabmenu li {
+    border-right: 1px solid #3c3c3c !important;
+}
+#cbi-openclash .CodeMirror-merge {
+    border: 1px solid transparent !important;
+}
+#cbi-openclash-config-clog .cbi-section {
+    border: 1px solid #3c3c3c !important;
+}
+#cbi-openclash .CodeMirror-gutters {
+    border-right: 1px solid #3c3c3c !important;
+    background-color: #1e1e1e !important;
+}
+
+/* luci-app-dockerman */
+#cbi-dockerd .img-con img {
+    filter: invert(0.4);
+}
+
+/* luci-app-istorex (interface config[NetworkPort]) */
+#cbi-nfs-mount  .app-container_status-label_bg {
+    background: #333333;
+}
+#cbi-nfs-mount td svg {
+    filter: invert(0.3);
+}
+#actioner .actioner-dns {
+    background-color: #333333;
+}
+#actioner .actioner-dns_header,
+#actioner .actioner-container_header {
+    border-bottom: 1px solid #cbcbcb !important;
+}
+#actioner .actioner-dns_footer {
+    border-top: 1px solid #cbcbcb !important;
+}
+
+/* luci-app-istorex (Network Guide) */
+#app #main #page .title,
+#app #main #page .desc {
+    color: #cccccc;
+    background-color: #333333;
+}
+#app #main #page .network-message li:not(span):not(a) {
+    color: #8d8d8d;
+}
+#app #main #page code {
+    background-color: #333333;
+}
+
+/* luci-app-istorex (Quick Start) */
+#app #main #page .network-container_flow-container,
+#app #main #page .app-container_status-container,
+#app #main #page .nas-container .nas-container_card .app-container,
+#app #main #page .app-container {
+    background-color: #333333;
+}
+#app #main #page .flow-data span,
+#app #main #page .app-container_status-label_block span,
+#app #main #page .app-container .item-label span:not(#app #main #page .app-container .progress-value span) {
+    color: #cccccc;
+}
+#app #main #page .app-container_status-info span,
+#app #main #page .app-container_status-info span,
+#app #main #page .app-container_title span {
+    color: #dddddd;
+}
+.app-container_body .app-container_status-label_bg {
+    background-color: #282828 !important;
+}
+#app #main #page .item-label_value .progress {
+    background-color: rgb(118, 118, 118);
+}
+#app #main #page .app-container_nas-menu button[class=""] {
+    background-color: #8b8b8b;
+}
+#app #main #page .app-container_nas-menu button[class="on"] {
+    background-color: #555555;
+}
+#app #main #page .app-container_title .DeviceBlock ul {
+    background-color: #cccccc;
+}
+#actioner div.action,
+#actioner div.actioner-container {
+    background-color: #3c3c3c;
+}
+#actioner div.action .title {
+    color: #cccccc;
+}
+#actioner div.action .desc {
+    color: #cbcbcb;
+}
+#actioner div.action div.roots span,
+#actioner div.action div.move span:not(span.tip),
+#actioner div.action div.left span,
+#actioner div.action div.input_row span,
+#actioner div.label-item label span {
+    color: #cbcbcb;
+}
+#actioner div.action span.tooltip-trigger svg path {
+    fill: #cbcbcb;
+}
+#actioner div.actioner-dns_body div.label-item_value select {
+    height: 43px;
+}
+#actioner div.actioner-container_footer div.close {
+    color: #ffffff;
+}
+#app #main div.app-container div.app-container_title span a svg path,
+#app #main #page span.disk_infoicon svg g {
+    fill: #8b8b8b;
+}
+
 @supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) {
     .login-page .login-container .login-form {
         -webkit-backdrop-filter: blur(var(--blur-radius-dark));
diff --git a/luci-theme-argone/luasrc/view/themes/argone/footer.htm b/luci-theme-argone/luasrc/view/themes/argone/footer.htm
index 0b9f10c9..50a63ab0 100644
--- a/luci-theme-argone/luasrc/view/themes/argone/footer.htm
+++ b/luci-theme-argone/luasrc/view/themes/argone/footer.htm
@@ -2,6 +2,7 @@
 	Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material Argone Template
 
 	luci-theme-argone
+	Copyright 2020 Jerrykuku
 
 	Have a bug? Please create an issue here on GitHub!
 	https://github.com/kenzok78/luci-theme-argone/issues
@@ -17,7 +18,7 @@
 	luci-theme-material:
 	https://github.com/LuttyYang/luci-theme-material/
 
-	Argon Theme
+	Argone Theme
 	https://demos.creative-tim.com/argon-dashboard/index.html
 
 	Login background
@@ -40,9 +41,9 @@
 </div>
 <footer>
 	<div class="ftc">
-		<a class="luci-link" href="https://github.com/openwrt/luci">Powered by <%= ver.luciname %>
+		<a class="luci-link" href="https://github.com/openwrt/luci" target="_blank">Powered by <%= ver.luciname %>
 			(<%= ver.luciversion %>)</a> /
-		<a href="https://github.com/kenzok78/luci-theme-argone">ArgoneTheme <%# vPKG_VERSION %></a> /
+		<a href="https://github.com/kenzok78/luci-theme-argone" target="_blank">ArgoneTheme <%# vPKG_VERSION %></a> /
 		<%= ver.distversion %>
 		<% if #categories > 1 then %>
 		<ul class="breadcrumb pull-right" id="modemenu">
@@ -58,27 +59,21 @@
 </div>
 </div>
 	<script>
-		// thanks for Jo-Philipp Wich <jow@openwrt.org>
-		var winHeight = $(window).height();
-		$(window).resize(function () {
-			if($(document.body).height() < 525 ){
-				if($(".ftc").css('display') != 'none'){
-					$(".ftc").hide()
-				}
-			}else{
-				if($(".ftc").css('display') == 'none'){
-					$(".ftc").show()
-				}
+		if (window.innerHeight < 660) {
+			document.getElementsByClassName("ftc")[0].style.display = "none";
+		} else {
+			document.getElementsByClassName("ftc")[0].style.display = "block";
+		}
+
+		window.addEventListener('resize', function() {
+			if (window.innerHeight < 660) {
+				document.getElementsByClassName("ftc")[0].style.display = "none";
+			} else {
+				document.getElementsByClassName("ftc")[0].style.display = "block";
 			}
 		})
 	</script>
 
-	<script>
-		if (window.orientation == 90 || window.orientation == -90) {
-			$(".ftc").hide()
-		}
-	</script>
-
 	<script src="<%=media%>/js/styles-argone.js<%# ?v=PKG_VERSION %>"></script>
 </body>
 </html>
diff --git a/luci-theme-argone/luasrc/view/themes/argone/header.htm b/luci-theme-argone/luasrc/view/themes/argone/header.htm
index b5a5d9c5..44434132 100644
--- a/luci-theme-argone/luasrc/view/themes/argone/header.htm
+++ b/luci-theme-argone/luasrc/view/themes/argone/header.htm
@@ -2,6 +2,7 @@
 	Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argone Template
 
 	luci-theme-argone
+	Copyright 2020 Jerryk <kenzok78@gmail.com>
 
 	Have a bug? Please create an issue here on GitHub!
 	https://github.com/kenzok78/luci-theme-argone/issues
@@ -14,7 +15,7 @@
 	MUI:
 	https://github.com/muicss/mui
 	
-	Argon Theme
+	Argone Theme
 	https://demos.creative-tim.com/argon-dashboard/index.html
 
 	Licensed to the public under the Apache License 2.0
@@ -266,6 +267,7 @@
 	<script src="<%=resource%>/cbi.js<%# ?v=PKG_VERSION %>"></script>
 	<script src="<%=resource%>/xhr.js<%# ?v=PKG_VERSION %>"></script>
 	<script src="<%=media%>/js/jquery.min.js?v=3.5.1"></script>
+	<script src="<%=media%>/js/color_calc-argone.js<%# ?v=PKG_VERSION %>"></script>
 </head>
 
 <body
diff --git a/luci-theme-argone/luasrc/view/themes/argone/header_login.htm b/luci-theme-argone/luasrc/view/themes/argone/header_login.htm
index 35c9ca6a..1424cbe5 100644
--- a/luci-theme-argone/luasrc/view/themes/argone/header_login.htm
+++ b/luci-theme-argone/luasrc/view/themes/argone/header_login.htm
@@ -2,6 +2,7 @@
 	Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argone Template
 
 	luci-theme-argone
+	Copyright 2020 Jerrykuku
 
 	Have a bug? Please create an issue here on GitHub!
 	https://github.com/kenzok78/luci-theme-argone/issues
@@ -14,7 +15,7 @@
 	MUI:
 	https://github.com/muicss/mui
 	
-	Argon Theme
+	Argone Theme
 	https://demos.creative-tim.com/argon-dashboard/index.html
 
 	Licensed to the public under the Apache License 2.0
diff --git a/luci-theme-argone/luasrc/view/themes/argone/sysauth.htm b/luci-theme-argone/luasrc/view/themes/argone/sysauth.htm
index 59fc5b9f..598c9ca2 100644
--- a/luci-theme-argone/luasrc/view/themes/argone/sysauth.htm
+++ b/luci-theme-argone/luasrc/view/themes/argone/sysauth.htm
@@ -2,6 +2,7 @@
 	Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI and Argone Template
 
 	luci-theme-argone
+	Copyright 2021 Jerryk
 
 	Have a bug? Please create an issue here on GitHub!
 	https://github.com/kenzok78/luci-theme-argone/issues
@@ -14,7 +15,7 @@
 	MUI:
 	https://github.com/muicss/mui
 
-	Argon Theme
+	Argone Theme
 	https://demos.creative-tim.com/argon-dashboard/index.html
 
 	Licensed to the public under the Apache License 2.0
@@ -128,9 +129,8 @@
 	<div class="login-container">
 		<div class="login-form">
 			<!-- Logo Start -->
-			<a class="brand" href="/"><img src="<%=media%>/img/argone.svg" class="icon">
-				<span class="brand-text"><%=striptags( (boardinfo.hostname or "?") ) %></span>
-			</a>
+			<a class="brand" href="/"><img src="<%=media%>/img/argone.svg" class="icon"></a>
+			<span class="brand-text"><%=striptags( (boardinfo.hostname or "?") ) %></span>
 			<!-- Logo End -->
 			<!-- Login Form Start -->
 			<form class="form-login" method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>">