diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
index d1ed9935bd..0cb6035ebb 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
@@ -384,12 +384,15 @@ class NetDbRenderer {
                 buf.append("</td></tr>");
 
             }
+            buf.append("<tr><td colspan=\"2\"><ul class=\"netdb_leases\">");
             for (int i = 0; i < ls.getLeaseCount(); i++) {
                 Lease lease = ls.getLease(i);
-                buf.append("<tr><td colspan=\"2\">");
-                buf.append("<b>").append(_t("Lease")).append(' ').append(i + 1).append(":</b> ").append(_t("Gateway")).append(' ');
+                buf.append("<li><b>").append(_t("Lease")).append(' ').append(i + 1).append(":</b> <span class=\"netdb_gateway\" title=\"")
+                   .append(_t("Gateway")).append("\"><img src=\"themes/console/images/info/gateway.png\" alt=\"")
+                   .append(_t("Gateway")).append("\"></span> <span class=\"tunnel_peer\">");
                 buf.append(_context.commSystem().renderPeerHTML(lease.getGateway()));
-                buf.append(' ').append(_t("Tunnel")).append(' ').append(lease.getTunnelId().getTunnelId()).append(' ');
+                buf.append("</span> <span class=\"netdb_tunnel\">").append(_t("Tunnel")).append(" <span class=\"tunnel_id\">")
+                   .append(lease.getTunnelId().getTunnelId()).append("</span></span> ");
                 if (debug) {
                     long exl = lease.getEndDate().getTime() - now;
                     if (exl > 0)
@@ -397,8 +400,9 @@ class NetDbRenderer {
                     else
                         buf.append("<b class=\"netdb_expiry\">").append(_t("Expired {0} ago", DataHelper.formatDuration2(0-exl))).append("</b>");
                 }
-                buf.append("</td></tr>\n");
+                buf.append("</li>");
             }
+            buf.append("</ul></td></tr>\n");
             buf.append("</table>\n");
             out.write(buf.toString());
             buf.setLength(0);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java
index 79a49e718d..80b7a7ac9e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java
@@ -344,49 +344,49 @@ public class PeerHelper extends HelperBase {
         }
         buf.append(".</h3>\n");
         buf.append("<div class=\"widescroll\"><table id=\"udpconnections\">\n");
-        buf.append("<tr><th class=\"smallhead\" nowrap><a href=\"#def.peer\">").append(_t("Peer")).append("</a><br>");
+        buf.append("<tr class=\"smallhead\"><th nowrap><a href=\"#def.peer\">").append(_t("Peer")).append("</a><br>");
         if (sortFlags != FLAG_ALPHA)
             appendSortLinks(buf, urlBase, sortFlags, _t("Sort by peer hash"), FLAG_ALPHA);
-        buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.dir\" title=\"")
+        buf.append("</th><th nowrap><a href=\"#def.dir\" title=\"")
            .append(_t("Direction/Introduction")).append("\">").append(_t("Dir"))
-           .append("</a></th><th class=\"smallhead\" nowrap>").append(_t("IPv6"))
-           .append("</th><th class=\"smallhead\" nowrap><a href=\"#def.idle\">").append(_t("Idle")).append("</a><br>");
+           .append("</a></th><th nowrap>").append(_t("IPv6"))
+           .append("</th><th nowrap><a href=\"#def.idle\">").append(_t("Idle")).append("</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by idle inbound"), FLAG_IDLE_IN);
         buf.append(" / ");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by idle outbound"), FLAG_IDLE_OUT);
         buf.append("</th>");
-        buf.append("<th class=\"smallhead\" nowrap><a href=\"#def.rate\">").append(_t("In/Out")).append("</a><br>");
+        buf.append("<th nowrap><a href=\"#def.rate\">").append(_t("In/Out")).append("</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by inbound rate"), FLAG_RATE_IN);
         buf.append(" / ");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by outbound rate"), FLAG_RATE_OUT);
         buf.append("</th>\n");
-        buf.append("<th class=\"smallhead\" nowrap><span class=\"peersort\"><a href=\"#def.up\">").append(_t("Up")).append("</a><br>");
+        buf.append("<th nowrap><span class=\"peersort\"><a href=\"#def.up\">").append(_t("Up")).append("</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by connection uptime"), FLAG_UPTIME);
-        buf.append("</span></th><th class=\"smallhead\" nowrap><span class=\"peersort\"><a href=\"#def.skew\">").append(_t("Skew")).append("</a><br>");
+        buf.append("</span></th><th nowrap><span class=\"peersort\"><a href=\"#def.skew\">").append(_t("Skew")).append("</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by clock skew"), FLAG_SKEW);
         buf.append("</span></th>\n");
-        buf.append("<th class=\"smallhead\" nowrap><a href=\"#def.cwnd\">CWND</a><br>");
+        buf.append("<th nowrap><a href=\"#def.cwnd\">CWND</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by congestion window"), FLAG_CWND);
-        buf.append("</th><th class=\"smallhead\" nowrap><span class=\"peersort\"><a href=\"#def.ssthresh\">SST</a><br>");
+        buf.append("</th><th nowrap><span class=\"peersort\"><a href=\"#def.ssthresh\">SST</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by slow start threshold"), FLAG_SSTHRESH);
         buf.append("</span></th>\n");
-        buf.append("<th class=\"smallhead\" nowrap><span class=\"peersort\"><a href=\"#def.rtt\">RTT</a><br>");
+        buf.append("<th nowrap><span class=\"peersort\"><a href=\"#def.rtt\">RTT</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by round trip time"), FLAG_RTT);
-        //buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.dev\">").append(_t("Dev")).append("</a><br>");
+        //buf.append("</th><th nowrap><a href=\"#def.dev\">").append(_t("Dev")).append("</a><br>");
         //appendSortLinks(buf, urlBase, sortFlags, _t("Sort by round trip time deviation"), FLAG_DEV);
-        buf.append("</span></th><th class=\"smallhead\" nowrap><span class=\"peersort\"><a href=\"#def.rto\">RTO</a><br>");
+        buf.append("</span></th><th nowrap><span class=\"peersort\"><a href=\"#def.rto\">RTO</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by retransmission timeout"), FLAG_RTO);
         buf.append("</span></th>\n");
-        buf.append("<th class=\"smallhead\" nowrap><a href=\"#def.mtu\">MTU</a><br>");
+        buf.append("<th nowrap><a href=\"#def.mtu\">MTU</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by outbound maximum transmit unit"), FLAG_MTU);
-        buf.append("</th><th class=\"smallhead\" nowrap><span class=\"peersort\"><a href=\"#def.send\">").append(_t("TX")).append("</a><br>");
+        buf.append("</th><th nowrap><span class=\"peersort\"><a href=\"#def.send\">").append(_t("TX")).append("</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets sent"), FLAG_SEND);
-        buf.append("</span></th><th class=\"smallhead\" nowrap><span class=\"peersort\"><a href=\"#def.recv\">").append(_t("RX")).append("</a><br>");
+        buf.append("</span></th><th nowrap><span class=\"peersort\"><a href=\"#def.recv\">").append(_t("RX")).append("</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets received"), FLAG_RECV);
         buf.append("</span></th>\n");
-        buf.append("<th class=\"smallhead\" nowrap><span class=\"peersort\"><a href=\"#def.resent\">").append(_t("Dup TX")).append("</a><br>");
+        buf.append("<th nowrap><span class=\"peersort\"><a href=\"#def.resent\">").append(_t("Dup TX")).append("</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets retransmitted"), FLAG_RESEND);
-        buf.append("</span></th><th class=\"smallhead\" nowrap><span class=\"peersort\"><a href=\"#def.dupRecv\">").append(_t("Dup RX")).append("</a><br>");
+        buf.append("</span></th><th nowrap><span class=\"peersort\"><a href=\"#def.dupRecv\">").append(_t("Dup RX")).append("</a><br>");
         appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets received more than once"), FLAG_DUP);
         buf.append("</span></th></tr>\n");
         out.write(buf.toString());
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java
index 164834cf74..05e43205f2 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java
@@ -205,23 +205,23 @@ class ProfileOrganizerRenderer {
         //buf.append("<h2><a name=\"flood\"></a>").append(_t("Floodfill and Integrated Peers"))
         //   .append(" (").append(integratedPeers.size()).append(")</h2>\n");
         buf.append("<div class=\"widescroll\"><table id=\"floodfills\">");
-        buf.append("<tr>");
-        buf.append("<th class=\"smallhead\">").append(_t("Peer")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("Caps")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("Integ. Value")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("Last Heard About")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("Last Heard From")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("Last Good Send")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("Last Bad Send")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("10m Resp. Time")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("1h Resp. Time")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("1d Resp. Time")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("Last Good Lookup")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("Last Bad Lookup")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("Last Good Store")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("Last Bad Store")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("1h Fail Rate")).append("</th>");
-        buf.append("<th class=\"smallhead\">").append(_t("1d Fail Rate")).append("</th>");
+        buf.append("<tr class=\"smallhead\">");
+        buf.append("<th>").append(_t("Peer")).append("</th>");
+        buf.append("<th>").append(_t("Caps")).append("</th>");
+        buf.append("<th>").append(_t("Integ. Value")).append("</th>");
+        buf.append("<th>").append(_t("Last Heard About")).append("</th>");
+        buf.append("<th>").append(_t("Last Heard From")).append("</th>");
+        buf.append("<th>").append(_t("Last Good Send")).append("</th>");
+        buf.append("<th>").append(_t("Last Bad Send")).append("</th>");
+        buf.append("<th>").append(_t("10m Resp. Time")).append("</th>");
+        buf.append("<th>").append(_t("1h Resp. Time")).append("</th>");
+        buf.append("<th>").append(_t("1d Resp. Time")).append("</th>");
+        buf.append("<th>").append(_t("Last Good Lookup")).append("</th>");
+        buf.append("<th>").append(_t("Last Bad Lookup")).append("</th>");
+        buf.append("<th>").append(_t("Last Good Store")).append("</th>");
+        buf.append("<th>").append(_t("Last Bad Store")).append("</th>");
+        buf.append("<th>").append(_t("1h Fail Rate")).append("</th>");
+        buf.append("<th>").append(_t("1d Fail Rate")).append("</th>");
         buf.append("</tr>");
         RateAverages ra = RateAverages.getTemp();
         for (PeerProfile prof : order) {
@@ -290,31 +290,31 @@ class ProfileOrganizerRenderer {
            .append("</td></tr>");
         buf.append("<tr id=\"capabilities_key\"><td colspan=\"2\"><table><tbody>");
         buf.append("<tr><td>&nbsp;</td>")
-           .append("<td><b>B:</b></td><td>").append(_t("SSU Testing")).append("</td>")
-           .append("<td><b>C:</b></td><td>").append(_t("SSU Introducer")).append("</td>")
+           .append("<td><b>B</b></td><td>").append(_t("SSU Testing")).append("</td>")
+           .append("<td><b>C</b></td><td>").append(_t("SSU Introducer")).append("</td>")
            .append("<td>&nbsp;</td></tr>");
         buf.append("<tr><td>&nbsp;</td>")
-           .append("<td><b>f:</b></td><td>").append(_t("Floodfill")).append("</td>")
-           .append("<td><b>H:</b></td><td>").append(_t("Hidden")).append("</td>")
+           .append("<td><b>f</b></td><td>").append(_t("Floodfill")).append("</td>")
+           .append("<td><b>H</b></td><td>").append(_t("Hidden")).append("</td>")
            .append("<td>&nbsp;</td></tr>");
         buf.append("<tr><td>&nbsp;</td>")
-           .append("<td><b>K:</b></td><td>").append(_t("Under {0} shared bandwidth", "12KBps")).append("</td>")
-           .append("<td><b>L:</b></td><td>").append(_t("{0} shared bandwidth", "12 - 32KBps")).append("</td>")
+           .append("<td><b>K</b></td><td>").append(_t("Under {0} shared bandwidth", "12KBps")).append("</td>")
+           .append("<td><b>L</b></td><td>").append(_t("{0} shared bandwidth", "12 - 32KBps")).append("</td>")
            .append("<td>&nbsp;</td></tr>");
         buf.append("<tr><td>&nbsp;</td>")
-           .append("<td><b>M:</b></td><td>").append(_t("{0} shared bandwidth", "32 - 64KBps")).append("</td>")
-           .append("<td><b>N:</b></td><td>").append(_t("{0} shared bandwidth", "64 - 128KBps")).append("</td>")
+           .append("<td><b>M</b></td><td>").append(_t("{0} shared bandwidth", "32 - 64KBps")).append("</td>")
+           .append("<td><b>N</b></td><td>").append(_t("{0} shared bandwidth", "64 - 128KBps")).append("</td>")
            .append("<td>&nbsp;</td></tr>");
         buf.append("<tr><td>&nbsp;</td>")
-           .append("<td><b>O:</b></td><td>").append(_t("{0} shared bandwidth", "128 - 256KBps")).append("</td>")
-           .append("<td><b>P:</b></td><td>").append(_t("{0} shared bandwidth", "256 - 2000KBps")).append("</td>")
+           .append("<td><b>O</b></td><td>").append(_t("{0} shared bandwidth", "128 - 256KBps")).append("</td>")
+           .append("<td><b>P</b></td><td>").append(_t("{0} shared bandwidth", "256 - 2000KBps")).append("</td>")
            .append("<td>&nbsp;</td></tr>");
         buf.append("<tr><td>&nbsp;</td>")
-           .append("<td><b>R:</b></td><td>").append(_t("Reachable")).append("</td>")
-           .append("<td><b>U:</b></td><td>").append(_t("Unreachable")).append("</td>")
+           .append("<td><b>R</b></td><td>").append(_t("Reachable")).append("</td>")
+           .append("<td><b>U</b></td><td>").append(_t("Unreachable")).append("</td>")
            .append("<td>&nbsp;</td></tr>");
         buf.append("<tr><td>&nbsp;</td>")
-           .append("<td><b>X:</b></td><td>").append(_t("Over {0} shared bandwidth", "2000KBps")).append("</td>")
+           .append("<td><b>X</b></td><td>").append(_t("Over {0} shared bandwidth", "2000KBps")).append("</td>")
            .append("<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>");
         buf.append("<tr><td>&nbsp;</td><td colspan=\"5\">").append(_t("Note: For P and X bandwidth tiers, O is included for the purpose of backward compatibility in the NetDB."))
            .append("</tr>");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
index e243a384be..b7c6b7f66f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
@@ -709,7 +709,7 @@ class SummaryBarRenderer {
             //buf.append("<h3><a href=\"/configupdate\">")
             buf.append("<h3><a href=\"/news\">")
                .append(_t("News &amp; Updates"))
-               .append("</a></h3><hr class=\"b\"><div class=\"newsheadings\">\n");
+               .append("</a></h3><hr class=\"b\"><div class=\"sb_newsheadings\">\n");
             // Get news content.
             List<NewsEntry> entries = Collections.emptyList();
             ClientAppManager cmgr = _context.clientAppManager();
@@ -719,7 +719,7 @@ class SummaryBarRenderer {
                     entries = nmgr.getEntries();
             }
             if (!entries.isEmpty()) {
-                buf.append("<ul>\n");
+                buf.append("<table>\n");
                 DateFormat fmt = DateFormat.getDateInstance(DateFormat.SHORT);
                 // the router sets the JVM time zone to UTC but saves the original here so we can get it
                 fmt.setTimeZone(SystemVersion.getSystemTimeZone(_context));
@@ -731,29 +731,30 @@ class SummaryBarRenderer {
                     if (i >= min && entry.updated > 0 &&
                         entry.updated < _context.clock().now() - 60*24*60*60*1000L)
                         break;
-                    buf.append("<li><a href=\"/?news=1&amp;consoleNonce=")
+                    buf.append("<tr><td><a href=\"/?news=1&amp;consoleNonce=")
                        .append(consoleNonce)
-                       .append("\">");
+                       .append("\"");
                     if (entry.updated > 0) {
                         Date date = new Date(entry.updated);
-                        buf.append(fmt.format(date))
-                           .append(": ");
+                        // tooltip to tag for translation post 0.9.31 release
+                        buf.append(" title=\"Published: ").append(fmt.format(date)).append("\"");
                     }
+                    buf.append(">");
                     buf.append(entry.title)
-                       .append("</a></li>\n");
+                       .append("</a></td></tr>\n");
                     if (++i >= max)
                         break;
                 }
-                buf.append("</ul>\n");
-                //buf.append("<a href=\"/news\">")
-                //   .append(_t("Show all news"))
-                //   .append("</a>\n");
+                buf.append("</table>\n");
             } else {
                 buf.append("<center><i>")
                    .append(_t("none"))
                    .append("</i></center>");
             }
             // Add post-headings stuff.
+            //buf.append("<a href=\"/news\">")
+                //.append(_t("Show all news"))
+                //.append("</a>\n");
             buf.append("</div>\n");
         }
         return buf.toString();
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index 1683582c27..3b151d57d4 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -45,16 +45,15 @@ public class SummaryHelper extends HelperBase {
     static final String DEFAULT_FULL =
         "HelpAndFAQ" + S +
         "ShortGeneral" + S +
-        "Bandwidth" + S +
         "UpdateStatus" + S +
-        "FirewallAndReseedStatus" + S +
+        "Bandwidth" + S +
         "NetworkReachability" + S +
+        "FirewallAndReseedStatus" + S +
         "I2PServices" + S +
         "I2PInternals" + S +
         "Peers" + S +
         "Tunnels" + S +
         "TunnelStatus" + S +
-        "Congestion" + S +
         "RestartStatus" + S +
         "Destinations" + S +
         "";
@@ -62,10 +61,10 @@ public class SummaryHelper extends HelperBase {
     static final String DEFAULT_FULL_ADVANCED =
         "HelpAndFAQ" + S +
         "ShortGeneral" + S +
-        "Bandwidth" + S +
         "UpdateStatus" + S +
-        "FirewallAndReseedStatus" + S +
+        "Bandwidth" + S +
         "NetworkReachability" + S +
+        "FirewallAndReseedStatus" + S +
         "I2PServices" + S +
         "I2PInternals" + S +
         "Advanced" + S +
@@ -80,11 +79,11 @@ public class SummaryHelper extends HelperBase {
     static final String DEFAULT_MINIMAL =
         "ShortGeneral" + S +
         "Bandwidth" + S +
-        "NewsHeadings" + S +
         "UpdateStatus" + S +
+        "NewsHeadings" + S +
         "NetworkReachability" + S +
-        "RestartStatus" + S +
         "FirewallAndReseedStatus" + S +
+        "RestartStatus" + S +
         "Destinations" + S +
         "";
 
@@ -516,10 +515,11 @@ public class SummaryHelper extends HelperBase {
                     buf.append("client.png\" alt=\"Client\" title=\"").append(_t("Client")).append("\">");
                 buf.append("</td><td align=\"left\"><b><a href=\"tunnels#").append(h.toBase64().substring(0,4));
                 buf.append("\" target=\"_top\" title=\"").append(_t("Show tunnels")).append("\">");
-                if (name.length() <= 20)
+                // Increase permitted max length of tunnel name & handle overflow with css
+                if (name.length() <= 32)
                     buf.append(DataHelper.escapeHTML(name));
                 else
-                    buf.append(DataHelper.escapeHTML(name.substring(0,18))).append("&hellip;");
+                    buf.append(DataHelper.escapeHTML(name.substring(0,29))).append("&hellip;");
                 buf.append("</a></b></td>\n");
                 LeaseSet ls = _context.netDb().lookupLeaseSetLocally(h);
                 if (ls != null && _context.tunnelManager().getOutboundClientTunnelCount(h) > 0) {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
index 1a5bb960df..db9af12337 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
@@ -35,6 +35,9 @@ class SummaryRenderer {
     private final Log _log;
     private final SummaryListener _listener;
     private final I2PAppContext _context;
+    private static final Color BACK_COLOR = new Color(246, 246, 255);
+    private static final Color SHADEA_COLOR = new Color(246, 246, 255);
+    private static final Color SHADEB_COLOR = new Color(246, 246, 255);
     private static final Color GRID_COLOR = new Color(100, 100, 100, 75);
     private static final Color MGRID_COLOR = new Color(255, 91, 91, 110);
     private static final Color AREA_COLOR = new Color(100, 160, 200, 200);
@@ -131,8 +134,11 @@ class SummaryRenderer {
             RrdGraphDef def = new RrdGraphDef();
 
             // Override defaults
-            def.setColor(RrdGraphDef.COLOR_GRID,  GRID_COLOR);
-            def.setColor(RrdGraphDef.COLOR_MGRID, MGRID_COLOR);
+            def.setColor(RrdGraphDef.COLOR_BACK,   BACK_COLOR);
+            def.setColor(RrdGraphDef.COLOR_SHADEA, SHADEA_COLOR);
+            def.setColor(RrdGraphDef.COLOR_SHADEB, SHADEB_COLOR);
+            def.setColor(RrdGraphDef.COLOR_GRID,   GRID_COLOR);
+            def.setColor(RrdGraphDef.COLOR_MGRID,  MGRID_COLOR);
             def.setFont(RrdGraphDef.FONTTAG_DEFAULT, new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10));
             def.setFont(RrdGraphDef.FONTTAG_TITLE,   new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10));
             def.setFont(RrdGraphDef.FONTTAG_AXIS,    new Font("Droid Sans Mono", Font.PLAIN, 10));
diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp
index a8724d8345..b3390f8ba0 100644
--- a/apps/routerconsole/jsp/configadvanced.jsp
+++ b/apps/routerconsole/jsp/configadvanced.jsp
@@ -30,13 +30,11 @@
  <table id="floodfillconfig" class="configtable">
   <tr><td class="infohelp">
 <%=intl._t("Floodfill participation helps the network, but may use more of your computer's resources.")%>
-  </td></tr>
-  <tr><td class="infohelp">
 <%
     if (advancedhelper.isFloodfill()) {
-%><%=intl._t("This router is currently a floodfill participant.")%><%
+%> (<%=intl._t("This router is currently a floodfill participant.")%><%
     } else {
-%><%=intl._t("This router is not currently a floodfill participant.")%><%
+%> (<%=intl._t("This router is not currently a floodfill participant.")%>)<%
     }
 %>
   </td></tr>
diff --git a/apps/routerconsole/jsp/help_ar.jsp b/apps/routerconsole/jsp/help_ar.jsp
index a3455aa751..0c33d9ddd1 100644
--- a/apps/routerconsole/jsp/help_ar.jsp
+++ b/apps/routerconsole/jsp/help_ar.jsp
@@ -32,7 +32,7 @@
 <p>اذا رغبت في المساعدة أو ترجمة الوثائق، أو المساعدة في أشياء أخرى، انظر اسفله <a href="http://i2p-projekt.i2p/ar/get-involved">تطوع</a></p>
 <p>المزيد من المساعدة هنا:</p>
 <ul class="links">
-<li class="tidylist"><a href="http://i2p-projekt.i2p/ar/faq">ابئلة شائعة i2p-projekt.i2p</a></li>
+<li><a href="http://i2p-projekt.i2p/ar/faq">ابئلة شائعة i2p-projekt.i2p</a></li>
 <li>او بالدردشة على IRC.</li></ul>
 </div>
 
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index cdf0c6dbbd..0c907b8ea3 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -2233,7 +2233,7 @@ public class WebMail extends HttpServlet
 			 spacer +
 			 button(CONFIGURE, _t("Settings")) +
 			"</td></tr>\n" +
-			"<tr><td align=\"center\" colspan=\"2\"><hr><a href=\"http://hq.postman.i2p/?page_id=14\">" + _t("Learn about I2P mail") + "</a> | <a href=\"http://hq.postman.i2p/?page_id=16\">" + _t("Create Account") + "</a></td></tr>\n" +
+			"<tr><td align=\"center\" colspan=\"2\"><hr><a href=\"http://hq.postman.i2p/?page_id=14\" target=\"_blank\">" + _t("Learn about I2P mail") + "</a> | <a href=\"http://hq.postman.i2p/?page_id=16\" target=\"_blank\">" + _t("Create Account") + "</a></td></tr>\n" +
 			"</table></div>");
 	}
 
diff --git a/history.txt b/history.txt
index 05d901477b..03cd78a051 100644
--- a/history.txt
+++ b/history.txt
@@ -1,14 +1,56 @@
 2017-07-26 str4d
+ * Themes:
+   - 'light' theme (console & apps):
+     - Rework to reduce contrast (ticket #1996)
+     - Add custom radio/checkbox icons for Chrome/Blink
  * Console:
    - Add JavaScript snippet to reset dest address scroll position onblur (fixes
      Chrome/Blink disappearing text bugs in i2ptunnel and susidns)
+   - Fix reseed failure notice overlap when "check connection" message shown
+   - Enhance presentation of console "error 500" messages
+   - Cosmetic tweaks to welcome page presentation, arabic welcome page tidyup
+   - Migrate .smallhead th class to tr to simplify markup
+   - Sidebar:
+     - Remove "Congestion" from default sidebar (still present in default
+       advanced sidebar)
+     - Fix label wrapping issue with translations
+     - Migrate sidepanel news section to tables to permit better control over
+       wrapping and placement (ticket #1996)
+     - Move news item dates to tooltips to lessen chance of headlines wrapping
+       and cleanup presentation
+     - Increase maximum length of local tunnel links in the sidebar (and handle
+       overflow with CSS) to minimize chance of default tunnels display
+       truncating in translations
+     - Add the power off icon to sidebar restart button on hover to clarify
+       button function (ticket #1996)
+   - /configadvanced: Move floodfill status to row above to remove unnecessary
+     whitespace and cleanup UI
    - /debug:
      - Add container divs and styling markup
      - Add top navigation menu
+     - Add debug icon to h2 headers to aid navigation
+   - /graphs: Improve presentation of graph images by removing rendered border
+     and setting background color to better integrate with themes
+   - /home: Widen div.app to lessen chance of truncation (classic/midnight)
    - /jars:
      - JARs, WARs & individual plugins separated with headers
      - Filenames stripped of path info (path indicated on headers and tooltips)
      - Add container divs and styling markup
+     - Minimize table overflow with conditional scaling of content
+     - One-click select for revision, sha256 & unsigned mods
+   - /logs:
+     - Reduce line/entry spacing for router and critical logs (#ticket 1996)
+     - Multi-column view for changelog at >=1400px to address horizontal
+       whitespace issue
+   - /netdb:
+     - Multi-column display of Leases in LeaseSet tables
+     - Better alignment of Lease elements, iconify gateway
+     - Placeholder flag for unknown/unresolved peers for [flag+dest] combos to
+       improve presentation / fix deadspace issue
+   - Chinese:
+     - Fix alignment of table contents in /tunnels (classic)
+     - Fix sidebar content display width (midnight)
+     - Cosmetic fixes (all themes)
  * I2PSnark:
    - Mitigate truncation of ratings dropdown in comments section (translations)
    - light: Reduce contrast of display text
@@ -20,7 +62,18 @@
    - Migrate "view or change bandwidth" to [Configure] tooltip to standardize
      configuration links, allow for more space for option labels and lessen
      chance of option labels wrapping in translations
- * SusiMail: Dismiss notifications on click
+ * I2PTunnel:
+   - Ensure message log font scales proportionately
+   - Fix overflow issue with dropdowns in Chrome/blink (dark/midnight)
+ * SusiDNS
+   - Reduce width of filter buttons to lessen chance of wrapping (ticket #1996)
+   - Add non-selectable items to improve copy/paste of hosts in address books
+   - Make dest addresses in host list only display scrollbar on focus to reduce
+     screen clutter
+   - Hide broken imagegen images
+ * SusiMail:
+   - Dismiss notifications on click
+   - Enhance presentation of 'postman' links on login panel
 
 2017-07-25 str4d
  * Console: Move JRobin default color and font changes into SummaryRenderer
diff --git a/installer/resources/icons/flags/a0.png b/installer/resources/icons/flags/a0.png
new file mode 100644
index 0000000000..fccea54876
Binary files /dev/null and b/installer/resources/icons/flags/a0.png differ
diff --git a/installer/resources/readme/readme_ar.html b/installer/resources/readme/readme_ar.html
index f9e9766a03..322ed406b4 100644
--- a/installer/resources/readme/readme_ar.html
+++ b/installer/resources/readme/readme_ar.html
@@ -7,7 +7,7 @@
 
 <ul>
 
-<ul class="links">
+<ul class="links twocol">
 
 <!--
 <li><a href="http://forum.i2p/">forum.i2p</a> وصلة آمنة ومجهولة الى المنتدى الرسمي <a href="http://forum.i2p/">forum.i2p</a></li>
@@ -16,12 +16,9 @@
 <li><a href="http://i2pwiki.i2p/">i2pwiki.i2p</a> ويكي مفتوح التي يستطيع الجميع تحريرها مع الكثير من المعلومات حول الشبكة</li>
 <li><a href="http://echelon.i2p">echelon.i2p</a> موقع لتحميل مجموعة من البرامج مثل</li>
 <li><a href="http://zerobin.i2p">zerobin.i2p</a> موقع لمشاركة المحتوى النصي</li>
-
+<li>هناك العديد من eepsites، فقط اتبع هذه الروابط لإكتشاف المزيد!</li>
 </ul>
 
-<p>هناك العديد من eepsites، فقط اتبع هذه الروابط لإكتشاف المزيد!</p>
-<br>
-
 <li><b>تصفح الانترنت</b> شبكة I2P مصممة لتقديم اكبر قدر من الامان والخصوصية للاتصال داخل الشبكة المغلقة، لذلك ينصح عدم استخدامها للوصول الى المواقع العادية مثل غوغل وغيرها لانها <b>لم تصمم كبروكسي خارجي للوصول لمواقع محجوبة</b>. يمكن معرفة استخدام الشبكة لكن بما أن الاتصال مجهول ومشفر لا يمكن معرفة النشاط الذي تقوم به (مشاركة الملفات، بريد الكتروني، دردشة...).</li>
 <li><b>مشاركة الملفات</b> يحتوي حزمة البرامج على برنامج تورنت <a href="i2psnark/">I2PSnark</a> يوفر امكانية مشاركة الملفات داخل الشبكة بصفة مشفرة وسرية، لكن لا يصلح لتحميل ملفات تورنت من الانترنت العادية.</li>
 <li><b>بريد الكتروني المجهول</b> يمكن تبادل بريد الكتروني المجهول داخل الشبكة وايضا مع شبكة الانترنت العادية عبر واجهة ويب <a href="/susimail/susimail">susimail</a> او اي برنامج متوافق مع (POP3/SMTP). يمكن التسجيل في الخدمة عبر <a href="http://hq.postman.i2p/">hq.postman.i2p</a><br>
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 067093bb6f..04359ef7cc 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -39,7 +39,7 @@ body {
 }
 
 .routersummary img[src$="i2plogo.png"], .routersummary h3, .confignav, *::before, *::after, div.app, .themechoice, .langselect, .langbox,
-.newsAuthor, #netdbcountrylist img, .viewfullentry, .sybil_routerinfo th img, .graphspanel {
+.newsAuthor, #newsDisplay, #netdbcountrylist img, .viewfullentry, .sybil_routerinfo th img, .graphspanel {
      -moz-user-select: none;
      -webkit-user-select: none;
      user-select: none;
@@ -320,12 +320,16 @@ img {
 
 /* console error messages */
 
+img[src="/themes/console/images/i2plogo.png"] {
+     box-shadow: none !important;
+}
+
 .sorry {
-     padding: 20px 20px 20px 60px;
-     background: #fff url(/themes/console/images/info/errortriangle.png) 10px center no-repeat;
-     background: url(/themes/console/images/info/errortriangle.png) 10px center no-repeat, linear-gradient(to bottom, #fff, #ffe);
+     padding: 20px 20px 20px 75px;
+     background: #fff url(/themes/console/images/info/errortriangle.png) 20px 40% no-repeat;
+     background: url(/themes/console/images/info/errortriangle.png) 20px 40% no-repeat, linear-gradient(to bottom, #fff, #ffe);
      margin: -1px 0 0 211px;
-     min-width: 490px;
+     min-width: 475px;
      border: 1px solid #89f;
      box-shadow: inset 0 0 0 1px #ff9;
      text-align: justify;
@@ -342,6 +346,39 @@ img {
      margin: 10px 0;
 }
 
+.sorry p {
+    padding: 0 !important;
+}
+
+#warning2 {
+     min-width: 540px;
+     background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.2)) repeat scroll 0 0 / 100% 100%, rgba(0, 0, 0, 0) url(images/bg0.png) repeat scroll 0 0 / 120px 120px;
+     margin-top: -15px;
+     padding: 0 15px 5px;
+     box-shadow: inset 0 0 0 1px #f99;
+     font-weight: normal;
+     color: #2c354f;
+}
+
+#warning2 h3 {
+     margin: -1px -16px 15px;
+     color: #2c354f;
+     box-shadow: inset 0 0 0 1px #f99;
+     padding: 8px 10px;
+}
+
+#warning2 b {
+     margin-right: 3px;
+     display: inline-block;
+     min-width: 140px;
+     text-align: right;
+}
+
+#warning2 p {
+     margin-left: 10px;
+     margin-right: 10px;
+}
+
 /* sidebar */
 
 .routersummaryouter {
@@ -441,7 +478,7 @@ img {
      border: 0;
      border-bottom: 0 !important;
      font-size: 8.5pt;
-     letter-spacing: 0.05em;
+/*     letter-spacing: 0.05em;*/
      margin: -7px -1px -7px -1px !important;
      padding: 8px 2px;
      text-transform: capitalize;
@@ -561,9 +598,13 @@ img {
 }
 
 #sb_localtunnels a {
-     text-transform: capitalize;
+     text-transform: none;
      display: inline-block;
      width: 100%;
+     max-width: 180px;
+     overflow: hidden;
+     text-overflow: ellipsis;
+     white-space: nowrap;
 }
 
 #sb_localtunnels td:first-child {
@@ -594,9 +635,15 @@ img {
      background: #fff;
      border: 1px solid #89f;
      border-radius: 2px;
-     box-shadow: 0 0 1px #bbb;
-     margin: -5px 1px -6px;
-     padding: 5px 3px;
+     box-shadow: 0 0 1px #bbb, inset 0 0 0 1px #fbb;
+     margin: -4px 2px -5px;
+     padding: 6px 5px;
+     line-height: 110%;
+     font-size: 8pt;
+}
+
+#sb_warning + .sb_notice {
+     margin-top: 10px;
 }
 
 p:empty + .sb_notice {
@@ -607,40 +654,66 @@ p:empty + .sb_notice {
      margin: -2px 0;
 }
 
-.newsheadings {
+/* sidebar news */
+
+.sb_newsheadings {
      text-align: right;
-     margin: -1px 5px -5px -23px;
+     margin: -1px 5px -5px 0;
+     margin: -3px 0 -7px 0;
      padding: 0;
      font-size: 8pt;
 }
 
-.newsheadings ul {
-     margin: 2px 5px -1px 38px;
-     padding: 0;
-     display: inline-block;
-     width: 171px;
+.sb_newsheadings table {
+     margin: -6px 0 2px !important;
+     width: 100%;
+     table-layout: auto;
+     background: #fff;
 }
 
-.newsheadings li {
-     list-style: none outside url(images/newsbullet_mini.png);
-     margin: 2px -4px 2px 8px;
-     vertical-align: middle;
+.sb_newsheadings td {
+     text-align: left;
+     border: none;
+     padding: 5px 3px;
+     border-collapse: collapse;
+     border-bottom: 1px solid #fff !important;
+     line-height: 100%;
+}
+
+.sb_newsheadings table tr:last-child td {
+     border-bottom: none !important;
+     padding-bottom: 3px !important;
+}
+
+.sb_newsheadings td {
+     background: #eff2ff;
+     padding-left: 20px;
+     padding-right: 8px;
+     text-align: left;
+     background: url(images/link.png) 4px 4px no-repeat !important;
+     background-size: 12px auto !important;
+     background-blend-mode: luminosity;
+     vertical-align: middle !important;
+     transition: ease background 0.2s;
+     word-spacing: 0.1em;
+}
+
+.sb_newsheadings tr:hover td {
+     background: url(images/link.png) 4px 4px no-repeat #ffd !important;
+     background-size: 12px auto !important;
+     background-blend-mode: normal;
+     transition: ease background 0.2s;
+}
+
+.sb_newsheadings td a {
      line-height: 110%;
-}
-
-.newsheadings li a {
-     margin-top: -2px;
-     margin-left: -3px;
      display: inline-block;
+     margin: 0;
+     padding: 0;
+     width: 100%;
 }
 
-.newsheadings li:first-child {
-     margin-top: -3px;
-}
-
-.newsheadings li:last-child {
-     margin-bottom: 0;
-}
+/* end sidebar news */
 
 div.refresh {
      margin-top: 10px !important;
@@ -764,6 +837,14 @@ div.refresh {
 
 /* welcome */
 
+div[lang="es"] li, div[lang="pt"] li, div[lang="sv"] li, div[lang="zh"] li {
+     list-style: none;
+}
+
+div[lang="sv"] li::first-letter {
+     text-transform: uppercase !important;
+}
+
 div[lang="ar"] li {
      margin: 0 10px 0 30px;
 }
@@ -774,6 +855,33 @@ div[lang="ar"] h3, div[lang="ar"] li {
 
 div[lang="de"] .twocol {
      margin-left: 50px !important;
+     margin-top: -8px !important;
+}
+
+div[lang="sv"] .twocol {
+     margin-top: 2px !important;
+}
+
+div[lang="es"] li {
+    list-style-type: none;
+    margin-left: -10px;
+}
+
+div[lang="es"] .twocol {
+     background: #eff2ff;
+     border-radius: 1px;
+     box-shadow: 0 0 0 1px #bbf;
+     padding: 5px 0 8px 48px;
+     margin-top: 15px !important;
+}
+
+div[lang="es"] .twocol:not(old) {
+     margin-left: 0 !important;
+     margin-right: 0 !important;
+}
+
+div[lang="pt"] li br {
+     display: none;
 }
 
 #console .links {
@@ -784,6 +892,11 @@ div[lang="de"] .twocol {
      padding-top: 10px;
 }
 
+#console li {
+     line-height: 140%;
+     text-align: justify;
+}
+
 .langbox {
      margin: 3.5px 2px 0;
      color: #001;
@@ -799,7 +912,7 @@ div[lang="de"] .twocol {
      padding: 0 !important;
      margin: 0 1px -1px;
      opacity: 0.9;
-     border: 1px solid #999;
+     border: 1px solid #bbf;
      transform: none !important;
 }
 
@@ -808,6 +921,10 @@ div[lang="de"] .twocol {
      transform: scale(1.1) !important;
 }
 
+.langbox img:hover:active {
+     transform: none !important;
+}
+
 .links {
      padding-bottom: 0;
      text-align: justify;
@@ -819,8 +936,36 @@ div[lang="de"] .twocol {
      padding: 5px 10px 0 !important;
 }
 
+.links:not(old) {
+     margin-left: -15px !important;
+     margin-right: -15px !important;
+}
+
+.links li:not(old) {
+     list-style: url(/themes/console/images/transparent.gif) !important;
+     list-style-position: outside;
+     padding: 5px 10px 0 !important;
+}
+
+.links li::before {
+     content: "";
+     display: inline-block;
+     width: 16px;
+     height: 18px;
+     background: url(images/link.png) left top 4px no-repeat !important;
+     background-size: 14px 14px !important;
+     margin-right: 4px;
+     margin-left: -20px;
+}
+
+div[lang="ar"] .links li::before {
+     background-position: right top 4px !important;
+     margin-right: -20px;
+     margin-left: 4px;
+}
+
 .links li:first-child {
-     padding: 14px 10px 5px !important;
+     padding: 15px 10px 5px !important;
 }
 
 .links li:last-child {
@@ -838,9 +983,9 @@ div[lang="de"] .twocol {
      -moz-columns: 2 400px;
      -webkit-columns: 2 400px;
      columns: 2 400px;
-     -moz-column-gap: 20px !important;
-     -webkit-column-gap: 20px !important;
-     column-gap: 20px !important;
+     -moz-column-gap: 40px !important;
+     -webkit-column-gap: 40px !important;
+     column-gap: 40px !important;
      display: block;
      margin: 10px 0 !important;
 }
@@ -864,6 +1009,10 @@ p + .twocol {
      margin-left: 30px !important;
 }
 
+#console div[lang="es"] .twocol {
+     margin-left: 0 !important;
+}
+
 .twocol li {
      margin-left: 20px;
 }
@@ -922,8 +1071,7 @@ pre {
 }
 
 tt, code {
-     font-size: 9pt;
-     font-weight: bold !important;
+     font: bold 8pt "Droid Sans Mono", "Andale Mono", "DejaVu Sans Mono", "Lucida Console", monospace !important;
      color: darkgreen;
 }
 
@@ -947,6 +1095,12 @@ select {
      cursor: pointer;
 }
 
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+select {
+     padding: 5px 16px 5px 8px !important;
+}
+}
+
 select option {
      background: #fff;
 }
@@ -1084,6 +1238,8 @@ input.search[type="text"] {
 
 input[name="refreshInterval"] {
      text-align: right;
+     min-width: 80px;
+     width: 80px;
 }
 
 input[type="submit"], input[type="reset"], button, .optbox {
@@ -1509,6 +1665,7 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re
 
 .routersummary .reload:hover, .routersummary .reload:focus {
      background: url(/themes/console/images/buttons/restart_hover.png) center center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%) !important;
+     background: url(/themes/console/images/buttons/shutdown_hover.png) 37% center no-repeat, url(/themes/console/images/buttons/restart_hover.png) 63% center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%) !important;
      border: 1px solid #89f;
 }
 
@@ -1678,12 +1835,6 @@ div.welcome {
      min-width: 570px;
 }
 
-.main#jardump {
-     padding: 0;
-     overflow-y: hidden !important;
-     min-width: 570px;
-}
-
 .main#proof {
      padding: 0;
      min-width: 570px;
@@ -1767,6 +1918,10 @@ div.news h3 {
      letter-spacing: 0.1em;
 }
 
+.newsentry:first-child {
+     margin-top: -6px;
+}
+
 .newsentry h3 {
      letter-spacing: 0.1em;
      box-shadow: none;
@@ -1794,27 +1949,33 @@ div.news p:last-child {
      margin-bottom: 10px;
 }
 
-div.news a {
-     color: #663;
+div.news a, #warning a {
+     color: #7f560f !important;
 }
 
-div.news a:hover, div.news a:visited:hover {
+div.news a:hover, div.news a:focus, div.news a:visited:hover, div.news a:visited:focus, #warning a:hover, #warning a:focus {
      color: #f60 !important;
 }
 
-div.news a:visited {
-     color: #773 !important;
+div.news a:visited, #warning a:visited {
+     color: #5f4312 !important;
 }
 
 div.news hr {
      color: #cc7;
      background: #775628;
-     height: 1px;
-     border: 0 solid #cc7;
-     margin: 10px 0 2px !important;
+     height: 2px;
+     border-bottom: 1px solid #fff9ef;
+     margin: 10px 0 1px !important;
      opacity: 0.7;
 }
 
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+div.news hr {
+     height: 1px;
+}
+}
+
 div.news hr:last-child {
      margin-bottom: 10px !important;
 }
@@ -1869,7 +2030,7 @@ div.news hr:last-child {
 /* top navigation */
 
 div.confignav {
-     padding: 6px 5px;
+     padding: 5px;
      margin: -16px -16px 5px -16px;
      border: 1px solid #89f;
      font-size: 9pt;
@@ -2115,8 +2276,8 @@ table.configtable, #permabanned, #loggingoptions, #configstats, ul#banlist {
      display: none;
 }
 
-#profilelist tr:hover, #floodfills tr:hover,  #ntcpconnections tr:hover, #udpconnections tr:hover,
-.homelinkedit tr:hover, .main#debug table:first-of-type tr:hover td {
+#profilelist tr:hover td, #floodfills tr:hover td,  #ntcpconnections tr:hover td, #udpconnections tr:hover td,
+.homelinkedit tr:hover td, #portmapper tr:hover td {
      background: #ffe;
      background: linear-gradient(to bottom, #fff, #ffe);
      color: #104e99;
@@ -2296,6 +2457,17 @@ tr:hover th {
      width: 16px;
 }
 
+#capabilities_key b {
+     text-transform: none !important;
+     display: inline-block;
+     min-width: 16px;
+     background: #dfe4ff;
+     text-align: center;
+     text-shadow: 0 1px 1px #fff;
+     border-radius: 2px;
+     padding: 1px 2px;
+}
+
 #thresholds tr:hover td, #profile_defs tr:hover td {
      background: none;
 }
@@ -2358,6 +2530,7 @@ ul#banlist + h3.tabletitle {
      -webkit-column-break-inside: avoid;
      display: table;
      padding: 3px !important;
+     line-height: 100%;
 }
 
 #banlist li img {
@@ -2631,9 +2804,9 @@ div.configure h2:first-child {
      vertical-align: middle;
 }
 
-#addkeyring tr, #loggingoptions tr, #profilelist tr:hover, #floodfills tr:hover, #jardump tr {
-     border-top: 1px inset #cfd6ff !important;
-     border-bottom: 1px inset #cfd6ff !important;
+#addkeyring tr td, #loggingoptions tr td, #profilelist tr:hover, #floodfills tr:hover {
+     border-top: 1px solid #cfd6ff !important;
+     border-bottom: 1px solid #cfd6ff !important;
 }
 
  tr.tablefooter {
@@ -2641,15 +2814,13 @@ div.configure h2:first-child {
      border-bottom: 1px solid #89f !important;
 }
 
-#sidebarconf tr:hover, #eventlog tr:hover, .tunneldisplay tr:hover, #jobstats tr:hover, #schedjobs tr:hover, #jardump tr:hover {
+#sidebarconf tr:hover td, #eventlog tr:hover td, .tunneldisplay tr:hover td, #jobstats tr:hover td, #schedjobs tr:hover td, #jardump tr:hover td {
      background: #ffd;
      background: linear-gradient(to bottom, #fff, #ffe);
      color: #104e99;
-     border-top: 1px solid #89f !important;
-     border-bottom: 1px solid #89f;
 }
 
-#sidebarconf tr:last-child, #sidebarconf tr:last-child:hover {
+#sidebarconf tr:last-child td, #sidebarconf tr:last-child:hover td {
      border-top: 1px solid #89f;
      background: #eff1ff;
 }
@@ -2991,6 +3162,10 @@ th.th_title {
      line-height: normal;
 }
 
+.smallhead th {
+     font-size: 8pt;
+}
+
 td {
      padding: 3px 5px;
 }
@@ -3098,11 +3273,19 @@ h4.app, h4.app2 {
 
 h4.app {
      margin-top: -5px;
+     background: url(/themes/console/images/eepsite.png) 8px center no-repeat, linear-gradient(to bottom, #fff 50%, #eff2ff 50%);
+     background-size: 16px 16px, 100% 100%;
+     background-blend-mode: luminosity, normal;
+     padding-left: 32px;
 }
 
 h4.app2 {
      clear: left;
      margin-top: 5px !important;
+     background: url(/themes/console/images/info/globe.png) 8px center no-repeat, linear-gradient(to bottom, #fff 50%, #eff2ff 50%);
+     background-size: 16px 16px, 100% 100%;
+     background-blend-mode: luminosity, normal;
+     padding-left: 32px;
 }
 
 div.ag2 {
@@ -3112,7 +3295,7 @@ div.ag2 {
 div.app {
      float: left;
      padding: 0;
-     min-width: 104px;
+     width: 140px;
      text-align: center !important;
      border: none;
      margin: 3px ;
@@ -3137,14 +3320,14 @@ div.app:hover a {
      vertical-align: middle;
 }
 
-div.applabel {
+.applabel {
      background: url(images/tinytitle.png) center center repeat-x;
      background: linear-gradient(to bottom, #fff 50%, #eff2ff 50%);
      font-size: 9pt;
      margin: 0;
      padding: 4px 2px;
      text-align: center;
-     width: 120px;
+     width: 136px;
      line-height: 110%;
      text-transform: lowercase;
      font-size: 8pt;
@@ -3165,7 +3348,7 @@ div.applabel {
      text-overflow: ellipsis;
 }
 
-.app:hover div.applabel {
+.app:hover .applabel {
      border-top: 1px solid #f60;
      background: #fff;
 }
@@ -3270,7 +3453,7 @@ table.search {
      padding: 0;
 }
 
-div.applabel:hover {
+.applabel:hover {
      box-shadow: none;
 }
 
@@ -3327,27 +3510,6 @@ h3#servicedebug a, h3#graphinfo a {
      filter: drop-shadow(0 0 1px #f60);
 }
 
-.main#debug h2 {
-     padding: 6px 10px;
-     font-size: 12pt;
-}
-
-.main#debug h3 {
-     padding: 4px 10px;
-}
-
-.main#debug th:last-child, .main#debug td:last-child {
-     text-align: right;
-}
-
-.main#debug td[colspan="2"] {
-     text-align: left;
-}
-
-.main#debug h2 + hr {
-     display: none;
-}
-
 h3 + .statusnotes {
      margin-top: -1px;
 }
@@ -3779,29 +3941,30 @@ p#enablefullstats {
      font-weight: bold;
 }
 
-div.graphspanel {
+.graphspanel {
      padding: 15px 5px 0;
      margin: -16px -16px -11px -16px;
      text-align: center !important;
      overflow: hidden;
 }
 
-div.graphspanel img {
+.graphspanel img {
      margin: 5px;
-     border: 1px solid #777;
+     padding: 1px;
+     background: #f6f6ff;
+     border: 1px solid #89f;
+     box-shadow: 0 0 1px #aaa;
      max-width: 95%;
      max-width: calc(100% - 50px);
 }
 
-div.graphspanel a img {
-     border: 1px solid #77f;
-     padding: 2px;
-     background: #ccf;
+.graphspanel a img {
+     background: #fff;
      opacity: 0.9;
      vertical-align: top;
 }
 
-div.graphspanel a img:hover {
+.graphspanel a img:hover {
      border: 1px solid #f60;
      text-align: center !important;
      background: #ccf;
@@ -3809,16 +3972,16 @@ div.graphspanel a img:hover {
      cursor: url(/themes/console/images/cursor_zoom.png), pointer;
 }
 
-div.graphspanel hr {
+.graphspanel hr {
      margin: 10px 0;
 }
 
-div.graphspanel form:last-child {
+.graphspanel form:last-child {
      text-align: left;
      margin: 0 20px;
 }
 
-div.graphspanel h3 {
+.graphspanel h3 {
      text-align: left;
      margin: 10px 20px 10px 20px;
 }
@@ -3924,14 +4087,14 @@ p#graphopts + p {
 
 /* end new graphs optionbox */
 
-div.footnote {
+.footnote {
      text-align: right;
      color: #339;
-     font-size: 7pt;
+     font-size: 8pt;
      margin-bottom: -4px !important;
 }
 
-div.footnote hr {
+.footnote hr {
      margin: 10px 0 5px 0 !important;
      color: #99f;
      background: #99f;
@@ -4291,44 +4454,6 @@ td#pw_adduser input {
 
 /* end configui */
 
-.main#jardump {
-     overflow: auto;
-}
-
-#jardump table {
-     border-left: none;
-     border-right: none;
-     margin-top: -1px;
-     margin-bottom: -1px;
-     font-size: 8pt;
-}
-
-#jardump th {
-     padding: 5px;
-     font-size: 9pt;
-}
-
-#jardump td {
-     vertical-align: top;
-}
-
-.main#jardump th:nth-child(1), .main#jardump th:nth-child(3), .main#jardump th:nth-child(6), .main#jardump th:nth-child(7) {
-     text-align: left;
-}
-
-#jardump tt {
-     letter-spacing: -0.05em;
-}
-
-#jardump a tt {
-     color: #006 !important;
-}
-
-#jardump a:hover tt {
-     color: #f60 !important;
-}
-
-
 .main#netdb > .confignav {
      margin-bottom: 15px;
 }
@@ -4721,6 +4846,80 @@ p:empty { /* empty paragraph nuke */
      font-size: 10pt !important;
 }
 
+/* leasesets */
+
+.netdb_leases, .netdb_leases li {
+     margin: -1px 0 0 !important;
+     padding: 0 !important;
+     columns: 400px auto;
+     column-rule: 1px solid #ccdeff;
+}
+
+.netdb_leases li {
+     line-height: 140%;
+     list-style: none;
+     vertical-align: middle;
+     border-bottom: 1px solid #ccdeff;
+     padding: 2px 0 3px !important;
+}
+
+.netdb_leases b:first-child {
+    display: inline-block;
+    min-width: 80px;
+    margin-right: 2px;
+    text-align: right;
+}
+
+.netdb_leases .tunnel_peer img {
+     margin-bottom: -1px;
+}
+
+.netdb_gateway img {
+     vertical-align: middle;
+}
+
+.netdb_tunnel {
+     display: inline-block;
+     background: #ddf;
+     padding: 0 4px;
+     margin-right: -4px;
+     border-radius: 2px;
+}
+
+.netdb_leases .tunnel_peer {
+     margin-left: 2px;
+}
+
+.netdb_leases .tunnel_peer tt, .netdb_leases .tunnel_peer tt a {
+     letter-spacing: 0.1em;
+}
+
+.netdb_leases .tunnel_id {
+     min-width: 74px;
+}
+
+.netdb_leases .tunnel_peer tt {
+     margin: 0 3px;
+}
+
+.main li .netdb_expiry {
+     font-weight: normal;
+     text-transform: lowercase;
+     color: #2c354f !important;
+     font-style: italic;
+}
+
+#console h2, #console h3 {
+     border-radius: 2px;
+     box-shadow: 0 0 2px rgba(200,200,200,0.5);
+}
+
+img.unknownflag {
+     opacity: 0.8;
+}
+
+/* end leasesets */
+
 /* end netdb */
 
 /* /stats */
@@ -4971,6 +5170,10 @@ h3.stats {
      padding: 2px 0 !important;
 }
 
+#volunteer .links:not(old) {
+     margin: -10px 10px 0 !important;
+}
+
 #sidebarhelp h2 {
      margin-bottom: 5px !important;
 }
@@ -5037,9 +5240,20 @@ p#fullhistory {
      text-align: right;
      margin-bottom: -5px;
      margin: -5px -1px -6px !important;
-     border: 1px solid #89f;
-     padding: 5px 10px 5px 5px !important;
      background: #fff;
+     background: linear-gradient(to right, #eff2ff 50%, #fff);
+     border: 1px solid #89f;
+     padding: 7px 10px 4px 5px !important;
+}
+
+#fullhistory::before {
+     content: "";
+     display: inline-block;
+     vertical-align: middle;
+     width: 18px;
+     height: 20px;
+     background: url(/themes/console/images/buttons/fullview.png) left 45% no-repeat;
+     background-size: 14px auto;
 }
 
 .main#help td.infohelp, .main#help td.infowarn, .main#help td.infohelp, .main#help p.infohelp {
@@ -5148,41 +5362,6 @@ p#fullhistory {
      background: none;
 }
 
-#debug h2 + table {
-     margin-top: -11px;
-}
-
-#debug th {
-     text-align: left;
-}
-
-#debug tr {
-     border-bottom: 1px solid #89f;
-}
-
-#debug td {
-     padding: 2px 5px;
-}
-
-#debug ul {
-      line-height: 120%;
-}
-
-#debug li:first-child {
-     padding: 10px 0 0;
-}
-
-#debug li:last-child {
-     padding-bottom: 0;
-     margin-bottom: -9px;
-}
-
-#debug li {
-     padding-bottom: 0;
-     margin-left: -5px;
-     margin-bottom: -2px;
-}
-
 #certs p {
      margin: 3px 0;
      padding: 10px 5px;
@@ -5208,13 +5387,6 @@ p#fullhistory {
      margin: -1px 0;
 }
 
-#advancedsettings td.infowarn {
-     padding: 10px 10px 10px 40px !important;
-     border: 1px solid #89f;
-     background: #fffff5 url(/themes/console/images/info/infowarn.png) 10px center no-repeat !important;
-     background-size: 22px 22px !important;
-}
-
 #configinfo th {
      text-align: left;
      font-family: "Droid Sans Mono", "Andale Mono", "DejaVu Sans Mono", "Lucida Console", monospace;
@@ -5229,6 +5401,13 @@ p#fullhistory {
      background: rgba(230,230,255,0.5);
 }
 
+.main#help #configinfo td.infowarn {
+     padding: 10px 10px 10px 38px !important;
+     border: 1px solid #89f;
+     background: #fffff5 url(/themes/console/images/info/infowarn.png) 10px center no-repeat !important;
+     background-size: 20px 20px !important;
+}
+
 /* informational images */
 
 #bugreports td.infohelp {
@@ -5296,6 +5475,14 @@ p.infowarn {
      background-size: 28px 28px;
 }
 
+#floodfillconfig tr:nth-child(2) td {
+     padding: 8px 10px 8px 18px;
+}
+
+#floodfillconfig tr:nth-child(2) b {
+     margin-right: 8px;
+}
+
 p#clientconf.infohelp, p#webappconfigtext.infohelp {
      background: #fff url(/themes/console/images/info/java_edit.png) 12px center no-repeat;
      padding: 15px 15px 15px 50px;
@@ -5925,6 +6112,309 @@ b.netdb_transport {
 
 /* end sybils */
 
+/* debug */
+
+.main#debug h2 {
+     padding: 8px 10px;
+     font-size: 12pt;
+}
+
+.main#debug h3 {
+     padding: 5px 10px;
+}
+
+.main#debug td[colspan="2"] {
+     text-align: left;
+}
+
+.main#debug h2 + hr {
+     display: none;
+}
+
+#debug h2 + table {
+     margin-top: -11px;
+}
+
+#debug th {
+     text-align: left;
+}
+
+#debug tr {
+     border-bottom: 1px solid #89f;
+}
+
+#debug td {
+     padding: 2px 5px;
+}
+
+#debug .expiry ul {
+     margin: 3px 0 10px -35px !important;
+}
+
+#debug li:first-child {
+     padding: 10px 0 0;
+}
+
+#debug li:last-child {
+     padding-bottom: 0;
+     margin-bottom: -9px;
+}
+
+#debug li {
+     list-style: none;
+     line-height: 150%;
+     padding-bottom: 0;
+     margin-left: -5px;
+     margin-bottom: -2px;
+}
+
+.debug_container {
+     background: #eef;
+     border: 1px solid #89f;
+     padding: 10px 15px;
+     margin-top: -16px;
+}
+
+.debug_container:empty, #debug ul:empty {
+     display: none;
+}
+
+.debug_container, #debug td {
+     line-height: 140%;
+}
+
+.main#debug h3 + table {
+     margin-top: -11px;
+}
+
+#debug td {
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+
+#debug h2 {
+     margin: 12px 0 0;
+     background: url(/themes/console/images/info/debug.png) right 6px center no-repeat, linear-gradient(to bottom, #fff 50%, #eff2ff 50%) !important;
+     background-size: 20px 20px, 100% 100% !important;
+     background-blend-mode: luminosity, normal, normal;
+}
+
+h2#debug_portmapper {
+     margin-top: 14px !important;
+}
+
+#debug h3 {
+     padding-left: 10px;
+}
+
+.debug_container + h3 {
+     margin-top: -1px;
+}
+
+.debug_section h2 + h3, .debug_container:empty + h3, h3 + .debug_container, .debug_section table + h3, .debug_container.buckets {
+     margin-top: -11px !important;
+}
+
+.expiry td {
+     padding-left: 3% !important;
+}
+
+.debug_container.buckets {
+     word-break: break-all;
+     margin-bottom: 5px;
+     padding-bottom: 0;
+     max-height: 600px;
+     overflow: auto;
+}
+
+.buckets hr {
+     display: none;
+}
+
+#debug th:first-child, #debug td:first-child {
+     padding-left: 10px;
+}
+
+#debug td:last-child {
+     text-align: right;
+     vertical-align: top;
+     padding-right: 10px;
+}
+
+.debug_outboundtarget td:first-child {
+     padding-left: 3% !important;
+}
+
+#portmapper td:first-child {
+     font-weight: bold;
+}
+
+#portmapper th:last-child, #portmapper td:last-child {
+     text-align: left !important;
+}
+
+#debug h3.debug_outboundsessions, #debug h3.debug_inboundsessions {
+     padding: 6px 10px 6px 28px;
+     background-blend-mode: luminosity, normal;
+}
+
+#debug h3.debug_outboundsessions {
+     margin-top: -6px !important;
+     background: url(/themes/console/images/outbound.png) 6px center no-repeat, linear-gradient(to bottom, #fff 50%, #eff2ff 50%) !important;
+}
+
+#debug h3.debug_inboundsessions {
+     background: url(/themes/console/images/inbound.png) 6px center no-repeat, linear-gradient(to bottom, #fff 50%, #eff2ff 50%) !important;
+}
+
+.debug_version {
+     color: #070;
+}
+
+/* end debug */
+
+/* jar dump */
+
+#jardump {
+     padding: 0;
+     overflow-x: auto;
+     overflow-y: hidden;
+     min-width: 570px;
+}
+
+#jardump table {
+     border-left: none;
+     border-right: none;
+     margin-top: -1px;
+     margin-bottom: -1px;
+     font-size: 8pt;
+}
+
+#jardump th {
+     padding: 5.5px 5px;
+     font-size: 9pt;
+     text-align: center;
+     border-left: none !important;
+     border-right: none !important;
+}
+
+#jardump th:first-child {
+     text-align: left;
+}
+
+#jardump tr td {
+     border-top: 1px solid #cfd6ff !important;
+}
+
+#jardump td {
+     vertical-align: top;
+}
+
+#jardump td:nth-child(2) {
+     font-style: italic;
+}
+
+#jardump tt {
+     letter-spacing: -0.05em;
+}
+
+#jardump a tt {
+     color: #006 !important;
+}
+
+#jardump a:hover tt {
+     color: #f60 !important;
+}
+
+.sha256 tt, .revision tt {
+     font-weight: normal !important;
+}
+
+.revision, .sha256, .unsignedmod {
+     -moz-user-select: all;
+     -webkit-user-select: all;
+     user-select: all;
+}
+
+.subheading.routerfiles {
+     background: url(/themes/console/images/eepsite.png) right 5px center no-repeat, linear-gradient(to right, #fff, #eef) !important;
+     background-size: 16px auto, 100% 100% !important;
+     background-blend-mode: luminosity, normal;
+}
+
+.subheading.pluginfiles {
+     background: url(/themes/console/images/plugin.png) right 5px center no-repeat, linear-gradient(to right, #fff, #eef) !important;
+     background-size: 16px auto, 100% 100% !important;
+     background-blend-mode: luminosity, normal;
+}
+
+.subheading.pluginfiles {
+     border-top: 1px solid #89f !important;
+}
+
+#jardump td {
+     border-left: 1px inset #cfd6ff !important;
+     vertical-align: middle;
+     text-align: center;
+}
+
+#jardump td:first-child, #jardump td:last-child {
+     text-align: left;
+}
+
+#jardump td:nth-child(2) {
+     text-align: right;
+}
+
+#jardump td:first-child {
+     border-left: none;
+     transition: ease padding 0.05s;
+}
+
+#jardump td:last-child {
+     padding: 1px 0;
+}
+
+.unsignedmod {
+     display: inline-block;
+     padding: 1px 2px;
+     word-break: break-all;
+     -moz-user-select: all;
+     -webkit-user-select: all;
+     user-select: all;
+}
+
+#jardump hr {
+     margin: 2px 0 !important;
+     background: #cfd6ff;
+}
+
+.unsignedmod:empty {
+     display: none;
+}
+
+#jardump td:first-child {
+     padding-left: 26px;
+     background-image: url(/themes/console/images/info/box.png);
+     background-position: 5px center;
+     background-repeat: no-repeat;
+     background-size: 16px 16px;
+}
+
+#jardump tr:hover td:first-child {
+     background: url(/themes/console/images/info/box.png) 5px center no-repeat, linear-gradient(to bottom, #fff, #ffe);
+     background: url(/themes/console/images/info/box.png) 5px center no-repeat #ffe;
+     background-size: 16px 16px;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+#jardump td:last-child {
+     word-break: break-all;
+}
+}
+
+/* end jardump */
+
 /* responsive layout */
 
 @media screen and (max-width: 900px) {
@@ -6344,15 +6834,26 @@ table.sybil_routerinfo:last-child {
 }
 }
 
+@media screen and (min-width: 1400px) {
+.main#help #changelog pre:not(old) {
+     columns: 560px auto;
+     column-gap: 40px;
+     column-rule: 1px dotted #abf;
+     margin-left: 0;
+     padding-left: 10px;
+}
+}
+
 @media screen and (min-width: 1500px) {
-body, .main, .main td, .news p, #news p, .tab, .tab2, .main li b, .joblog li, .themelabel, .ui_lang, .applabel a, .statusnotes, .routersummary button.download,
-#peerdefs, #profile_defs, #thresholds, #configinfo, .infohelp, .infowarn, button, input, select, textarea, code, tt, pre, .netdbentry th, .configtable th, .statlist a[name],
+body, .main, .main td, .news p, #news p, .tab, .tab2, .main li b, .joblog li, .themelabel, .ui_lang, .applabel a,
+.statusnotes, .routersummary button.download, #peerdefs, #profile_defs, #thresholds, #configinfo, .infohelp, .infowarn,
+button, input, select, textarea, code, tt, pre, .netdbentry th, .configtable th, .statlist a[name],
 .statlist b, .statlist li b, .statlist a[name]:hover, div.messages, th {
      font-size: 10pt !important;
 }
 
 .routersummary td, .routersummary a, .routersummary button, .routersummary h4, .routersummary h4 a, div.news, #banlist li,
-.news #newsStatus, .news #ewsDisplay, .topness, .footnote, .cells tt, #profilelist tt {
+.news #newsStatus, .news #newsDisplay, .topness, .footnote, .cells tt, #profilelist tt, .sb_notice {
      font-size: 9pt !important;
 }
 
@@ -6394,13 +6895,14 @@ tt a, .cells tt, #profilelist tt {
 #sb_internals a, #sb_services a, #sb_advanced a {
      max-width: 212px;
 }
+
 .routersummary button[type="submit"] {
      min-width: 100px;
      margin: 2px 4px 1px;
 }
 
 div.app {
-     width: 154px;
+     width: 160px !important;
 }
 
 .app img {
@@ -6408,7 +6910,7 @@ div.app {
 }
 
 .applabel {
-     width: 150px !important;
+     width: 156px !important;
      padding: 4px 2px 2px !important;
 }
 
@@ -6425,8 +6927,8 @@ h3, h3.ptitle, h3.tabletitle, th.th_title {
      font-size: 11pt;
 }
 
-.newsheadings ul {
-     width: 202px;
+.sb_newsheadings ul {
+     width: 193px;
 }
 
 .newsentry h3, .newsentry h3 a, #news.main h3, .newsDate {
@@ -6562,6 +7064,14 @@ div.news {
 .langselect img[src^="/flags"] {
      margin-left: -81px !important;
 }
+
+.sb_newsheadings table {
+     width: 224px !important;
+}
+
+.sb_newsheadings td:last-child, .sb_newsheadings tr:hover td:last-child {
+     background-position: 4px 5px !important;
+}
 }
 
 /* end responsive layout */
diff --git a/installer/resources/themes/console/classic/console_big.css b/installer/resources/themes/console/classic/console_big.css
index 5f4cbde947..65b2e7a762 100644
--- a/installer/resources/themes/console/classic/console_big.css
+++ b/installer/resources/themes/console/classic/console_big.css
@@ -11,6 +11,10 @@
      line-height: 140% !important;
 }
 
+b {
+     font-weight: normal !important;
+}
+
 input[type="submit"], input[type="cancel"], input[type="file"], button, button.search, input.cancel {
      font-size: 11pt !important;
      padding-top: 3px;
@@ -26,28 +30,30 @@ input[type="submit"], input[type="cancel"], input[type="file"], button, button.s
 
 .routersummary button {
      min-width: 100px !important;
+     padding-top: 3px !important;
+     padding-bottom: 3px !important;
 }
 
 /* sidepanel */
 
-div.routersummary h3, .routersummary h3 a  {
+.routersummary h3, .routersummary h3 a  {
      font-size: 13pt !important;
 }
 
-div.routersummary h4, .routersummary h4 a {
+.routersummary h4, .routersummary h4 a {
      font-size: 13pt !important;
      letter-spacing: 0;
 }
 
-div.routersummary td {
+.routersummary td {
      font-size: 11pt;
 }
 
-div.routersummary {
+.routersummary {
      width: 220px;
 }
 
-div.routersummary table {
+.routersummary table {
      width: 219px !important;
 }
 
@@ -64,7 +70,7 @@ div.routersummary table {
      font-size: 10pt !important;
 }
 
-div.routersummary table a:link, div.routersummary table a:visited {
+.routersummary table a:link, .routersummary table a:visited {
      font-size: 12pt;
      font-weight: normal;
      text-shadow: none;
@@ -74,7 +80,7 @@ div.routersummary table a:link, div.routersummary table a:visited {
 
 /* global overrides */
 
-a, b, div.routersummary h3 a, div.routersummary h4 {
+a, b, .routersummary h3 a, .routersummary h4 {
     font-weight: normal !important;
     font-size: 100%;
 }
@@ -158,11 +164,11 @@ div.main, div.news, h1, .sorry {
      margin-right: 8px;
 }
 
-div.joblog li i {
-     font-weight: normaL;
+.joblog li i {
+     font-weight: normal;
 }
 
-b, div.joblog b {
+.joblog b {
     color: #003;
     font-size: 110%;
 }
@@ -173,7 +179,7 @@ table code {
 
 .tab, .tab2 {
      font-size: 11pt;
-} 
+}
 
 .applabel a {
      padding: 0 2px 6px !important;
@@ -343,23 +349,25 @@ h3#iptransport a::after, h3#advancedconfig a::after {
      background: #eef;
      margin-top: 15px !important;
      margin-bottom: -20px !important;
-     padding: 10px 10px 5px;
+     padding: 10px;
      border-radius: 4px;
 }
 
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+.twocol {
+     margin-top: 5px !important;
+}
+}
+
 .twocol li {
-     margin-left: 35px !important;
-     margin-right: 0;
-     margin-top: 0;
-     margin: 0 0 0 35px !important;
+     margin: 0 0 0 20px !important;
      padding: 0 0 10px !important;
 }
 
 .twocol li:first-child {
-     margin-top: 0 !important;
+     margin-top: 5px !important;
      margin-bottom: 10px !important;
      padding-top: 0 !important;
-     padding-left: 0 !important;
 }
 
 div[lang="zh"] a {
@@ -404,12 +412,11 @@ a:hover code {
 div.applabel {
      height: 22px !important;
      padding: 2px;
-     width: 140px;
 }
 }
 
 @media screen and (min-width: 0) {
-div.routersummary img[src$="i2plogo.png"] {
+.routersummary img[src$="i2plogo.png"] {
      margin-top: -1px;
      transform: none;
      width: 210px;
@@ -486,6 +493,31 @@ div.news h3, .newsDate, div.news a {
 #netdboverview th {
      font-size: 12pt !important;
 }
+
+.sb_newsheadings td, .sb_newsheadings tr:hover td {
+     background-position: 4px center !important;
+}
+
+.sb_newsheadings td a {
+     font-size: 9pt !important;
+}
+
+.main#tunnels td, .tunnel_cap, .tunnel_id, #tunnels .cells, #tunnels tt a {
+     font-size: 10pt !important;
+     letter-spacing: 0 !important;
+     word-spacing: 0 !important;
+}
+
+.tunnel_peer {
+     min-width: 60px !important;
+}
+
+b.tunnel_cap, .tunnel_cap b {
+     min-width: 18px;
+     color: #fff !important;
+     font-size: 10pt !important;
+     text-shadow: 0 1px 1px #555 !important;
+}
 }
 
 @media screen and (min-width: 1200px) {
@@ -513,7 +545,7 @@ body, .main, .main td, .news p, #news p, .main li b, div.joblog li, .themelabel,
      margin-top: 2px !important;
 }
 
-div.routersummary img[src$="i2plogo.png"] {
+.routersummary img[src$="i2plogo.png"] {
      margin-left: 1px;
 }
 
@@ -521,17 +553,10 @@ div.routersummary img[src$="i2plogo.png"] {
      width: 225px !important;
 }
 
-div.app {
-     width: 164px;
-}
-
-div.applabel {
+.applabel {
      padding: 3px 2px 4px !important;
-     width: 160px !important;
-}
 }
 
-@media screen and (min-width: 1500px) {
 .langselect img[src^="/flags"] {
     margin-left: -92px !important;
 }
@@ -539,6 +564,15 @@ div.applabel {
 .langselect input[name="lang"]:checked + img {
     margin-left: -93px !important;
 }
+
+.newsheadings {
+     margin-left: -2px !important;
+     margin-right: 0 !important;
+}
+
+.newsheadings ul {
+     width: 178px !important;
+}
 }
 
 /* end responsive layout */
\ No newline at end of file
diff --git a/installer/resources/themes/console/classic/i2ptunnel.css b/installer/resources/themes/console/classic/i2ptunnel.css
index 1a60d23ff1..2790ecfa5d 100644
--- a/installer/resources/themes/console/classic/i2ptunnel.css
+++ b/installer/resources/themes/console/classic/i2ptunnel.css
@@ -512,6 +512,7 @@ textarea#statusMessages {
      border: none;
      margin: 0;
      font-family: "Droid Sans Mono", "Noto Mono", Consolas, "Lucida Console", "DejaVu Sans Mono", monospace;
+     font-size: 8pt;
 }
 
 textarea#statusMessages:focus {
@@ -662,7 +663,7 @@ td.blankColumn {
      background: rgba(240,240,255,0.5);
 }
 
-#throttler tr:nth-child(even),  #wizardTunnelTypes tr:nth-child(even), #wizardSummary tr:nth-child(even) {
+#throttler tr:nth-child(even), #wizardTunnelTypes tr:nth-child(even), #wizardSummary tr:nth-child(even) {
      background: #e7e7ff;
      background: rgba(220,220,255,0.5);
 }
@@ -785,7 +786,7 @@ input[type="file"] {
      border: none;
 }
 
-#wizardTunnelTypes select {
+#wizardTunnelTypes select, #wizardPanel .freetext {
      margin-left: 0 !important;
 }
 
@@ -851,6 +852,12 @@ input[type="file"] {
      padding: 0;
 }
 
+#tunnelWizardPage #targetDestination {
+     width: 50% !important;
+}
+
+/* end wizard specifics */
+
 /* more space */
 
 .freetext, .tunnelConfig textarea, #customOptions, #userAgents, #hostField  {
@@ -933,6 +940,10 @@ div[class^="status"] {
 .control, .control:link, .control:visited {
      min-width: 60px !important;
 }
+
+#tunnelWizardPage #targetDestination {
+     width: 200px !important;
+}
 }
 
 @media screen and (min-width: 1200px) {
@@ -1086,6 +1097,10 @@ input[type="text"] + label {
      width: 552px;
 }
 
+textarea#statusMessages {
+     font-size: 9pt;
+}
+
 #registration .displayText {
      width: 800px;
 }
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 211fdf0a57..371f8430c5 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -8,7 +8,7 @@ body {
      padding: 0;
      text-align: center;
      background: #010 url(images/camotile.png) top left fixed;
-     color: #EE9;
+     color: #ee9;
      font: 8.5pt/130% "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
 }
 
@@ -68,7 +68,7 @@ pre {
      overflow-x: auto;
      text-align: left;
      font: 8.5pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
-     color: #EE9;
+     color: #ee9;
 }
 
 /* proxy errors */
@@ -77,7 +77,7 @@ div.logo { /* proxy error "fake" sidebar */
      float: left;
      padding: 10px;
      text-align: center;
-     color: #EE9;
+     color: #ee9;
      margin: -1px 20px 0;
      border: 1px solid #494;
      background: #000 url(images/camotile2.png);
@@ -255,6 +255,8 @@ div.warning {
 
 /* end proxy errors */
 
+/* sidebar */
+
 .routersummaryouter {
      float: left;
      width: 200px;
@@ -406,6 +408,14 @@ div.warning {
    min-height: 14px;
 }
 
+#sb_general td, #sb_shortgeneral td {
+     white-space: nowrap;
+}
+
+#sb_general td:first-child, #sb_shortgeneral td:first-child {
+     max-width: 130px;
+}
+
 #sb_localtunnels {
      margin: -4px -7px -7px -8px !important;
 }
@@ -426,6 +436,11 @@ div.warning {
 
 #sb_localtunnels a {
      display: inline-block;
+     width: 100%;
+     max-width: 156px;
+     overflow: hidden;
+     text-overflow: ellipsis;
+     white-space: nowrap;
 }
 
 #sb_localtunnels td:last-child {
@@ -479,10 +494,24 @@ div.warning {
      border: 1px solid #262;
      border-radius: 2px;
      box-shadow: inset 0 0 0 1px #000;
-     margin: -2px -5px -4px;
+     margin: -4px -7px -6px;
      padding: 5px 3px;
 }
 
+#sb_warning {
+     border-bottom: 1px solid #494 !important;
+     margin-left: -10px !important;
+     margin-right: -10px !important;
+}
+
+#sb_warning + .sb_notice {
+     margin-top: 11px;
+}
+
+#sb_warning + hr {
+     margin-top: 7px !important;
+}
+
 p:empty + .sb_notice {
      margin-top: 9px;
 }
@@ -618,78 +647,117 @@ div.refresh {
      margin-bottom: -5px !important;
 }
 
-div.newsheadings {
-     text-align: center;
-     margin: -3px 0 -5px 10px;
-     word-spacing: 0;
-}
+/* sidebar news */
 
-div.newsheadings li {
-     list-style: none outside url(images/newsbullet_mini.png);
-     margin: 0 -6px 2px 4px;
-     line-height: 110%;
-     text-transform: capitalize;
-}
-
-div.newsheadings li b {
-     font-weight: normal !important;
-}
-
-div.newsheadings button {
-     margin: 4px 0 2px;
-}
-
-div.tunnels {
-     padding-top: 3px !important;
-     margin-left: -4px;
-     text-align: center;
-}
-
-div.tunnels table {
-     margin: -5px 0 -5px -3px !important;
-}
-
-div.tunnels td {
-     padding: 1px 0 1px 0;
-     text-transform: capitalize;
-}
-
-div.tunnels td:first-child {
-     width: 16px;
-     text-align: left;
-     padding-right: 2px;
-}
-
-div.tunnels td:last-child {
+.sb_newsheadings {
+     width: 192px;
+     margin-left: 0;
+     margin-bottom: -7px !important;
      text-align: right;
-     padding-right: 1px;
 }
 
+.sb_newsheadings table {
+     margin-bottom: 3px !important;
+}
+
+.sb_newsheadings a {
+     display: inline-block;
+     padding: 0 3px 0 0;
+
+}
+
+.sb_newsheadings td {
+     padding: 4px 5px 4px 24px;
+     text-align: left;
+     background: url(images/newsbullet_mini.png) 4px center no-repeat !important;
+     border-bottom: 1px solid #131 !important;
+}
+
+.sb_newsheadings tr:last-child td {
+     border-bottom: none !important;
+}
+
+/* end sidebar news */
+/* end sidebar */
+
 /* console error messages */
 
-div.sorry {
+img[src="/themes/console/images/i2plogo.png"] {
+     margin-top: 2px !important;
+     margin-left: -1px !important;
+     width: 180px !important;
+     filter: invert(1) sepia(100%) hue-rotate(70deg) !important;
+}
+
+img[src="/themes/console/images/i2plogo.png"]:hover,
+img[src="/themes/console/images/i2plogo.png"]:focus {
+     filter: invert(1) sepia(100%) hue-rotate(70deg) drop-shadow(0 0 2px #930) !important;
+}
+
+a:active img[src="/themes/console/images/i2plogo.png"] {
+     filter: invert(1) sepia(100%) hue-rotate(70deg) drop-shadow(0 0 3px #f60) !important;
+}
+
+.sorry {
      margin: -1px 5px 10px 216px;
-     padding: 20px 20px 20px 75px;
-     background: #020;
+     padding: 20px 20px 20px 70px;
+     background: #010;
      border: 1px solid #494;
      border-radius: 0 0 4px 4px;
      text-align: justify;
-     background-image:url(/themes/console/images/info/errortriangle.png);
-     background-position:15px center;
-     background-repeat:no-repeat;
-     box-shadow: inset 0 0 0 1px #d00;
+     background: url(/themes/console/images/info/errortriangle.png) 15px 45% no-repeat #010;
+     box-shadow: inset 0 0 0 1px #700;
      word-wrap: break-word;
-     min-width: 555px;
-     color: #EE9;
+     min-width: 560px;
+     color: #ee9;
      font-size: 10pt;
 }
 
+.sorry p {
+     line-height: 130% !important;
+}
+
+#warning2 {
+     min-width: 610px;
+     margin-top: -14px;
+     margin-bottom: 5px;
+     background: #010;
+     padding: 10px 20px 5px;
+}
+
+#warning2 h3 {
+     border-width: 1px;
+     border-radius: 0;
+     border-left: none;
+     border-right: none;
+     margin: -21px -20px 0;
+     padding: 10px;
+     box-shadow: inset 0 0 0 1px #700;
+}
+
+#warning2 p {
+     font-size: 9pt;
+}
+
+#warning2 p + h3 {
+     margin-top: -5px;
+}
+
+#warning2 b {
+     display: inline-block;
+     min-width: 140px;
+     text-align: right;
+     margin-right: 5px;
+     line-height: 150%;
+}
+
 .sorry hr {
-     color: #EE9;
-     background: #EE9;
+     color: #ee9;
+     background: #ee9;
      height: 1px;
-     border: 1px solid #EE9;
+     border-top: 1px solid #ee9;
      margin: 10px 0;
+     opacity: 0.7;
 }
 
 /* main section */
@@ -698,19 +766,19 @@ div.sorry {
      margin: -1px 5px 5px 216px;
      padding: 0 15px 5px 15px;
      text-align: left;
-     color: #EE9;
+     color: #ee9;
      width: auto;
      border: 1px solid #494;
      border-radius: 0 0 2px 2px;
-     background:  #000 url("images/camotile2.png") !important;
+     background:  #000 url(images/camotile2.png) !important;
      min-width: 620px;
      box-shadow: 0 1px 5px #000;
      font-size: 9pt;
 }
 
 .main, .routersummary {
-     background:  #000 url("images/camotile2.png") !important;
-     background:  linear-gradient(to bottom, rgba(0,0,0,0.3), rgba(0,0,0,0.45)), url("images/camotile2.png") #000 !important;
+     background:  #000 url(images/camotile2.png) !important;
+     background:  linear-gradient(to bottom, rgba(0,0,0,0.3), rgba(0,0,0,0.45)), url(images/camotile2.png) #000 !important;
      box-shadow: inset 0 0 0 1px #000, 0 1px 5px #000;
 }
 
@@ -735,7 +803,7 @@ div.sorry {
      background-size: 3px 3px, 175px 175px;
 }
 
-div.main#news {
+.main#news {
      background: #000 url(images/news.png) no-repeat scroll bottom right !important;
 }
 
@@ -759,25 +827,29 @@ div.news h3, #newspage h3 {
      color: #ee9;
 }
 
-div.main textarea {
+.news .newsentry:first-child {
+     margin-top: -3px;
+}
+
+.main textarea {
      background: #000;
-     color: #EE9;
+     color: #ee9;
      font: 8pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
      resize: none;
 }
 
 div.news {
      margin: -1px 5px 0 216px;
-     padding: 6px 20px 5px;
+     padding: 6px 15px 8px;
      border: 1px solid #494;
      background: #000 url(images/news.png) no-repeat scroll bottom right;
-     background: linear-gradient(to bottom, rgba(0,0,0,0.3), rgba(0,0,0,0.5)), url("images/news.png") no-repeat scroll right bottom,  url("images/camotile2.png") #000 !important;
+     background: linear-gradient(to bottom, rgba(0,0,0,0.3), rgba(0,0,0,0.5)), url(images/news.png) no-repeat scroll right bottom, url(images/camotile2.png) #000 !important;
      background-blend-mode: lighten;
      color: #ee9;
      font-size: 8pt;
      text-align: right;
      box-shadow: 0 1px 5px #000;
-     min-width: 610px !important;
+     min-width: 620px !important;
 }
 
 /* MS Edge 14+ fix (no support for blend-mode) */
@@ -814,7 +886,7 @@ div.news h4 {
 
 div.news p, div.newscontent p {
      font-size: 9pt;
-     color: #EE9;
+     color: #ee9;
      margin: 0 !important;
 }
 
@@ -823,7 +895,7 @@ div.news p:nth-child(n+2), div.newscontent p:nth-child(n+2) {
 }
 
 div.news hr {
-     margin: 8px 0 3px 0;
+     margin: 8px 0 5px 0;
 }
 
 #newsStatus {
@@ -835,6 +907,11 @@ div.news hr {
      margin-left: 10px;
 }
 
+.news #newsDisplay, .news #newsStatus {
+     margin-top: 3px !important;
+     display: inline-block;
+}
+
 .newsAuthor {
      float: right;
      background: url(/themes/console/images/info/author_dark.png) left 2px center no-repeat;
@@ -869,7 +946,7 @@ div.widescroll { /* only scroll content, not entire page eg /peers */
 .confignav {
      background: url(images/header.png) repeat-x scroll center center #000;
      background: linear-gradient(to bottom, #001000, #001900 50%, #000 51%, #000) !important;
-     padding: 7px 5px !important;
+     padding: 7px !important;
      margin: -1px -16px 15px;
      border: 1px solid #494;
      font-weight: bold !important;
@@ -1176,7 +1253,7 @@ table hr {
 
 th {
      padding: 7px 2px;
-     color: #EE9;
+     color: #ee9;
      text-align: center;
      font-size: 9pt;
      background: #000 url(images/header.png) center center repeat-x;
@@ -1304,7 +1381,7 @@ td img {
 /* end peer sort */
 
 tt {
-     font: bold 9pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
+     font: bold 8pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
      color: #FF0;
 }
 
@@ -1442,6 +1519,14 @@ div[lang="de"] .twocol, div[lang="pt"] .twocol, div[lang="es"] .twocol, div[lang
      margin: 10px -5px 5px !important;
 }
 
+div[lang="es"] li, div[lang="pt"] li, div[lang="sv"] li {
+     list-style: none;
+}
+
+div[lang="sv"] li::first-letter {
+     text-transform: uppercase !important;
+}
+
 p + .twocol, div[lang="de"] p + .twocol {
      margin: 10px 25px !important;
 }
@@ -1489,7 +1574,7 @@ p:empty { /* kills empty paragraphs that are likely erroneous eg. see top of /pr
 
 h1 {
      text-align: left;
-     color: #EE9;
+     color: #ee9;
      padding: 13px 15px;
      margin: 0 5px 0 216px !important;
      font-size: 17pt;
@@ -1546,7 +1631,7 @@ h2 a:hover {
 h3, h3.welcome {
      border: 1px solid #494;
      border-left: 5px solid #494;
-     padding: 6px 10px;
+     padding: 7px 10px;
      margin: 12px 0 10px 0;
      border-radius: 0 2px 2px 0;
      background: #000 url(images/header.png) center center ;
@@ -1573,7 +1658,7 @@ h2, h3, h4 {
 }
 
 h1, h4.app, h4.app2 {
-     background: linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000000 56%, #000000 100%), url("images/camotile2.png") #000 !important;
+     background: linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000000 56%, #000000 100%), url(images/camotile2.png) #000 !important;
      background-blend-mode: exclusion;
      box-shadow: inset 0 0 0 1px #000;
      text-shadow: 0 1px 1px #000;
@@ -1590,7 +1675,6 @@ button, button:visited {
      padding: 4px 2px !important;
      text-decoration: none;
      border-radius: 2px;
-     font-size: 8pt;
      font-weight: bold;
      margin: 2px 3px;
      text-align: center;
@@ -1690,7 +1774,7 @@ input {
      background: #000;
      color: #494;
      margin: 5px;
-     font: bold 8pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
+     font: bold 9pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
      padding: 4px 2px;
      text-decoration: none;
      min-width: 110px;
@@ -1724,8 +1808,8 @@ input[type="text"], input[type="password"] {
      background: linear-gradient(to bottom, #000 0%, #010 100%);
      color: #ee9;
      margin: 5px 10px;
-     padding: 4px 3px;
-     font: bold 8pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
+     padding: 5px;
+     font: bold 9pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
      border: 1px solid #494 !important;
      text-decoration: none;
      border-radius: 2px;
@@ -1819,7 +1903,7 @@ select {
      border: 1px outset #191;
      border-radius: 2px;
      min-width: 110px;
-     font: 8pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
+     font: 9pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
      font-weight: bold;
      padding: 4px 16px 4px 4px !important;
      cursor: pointer;
@@ -1901,12 +1985,13 @@ textarea[readonly]:focus {
      font-weight: normal;
 }
 
-input[type="submit"], input[type="reset"], select, button { /* webkit/blink fix for oversaturated colors */
+input[type="submit"], input[type="reset"], select, button {
      border: 1px solid #8b8;
      border-bottom: 1px solid #171;
      border-right: 1px solid #171;
      background: linear-gradient(to bottom, #020 0%, #000 20%, #000 80%, #010 100%);
      filter: drop-shadow(0 0 1px #131);
+     font-size: 8pt;
 }
 
 input[type="submit"], input[type="reset"], button {
@@ -1916,8 +2001,8 @@ input[type="submit"], input[type="reset"], button {
 
 .statusnotes {
      font-style: italic;
-     font-size: 8pt;
-     color: #EE9;
+     font-size: 9pt;
+     color: #ee9;
      text-align: center;
      border: 1px solid #494 !important;
      margin: -2px 0 5px 0;
@@ -2276,7 +2361,7 @@ form[action="events"] {
      background: #000;
 }
 
-.smallhead {
+.smallhead th {
      font-size: 8pt
 }
 
@@ -2514,15 +2599,6 @@ tr#addnew, tr#addnew:hover {
      border-radius: 2px;
 }
 
-/* fixes weird height variation */
-/*
-@-moz-document url-prefix() {
-.themechoice {
-     min-height: 75px;
-}
-}
-*/
-
 .themechoice:hover {
      border: 1px solid #f60;
      background: #000;
@@ -2653,7 +2729,7 @@ p#helptranslate {
 h3#themeheading, h3#langheading, h3#passwordheading {
      border-radius: 0;
      border: 1px solid #494;
-     padding: 6px 10px;
+     padding: 8px 10px;
      font-size: 10.5pt;
      word-spacing: 0.1em;
      letter-spacing: 0.08em;
@@ -3002,6 +3078,11 @@ ul#banlist {
      margin-top: -2px;
 }
 
+#profiles #banlist {
+     border: none;
+     margin: 0;
+}
+
 /* /confignet */
 
 h3#iptransport {
@@ -3459,6 +3540,10 @@ h3#servicedebug a, h3#graphinfo a {
      letter-spacing: normal;
 }
 
+/* end /configservice */
+
+/* /tunnels */
+
 .main#tunnels h3 {
      padding-right: 5px;
 }
@@ -3475,7 +3560,6 @@ h3#servicedebug a, h3#graphinfo a {
      content: url(/themes/console/images/buttons/configure.png);
      float: right;
      padding: 0;
-
 }
 
 .main#tunnels h3 a[href^="/configtunnels#"]:hover, h3.tabletitle a:hover::after,
@@ -3483,6 +3567,8 @@ h3#servicedebug a, h3#graphinfo a {
      filter: drop-shadow(0 0 1px #f60);
 }
 
+/* end /tunnels */
+
 /* configclients */
 
 table#clientconfig th:first-child {
@@ -3874,6 +3960,83 @@ th > img[src^="/imagegen"] { /* scale down header images */
      margin-bottom: 8px;
 }
 
+/* leasesets */
+
+.netdb_leases, .netdb_leases li, .netdb_leases li:first-child {
+     margin: 0 !important;
+}
+
+.netdb_leases {
+     columns: auto 420px !important;
+     column-rule: 1px solid #131;
+     column-gap: 1em;
+}
+
+.netdb_leases li {
+     list-style: none;
+     display: inline-block;
+     padding: 1px 20px 1px 0;
+     margin: 1px 0;
+     min-width: 400px;
+}
+
+.netdb_leases li b:first-child {
+     display: inline-block;
+     min-width: 80px !important;
+     text-align: right;
+     margin: 0 !important;
+     padding: 0 !important;
+}
+
+.netdb_gateway {
+     margin-left: 0 !important;
+     margin-right: -10px !important;
+     vertical-align: bottom;
+}
+
+.netdb_gateway img {
+     vertical-align: bottom;
+}
+
+.netdb_tunnel {
+     display: inline-block;
+     background: #030;
+     padding: 0 4px;
+     margin-left: 4px;
+     margin-right: -4px;
+     border-radius: 2px;
+}
+
+.netdb_leases .tunnel_id {
+     min-width: 74px;
+}
+
+.netdb_leases .tunnel_peer, .tunneldisplay .tunnel_peer {
+     min-width: 64px;
+}
+
+.netdb_leases .tunnel_peer tt, .netdb_leases .tunnel_peer tt a {
+     font-size: 8pt !important;
+     font-weight: bold !important;
+}
+
+.netdb_leases .tunnel_peer tt, .netdb_leases .tunnel_peer a {
+     letter-spacing: 0.1em !important;
+     margin: 0 !important;
+     padding: 0 !important;
+}
+
+.main li .netdb_expiry {
+     font-weight: normal;
+     text-transform: lowercase;
+     font-style: italic;
+}
+
+img.unknownflag {
+     opacity: 0.8;
+}
+
+/* end leasesets */
 /* end netdb */
 
 /* logs */
@@ -4178,6 +4341,17 @@ table#profile_defs td, table#thresholds td {
      width: 16px;
 }
 
+#capabilities_key b {
+     text-transform: none !important;
+     display: inline-block;
+     min-width: 16px;
+     background: #002000;
+     text-align: center;
+     text-shadow: 0 1px 1px #000;
+     border-radius: 2px;
+     padding: 1px 2px;
+}
+
 #profile_defs b {
      text-transform: capitalize;
 }
@@ -4244,26 +4418,26 @@ h3#bannedpeers {
 ul#banlist {
      border: 1px solid #494;
      background: #000;
-     padding: 10px 10px 10px 0;
+     padding: 10px 5px 10px 0;
      margin: -1px 0 13px;
      -moz-column-count: auto;
-     -moz-column-width: 300px;
-     -moz-column-gap: 10px;
+     -moz-column-width: 280px;
+     -moz-column-gap: 5px;
      -moz-column-rule: 1px dotted #494;
      -webkit-column-count: auto;
-     -webkit-column-width: 300px;
-     -webkit-column-gap: 10px;
+     -webkit-column-width: 280px;
+     -webkit-column-gap: 5px;
      -webkit-column-rule: 1px dotted #494;
      column-count: auto;
-     column-width: 300px;
-     column-gap: 10px;
-     column-rule: 1px dotted #494;
+     column-width: 280px;
+     column-gap: 5px;
+     column-rule: 1px dotted #151;
 }
 
 #banlist li {
      list-style: none !important;
-     border-bottom: 1px dotted #494;
-     margin: 0 10px 3px;
+     border-bottom: 1px dotted #151;
+     margin: 0 8px 3px;
      padding-top: 3px;
      min-width: 250px;
      width: 88%;
@@ -4758,53 +4932,6 @@ table#leasesetdebug th a:hover, table#leasesetsummary th a:hover {
      filter: drop-shadow(0 0 1px #f60);
 }
 
-.main#debug {
-     line-height: 140%;
-     padding-bottom: 0;
-}
-
-.main#debug table {
-     margin-top: -13px;
-}
-
-.main#debug th, .main#debug td {
-     text-align: left;
-     padding: 5px 10px;
-}
-
-.main#debug th:last-child {
-     text-align: right;
-}
-
-.main#debug td:last-child {
-     vertical-align: top;
-     text-align: right;
-}
-
-.main#debug li:last-child {
-     padding-bottom: 2px;
-}
-
-.main#debug h2 {
-     border-radius: 0;
-     padding: 5px 10px;
-     font-size: 11pt;
-}
-
-.main#debug h3 {
-     border-radius: 0;
-     padding: 3px 10px;
-     font-size: 10pt;
-}
-
-.main#debug h2 + hr {
-     display: none;
-}
-
-div.debugcontainer {
-     border: 1px solid #f00;
-}
-
 .main#certs {
      padding-top: 3px;
 }
@@ -4842,64 +4969,6 @@ div.debugcontainer {
      width: 100%;
 }
 
-.main#jardump {
-     overflow: auto !important;
-     padding: 0;
-/*     display: inline-table;*/
-     min-width: 650px !important;
-}
-
-.main#jardump table {
-     margin: -1px 0 0;
-     border: 0;
-     border-collapse: collapse;
-     font-size: 8pt;
-     color: #bb7;
-}
-
-.main#jardump th {
-     padding: 9px 5px;
-}
-
-.main#jardump th:nth-child(1), .main#jardump th:nth-child(3), .main#jardump th:nth-child(6), .main#jardump th:nth-child(7) {
-     text-align: left;
-}
-
-.main#jardump tr:hover, .main#jardump tr:hover td {
-     background: #020;
-     color: #ee9;
-}
-
-.main#jardump td {
-     vertical-align: top;
-     padding: 2px 5px;
-     color: #bb7;
-}
-
-.main#jardump td:first-child {
-     color: #eea;
-}
-
-.main#jardump th:nth-child(4), .main#jardump th:nth-child(5) {
-     white-space: nowrap !important;
-}
-
-.main#jardump tt {
-     letter-spacing: -0.03em;
-}
-
-.main#jardump font[color="red"] {
-     color: #d00;
-}
-
-@media screen and (-webkit-min-device-pixel-ratio:0) { /* fixes column wrapping on webkit */
-.main#jardump td {
-     word-break: break-word !important;
-     word-break: break-all !important;
-     max-width: 230px;
-}
-}
-
 .main#proof {
      padding: 0;
 }
@@ -5238,6 +5307,7 @@ textarea#advancedsettings {
      white-space: pre-wrap;
      border: 0 none transparent;
      border-radius: 0;
+     word-break: break-all;
 }
 
 .configtable td.infohelp, p.infohelp, td.infohelp, p.infowarn, td.infowarn, p#debugmode, p#sybilinfo {
@@ -5292,7 +5362,7 @@ h3#updateplugins, h3#pluginmanage, h3#bannedpeers, h3.ptitle, h3#transports, h3#
      border: 1px solid #494;
      text-transform: uppercase;
      letter-spacing: 0.08em;
-     padding: 7px 10px;
+     padding: 8px 10px;
 }
 
 h3#pluginmanage {
@@ -5384,7 +5454,7 @@ table#externali2cp th {
 }
 
 th.th_title {
-     padding: 10px;
+     padding: 8px 10px !important;
      text-align: left;
      background: linear-gradient(to bottom, #1a261a 0%,#223022 7%,#212f21 9%,#172317 21%,#091109 49%,#050d05 50%,#020602 51%,#010301 53%,#000000 56%,#000000 100%) !important;
 }
@@ -5609,6 +5679,14 @@ p#sybilinfo {
      background-size: 28px 28px !important;
 }
 
+#floodfillconfig tr:nth-child(2) td {
+     padding: 8px 10px 8px 18px;
+}
+
+#floodfillconfig tr:nth-child(2) b {
+     margin-right: 10px;
+}
+
 p#clientconf.infohelp, p#webappconfigtext.infohelp {
      background: #000 url(/themes/console/images/info/java_edit.png) 12px center no-repeat !important;
      padding: 15px 15px 15px 50px;
@@ -5864,7 +5942,7 @@ p#profiles_overview {
 
 /* /tunnels */
 
-tt a {
+tt a, .tunnel_peer tt {
      letter-spacing: 0.07em;
 }
 
@@ -5906,6 +5984,14 @@ tt a {
      text-align: right;
 }
 
+.tunnel_peer img {
+     margin-right: 2px;
+}
+
+.tunnel_peer tt {
+     margin-left: 0;
+}
+
 .tunnel_local {
      font-size: 8pt;
      text-transform: lowercase;
@@ -6299,6 +6385,329 @@ b.netdb_transport {
 
 /* end sybils */
 
+/* debug */
+
+#debug {
+     line-height: 140%;
+     padding-bottom: 0;
+}
+
+#debug table {
+     margin-top: -13px;
+}
+
+#debug th, #debug td {
+     text-align: left;
+     padding: 5px 10px;
+}
+
+#debug th {
+     padding: 7px 10px;
+}
+
+#debug th:last-child, #debug td:last-child {
+     text-align: right;
+}
+
+#debug td:last-child {
+     vertical-align: top;
+}
+
+#debug h2, #debug h3 {
+     border-radius: 0;
+}
+
+#debug h2 {
+     padding: 8px 10px;
+     font-size: 11.5pt;
+     background: url(/themes/console/images/info/debug.png) right 5px center no-repeat, linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000000 56%, #000000 100%) !important;
+     background-size: 20px 20px, 100% 100% !important;
+     background-blend-mode: luminosity, normal;
+}
+
+#debug h2 + hr, .buckets hr {
+     display: none;
+}
+
+#debug h3 {
+     border-width: 1px !important;
+     padding: 5px 10px !important;
+     font-size: 10pt;
+}
+
+.debug_container {
+     margin-top: -11px;
+     border: 1px solid #494;
+     padding: 10px 15px;
+     background: #000800;
+}
+
+.debug_container:empty::after {
+     content: "None";
+     display: inline-block;
+     font-style: italic;
+}
+
+.buckets {
+     margin-top: -13px;
+     margin-bottom: 15px;
+     max-height: 600px;
+     overflow: auto;
+     word-break: break-all;
+}
+
+.debug_container + h3, .debug_outboundsessions {
+     margin-top: -1px;
+}
+
+.debug_outboundsessions {
+     margin-top: -2px;
+}
+
+#debug h2 + h3, .buckets {
+     margin-top: -13px;
+}
+
+#debug ul, #debug li {
+     margin: 0 !important;
+     text-align: left !important;
+}
+
+#debug li:last-child {
+     padding-bottom: 2px;
+}
+
+#debug li {
+     display: inline-block;
+     padding: 2px 0 !important;
+     min-width: 400px !important;
+}
+
+#debug ul, .debug_targetinfo {
+     columns: 400px 2;
+     column-rule: 1px solid #131;
+     column-gap: 30px;
+}
+
+.debug_targetinfo {
+     line-height: 140%;
+}
+
+.debug_targetinfo b {
+     margin-right: 3px;
+}
+
+#debug h3.debug_outboundsessions, #debug h3.debug_inboundsessions {
+     padding: 6px 10px 6px 28px !important;
+     background-blend-mode: luminosity, normal;
+}
+
+#debug h3.debug_outboundsessions {
+     margin-top: -6px !important;
+     background: url(/themes/console/images/outbound.png) 6px center no-repeat, linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000 56%) !important;
+}
+
+#debug h3.debug_inboundsessions {
+     background: url(/themes/console/images/inbound.png) 6px center no-repeat, linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000 56%) !important;
+}
+
+.debug_version {
+     color: #aa0;
+     font-weight: bold;
+}
+
+#portmapper td:first-child {
+     font-weight: bold;
+}
+
+#portmapper th:last-child, #portmapper td:last-child {
+     text-align: left !important;
+}
+
+/* end debug */
+
+/* jardump */
+
+#jardump {
+     overflow: auto !important;
+     padding: 0;
+     min-width: 650px !important;
+}
+
+#jardump table {
+     margin: -1px 0 0;
+     border: 0;
+     border-collapse: collapse;
+     font-size: 8pt;
+     color: #bb7;
+}
+
+#jardump th {
+     padding: 9px 5px;
+}
+
+#jardump th:nth-child(4), #jardump th:nth-child(5) {
+     white-space: nowrap !important;
+}
+
+#jardump th {
+     border-right: none;
+     border-left: none;
+}
+
+#jardump th, #jardump td {
+     vertical-align: middle !important;
+     text-align: center !important;
+}
+
+#jardump th:first-child, #jardump td:first-child {
+     text-align: left !important;
+}
+
+#jardump td {
+     border-right: 1px inset #131;
+     vertical-align: top;
+     padding: 2px 5px;
+     color: #bb7;
+}
+
+#jardump td:first-child, #jardump tr:hover td:first-child {
+     padding-left: 24px;
+     padding-right: 0 !important;
+     background-image: url(/themes/console/images/info/box.png) !important;
+     background-position: 6px center;
+     background-repeat: no-repeat;
+     background-size: 16px 16px;
+}
+
+#jardump td:first-child {
+     color: #eea;
+}
+
+#jardump td:first-child b {
+     display: inline-block;
+     padding: 4px;
+     border-radius: 2px;
+     margin-right: 4px;
+}
+
+#jardump td:nth-child(2) {
+     text-align: right !important;
+     font-style: italic;
+}
+
+#jardump td:last-child {
+     word-break: break-all;
+     text-align: left !important;
+     border-right: none;
+     padding: 0;
+}
+
+#jardump tr:hover td {
+     background: #020;
+     color: #ee9;
+     border: 1px solid #151;
+     border-left: 1px solid transparent;
+     border-right: 1px solid transparent;
+}
+
+#jardump tr:hover .unsignedmod:not(:empty) {
+     background: #600;
+     color: #fff;
+     border-radius: 2px;
+}
+
+#jardump tr:hover td:first-child b {
+     background: #030;
+     border: 1px solid #010;
+     margin-right: 0;
+     box-shadow: 0 0 1px 0 #010;
+     width: 95%;
+     width: calc(100% - 10px);
+}
+
+#jardump tr:hover hr {
+     background: transparent;
+}
+
+#jardump tr:hover td:first-child {
+     padding-left: 26px !important;
+     padding-right: 0 !important;
+}
+
+#jardump tt {
+     letter-spacing: -0.03em;
+}
+
+#jardump font[color="red"] {
+     color: #d00;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) { /* fixes column wrapping on webkit */
+#jardump td {
+     word-break: break-word !important;
+     word-break: break-all !important;
+     max-width: 230px;
+}
+}
+
+.revision, .sha256, .unsignedmod {
+     display: inline-block;
+     -moz-user-select: all;
+     -webkit-user-select: all;
+     user-select: all;
+}
+
+.unsignedmod {
+     padding: 2px 2px 2px 4px;
+     margin: 0;
+}
+
+#jardump hr {
+     margin: 1px 0;
+     width: 100%;
+     height: 1px;
+     background: #131;
+     display: block !important;
+}
+
+#jardump .subheading {
+     padding-top: 6px !important;
+     padding-bottom: 6px !important
+}
+
+.subheading.routerfiles {
+     background: url(/themes/console/images/eepsite.png) right 5px center no-repeat, linear-gradient(to right, #000, #001000 40%) !important;
+     background-size: 16px auto, 100% 100% !important;
+     background-blend-mode: luminosity, normal;
+}
+
+.subheading.pluginfiles {
+     background: url(/themes/console/images/plugin.png) right 5px center no-repeat, linear-gradient(to right, #000, #001000 40%) !important;
+     background-size: 16px auto, 100% 100% !important;
+     background-blend-mode: luminosity, normal;
+}
+
+.unsignedmod {
+     display: inline-block;
+     word-break: break-all;
+}
+
+@media screen and (max-width: 1400px) {
+.revision, .sha256 {
+     display: inline-block;
+     max-width: 100px !important;
+     overflow: hidden;
+     text-overflow: ellipsis
+}
+
+.revision:hover, .sha256:hover {
+     overflow: auto;
+     text-overflow: clip;
+}
+}
+/* end jardump */
+
 /* responsive layout */
 
 @media screen and (max-width: 900px) {
@@ -6431,9 +6840,33 @@ td.optionsave {
 }
 }
 
+@media screen and (min-width: 1400px) {
+#profiles #banlist {
+     border: none;
+     margin: -15px -15px -5px;
+     padding: 10px 5px;
+}
+
+.main#help #changelog pre:not(old) {
+     columns: 550px auto;
+     column-gap: 40px;
+     column-rule: 1px dotted #151;
+     margin-left: 0;
+     padding-left: 10px;
+     width: calc(100% - 22px) !important;
+     overflow-y: hidden;
+}
+}
+
+@media screen and (min-width: 1460px) {
+input[type="submit"], input[type="reset"], select, button {
+     font-size: 9pt;
+}
+}
+
 @media screen and (min-width: 1500px) {
 body, .main, .main td, .news p, #news p, textarea, .main textarea, code, tt, #changelog pre,
-ul.statlist a[name], ul.statlist b, ul.statlist li b, ul.statlist a[name]:hover, .confignav {
+ul.statlist a[name], ul.statlist b, ul.statlist li b, ul.statlist a[name]:hover, .confignav, th, #configinfo th {
      font-size: 10pt !important;
 }
 
@@ -6452,7 +6885,7 @@ ul.statlist a[name], ul.statlist b, ul.statlist li b, ul.statlist a[name]:hover,
      margin-left: 242px !important;
 }
 
-pre, #logs li, .smallhead {
+pre, #logs li, .smallhead th {
      font-size: 9pt !important;
 }
 
@@ -6496,8 +6929,8 @@ div.app {
      font-size: 10pt !important;
 }
 
-th, #configinfo th, code, tt {
-     font-size: 10pt;
+code, tt {
+     font-size: 9pt !important;
 }
 
 table#floodfills th:first-child, table#floodfills td:first-child {
@@ -6522,7 +6955,7 @@ h4#updateplugins {
 }
 
 .sorry {
-     margin-left: 232px !important;
+     margin-left: 242px !important;
 }
 
 div.joblog h3 {
@@ -6629,12 +7062,25 @@ table#reseedconfig input[type="text"], table#reseedconfig input[type="password"]
 .langselect .optbox {
      min-width: 144px !important;
 }
+
 .langselect img {
      margin-left: -81px !important;
 }
+
 .langselect input[name="lang"]:checked + img {
      margin-left: -82px !important;
 }
+
+ul#banlist {
+     -moz-column-width: 300px;
+     -webkit-column-width: 300px;
+     column-width: 300px;
+}
+
+img[src="/themes/console/images/i2plogo.png"] {
+     margin-top: 3px !important;
+     width: 200px !important;
+}
 }
 
 @media screen and (-webkit-min-device-pixel-ratio:0) and (min-width: 1500px) {
@@ -6763,3 +7209,31 @@ _:-ms-lang(x), .tunnels_client th:first-child::after {
 
 /* end Edge/IE tweaks */
 
+/* TODO: can we simplify sidebar element positioning by getting a handle on the #xhr div? */
+/*
+#xhr {
+     width: 204px;
+     background: rgba(255,255,0,0.1);
+     margin: 0 0 0 -10px;
+     text-align: center !important;
+}
+
+.routersummary table, #sb_localtunnels {
+     width: 200px !important;
+     margin-left: 2px !important;
+     margin-right: 2px !important;
+}
+
+.routersummary h4 {
+     width: 198px !important;
+     margin: 0 0 0 2px; !important;
+     display: inline-block;
+}
+
+.routersummary h3, .routersummary hr {
+     width: 100% !important;
+     margin-left: 0 !important;
+     margin-right: 0 !important;
+}
+*/
+
diff --git a/installer/resources/themes/console/dark/console_ar.css b/installer/resources/themes/console/dark/console_ar.css
index dba5201695..9f21afe065 100644
--- a/installer/resources/themes/console/dark/console_ar.css
+++ b/installer/resources/themes/console/dark/console_ar.css
@@ -94,7 +94,7 @@ div.routersummary td:last-child {
      margin-left: 3px;
 }
 
-div.routersummary td:first-child {
+.routersummary td:first-child {
      text-align: right;
 }
 
@@ -106,6 +106,15 @@ div.routersummary td:first-child {
      text-align: left;
 }
 
+#sb_localtunnels a {
+     display: inline-block;
+     width: 100%:
+}
+
+#sb_localtunnels td:nth-child(2) {
+     text-align: right !important;
+}
+
 .langbox {
      float: left;
      text-align: left;
@@ -127,7 +136,7 @@ div.routersummary form {
     text-align: center;
 }
 
-div.joblog li, div.newsheadings li {
+div.joblog li {
     text-align: left;
     direction: ltr;
 }
@@ -493,6 +502,35 @@ a.viewfullentry::after, a[href^="viewprofile"]::after {
      margin-left: 3px !important;
 }
 
+.sb_newsheadings td, .sb_newsheadings tr:hover td {
+     background-position: right 4px center !important;
+     padding-right: 22px !important;
+     padding-left: 8px !important;
+     text-align: right !important;
+}
+
+.sb_newsheadings td a {
+     font-size: 9pt !important;
+     font-weight: bold;
+}
+
+.main#console .twocol {
+     margin: 5px 35px 5px 0 !important;
+     background: rgba(0, 32, 0, 0.5);
+     border-radius: 3px;
+     padding-top: 10px;
+     padding-bottom: 10px;
+     line-height: 120% !important;
+}
+
+.twocol li {
+     list-style-position: inside !important;
+     padding-right: 0 !important;
+     margin-right: 0 !important;
+}
+
+/* responsive layout */
+
 @media screen and (min-width: 1500px) {
 .main, .news, h1, .sorry {
      margin-right: 232px !important;
@@ -551,4 +589,7 @@ div[lang="ar"], div[lang="ar"] code, div[lang="ar"] b {
      margin-right: -10px;
      margin-top: -19px !important;
 }
-}
\ No newline at end of file
+}
+
+/* end responsive layout */
+
diff --git a/installer/resources/themes/console/dark/console_big.css b/installer/resources/themes/console/dark/console_big.css
index 3ac97129a8..43d531da5f 100644
--- a/installer/resources/themes/console/dark/console_big.css
+++ b/installer/resources/themes/console/dark/console_big.css
@@ -7,31 +7,31 @@ h1, h2, h3, h4 {
      font-weight: normal !important;
 }
 
-div.routersummary table td {
+.routersummary table td {
      padding: 2px 1px;
 }
 
-div.routersummary h3, div.routersummary h4, div.routersummary p, div.routersummary h3 a, div.routersummary a {
+.routersummary h3, .routersummary h4, .routersummary p, .routersummary h3 a, .routersummary a {
      text-shadow: none !important;
 }
 
-div.routersummary h3 a {
+.routersummary h3 a {
      font-size: 14pt !important;
      text-transform: uppercase !important;
      letter-spacing: 0.15em !important;
 }
 
-div.routersummary h4, .routersummary h4 a {
+.routersummary h4, .routersummary h4 a {
      font-size: 11pt !important;
      font-weight: normal;
 }
 
-div.routersummary b {
+.routersummary b {
      font-size: 10pt;
      font-weight: normal;
 }
 
-div.routersummary a {
+.routersummary a {
      font-size: 10pt;
      font-weight: normal;
 }
@@ -41,7 +41,7 @@ div.routersummary a {
      padding-bottom: 10px;
 }
 
-div.messages, div.error, .error ul li {
+.messages, .messages li, div.error, .error ul li {
      font-size: 11pt;
      font-weight: normal !important;
 }
@@ -134,19 +134,6 @@ input[type="submit"], input[type="reset"], .cancel, .accept {
      font-size: 9pt !important;
 }
 
-.langselect .optbox {
-     min-height: 68px;
-}
-
-.langselect img {
-     margin-top: 8px !important;
-}
-
-.langselect input[name="lang"]:checked + img, .langselect input[name="lang"]:checked + #config_ui img[src="/flags.jsp?c=a1"] {
-     margin-top: 6px !important;
-     margin-left: -66px !important;
-}
-
 table#leasesetdebug th a:not(old), table#leasesetsummary th a:not(old), #tunnels.main h3 a:not(old), #logs h3 a:not(old),
 a[href^="configpeer?peer"], h3#iptransport a:not(old), h3#iptransport a:not(old) {
      font-size: 0 !important;
@@ -209,6 +196,20 @@ li .twocol {
      line-height: 180%;
 }
 
+.sb_notice, .sb_notice a {
+     font-size: 10pt !important;
+     line-height: 120% !important;
+}
+
+.sb_newsheadings td, .sb_newsheadings tr:hover td {
+     background-position: 4px center !important;
+     padding-left: 24px !important;
+}
+
+.search select, .search button, .search input[type="text"] {
+     font-size: 10pt !important;
+}
+
 @media screen and (min-width: 0) {
 body {
      font-family: "Droid Sans", "Noto Sans", Verdana, "Bitstream Vera Sans", Tahoma, Helvetica, sans-serif;
@@ -229,11 +230,11 @@ div.main, div.news, h1, .sorry {
      font-size: 12pt !important;
 }
 
-div.routersummary {
+.routersummary {
      width: 200px !important;
 }
 
-div.routersummary table, table#sb_localtunnels {
+.routersummary table, table#sb_localtunnels {
     font-size: 10pt;
     width: 215px !important;
 }
@@ -279,7 +280,7 @@ p#fullhistory {
      margin-top: -13px !important;
 }
 
-div.routersummary img[src$="i2plogo.png"] {
+.routersummary img[src$="i2plogo.png"] {
     margin-left: -5px;
     margin-top: -3px;
     width: 211px;
diff --git a/installer/resources/themes/console/dark/i2ptunnel.css b/installer/resources/themes/console/dark/i2ptunnel.css
index 4ca8e32120..a2b1776403 100644
--- a/installer/resources/themes/console/dark/i2ptunnel.css
+++ b/installer/resources/themes/console/dark/i2ptunnel.css
@@ -119,7 +119,7 @@ hr {
      margin: 8px auto;
      padding: 5px 3px 5px 1px !important;
      width: calc(100% - 14px);
-     min-width: 540px;
+     min-width: 700px;
      max-width: 1400px;
      overflow: hidden;
      text-align: left;
@@ -404,6 +404,7 @@ textarea#statusMessages, textarea#statusMessages:active, textarea#statusMessages
      padding: 2px 4px;
      color: #69f;
      font-family: "Droid Sans Mono", "Noto Mono", Consolas, "Lucida Console", "DejaVu Sans Mono", monospace;
+     font-size: 8pt;
 }
 
 _:-ms-lang(x), textarea#statusMessages, textarea#statusMessages:active, textarea#statusMessages:focus {
@@ -599,8 +600,9 @@ a.control {
 
 select {
      color: #494;
-     font: 8pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
+     font-family: "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
      font-weight: bold;
+     font-size: 8pt !important;
      padding: 4px 16px 4px 4px !important;
      -moz-appearance: none;
      -webkit-appearance: none;
@@ -1090,24 +1092,26 @@ h2, h3 {
 
 @media screen and (min-width: 1400px) {
 
-body, td, a, button, input, .control, select, textarea#statusMessages, .freetext, textarea {
-     font-size: 10pt;
+body, td, a, button, input, .control, select, .freetext, textarea {
+     font-size: 10pt !important;
 }
 
 h2, h3 {
      font-size: 12pt;
 }
+
+textarea#statusMessages, textarea#statusMessages:active, textarea#statusMessages:focus {
+     font-size: 9pt;
 }
+}
+
+/* end responsive layout */
 
 /* TO DO: merge with main classes */
 
-.panel {
-     min-width: 700px;
-}
-
 @media screen and (-webkit-min-device-pixel-ratio:0) { /* fixes chrome/blinkoverflow issue */
 select {
-     white-space: normal;
+     white-space: normal !important;
 }
 }
 
diff --git a/installer/resources/themes/console/images/info/gateway.png b/installer/resources/themes/console/images/info/gateway.png
new file mode 100644
index 0000000000..f232015caf
Binary files /dev/null and b/installer/resources/themes/console/images/info/gateway.png differ
diff --git a/installer/resources/themes/console/images/info/rosette.png b/installer/resources/themes/console/images/info/rosette.png
new file mode 100644
index 0000000000..1c809b05f6
Binary files /dev/null and b/installer/resources/themes/console/images/info/rosette.png differ
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index e3f4eecb2b..631f72648c 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -9,7 +9,7 @@ html {
 body {
      margin: 6px;
      text-align: center;
-     color: #333;
+     color: #33333f;
      font: 9pt/130% "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Lucida Grande", Verdana, Helvetica, sans-serif;
      background: #a4a4cb url(images/tile2.png) fixed;
      background-size: 32px 32px;
@@ -29,6 +29,10 @@ body {
      background-size: 32px 32px, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0;
 }
 
+b {
+     color: #41465f;
+}
+
 .hide, .hideme {
      display: none;
 }
@@ -52,7 +56,7 @@ div.clearer {
 }
 
 .routersummary img[src$="i2plogo.png"], .routersummary h3, .confignav, *::before, *::after, div.app, .themechoice, .langselect, .langbox,
-.newsAuthor, #netdbcountrylist img, .viewfullentry, .sybil_routerinfo th img, .graphspanel {
+.newsAuthor, #netdbcountrylist img, .viewfullentry, .sybil_routerinfo th img, .graphspanel, #themeoptions {
      -moz-user-select: none;
      -webkit-user-select: none;
      user-select: none;
@@ -71,7 +75,7 @@ img[src$="bound.png"] {
 }
 
 a img[src$="bound.png"] {
-     filter: hue-rotate(-40deg) drop-shadow(0 0 1px #ccc);
+     filter: hue-rotate(-40deg) drop-shadow(0 0 1px #ccf);
 }
 
 a:hover img[src$="bound.png"] {
@@ -79,7 +83,7 @@ a:hover img[src$="bound.png"] {
 }
 
 a img {
-     filter: drop-shadow(0 0 1px #ccc);
+     filter: drop-shadow(0 0 1px #ccf);
 }
 
 a:hover img {
@@ -91,7 +95,7 @@ pre {
      overflow: auto;
      text-align: left;
      font: 8pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
-     color: #333;
+     color: #33333f;
      margin: 10px;
 }
 
@@ -112,16 +116,16 @@ pre {
 .routersummary {
      width: 190px;
      padding: 8px 8px 10px;
-     margin-bottom: 8px;
+     margin-bottom: 2px;
      text-align: center !important;
      border: 1px solid #447;
-     color: #333;
+     color: #33333f;
      font-size: 8pt;
      clear: left;/* fixes a bug in Opera */
      border-radius: 2px;
-     background: #fff;
+     background: #fafaff;
      box-shadow: inset 0 0 0 1px #bbf;
-     filter: drop-shadow(0 0 1px #999);
+     filter: drop-shadow(0 0 1px #999daf);
 }
 
 .routersummary div[style="height: 36px;"] {
@@ -143,7 +147,7 @@ pre {
      margin-left: -1px !important;
      width: 192px;
      height: auto;
-     filter: drop-shadow(0 0 1px #ccc);
+     filter: drop-shadow(0 0 1px #ccf);
 }
 
 .routersummary img[src$="i2plogo.png"]:hover {
@@ -208,7 +212,7 @@ pre {
      background: #e7e7ff !important;
      background: #e7e7ff url(images/header.png) center center repeat-x !important;
      background: linear-gradient(to bottom, #fff 50%, #eef 50%) !important;
-     background: #e7e7ff linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)) !important;
+     background: #e7e7ff linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)) !important;
      border: 1px solid #99f;
      border-left: none;
      border-right: none;
@@ -337,7 +341,7 @@ h4.sb_info + hr + form {
 }
 
 #sb_localtunnels td img {
-     filter: drop-shadow(0 0 1px rgba(204, 204, 204, 0.6));
+     filter: drop-shadow(0 0 1px #ccf);
 }
 
 #sb_localtunnels td:last-child {
@@ -350,6 +354,10 @@ h4.sb_info + hr + form {
 #sb_localtunnels a {
      display: inline-block;
      width: 100%;
+     max-width: 158px;
+     white-space: nowrap;
+     overflow: hidden;
+     text-overflow: ellipsis;
 }
 
 #sb_localtunnels tr:hover td {
@@ -378,6 +386,14 @@ h4.sb_info + hr + form {
      margin-top: -7px !important;
 }
 
+#sb_general td, #sb_shortgeneral td {
+     white-space: nowrap;
+}
+
+#sb_general td:first-child, #sb_shortgeneral td:first-child {
+     max-width: 130px;
+}
+
 #sb_general td::after, #sb_shortgeneral td::after, #sb_bandwidth td::after,
 #sb_peers td::after, #sb_tunnels td::after, #sb_queue td::after {
    content: "";
@@ -397,13 +413,17 @@ h4.sb_info + hr + form {
      margin-top: 6px;
 }
 
+#sb_warning + .sb_notice {
+     margin-top: 10px;
+}
+
 .sb_notice {
-     background: #eef;
+     background: #f2f2ff;
      border: 1px solid #89f;
      border-radius: 2px;
      box-shadow: 0 0 1px #bbb, inset 0 0 0 1px #fff;
      margin: -5px;
-     padding: 5px 3px;
+     padding: 5px;
      line-height: 140%;
 }
 
@@ -413,37 +433,39 @@ p:empty + .sb_notice {
 
 @media screen and (-webkit-min-device-pixel-ratio:0) {
 .sb_notice {
-     margin-bottom: -7px;
+     margin-bottom: -6px;
 }
 }
 
 /* experimental sidebar navigation for webapps */
 
+#sb_services {
+     margin: -15px -9px -11px -7px;
+     width: 204px !important;
+}
+
 #sb_services td {
-     background: url(images/noise.png);
+     padding-top: 4px;
+     padding-bottom: 4px;
 }
 
 #sb_services a:link, #sb_services a:visited {
      display: inline-block;
      width: 100%;
-     padding: 4px 2px 4px 20px;
+     padding: 4px 2px 4px 24px;
      text-align: left;
      border-bottom: 1px dotted #ddf;
      background: url(images/application.png) left center no-repeat;
      background-size: 14px 14px;
 }
 
-#sb_services a:link:first-child {
-     padding-top: 2px;
-}
-
 #sb_services a:link:last-child {
      border-bottom: none;
-     padding-bottom: 2px;
 }
 
 #sb_services a {
-     background-blend-mode: luminosity, normal;
+     background-blend-mode: luminosity;
+     vertical-align: sub !important;
 }
 
 #sb_services a:hover {
@@ -451,49 +473,54 @@ p:empty + .sb_notice {
 }
 
 #sb_services a[href="/susimail/susimail"] {
-     background: #fbfbfe url(images/inbox.png) left center no-repeat;
+     background: #f8f8ff url(images/inbox.png) 2px center no-repeat;
+     background: rgba(248, 248, 255, 0.8) url(images/inbox.png) 2px center no-repeat;
 }
 
 #sb_services a[href="/susimail/susimail"]:hover {
-     background: #ffe url(images/inbox.png) left center no-repeat;
+     background: #ffe url(images/inbox.png) 2px center no-repeat;
      border-radius: 2px;
 }
 
 #sb_services a[href="/i2psnark/"] {
-     background: #fbfbfe url(/themes/console/images/i2psnark.png) left center no-repeat;
+     background: #f8f8ff url(/themes/console/images/i2psnark.png) 2px center no-repeat;
+     background: rgba(248, 248, 255, 0.8) url(/themes/console/images/i2psnark.png) 2px center no-repeat;
      background-size: 16px 16px;
 }
 
 #sb_services a[href="/i2psnark/"]:hover {
-     background: #ffe url(/themes/console/images/i2psnark.png) left center no-repeat;
+     background: #ffe url(/themes/console/images/i2psnark.png) 2px center no-repeat;
      background-size: 16px 16px;
      border-radius: 2px;
 }
 
 #sb_services a[href="http://127.0.0.1:7658/"] {
-     background: #fbfbfe url(images/server.png) left center no-repeat;
+     background: #f8f8ff url(images/server.png) 2px center no-repeat;
+     background: rgba(248, 248, 255, 0.8) url(images/server.png) 2px center no-repeat;
 }
 
 #sb_services a[href="http://127.0.0.1:7658/"]:hover {
-     background: #ffe url(images/server.png) left center no-repeat;
+     background: #ffe url(images/server.png) 2px center no-repeat;
      border-radius: 2px;
 }
 
 #sb_services a[href="/orchid/"] {
-     background: #fbfbfe url(images/flower.png) left center no-repeat;
+     background: #f8f8ff url(images/flower.png) 2px center no-repeat;
+     background: rgba(248, 248, 255, 0.8) url(images/flower.png) 2px center no-repeat;
 }
 
 #sb_services a[href="/orchid/"]:hover {
-     background: #ffe url(images/flower.png) left center no-repeat;
+     background: #ffe url(images/flower.png) 2px center no-repeat;
      border-radius: 2px;
 }
 
 #sb_services a[href*="bote"] {
-     background: #fbfbfe url(images/mail_black.png) left center no-repeat;
+     background: #f8f8ff url(images/mail_black.png) 2px center no-repeat;
+     background: rgba(248, 248, 255, 0.8) url(images/mail_black.png) 2px center no-repeat;
 }
 
 #sb_services a[href*="bote"]:hover {
-     background: #ffe url(images/mail_black.png) left center no-repeat;
+     background: #ffe url(images/mail_black.png) 2px center no-repeat;
      border-radius: 2px;
 }
 
@@ -550,7 +577,6 @@ p:empty + .sb_notice {
      background: rgba(255,110,110,0.1);
      box-shadow: inset 0 0 0 1px rgba(255,0,0,0.3), 0 0 1px rgba(96,96,96,0.5);
      background: repeating-linear-gradient(135deg, rgba(255,100,100,0.1) 2px, rgba(255,200,200,0.3) 3px,  rgba(255,100,100,0.1) 5px);
-     border: 1px dotted #d33;
 }
 
 .routersummary .warn, .routersummary .clockskew {
@@ -567,7 +593,7 @@ p:empty + .sb_notice {
 }
 
 .routersummary .vmcomm {
-     border: 1px dotted #999;
+     border: 1px dotted #999daf;
 }
 
 .routersummary .running {
@@ -669,29 +695,59 @@ p:empty + .sb_notice {
 */
 /* end tunnel build status */
 
-.newsheadings {
-     text-align: right;
-     margin: -5px 0 -3px 8px;
+/* sidebar news */
+
+.sb_newsheadings {
+     margin: -5px 0 0 8px;
 }
 
-.newsheadings li {
-     list-style: none outside url(images/newsbullet_mini.png);
-     margin: 4px -4px 2px 10px;
-     line-height: 120%;
+.sb_newsheadings table {
+     table-layout: auto;
+     width: 202px !important;
+     margin: -12px 0 -8px -14px;
 }
 
-.newsheadings li:first-child {
-     margin-top: 0;
+.sb_newsheadings td a {
+     padding: 2px 0 !important;
+     display: inline-block;
+     width: 100%;
 }
 
-.refresh {
-     padding: 1px 0 0 0 !important;
+.sb_newsheadings a {
+     display: inline-block;
+     margin: -1px 0 -2px;
 }
 
-.routersummary p {
-     padding: 0;
+.sb_newsheadings td {
+     background: url(images/newsbullet_mini.png) 2px 7px no-repeat !important;
+     padding-left: 19px !important;
+     border-bottom: 1px dotted #ddf !important;
+     padding: 6px 1px;
+     text-align: left;
+     line-height: 100%;
 }
 
+.sb_newsheadings tr:hover td {
+     background: url(images/newsbullet_mini.png) 2px 7px no-repeat #ffe !important;
+     background-blend-mode: luminosity;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+.sb_newsheadings table {
+     width: 202px !important;
+     margin-bottom: -10px;
+}
+
+.sb_newsheadings td, .sb_newsheadings tr:hover td {
+     background-position: 2px 6px !important;
+}
+}
+
+.sb_newsheadings tr:last-child td {
+     border-bottom: none !important;
+}
+
+/* end sidebar news */
 /* end sidebar */
 
 /* proxy error messages */
@@ -704,16 +760,11 @@ p:empty + .sb_notice {
      margin: 0 10px;
      border: 1px solid #447;
      border-radius: 2px;
-     background: #fff;
+     background: #f8f8ff;
      width: 185px;
      box-shadow: inset 0 0 0 1px #bbf;
 }
 
-.logo:not(old) {
-     background: linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.3)), url(images/noise.png) #fff;
-     background-size: 100% 100%, 50px 50px;
-}
-
 .logo hr {
      margin: 8px -10px;
      background: #7789bf;
@@ -737,9 +788,9 @@ p:empty + .sb_notice {
 .warning {
      margin: 16px 12px 30px 232px;
      padding: 10px 25px 20px 75px;
-     background: #fff;
+     background: #fafaff;
      border: 1px solid #447;
-     color: #333;
+     color: #33333f;
      border-radius: 2px;
      text-align: justify;
      background-image: url(/themes/console/images/itoopie_sm.png);
@@ -751,8 +802,8 @@ p:empty + .sb_notice {
 }
 
 .warning:not(old) {
-     background: url("/themes/console/images/itoopie_sm.png") no-repeat scroll 10px center, linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.3)), url(images/noise.png) #fff;
-     background-size: 54px auto, 100% 100%, 50px 50px;
+     background: url(/themes/console/images/itoopie_sm.png) no-repeat scroll 10px center, linear-gradient(to bottom, rgba(248,248,255,0.8), rgba(240,240,255,0.8)) #f8f8ff;
+     background-size: 54px auto, 100% 100%;
      background-position: 10px calc(50% + 16px);
 }
 
@@ -804,8 +855,7 @@ p:empty + .sb_notice {
 .warning {
      margin: 114px 5px 0 !important;
      background: #fff !important;
-     background: linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.3)), url(images/noise.png) #fff !important;
-     background-size: 100% 100%, 50px 50px !important;
+     background: linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.3)) #f8f8ff !important;
      padding-left: 25px !important;
 }
 
@@ -946,8 +996,8 @@ p:empty + .sb_notice {
 
 #jumplinks h4 {
      margin-bottom: 10px;
-     border-color: #113;
-     color: #333;
+     border-color: #41465f;
+     color: #41465f;
 }
 
 .warning p + .formaction {
@@ -968,97 +1018,165 @@ p:empty + .sb_notice {
      border: 1px solid #447;
      border-radius: 0 0 2px 2px;
      text-align: justify;
-     background: #fffff9 url(/themes/console/images/info/errortriangle.png) 20px center no-repeat;
+     background: #fafaff url(/themes/console/images/info/errortriangle.png) 16px 40% no-repeat;
+     background: url(/themes/console/images/info/errortriangle.png) 16px 40% no-repeat, linear-gradient(to top, rgba(224, 224, 255, 0.5), #fafaff), repeating-linear-gradient(135deg, #fff 2px, rgba(221, 221, 255, 1) 3px, #fafaff 5px);
      box-shadow: inset 0 0 1px #f00;
      word-wrap: break-word;
      font-weight: bold;
-     color: #531;
-     min-width: 455px;
+     min-width: 481px;
 }
 
-.sorry hr {
-     color: #531;
-     background: #531;
+.sorry hr, .sorry hr:last-child {
+     color: #558;
+     background: #558;
      height: 1px;
-     border: 1px solid #531;
+     border-top: 1px solid #558;
      margin: 10px 0 !important;
 }
 
+#warning2 {
+     min-width: 536px;
+     margin-top: -25px;
+     margin-bottom: 5px;
+     padding: 20px 20px 5px;
+     background: #fafaff;
+     background: linear-gradient(to bottom, rgba(252, 252, 255, 0.8), rgba(252, 252, 255, 0.5)) #fafaff;
+     color: #33333f;
+     font-weight: normal;
+}
+
+#warning2 h3 {
+     margin: -21px -19px 5px;
+     padding: 8px 10px;
+     border-width: 1px;
+     border-left: none;
+     border-right: none;
+     border-radius: 0;
+}
+
+#warning2 p:first-of-type {
+     font-weight: bold;
+     color: #41465f;
+}
+
+#warning2 p + h3 {
+     margin-top: -10px !important;
+}
+
+#warning2 b {
+     display: inline-block;
+     min-width: 140px;
+     margin-right: 5px;
+     text-align: right;
+}
+
+/* end console error messages */
+
+/* main content div & variations */
+
+.main, .routersummary, .logo {
+     background: #f8f8ff !important;
+     background: linear-gradient(to bottom, rgba(248,248,255,0.5), rgba(240,240,255,0.5)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #fafaff !important;
+}
+
 .main {
      margin: -12px 0 8px 214px;
      padding: 0 15px 10px 15px;
      text-align: left;
-     color: #333;
+     color: #33333f;
      width: auto;
      min-width: 546px;
      border: 1px solid #447;
      border-radius: 0 0 2px 2px;
      box-shadow: inset 0 0 0 1px #bbf;
-     background: #fff;
-     background: linear-gradient(to right, #fff, #f7f8ff, #fff);
-     background-size: 100% 100%;
-     filter: drop-shadow(0 1px 1px #999);
+     filter: drop-shadow(0 1px 1px #999daf);
 }
 
 .main[id^="config_"] {
      padding-bottom: 5px !important;
 }
 
+.main#console {
+     box-shadow: inset 0 0 0 1px #bbf !important;
+}
+
+.news, .main#news, .main#proof, .main#oldconsole, #warning2 {
+     background: #f8f8ff url(/themes/snark/ubergine/images/hat.png) no-repeat scroll right bottom;
+     background: linear-gradient(to bottom, rgba(248,248,255,0.5), rgba(240,240,255,0.5)), url(/themes/snark/ubergine/images/hat.png) no-repeat right bottom, repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #f8f8ff !important;
+     background-size: 100% 100%, auto 160px, 100% 100% !important;
+}
+
+.main#news {
+     padding: 3px 15px 5px;
+}
+
+.news#news {
+     margin: -12px 0 5px 214px;
+     padding: 5px 15px 12px;
+     border: 1px solid #447;
+     color: #224;
+     border-radius: 0 0 2px 2px;
+     text-align: right !important;
+     font-size: 8pt;
+     line-height: 140%;
+     box-shadow: inset 0 0 0 1px #bbf;
+     min-width: 546px;
+     filter: drop-shadow(0 1px 1px #999daf);
+}
+
+.main#proof, .main#oldconsole {
+     background-size: 100% 100%, auto 70%, 100% 100% !important;
+}
+
+.main#torrents {
+     padding: 0;
+     min-width: 576px;
+}
+
+#i2psnarkframe {
+     margin: 0;
+}
+
+.main#webmail {
+     padding: 0 8px;
+}
+
+#susimailframe {
+     margin-top: 3px;
+}
+
+.main#dns {
+     padding: 0;
+     min-width: 576px;
+}
+
+#susidnsframe {
+     margin: 0 0 -2px;
+     height: 100%;
+     width: 100%;
+     overflow: hidden;
+}
+
+.main#tunnelmgr {
+     padding: 0 10px;
+     min-width: 556px;
+}
+
+#i2ptunnelframe {
+     margin: -4px 0 -1px;
+     overflow: hidden;
+}
+
+.main#embedded {
+     padding: 1px 11px 4px;
+}
+
+/* end main content div & variations */
+
 .main li:first-child {
      margin-top: 10px;
 }
 
-.main#debug {
-     background: #fff;
-}
-
-.main#debug li:first-child {
-     margin-top: 0 !important;
-}
-
-.main#debug table:first-of-type td:first-child {
-     font-weight: bold;
-}
-
-.main#debug table:first-of-type td:last-child {
-     text-align: left;
-}
-
-.main#debug td:first-child, .main#debug th:first-child {
-     padding-left: 10px;
-}
-.main#debug td:last-child {
-     text-align: right;
-     vertical-align: top;
-}
-
-.main#debug ul li {
-     list-style: none;
-     margin-left: 0;
-     padding: 0;
-}
-
-.main#debug h2 {
-     border-radius: 0;
-     padding: 8px 10px;
-}
-
-.main#debug h3 {
-     border-radius: 0;
-}
-
-.main#debug table {
-     filter: drop-shadow(0 0 1px #ccc);
-}
-
-.main#debug h2 + table {
-     margin-top: -16px;
-}
-
-.main#debug hr {
-     display: none;
-}
-
 .main hr, hr {
      color: #113;
      background: #113;
@@ -1072,8 +1190,7 @@ hr:last-child {
 }
 
 .main textarea {
-     background: #fff;
-     color: #001;
+     color: #33333f;
      font: 9pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
      margin: 5px 0;
      resize: none;
@@ -1081,10 +1198,17 @@ hr:last-child {
 
 td.tabletextarea {
      padding: 0 !important;
-     background: #fff;
+     background: #fafaff;
 }
 
-textarea[id="advancedsettings"] {
+textarea[id="advancedsettings"]:focus {
+     background: #fff !important;
+     color: #19191f;
+     border-radius: 0 !important;
+}
+
+textarea[id="advancedsettings"], textarea[id="advancedsettings"][disabled]:focus {
+     background: #f8f8ff !important;
      width: 99% !important;
      width: calc(100% - 3px) !important;
      border: none !important;
@@ -1094,6 +1218,7 @@ textarea[id="advancedsettings"] {
      box-shadow: none;
      filter: none !important;
      font-size: 9pt;
+     color: #33333f;
 }
 
 textarea[name="reseedURL"] {
@@ -1121,22 +1246,6 @@ textarea[name="reseedURL"] {
 
 /* news */
 
-div.news {
-     margin: -12px 0 5px 214px;
-     padding: 5px 15px 12px;
-     border: 1px solid #447;
-     color: #224;
-     border-radius: 0 0 2px 2px;
-     text-align: right !important;
-     font-size: 8pt;
-     line-height: 140%;
-     box-shadow: inset 0 0 0 1px #bbf;
-     background: #fff url(/themes/snark/ubergine/images/hat.png) no-repeat scroll right bottom;
-     background: url(/themes/snark/ubergine/images/hat.png) no-repeat scroll right bottom, linear-gradient(to right, #fff, #f7f8ff, #fff);
-     min-width: 546px;
-     filter: drop-shadow(0 1px 1px #999);
-}
-
 .news hr {
      background: #339;
      opacity: 0.6;
@@ -1192,13 +1301,22 @@ div.newscontent p {
 
 #newsStatus, #newsDisplay {
      display: inline-block;
+     color: #41465f;
+}
+
+#newsStatus, .news #newsDisplay {
+     padding-top: 3px !important;
 }
 
 .newsentry + hr + #newsStatus, .newsentry + hr + #newsStatus + #newsDisplay {
      margin-top: -6px !important;
 }
 
-#newsStatus {
+hr + #newsStatus, hr + #newsStatus + #newsDisplay {
+     padding-top: 1px !important;
+}
+
+#news #newsStatus {
      float: left;
      text-align: justify;
      margin-bottom: 6px !important;
@@ -1217,25 +1335,19 @@ div.newscontent p {
      background-size: 10px 10px;
      font-size: 8pt !important;
      display: inline-block;
-     opacity: 0.8;
+     opacity: 0.9;
      letter-spacing: 0.1em !important;
      text-transform: none;
 }
 
 .newsDate {
-     opacity: 0.8;
+     opacity: 0.9;
      margin-right: 1px;
 }
 
-.main#news {
-     padding: 3px 15px 5px;
-     background: #fff url(/themes/snark/ubergine/images/hat.png) no-repeat scroll right bottom;
-     background: url(/themes/snark/ubergine/images/hat.png) no-repeat scroll right bottom, linear-gradient(to right, #fff, #f7f8ff, #fff);
-}
-
 div.news h3, #news h3 {
-     background: url(images/news.png) 8px center no-repeat #fff !important;
-     background: url(images/news.png) 8px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 5%, rgba(231, 231, 255, 0.8)) 15% !important;
+     background: url(images/news.png) 8px center no-repeat #fcfcff !important;
+     background: url(images/news.png) 8px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(to right, #fafaff 5%, rgba(231, 231, 255, 0.8)) 15% !important;
      text-align: left;
      padding: 5px 10px 5px 30px;
      border: 1px solid #7778bf;
@@ -1272,23 +1384,8 @@ div.newscontent h6 {
      text-align: left;
 }
 
-#news {
-     background: linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.3)), url(/themes/snark/ubergine/images/hat.png) bottom right no-repeat, url(images/noise.png) #fff !important;
-     background-size: 100% 100%, 140px auto, 50px 50px !important;
-}
-
 /* end news */
 
-.main#torrents {
-     padding: 0 10px;
-     min-width: 576px;
-}
-
-.main, .routersummary, .logo {
-     background: #fff url(images/noise.png) 0 0 / 50px 50px !important;
-     background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.5)) 0 0 / 100% 100%, #fff url("images/noise.png") 0 0 / 50px 50px !important;
-}
-
 /* top navigation */
 
 h1, .confignav {
@@ -1297,15 +1394,16 @@ h1, .confignav {
 
 .confignav, .main#help div.confignav {
      padding: 8px;
-     margin: -1px -16px 5px -16px;
+     margin: -1px -15px 5px -15px;
      border: 1px solid #7778bf;
+     border-left: none;
+     border-right: none;
      box-shadow: inset 0 0 0 1px #bbf;
      font-size: 9pt;
      text-align: center;
      font-weight: bold;
-     color: #000;
-     background: linear-gradient(to bottom, #fff 50%, rgba(255, 255, 255, 0.6) 52%, rgba(240, 240, 240, 0.4)) #efefff !important;
-     background: linear-gradient(to right, rgba(255,255,255,0.7), rgba(255,255,255,0) 15%, rgba(255,255,255,0) 85%, rgba(255,255,255,0.7)), linear-gradient(to bottom, #fff 50%, rgba(255, 255, 255, 0.6) 52%, rgba(240, 240, 240, 0.4)) #efefff !important;
+     color: #33333f;
+     background: linear-gradient(to bottom, #fbfbff 50%, rgba(248,248,255,0.6) 50%), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #fafaff !important;
 }
 
 .tab, .tab2 {
@@ -1360,7 +1458,7 @@ h1, .confignav {
 }
 
 @media screen and (min-width: 1400px) {
-#help .confignav {
+#help .confignav, #debug .confignav {
      position: sticky;
      top: -1px;
      z-index: 999;
@@ -1370,7 +1468,7 @@ h1, .confignav {
 /* end topnav */
 
 .th_title a, .th_title a:hover {
-     color: #31334f !important;
+     color: #41465f !important;
 }
 
 .configure {
@@ -1381,7 +1479,6 @@ h1, .confignav {
 .configure h3, .graphspanel h3 {
      border: 1px solid #7778bf;
      border-left: 5px solid #7778bf;
-     padding: 5px;
      margin: 15px 0 15px 0;
      border-radius: 0 2px 2px 0;
      background: #ffe;
@@ -1426,7 +1523,8 @@ h3#iptransport a::after, h3#advancedconfig a::after {
      margin: 0;
      vertical-align: text-top;
      cursor: help;
-     filter: hue-rotate(-20deg) saturate(200%) drop-shadow(0 0 1px #999);
+     filter: hue-rotate(-20deg) saturate(200%) drop-shadow(0 0 1px #999daf);
+     mix-blend-mode: luminosity;
 }
 
 h3#iptransport a:hover, h3#advancedconfig a:hover {
@@ -1440,7 +1538,7 @@ h3#transports, h3#upnp {
 pre#transports {
      display: inline-block;
      border: 1px solid #7789bf;
-     background: #fff;
+     background: #fafaff;
      padding: 10px 0 0 10px;
      width: calc(100% - 12px);
      margin: -16px 0 0;
@@ -1450,7 +1548,7 @@ pre#transports {
      border: 1px solid #7789bf;
      margin: -16px 0 5px;
      padding: 5px 10px;
-     background: #fff;
+     background: #fafaff;
      background: repeating-linear-gradient(135deg, rgba(255, 255, 255, 0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px);
 }
 
@@ -1494,7 +1592,7 @@ b.suboption {
      content: url(/themes/console/images/buttons/configure.png);
      float: right;
      padding: 0;
-     filter: drop-shadow(0 0 1px #999);
+     filter: drop-shadow(0 0 1px #999daf);
 }
 
 .main#tunnels h3 a[href^="/configtunnels#"]:hover, #criticallogs + h3.tabletitle a:hover {
@@ -1554,7 +1652,7 @@ p#enablefullstats {
 
 #configstats td:first-child:empty + td > label { /* remove pointer from inert labels */
      cursor: text;
-     color: #333;
+     color: #33333f;
 }
 
 #configstats td:last-child {
@@ -1622,13 +1720,12 @@ p#tunnelconfig {
 }
 
 .graphspanel img {
-     border: 1px solid #7778bf;
      padding: 2px;
      margin: 6px;
      text-align: center !important;
      vertical-align: top !important;
-     background: #001;
-     box-shadow: inset 0 0 1px 1px #99f;
+     background: #41465f;
+     box-shadow: inset 0 0 0 1px #ccf;
      max-width: 98%;
 }
 
@@ -1737,16 +1834,16 @@ h3#graphdisplay {
      border-radius: 2px;
      border: 1px solid #7778bf;
      background: #eef;
-     background: url(/themes/snark/ubergine/images/hat.png) bottom right no-repeat, linear-gradient(to right, #fff, #eef);
+     background: url(/themes/snark/ubergine/images/hat.png) bottom right no-repeat, linear-gradient(to right, #fafaff, #eef);
      background-size: auto 100%, 100% 100%;
      font-weight: bold;
      box-shadow: inset 0 0 0 1px #fff;
      line-height: 130%;
-     filter: drop-shadow(0 0 1px #ccc);
+     filter: drop-shadow(0 0 1px #ccf);
 }
 
 .main#config_update .messages {
-     background: url(/themes/console/images/info/newspaper.png) 12px center no-repeat, url(/themes/snark/ubergine/images/hat.png) bottom right no-repeat, linear-gradient(to right, #fff, #eef);
+     background: url(/themes/console/images/info/newspaper.png) 12px center no-repeat, url(/themes/snark/ubergine/images/hat.png) bottom right no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px, auto 100%, 100% 100% !important;
 }
@@ -1800,7 +1897,7 @@ table {
      border: 1px solid #7778bf;
      margin: 1px 0 5px 0;
      font-size: 9pt;
-     background: #fff;
+     background: #fafaff;
 }
 
 #configinfo th {
@@ -1815,17 +1912,17 @@ table {
 td.optionsave {
      text-align: right;
      padding: 5px !important;
-     background: #fff;
+     background: #fafaff;
      border-top: 1px solid #7778bf !important;
 }
 
 td.optionsave, .formaction, form[action="configpeer"] tr:last-child td, table#addkeyring tr:last-child td {
-     background: linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important;
+     background: linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important;
 }
 
 #pluginupdater {
      padding: 15px 5px 15px 50px;
-     background: url(/themes/console/images/info/update.png) 12px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important;
+     background: url(/themes/console/images/info/update.png) 12px center no-repeat, linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important;
      background-size: 28px 28px, 100% 100% !important;
 }
 
@@ -1839,6 +1936,7 @@ td.optionsave, .formaction, form[action="configpeer"] tr:last-child td, table#ad
 
 td.infohelp, #help tr:hover td.infohelp, #eventlog tr:hover .infohelp {
      background: #fff url(/themes/console/images/info/infohelp.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/infohelp.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
      border-bottom: 1px solid #7778bf !important;
      border-top: 1px solid #7778bf !important;
@@ -1847,6 +1945,7 @@ td.infohelp, #help tr:hover td.infohelp, #eventlog tr:hover .infohelp {
 
 td.infowarn, #help tr:hover td.infowarn {
      background: #fff url(/themes/console/images/info/infowarn.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/infowarn.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px !important;
      border-bottom: 1px solid #7778bf !important;
      border-top: 1px solid #7778bf !important;
@@ -1883,7 +1982,7 @@ table#wrapperlogs {
 }
 
 #logs table[id$="logs"] tr:first-child td, .subheading {
-     background: linear-gradient(45deg, #fff, #eef) !important;
+     background: linear-gradient(45deg, #fcfcff, #eef) !important;
      box-shadow: inset 0 0 0 1px #fff;
 }
 
@@ -1902,8 +2001,7 @@ table#wrapperlogs {
 }
 
 #logs ul {
-     margin-left: 0;
-     margin-right: -26px;
+     margin: -3px -26px -3px 0;
      display: inline-block;
      word-break: break-all;
 }
@@ -1915,6 +2013,7 @@ table#wrapperlogs {
      text-align: left;
      display: inline-block;
      width: calc(100% - 48px);
+     padding-top: 1px !important;
 }
 
 #logs li::after {
@@ -1922,7 +2021,7 @@ table#wrapperlogs {
      display: block;
      border-top: 1px dotted #ddf;
      width: 100%;
-     margin: 5px 0 0;
+     margin: 2px 0 -3px;
 }
 
 #logs li:last-child::after {
@@ -1989,6 +2088,7 @@ table#wrapperlogs {
      background: rgba(255,255,239,0.4);
      border-top: 1px inset transparent;
      border-bottom: 1px inset transparent;
+     color: #19191f;
 }
 
 #enviro td:first-child {
@@ -1999,6 +2099,10 @@ table#wrapperlogs {
      padding-left: 10px;
 }
 
+#enviro:hover td:first-child b {
+     color: #26262f !important;
+}
+
 table[id$="logs"] td {
      padding: 5px;
 }
@@ -2033,7 +2137,7 @@ table hr {
 
 th {
      padding: 6px 5px;
-     color: #31334f;
+     color: #41465f;
      background: #eef url(images/header.png) center center repeat-x;
      background: linear-gradient(to bottom, #fff 50%, rgba(238, 238, 255, 0.2) 50%, #eef 100%) !important;
      text-align: left;
@@ -2041,39 +2145,60 @@ th {
      line-height: 110%;
      border-bottom: 1px solid #7778bf !important;
      border-top: 1px solid #7778bf !important;
+     vertical-align: middle;
+}
+
+th img[src="/themes/console/images/outbound.png"] {
+     vertical-align: middle;
+}
+
+th img[src="/themes/console/images/outbound.png"] {
+     vertical-align: text-top;
 }
 
 .main[id^="config_"] th {
      font-size: 10pt;
 }
 
+.main[id^="config_"] th:first-child {
+     padding-left: 10px;
+}
+
 tr {
      vertical-align: middle !important;
 }
 
 tr:nth-child(even), pre#transports {
      background: #efefff;
-     background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px), #fff;
+     background: repeating-linear-gradient(135deg, rgba(252,252,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fafaff 5px) #fafaff;
 }
 
 tr:nth-child(odd) {
      background: #f7f8ff;
-     background: repeating-linear-gradient(45deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff;
+     background: repeating-linear-gradient(45deg, rgba(255,255,255,0.5) 2px, rgba(200, 200, 255, 0.3) 3px, #fafaff 5px), #fafaff;
 }
 
 tr th {
      background: #eef url(images/header.png) center center repeat-x;
-     background: linear-gradient(to bottom, #fff 50%, rgba(238, 238, 255, 0.2) 50%, #eef 100%) #fff !important;
+     background: linear-gradient(to bottom, #fafaff 50%, rgba(252, 252, 255, 0.8) 50%, #e2e2ff 100%) #fafaff !important;
 }
 
 td {
      padding: 3px 5px;
-     color: #333;
+     color: #33333f;
      vertical-align: middle;
      border-top: 1px inset #ddf;
      border-bottom: 1px inset #ddf;
 }
 
+#floodfillconfig tr:nth-child(2) td {
+     padding: 8px 10px 8px 18px;
+}
+
+#floodfillconfig tr:nth-child(2) b {
+     margin-right: 10px;
+}
+
 #tunnelconfig tr:last-child, #webappconfig tr:last-child {
      background: #efefff;
      background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px);
@@ -2096,7 +2221,7 @@ td {
 }
 
 #netconfig tr {
-     background: #fff;
+     background: #fafaff;
      background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px);
 }
 
@@ -2134,11 +2259,11 @@ h4.app, h4.app2 {
      display: inline-block;
      width: calc(100% - 44px);
      border-radius: 2px;
-     color: #31334f;
+     color: #41465f;
 }
 
 h4.app {
-     background: url(/themes/console/images/eepsite.png) 10px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
+     background: url(/themes/console/images/eepsite.png) 10px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(to right, #fcfcff 5%, rgba(231, 231, 255, 0.8) 25%) #f8f8ff !important;
      background-size: 16px 16px, 100% 100%, 100% 100% !important;
      margin-top: 15px;
 }
@@ -2146,7 +2271,7 @@ h4.app {
 h4.app2 {
      clear: left;
      margin-top: 10px !important;
-     background: url(images/globe.png) 10px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
+     background: url(images/globe.png) 10px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(to right, #fcfcff 5%, rgba(231, 231, 255, 0.8) 25%) #f8f8ff !important;
      background-size: 16px 16px, 100% 100%, 100% 100% !important;
 }
 
@@ -2225,13 +2350,13 @@ table.search {
      border-radius: 0 0 2px 2px;
      border: 1px solid #7778bf;
      background: none;
-     background: linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important;
+     background: linear-gradient(to bottom, #fafaff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important;
      padding: 8px;
      width: 70%;
      margin-left:auto;
      margin-right:auto;
      margin-top: -19px;
-     box-shadow: 0 1px 1px 1px rgba(200, 200, 200, 0.3);
+     box-shadow: 0 1px 1px 1px rgba(210, 210, 255, 0.3);
 }
 
 .search tr {
@@ -2280,7 +2405,7 @@ table.search select {
      max-width: 32px;
      padding: 6px;
      padding: 10px 60px;
-     filter: drop-shadow(0 0 1px #ccc);
+     filter: drop-shadow(0 0 1px #ccf);
      opacity: 0.9;
 }
 
@@ -2329,7 +2454,7 @@ table.search select {
 /* end home page */
 
 tt, code {
-     font: bold 9pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace !important;
+     font: bold 8pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
      color: #050;
 }
 
@@ -2347,8 +2472,8 @@ tt::-moz-selection {
      word-wrap: break-word;
 }
 
-.main li b, .statlist b a:hover {
-     color: #335 !important;
+.statlist b a:hover {
+     color: #41465f !important;
 }
 
 .tidylist {
@@ -2411,7 +2536,7 @@ a:link {
      outline: none;
 }
 
-a:visited {
+a:visited, .tab a {
      color: #2c4e8f;
      text-decoration: none;
      font-weight: bold;
@@ -2446,6 +2571,8 @@ a:active {
 
 .links code, #console code {
      color: #910;
+     font-size: 8pt !important;
+     font-weight: bold;
 }
 
 p {
@@ -2457,13 +2584,14 @@ p.infohelp, p#sybilinfo, p#debugmode, p#upnpstatus, p#pluginconfigtext, p#gather
      border: 1px solid #7778bf;
      padding: 15px 15px 15px 50px;
      background: #fff url(/themes/console/images/info/infohelp.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/infohelp.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      line-height: 130%;
 }
 
 p#upnpstatus, p#keyringhelp, .widescroll + p.infohelp, #profiles ul#banlist, #config_reseed .confignav + p.infohelp 
 p#sybilinfo, p#debugmode, #config_family p.infohelp, p#profiles_overview, p#gatherstats {
      border-radius: 2px;
-     filter: drop-shadow(0 0 1px #ccc);
+     filter: drop-shadow(0 0 1px #ccf);
 }
 
 p#profiles_overview {
@@ -2474,18 +2602,33 @@ p#profiles_overview {
      margin-bottom: -5px;
 }
 
+#profiles .tunnel_peer {
+     margin-left: -6px;
+}
+
+#profiles .tunnel_peer img {
+     margin-left: -6px;
+}
+
 .infohelp + hr {
      display: none;
 }
 
 #bugreports {
+    padding: 10px 0 10px 10px;
     border-collapse: separate;
     border-radius: 2px;
-    filter: drop-shadow(0 0 1px #ccc)
+    filter: drop-shadow(0 0 1px #ccf);
+    background: linear-gradient(135deg, #fafaff, #f8f8ff);
+}
+
+#bugreports tr {
+     background: transparent
 }
 
 #bugreports td.infohelp {
      background: #fff url(/themes/console/images/info/bugreport.png) no-repeat left center !important;
+     background: url(/themes/console/images/info/bugreport.png) no-repeat left center !important;
      padding: 10px 15px 10px 40px;
      background-size: 28px 28px;
      border: none !important;
@@ -2495,59 +2638,66 @@ p#profiles_overview {
 p#debugmode {
      padding: 15px 15px 15px 50px;
      background: #fff url(/themes/console/images/info/debug.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/debug.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      background-size: 28px 28px;
 }
 
 p#sybilinfo {
      padding: 15px 15px 15px 50px;
      background: #fff url(/themes/console/images/info/experimental.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/experimental.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      background-size: 28px 28px;
      border-radius: 2px;
-     filter: drop-shadow(0px 0 1px #ccc);
+     filter: drop-shadow(0px 0 1px #ccf);
 }
 
 p.infowarn {
      border: 1px solid #7778bf;
      padding: 15px 15px 15px 50px;
      background: #fff url(/themes/console/images/info/infowarn.png) 10px center no-repeat;
+     background: url(/themes/console/images/info/infowarn.png) 10px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      line-height: 130%;
 }
 
 #bandwidthconfig tr:first-child .infohelp {
      background: #fff url(/themes/console/images/info/bandwidth.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/bandwidth.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px;
 }
 
 #addkeyring td.infohelp {
      background: #fff url(/themes/console/images/info/keys.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/keys.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px;
 }
 
 #joinfamily tr:nth-child(3) td:first-child {
      background: #fff url(/themes/console/images/info/key.png) 12px center no-repeat;
-     background: url(/themes/console/images/info/key.png) 12px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: url(/themes/console/images/info/key.png) 12px center no-repeat, linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px, 100% 100%, 100% 100% !important;
 }
 
 #joinfamily tr:nth-child(2) td {
-     background: #fff;
+     background: #fafaff;
+     background: linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 10px 15px;
 }
 
 #newfamily tr:last-child td:first-child {
      background: #fff url(/themes/console/images/info/label.png) 12px center no-repeat;
-     background: url(/themes/console/images/info/label.png) 12px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: url(/themes/console/images/info/label.png) 12px center no-repeat, linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px, 100% 100%, 100% 100% !important;
 }
 
 #exportfamily tr:nth-child(2) td:first-child {
      background: url(/themes/console/images/info/export_key.png) 12px center no-repeat, #fff !important;
+     background: url(/themes/console/images/info/export_key.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff) !important;
      padding: 20px 15px 20px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 #leavefamily {
@@ -2556,16 +2706,16 @@ p.infowarn {
 
 #leavefamily tr:last-child td:first-child {
      background: #fff url(/themes/console/images/info/leave_family.png) 12px center no-repeat;
-     background: url(/themes/console/images/info/leave_family.png) 12px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: url(/themes/console/images/info/leave_family.png) 12px center no-repeat, linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px;
 }
 
 #oldhome td:first-child {
      background: #fff url(/themes/console/images/info/home.png) 12px center no-repeat;
-     background: url(/themes/console/images/info/home.png) 12px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: url(/themes/console/images/info/home.png) 12px center no-repeat, linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%, 100% 100%;
 }
 
 #oldhome input[type="checkbox"], #enablefullstats input[type="checkbox"] {
@@ -2574,8 +2724,9 @@ p.infowarn {
 
 #floodfillconfig tr:first-child .infohelp {
      background: #fff url(/themes/console/images/info/floodfill_32x32.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/floodfill_32x32.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 #floodfillconfig label {
@@ -2584,31 +2735,34 @@ p.infowarn {
 
 p#clientconf.infohelp, p#webappconfigtext.infohelp {
      background: #fff url(/themes/console/images/info/java_edit.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/java_edit.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 p#pluginconfigtext {
      background: #fff url(/themes/console/images/info/plugin_edit.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/plugin_edit.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 #plugininstall .infohelp {
      background: #fff url(/themes/console/images/info/plugin_link.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/plugin_link.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 #plugininstall tr:nth-child(3) td:nth-last-child(2), #manualreseed tr:nth-child(3) td:nth-last-child(2) {
-     background: #fff url(/themes/console/images/info/url.png) 12px center no-repeat;
-     background: url(/themes/console/images/info/url.png) 12px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: #fafaff url(/themes/console/images/info/url.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/url.png) 12px center no-repeat, linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px, 100% 100%, 100% 100% !important;
 }
 
 #plugininstall tr:nth-child(3) td:nth-last-child(1), #manualreseed tr:nth-child(3) td:nth-last-child(1), #manualreseed tr:nth-child(5) td:nth-last-child(1) {
-     background: #fff;
+     background: #fafaff;
 }
 
 .optionsave form {
@@ -2617,88 +2771,87 @@ p#pluginconfigtext {
 }
 
 #manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2) {
-     background: #fff url(/themes/console/images/info/from_file.png) 12px center no-repeat;
-     background: url(/themes/console/images/info/from_file.png) 12px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: #fafaff url(/themes/console/images/info/from_file.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/from_file.png) 12px center no-repeat, linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
      padding: 15px 15px 15px 50px;
      background-size: 28px 28px, 100% 100%, 100% 100% !important;
 }
 
 #manualreseed tr:nth-last-child(2) td.infohelp {
-     background: #fff url(/themes/console/images/info/box.png) 12px center no-repeat;
+     background: #fafaff url(/themes/console/images/info/box.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/box.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 #config_peers tr:nth-child(3) td.infohelp {
-     background: #fff url(/themes/console/images/info/blocked.png) 12px center no-repeat;
+     background: #fafaff url(/themes/console/images/info/blocked.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/blocked.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 h3#shutdownrouter + p.infohelp {
-     background: #fff url(/themes/console/images/info/power.png) 12px center no-repeat;
+     background: #fafaff url(/themes/console/images/info/power.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/power.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 h3#restartrouter + p.infohelp, #config_family .infohelp.needrestart {
-     background: #fff url(/themes/console/images/info/reboot.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/reboot.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
-h3#shutdownrouter, h3#systray {
-     margin-bottom: -15px;
+h3#shutdownrouter, h3#systray, h3#servicedebug {
+     margin-bottom: -13px;
 }
 
 h3#systray + p.infohelp {
-     background: #fff url(/themes/console/images/info/systray.png) 12px center no-repeat;
+     background: #fafaff url(/themes/console/images/info/systray.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/systray.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
-}
-
-h3#servicedebug {
-     margin-bottom: -15px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 h3#servicedebug + p.infohelp {
-     background: #fff url(/themes/console/images/info/debug.png) 12px center no-repeat;
+     background: #fafaff url(/themes/console/images/info/debug.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/debug.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 h3#browseronstart + p.infohelp {
-     background: #fff url(/themes/console/images/info/launch_browser.png) 12px center no-repeat;
+     background: #fafaff url(/themes/console/images/info/launch_browser.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/launch_browser.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 .main#config_reseed p.infohelp {
-     background: #fff url(/themes/console/images/info/connect.png) 12px center no-repeat;
+     background: #fafaff url(/themes/console/images/info/connect.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/connect.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 p#enablefullstats, p#gatherstats {
-     background: #fff url(/themes/console/images/info/statistics.png) 12px center no-repeat;
+     background: #fafaff url(/themes/console/images/info/statistics.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/statistics.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 15px 15px 15px 50px;
-     background-size: 28px 28px;
+     background-size: 28px 28px, 100% 100%;
 }
 
 #config_family .infohelp {
-      background: #fff url(/themes/console/images/info/family.png) 12px center no-repeat !important;
+      background: #fafaff url(/themes/console/images/info/family.png) 12px center no-repeat !important;
+      background: url(/themes/console/images/info/family.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff) !important;
       padding: 15px 15px 15px 50px !important;
-      background-size: 28px 28px !important;
+      background-size: 28px 28px, 100% 100% !important;
 }
 
 /* stats page */
 
-p#gatherstats + form, ul.statlist {
-     border: 1px solid #7778bf;
-     padding: 10px;
-     background: #fff;
-}
-
 .main#stats {
      padding-bottom: 15px;
 }
@@ -2711,6 +2864,13 @@ p#gatherstats + form, ul.statlist {
      margin-top: -1px;
 }
 
+p#gatherstats + form, ul.statlist {
+     border: 1px solid #7778bf;
+     padding: 10px;
+     background: #fafaff;
+     background: linear-gradient(135deg, #fafaff, #f8f8ff);
+}
+
 ul.statlist {
      border: 1px solid #7778bf;
      padding: 0 10px 10px;
@@ -2832,18 +2992,18 @@ li.noevents {
 
 h1 {
      text-align: left;
-     color: #31334f;
+     color: #41465f;
      padding: 17px 15px 14px;
      margin: 0 0 10px 214px;
      font-size: 18pt;
      line-height: 90%;
      letter-spacing: 0.12em;
      text-transform: uppercase;
+     text-shadow: 0 1px 1px #fff;
      box-shadow: inset 0 0 0 1px #bbf;
      white-space: normal;
-     background: #fff;
-     background: linear-gradient(to bottom, rgba(255,255,255,0.8) 50%, rgba(255,255,255,0.7) 50%),  url(images/noise.png) #fff !important;
-     background-size: 100% 100%, 50px 50px !important;
+     background: #fcfcff;
+     background: linear-gradient(135deg, #fcfcff, rgba(252,252,255,0) 600px), linear-gradient(to bottom, #fcfcff 50%, rgba(248,248,255,0.6) 50%), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #fafaff !important;
      border: 1px solid #447;
      border-radius: 2px;
      min-width: 546px;
@@ -2859,6 +3019,7 @@ span.newtab {
 
 .newtab img {
      margin-top: -3px;
+     opacity: 0.8;
 }
 
 .newtab img:hover {
@@ -2867,7 +3028,7 @@ span.newtab {
 
 h2 {
      font-size: 13pt;
-     color: #31334f;
+     color: #41465f;
      letter-spacing: 0.08em;
      word-spacing: 0.1em;
      background: url(images/header.png) center center repeat-x;
@@ -2912,7 +3073,7 @@ h2 img {
 h3 {
      border: 1px solid #7789bf;
      border-left: 5px solid #7789bf;
-     padding: 6px 5px 5px 7px;
+     padding: 7px 5px 6px 7px;
      margin: 12px 0 15px 0;
      border-radius: 0 2px 2px 0;
      background: url(images/header.png) center center repeat-x !important;
@@ -2921,7 +3082,7 @@ h3 {
      text-transform: uppercase;
      letter-spacing: 0.08em;
      word-spacing: 0.1em;
-     color: #31334f;
+     color: #41465f;
      box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
 }
 
@@ -2933,7 +3094,7 @@ h3.tabletitle, h3.ptitle, #config_advanced h3.tabletitle, h3#bannedpeers {
 }
 
 h3.ptitle {
-     margin-bottom: -14px;
+     margin-bottom: -13px;
 }
 
 h3#bannedpeers {
@@ -2941,7 +3102,7 @@ h3#bannedpeers {
 }
 
 h2, h3 {
-     background: linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
+     background: linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(to right, #fafaff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
 }
 
 /* /configpeers */
@@ -3038,7 +3199,7 @@ h4 {
      border-radius: 2px;
      background: #eef;
      background: linear-gradient(to right, #fff, #eef);
-     color: #31334f;
+     color: #41465f;
      box-shadow: inset 0 0 0 1px #fff;
 }
 
@@ -3100,10 +3261,34 @@ h4 {
 
 /* welcome section */
 
+div[lang="es"] li, div[lang="pt"] li, div[lang="sv"] li, div[lang="zh"] li {
+     margin-left: 15px;
+     margin-right: 15px;
+     list-style: none;
+     text-align: justify;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+div[lang="es"] li, div[lang="pt"] li, div[lang="sv"] li, div[lang="zh"] li {
+     margin-left: 25px;
+}
+}
+
+div[lang="es"] .twocol, div[lang="pt"] .twocol, div[lang="sv"] .twocol, div[lang="zh"] .twocol {
+     margin-left: 25px;
+}
+
+div[lang="sv"] li::first-letter {
+     text-transform: uppercase !important;
+}
+
+div[lang="de"] .links li {
+     padding-left: 0;
+}
+
 .langbox {
      margin: 3px 1px 0 5px;
      padding: 2px 3px;
-     color: #001;
      font-size: 7pt;
      width: 360px;
      text-align: right;
@@ -3176,22 +3361,23 @@ button.search:hover {
 }
 
 input.search[type="text"] {
-     background: #fff url(/themes/console/images/buttons/search.png) no-repeat 4px center;
+     background: #f8f8ff url(/themes/console/images/buttons/search.png) no-repeat 4px center !important;
      padding: 4px 3px 4px 22px;
      background-size: 16px 16px !important;
      background-blend-mode: luminosity;
 }
 
 input.search[type="text"]:focus {
+     background: #fff url(/themes/console/images/buttons/search.png) no-repeat 4px center !important;
      background-blend-mode: normal;
 }
 
 input, input:visited, button, button:visited {
-     border: 1px solid #999;
+     border: 1px solid #999daf;
      box-shadow: inset 0 0 0 1px #fff;
      background: #eee;
      background: linear-gradient(to bottom, #fff, #ddd);
-     color: #333;
+     color: #41465f;
      margin: 3px;
      font: 9pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Lucida Grande", Verdana, Helvetica, sans-serif;
      padding: 4px 5px;
@@ -3199,7 +3385,15 @@ input, input:visited, button, button:visited {
      border-radius: 2px;
      opacity: 1;
      background-size: 14px auto, 100% 100% !important;
-     filter: saturate(70%) drop-shadow(0 0 1px rgba(204, 204, 204, 0.6));
+     filter: drop-shadow(0 0 1px #ccf);
+}
+
+input[type="text"], textarea, input[type="password"] {
+     filter: drop-shadow(0 0 1px #ccf);
+}
+
+input[type="submit"], input[type="reset"], button {
+     filter: saturate(70%) drop-shadow(0 0 1px #ccf);
 }
 
 button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner {
@@ -3545,6 +3739,7 @@ button.download.control:hover, button.download.control:focus {
 
 .routersummary .reload:hover, .routersummary .reload:focus {
      background: url(/themes/console/images/buttons/restart_hover.png) center center no-repeat, linear-gradient(to bottom, #ddd, #fff) !important;
+     background: url(/themes/console/images/buttons/shutdown_hover.png) 37% center no-repeat, url(/themes/console/images/buttons/restart_hover.png) 63% center no-repeat,  linear-gradient(to bottom, #ddd, #fff) !important;
      border: 1px solid #f60;
 }
 
@@ -3638,15 +3833,23 @@ button.download.control:hover, button.download.control:focus {
 /* end sidebar buttons */
 
 input[type="text"], input[type="password"] {
-     background: #fff;
-     box-shadow: inset 2px 2px 1px rgba(204, 204, 204, 0.6);
+     background: #f8f8ff;
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
      font-family: "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Lucida Grande", Verdana, Helvetica, sans-serif;
 }
 
+input[name="refreshInterval"] {
+     text-align: right;
+     min-width: 80px;
+     width: 80px;
+}
+
 input[type="text"]:focus, input[type="password"]:focus {
+     background: #fff;
      box-shadow: none;
      filter: drop-shadow(0 0 1px #89f);
-     color: #000;
+     color: #19191f;
+     border: 1px solid #676c7f;
 }
 
 .main[id^="config_"] input[name="port"] {
@@ -3659,6 +3862,7 @@ input[type="file"] {
      padding: 0;
      background: none;
      box-shadow: none;
+     cursor: pointer;
 }
 
 .optbox, input[type="checkbox"], input[type="radio"] {
@@ -3674,23 +3878,25 @@ input[type="file"] {
      border: 0;
      box-shadow: none;
      cursor: pointer;
+     filter: sepia(100%) hue-rotate(185deg) drop-shadow(0 0 1px #ccf);
 }
 
 .optbox:hover, input[type="checkbox"]:hover, input[type="radio"]:hover,
 input[type="checkbox"]:focus, input[type="radio"]:focus {
      outline: none;
-     filter: drop-shadow(0 0 3px #89f);
      min-height: 16px;
      height: 16px;
      min-width: 16px !important;
      width: 16px !important;
      opacity: 1.0;
      border: 0;
+     filter: sepia(100%) hue-rotate(185deg) drop-shadow(0 0 3px #89f);
 }
 
+input[type="checkbox"][disabled], input[type="radio"][disabled],
 input[type="checkbox"][disabled]:hover, input[type="radio"][disabled]:hover,
 input[type="checkbox"][disabled]:focus, input[type="radio"][disabled]:focus {
-     filter: none;
+     filter: sepia(100%) hue-rotate(185deg);
      box-shadow: none;
 }
 
@@ -3699,7 +3905,7 @@ label {
 }
 
 label:hover {
-     color: #000;
+     color: #19191f;
 }
 
 .main#config_clients label[for="0"] {
@@ -3712,21 +3918,28 @@ select {
      appearance: none;
      background: url(images/dropdown.png) right center no-repeat #fff;
      background: url(images/dropdown.png) right center no-repeat, linear-gradient(to bottom, #fff, #ddd);
+     background-blend-mode: hard-light, normal;
      padding: 4px 16px 4px 4px !important;
-     color: #333;
+     color: #33333f;
      margin: 5px;
-     border: 1px solid #999;
+     border: 1px solid #999daf;
      min-width: 120px;
      font: 9pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Lucida Grande", Verdana, Helvetica, sans-serif;
      border-radius: 2px;
      text-align: left !important;
      box-shadow: inset 0 0 0 1px #fff;
-     filter: drop-shadow(0 0 1px rgba(204, 204, 204, 0.6));
+     filter: drop-shadow(0 0 1px #ccf);
+}
+
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+select {
+     padding: 5px 16px 5px 6px !important;
+}
 }
 
 select:focus {
      box-shadow: 0 0 0 1px #89f;
-     color: #000;
+     color: #19191f;
 }
 
 select option {
@@ -3752,8 +3965,8 @@ select::-ms-expand {
 
 input[readonly], input[disabled], input[readonly]:focus, input[disabled]:focus {
      background: #e9e9e9;
-     box-shadow: inset 2px 2px 1px rgba(204, 204, 204, 0.6);
-     color: #333;
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
+     color: #4d4d5f;
      filter: none;
      cursor: default;
 }
@@ -3761,19 +3974,21 @@ input[readonly], input[disabled], input[readonly]:focus, input[disabled]:focus {
 textarea {
      padding: 5px;
      margin: 5px !important;
-     background: #ffe;
-     color: #333 !important;
+     background: #f8f8ff;
+     color: #33333f !important;
      border-radius: 2px;
      font: 8pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
      min-height: 100px;
      min-width: 97%;
-     border: 1px solid #999;
-     box-shadow: inset 2px 2px 1px rgba(204, 204, 204, 0.6);
+     border: 1px solid #999daf;
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
 }
 
 textarea:focus {
-     color: #001 !important;
+     background: #fff;
+     color: #19191f !important;
      box-shadow: none;
+     border: 1px solid #676c7f;
      filter: drop-shadow(0 0 1px #89f);
 }
 
@@ -3786,7 +4001,7 @@ textarea:focus {
      margin: -5px 0 5px 0;
      padding: 7px;
      background: #eef;
-     background: linear-gradient(to right, #efefff, #fff, #efefff) #fff;
+     background: linear-gradient(to right, #efefff, #fafaff, #efefff) #fff;
      letter-spacing: 0em !important;
      box-shadow: inset 0 0 0 1px #fff;
 }
@@ -3894,7 +4109,7 @@ h3#activejobs + ol li:before, h3#scheduledjobs + ol li:before, h3#readyjobs + ol
      font-weight: bold;
      line-height: 50%;
      vertical-align: sub;
-     color: #393;
+     color: #41465f;
 }
 
 h3#finishedjobs + ol li:before {
@@ -3922,7 +4137,7 @@ h3#scheduledjobs + ol li:before {
      margin-bottom: -2px;
 }
 
-.smallhead {
+.smallhead th {
      font-size: 8pt
 }
 
@@ -3934,14 +4149,16 @@ h3#scheduledjobs + ol li:before {
      border-left: 1px inset #ddf;
      border-top: 1px inset #ddf !important;
      border-bottom: 1px inset #ddf !important;
+     padding-top: 4px;
+     padding-bottom: 4px;
 }
 
 .tablefooter {
-     background: #fff;
+     background: #f8f8ff;
 }
 
 .tablefooter tr, .tablefooter td {
-     background: #fff;
+     background: #f8f8ff;
      border-top: 1px solid #7778bf;
      border-bottom: 1px solid #7778bf !important;
      padding: 8px 2px;
@@ -3954,7 +4171,7 @@ h3#scheduledjobs + ol li:before {
      border: 1px solid #7778bf;
      margin-top: -15px;
      padding: 5px;
-     background: #fff;
+     background: #fafaff;
 }
 
 #config_homepage .formaction, #config_clients .formaction, #webappconfigactions {
@@ -3998,40 +4215,6 @@ iframe.iframed {
      margin: 10px 0 0;
 }
 
-.main#webmail {
-     padding: 0 8px;
-}
-
-#susimailframe {
-     margin-top: 3px;
-}
-
-.main#dns {
-     padding: 0;
-     min-width: 576px;
-}
-
-#susidnsframe {
-     margin: 0 0 -2px;
-     height: 100%;
-     width: 100%;
-     overflow: hidden;
-}
-
-.main#tunnelmgr {
-     padding: 0 10px;
-     min-width: 556px;
-}
-
-#i2ptunnelframe {
-     margin: -4px 0 -1px;
-     overflow: hidden;
-}
-
-.main#embedded {
-     padding: 1px 11px 4px;
-}
-
 /* Fixes for when app is not started and console error loads inside iframe */
 
 body.iframed {
@@ -4068,11 +4251,12 @@ body.iframed {
 
 #consolepass tr:first-child td {
      background: #fff url(/themes/console/images/info/user_add.png) 12px center no-repeat;
+     background: url(/themes/console/images/info/user_add.png) 12px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      background-size: 28px 28px;
      padding: 15px 15px 15px 50px;
 }
 
-.main#config_ui .themechoice .optbox, .main#config_ui .langselect .optbox {
+#config_ui .themechoice .optbox, #config_ui .langselect .optbox {
      vertical-align: text-bottom;
 }
 
@@ -4091,7 +4275,7 @@ body.iframed {
      background: linear-gradient(to bottom, #fff, #ddf);
      transition: filter ease 0.3s 0s;
      box-shadow: inset 0 0 0 1px #fff;
-     filter: drop-shadow(0 0 1px #ccc);
+     filter: drop-shadow(0 0 1px #ccf);
 }
 
 .themechoice:hover {
@@ -4116,7 +4300,7 @@ body.iframed {
      filter: drop-shadow(0 0 1px #f60);
 }
 
-.main#config_ui .themechoice .optbox {
+#config_ui .themechoice .optbox {
      min-height: 88px !important;
      min-width: 123px !important;
      opacity: 0; /* hide the radio icon so we can use thumbnail img instead */
@@ -4141,7 +4325,7 @@ body.iframed {
 #themeoptions {
      clear: both;
      border-top: 1px solid #ddf;
-     background: repeating-linear-gradient(45deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff;
+     background: repeating-linear-gradient(45deg, rgba(252,252,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fafaff 5px), #fafaff;
      margin: 0 -5px 5px;
      position: relative;
      top: 4px;
@@ -4165,6 +4349,7 @@ p#helptranslate {
      text-align: left !important;
      border-top: 1px solid #7778bf;
      background: url(/themes/console/images/info/notice.png) left 14px center no-repeat, #fff;
+     background: url(/themes/console/images/info/notice.png) left 14px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      background-size: 28px 28px;
 }
 
@@ -4221,16 +4406,16 @@ div#themesettings {
      padding: 4px 5px 0;
      margin: -16px 0 0;
      border: 1px solid #7778bf;
-     background: #fff;
-     background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(248, 248, 255, 0.3) 3px, #fff 5px);
+     background: #fafaff;
+     background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(248, 248, 255, 0.3) 3px, #fafaff 5px);
 }
 
 div#langsettings {
      padding: 4px 5px 0;
      border: 1px solid #7778bf;
      margin: -16px 0 0;
-     background: #fff;
-     background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(248, 248, 255, 0.3) 3px, #fff 5px);
+     background: #fafaff;
+     background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(248, 248, 255, 0.3) 3px, #fafaff 5px);
 }
 
 #themesettings hr, #langsettings hr {
@@ -4249,7 +4434,7 @@ div#langsettings {
      background: linear-gradient(to bottom, #fff, #ddf);
      transition: transform 0.3s ease 0s;
      box-shadow: inset 0 0 0 1px #fff;
-     filter: drop-shadow(0 0 1px #ccc);
+     filter: drop-shadow(0 0 1px #ccf);
 }
 
 .langselect:hover {
@@ -4257,7 +4442,7 @@ div#langsettings {
      background: #fff;
 }
 
-.main#config_ui .langselect .optbox, .main#config_ui .langselect .optbox:hover, .main#config_ui .langselect .optbox:focus {
+#config_ui .langselect .optbox, #config_ui .langselect .optbox:hover, #config_ui .langselect .optbox:focus {
      width: 118px !important;
      min-height: 56px !important;
      height: 56px !important;
@@ -4301,7 +4486,7 @@ div#langsettings {
      color: #f60;
      border-top: 1px solid #f60;
      background: #fff !important;
-     background: linear-gradient(to bottom, #fff 0%, #fff 50%, #ffe8bf 50%, #efd9b3 100%) !important;
+     background: linear-gradient(to bottom, #fff 50%, #ffe8bf 50%, #efd9b3 100%) !important;
 }
 
 .langselect:active > input[name="lang"] + img + .ui_lang {
@@ -4399,16 +4584,25 @@ table#consolepass input[name="name"] {
      margin-right: 20px;
 }
 
-#consolepass input[name="name"], #externali2cp input[name="user"], #reseedconfig input[name="username"] {
-     background: #fff url(/themes/console/images/buttons/user.png) 5px center no-repeat;
+#consolepass input[name="name"], #externali2cp input[name="user"], #reseedconfig input[name="username"],
+#consolepass input[name="nofilter_pw"], #externali2cp input[name="nofilter_pw"], #reseedconfig input[type="password"] {
      padding: 4px 5px 4px 26px !important;
      background-size: 16px 16px !important;
+     background-blend-mode: luminosity;
+}
+
+#consolepass input[name="name"], #externali2cp input[name="user"], #reseedconfig input[name="username"] {
+     background: #f8f8ff url(/themes/console/images/buttons/user.png) 5px center no-repeat;
 }
 
 #consolepass input[name="nofilter_pw"], #externali2cp input[name="nofilter_pw"], #reseedconfig input[type="password"] {
-     background: #fff url(/themes/console/images/buttons/password.png) 5px center no-repeat !important;
-     padding: 4px 5px 4px 26px !important;
-     background-size: 16px 16px !important;
+     background: #f8f8ff url(/themes/console/images/buttons/password.png) 5px center no-repeat !important;
+}
+
+#consolepass input[name="name"]:focus, #externali2cp input[name="user"]:focus, #reseedconfig input[name="username"]:focus,
+#consolepass input[name="nofilter_pw"]:focus, #externali2cp input[name="nofilter_pw"]:focus, #reseedconfig input[type="password"]:focus {
+     background-color: #fff !important;
+     background-blend-mode: normal;
 }
 
 /* end configui */
@@ -4425,16 +4619,12 @@ table#addkeyring tr:last-child td {
 #config_summarybar .configtable td:not(.optionsave) {
      padding-left: 50px;
      background: url(/themes/console/images/info/interval.png) 12px center no-repeat;
-     background: url(/themes/console/images/info/interval.png) 12px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: url(/themes/console/images/info/interval.png) 12px center no-repeat, linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
      background-size: 28px 28px, 100% 100%, 100% 100% !important;
 }
 
 /* peers, profiles, tunnels */
 
-#ntcpconnections tr:nth-child(odd), #udpconnections tr:nth-child(odd), #profilelist tr:nth-child(odd), .tunneldisplay  tr:nth-child(odd) {
-     background: repeating-linear-gradient(45deg, rgba(255,255,255,0.5) 2px, rgba(201, 201, 255, 0.3) 3px, #fff 5px), #fff;
-}
-
 .cells tt, #profilelist tt, tt a {
      font-size: 8pt !important;
      margin-left: 2px !important;
@@ -4517,7 +4707,8 @@ table#addkeyring tr:last-child td {
 }
 
 #peerdefs td {
-     line-height: 130%;
+     line-height: 150%;
+     padding: 5px;
 }
 
 .peer_arrow {
@@ -4548,6 +4739,10 @@ tt a {
      text-shadow: 0 1px 1px #555;
 }
 
+#tunnel_defs b {
+     color: #fff !important;
+}
+
 .tunnel_cap:empty {
      border: none;
 }
@@ -4567,10 +4762,10 @@ tt a {
      display: inline-block;
 }
 
-.tunnel_peer {
+#tunnels .tunnel_peer {
      display: inline-block;
      min-width: 64px;
-     text-align: right;
+     text-align: center;
 }
 
 .tunnel_local {
@@ -4613,10 +4808,6 @@ tt a {
 
 /* netdb */
 
-.main#netdb, .main#events {
-     background: #fff;
-}
-
 .confignav + .netdbentry {
      margin-top: 10px;
 }
@@ -4666,7 +4857,7 @@ a.viewfullentry:not(old), #profilelist a[href^="viewprofile"]:not(old) {
 a.viewfullentry::after, #profilelist a[href^="viewprofile"]::after {
      content: url(/themes/console/images/buttons/fullview.png);
      vertical-align: text-top;
-     filter: drop-shadow(0 0 1px #999);
+     filter: drop-shadow(0 0 1px #999daf);
 }
 
  #profilelist a[href^="viewprofile"]::after {
@@ -4685,7 +4876,7 @@ a.viewfullentry:hover {
      content: url(/themes/console/images/buttons/floodfill.png);
      vertical-align: text-top;
      padding-right: 0;
-     filter: drop-shadow(0 0 1px #999);
+     filter: drop-shadow(0 0 1px #999daf);
 }
 
 #leasesetdebug th a:hover, table#leasesetsummary th a:hover {
@@ -4701,7 +4892,7 @@ a.viewfullentry:hover {
      font-size: 11pt !important;
      letter-spacing: 0.08em;
      word-spacing: 0.1em;
-     background:  url(/themes/console/images/info/globe.png) 8px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
+     background:  url(/themes/console/images/info/globe.png) 8px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(to right, #fcfcff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
      background-size: 18px 18px, 100% 100%, 100% 100% !important;
      padding: 8px 5px 8px 32px;
 }
@@ -4869,10 +5060,11 @@ a.viewfullentry:hover {
      border: 1px solid #7778bf;
      padding: 20px;
      font-weight: bold;
-     background: #fff;
+     background: #fafaff;
      margin-top: -6px;
      margin-bottom: 5px;
      text-align: center;
+     color: #41465f;
 }
 
 #notinitialized, .netdbnotfound {
@@ -4880,20 +5072,29 @@ a.viewfullentry:hover {
 }
 
 #sybilnav {
+     padding: 10px;
+     border-radius: 2px;
      -moz-columns: 4;
      -webkit-columns: 4;
      columns: 4;
      -moz-column-gap: 10px;
      -webkit-column-gap: 10px;
      column-gap: 10px;
-     border-radius: 2px;
 }
 
 #sybilnav, #sybils_summary {
      border: 1px solid #7778bf;
-     padding: 10px;
      margin-bottom: 10px;
-     background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px), #fff;
+     background: repeating-linear-gradient(135deg, rgba(248,238,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fafaff 5px), #fafaff;
+     box-shadow: inset 0 0 0 1px #fff;
+}
+
+#sybils_summary {
+     padding: 5px 10px;
+     line-height: 160%;
+     -moz-columns: 400px auto;
+     -webkit-columns: 400px auto;
+     columns: 400px auto;
 }
 
 h3.sybils {
@@ -4916,9 +5117,9 @@ h3.sybils {
      box-shadow: inset 0 0 0 1px #fff;
      margin: 2px 0;
      background: #eef url(images/eye.png) 5px center no-repeat;
-     background: url(images/eye.png) 5px center no-repeat, linear-gradient(to right, #fff 70%, #eef);
+     background: url(images/eye.png) 5px center no-repeat, linear-gradient(45deg, #fafaff 60%, #eef);
      line-height: 88%;
-     filter: drop-shadow(0 0 1px #ccc);
+     filter: drop-shadow(0 0 1px #ccf);
 }
 
 #sybilnav li a {
@@ -4930,6 +5131,10 @@ h3.sybils {
      margin-bottom: 10px;
 }
 
+.sybil_routerinfo:last-of-type {
+     margin-bottom: 5px;
+}
+
 .sybil_routerinfo th {
      padding: 1px 1px 1px 6px !important;
 }
@@ -4958,12 +5163,14 @@ h3.sybils {
 }
 
 p.sybil_info, p.family, p.threatpoints, p.hashdist, p#sybil_totals, p.notfound {
-     border: 1px solid #7778bf;
-     padding: 5px 5px 5px 30px;
      margin: 3px 0;
+     padding: 7px 5px 7px 30px;
+     border: 1px solid #7778bf;
+     box-shadow: inset 0 0 0 1px #fff;
      font-weight: bold;
+     color: #41465f;
      text-align: left;
-     background: url(images/eye.png) 8px center no-repeat, repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px), #fff;
+     background: url(images/eye.png) 8px center no-repeat, repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fafaff 5px), #fafaff;
 }
 
 p#sybil_totals {
@@ -4974,14 +5181,14 @@ p.family + p.family, p.sybil_info + p.sybil_info {
      margin-top: -4px;
 }
 
-p.family:nth-child(even), p.sybil_info:nth-child(even) {
+p.family:nth-child(even) {
      background: #efefff;
-     background: url(images/eye.png) 8px center no-repeat, repeating-linear-gradient(45deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff;
+     background: url(images/eye.png) 8px center no-repeat, repeating-linear-gradient(45deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fafaff 5px), #fafaff;
 }
 
-p.family:nth-child(odd), p.sybil_info:nth-child(odd) {
+p.family:nth-child(odd) {
      background: #f7f8ff;
-     background: url(images/eye.png) 8px center no-repeat, repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px), #fff;
+     background: url(images/eye.png) 8px center no-repeat, repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fafaff 5px), #fff;
 }
 
 p.sybil_info + a[name] + table.sybil_routerinfo, p.hashdist + a[name] + table.sybil_routerinfo, table.sybil_routerinfo + p {
@@ -4995,7 +5202,7 @@ p.sybil_info + a[name] + table.sybil_routerinfo, p.hashdist + a[name] + table.sy
      width: calc(100% - 22px);
      margin: -4px 0 8px;
      background: #eef;
-     background: repeating-linear-gradient(45deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff;
+     background: repeating-linear-gradient(45deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fafaff 5px), #fafaff;
      box-shadow: inset 0 0 0 1px #fff;
 }
 
@@ -5024,6 +5231,7 @@ p:empty { /* empty paragraph nuke */
      width: 100px;
      white-space: nowrap;
      font-weight: bold;
+     color: #41465f;
 }
 
 #netdblookup td:nth-child(2) {
@@ -5032,7 +5240,7 @@ p:empty { /* empty paragraph nuke */
 
 .subheading {
      text-align: left !important;
-     background: #fff;
+     background: #fafaff;
      padding: 10px;
      border: 1px solid #7778bf;
 }
@@ -5055,38 +5263,128 @@ p:empty { /* empty paragraph nuke */
      font-weight: bold;
 }
 
+/* leasesets */
+
+.netdb_leases, .netdb_leases li, .netdb_leases li:first-child {
+     margin: 0;
+}
+
+.netdb_leases {
+     columns: auto 420px !important;
+     column-rule: 1px solid #ccf;
+     column-gap: 1em;
+     display: block;
+}
+
+.netdb_leases li {
+     list-style: none;
+     display: inline-block;
+     padding: 1px 0;
+     margin: 1px 0;
+     min-width: 400px;
+}
+
+.netdb_leases li b:first-child {
+     display: inline-block;
+     min-width: 80px !important;
+     text-align: right;
+     margin: 0 !important;
+     padding: 0 !important;
+}
+
+.netdb_gateway {
+     margin-left: -3px !important;
+     margin-right: -3px !important;
+}
+
+.netdb_tunnel {
+     display: inline-block;
+     background: #e2e2ff;
+     background: rgba(204, 204, 255, 0.4);
+     padding: 0 4px;
+     margin-left: 4px;
+     margin-right: -4px;
+     border-radius: 2px;
+}
+
+.netdb_leases .tunnel_id {
+     min-width: 74px;
+}
+
+.netdb_leases .tunnel_peer {
+     min-width: 64px;
+}
+
+.netdb_leases .tunnel_peer tt, .netdb_leases .tunnel_peer tt a {
+     font-size: 8pt !important;
+     font-weight: bold !important;
+}
+
+.netdb_leases .tunnel_peer tt, .netdb_leases .tunnel_peer a {
+     letter-spacing: 0.1em !important;
+     margin: 0 !important;
+     padding: 0 !important;
+}
+
+.main li .netdb_expiry {
+     font-weight: normal;
+     text-transform: lowercase;
+     font-style: italic;
+}
+
+img.unknownflag {
+     opacity: 0.8;
+}
+
+/* end leasesets */
+
 /* end netdb */
 
 ul#banlist {
-     background: #fff;
+     background: #fafaff;
      border: 1px solid #7778bf;
      border-radius: 2px;
      display: block;
      padding: 5px 1px;
-     -moz-columns: 2;
+     -moz-columns: 300px auto;
+     -webkit-columns: 300px auto;
+     columns: 300px auto;
      -moz-column-gap: 0;
-     -webkit-columns: 2;
      -webkit-column-gap: 0;
-     columns: 2;
      column-gap: 0;
 }
 
+#profiles #banlist {
+    border: none;
+    background: none;
+    padding: 5px 0;
+}
+
+#config_peers #banlist {
+     padding-bottom: 0;
+}
+
 #banlist li {
+     display: inline-block;
      list-style: none;
-     margin: 5px;
+     margin: 5px 3px 5px 0;
      border: 1px solid #7778bf;
      border-radius: 2px;
-     padding: 5px 5px 5px 35px;
+     padding: 8px 10px 0 35px;
      line-height: 120%;
      background: #eef url(/themes/console/images/buttons/ban.png) 10px center no-repeat;
-     background: url(/themes/console/images/buttons/ban.png) 10px center no-repeat, repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px) #fff;
+     background: url(/themes/console/images/buttons/ban.png) 10px center no-repeat, repeating-linear-gradient(135deg, rgba(252,252,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px) #fafaff;
+     -webkit-break-inside: avoid;
      break-inside: avoid;
      page-break-inside: avoid;
-     -webkit-break-inside: avoid;
-     min-height: 33px;
      font-size: 9pt;
      box-shadow: inset 0 0 0 1px #fff;
-     filter: drop-shadow(0 0 1px #ccc);
+     filter: drop-shadow(0 0 1px #f8f8ff);
+     min-width: 300px;
+}
+
+#config_peers #banlist li {
+     margin: 0 -2px 5px 5px;
 }
 
 #banlist li:first-child {
@@ -5206,13 +5504,19 @@ ul#banlist {
 
 #capabilities_key b {
      text-transform: none !important;
+     display: inline-block;
+     min-width: 16px;
+     background: #e2e2ff;
+     text-align: center;
+     border-radius: 2px;
+     padding: 1px 2px;
 }
 
 #profilelist tr:hover td, #floodfills tr:hover td, #ntcpconnections tr:nth-last-child(n+2):hover td, #udpconnections tr:nth-last-child(n+2):hover td,
 #schedjobs tr:hover td, #jobstats tr:nth-last-child(n+2):hover td, #jardump tr:hover td, #sidebarconf tr:nth-last-child(n+2):hover td, #eventlog tr:hover td,
 #netdboverview table tr:hover td, #debug tr:hover td, #clientconfig tr:hover td, #webappconfig tr:hover td, #portfaq tr:hover td, .tunneldisplay tr:hover td {
      background: #ffd;
-     color: #111;
+     color: #19191f;
 }
 
 /* peers - sort icons */
@@ -5224,7 +5528,7 @@ ul#banlist {
 
 .sortup, .sortdown, .sortupactive, .sortdownactive {
      padding: 1px 0;
-     border: 1px solid #999;
+     border: 1px solid #999daf;
      border-radius: 2px;
      margin: 3px 1px 0 !important;
      vertical-align: middle;
@@ -5317,16 +5621,6 @@ table#schedjobs {
      padding: 5px;
 }
 
-.main#jardump {
-     overflow-x: auto;
-     min-width: 576px;
-}
-
-table#jardump {
-     margin: 15px 0 0;
-     font-size: 8pt;
-}
-
 #advconf {
      margin-bottom: 12px;
 }
@@ -5337,7 +5631,6 @@ table#jardump {
 
 #peerdefs td:first-child {
      text-align: right;
-     width: 50px;
      white-space: nowrap;
 }
 
@@ -5440,45 +5733,7 @@ h3#ntcpcon, h3#udpcon {
 #loggingoptions p {
      text-align: left;
      margin: 0 5px 2px 5px;
-}
-
-.main#proof textarea, .main#proof textarea:focus {
-     background: none;
-     border: none;
-     box-shadow: none;
-     color: #001 !important;
-     filter: none;
-     outline: none;
-     line-height: 140%;
-}
-
-.main#jardump {
-     padding: 0;
-}
-
-.main#jardump table {
-     margin: -1px 0 0;
-     border: none;
-}
-
-#jardump tt {
-     letter-spacing: -0.03em;
-}
-
-#jardump a tt {
-     color: #359;
-}
-
-#jardump a:visited tt {
-    color: #218;
-}
-
-#jardump a:hover tt {
-     color: #f60;
-}
-
-#jardump a:active tt {
-     color: #f90;
+     line-height: 150%;
 }
 
 #volunteer, #sidebarhelp, #configurationhelp, #reachabilityhelp, #advancedsettings, #legal, #changelog, #faq {
@@ -5486,7 +5741,7 @@ h3#ntcpcon, h3#udpcon {
      border-radius: 2px;
      margin-bottom: 10px;
      padding: 0 10px 5px;
-     background: #fff;
+     background: #fafaff;
 }
 
 #volunteer {
@@ -5521,18 +5776,14 @@ h3#ntcpcon, h3#udpcon {
     margin-right: -1px !important;
 }
 
-.main#help div, .logtable tr:nth-child(n+2) td, .main#console {
-     background: linear-gradient(to bottom, #fff, rgba(250,250,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #fff !important;
+.main#help div, .logtable tr:nth-child(n+2) td, .main#console, .debug_container {
+     background: linear-gradient(to bottom, rgba(248,248,255,0.5), rgba(250,250,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #fafaff !important;
      margin-bottom: 13px;
      box-shadow: inset 0 0 0 1px #fff;
 }
 
-.main#console {
-     box-shadow: inset 0 0 0 1px #bbf;
-}
-
 .main#help #volunteer, #wrapperlogs pre {
-     background: linear-gradient(to bottom, #fff, rgba(250,250,255,0.3)), url(/themes/snark/ubergine/images/hat.png) no-repeat right -3px bottom -3px / auto 80%, repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important;
+     background: linear-gradient(to bottom, #fafaff, rgba(248,248,255,0.3)), url(/themes/snark/ubergine/images/hat.png) no-repeat right -3px bottom -3px / auto 80%, repeating-linear-gradient(135deg, rgba(252,252,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fafaff 5px) #fafaff !important;
      box-shadow: inset 0 0 0 1px #fff;
 }
 
@@ -5548,7 +5799,7 @@ h3#ntcpcon, h3#udpcon {
 .main#help td.infohelp, .main#help td.infowarn, .main#help td.infohelp:hover, .main#help td.infowarn:hover {
      background-size: 24px 24px !important;
      padding-left: 46px !important;
-     color: #333 !important;
+     color: #33333f !important;
      padding-right: 15px !important;
 }
 
@@ -5565,7 +5816,7 @@ h3#ntcpcon, h3#udpcon {
 
 #faq h3 {
      padding: 5px 10px 6px 35px;
-     background: url(/themes/console/images/info/question.png) 10px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
+     background: url(/themes/console/images/info/question.png) 10px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(to right, #fcfcff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
      background-size: 18px 18px, 100% 100%, 100% 100% !important;
      background-blend-mode: luminosity, normal, normal;
      text-transform: none;
@@ -5630,22 +5881,75 @@ h3#ntcpcon, h3#udpcon {
 #fullhistory {
      text-align: right;
      margin: 0 0 0 -10px;
-     padding: 5px 8px;
+     padding: 6px 5px 5px;
      border-top: 1px solid #7778bf;
-     background: linear-gradient(to right, #efefff 65%, #fff)
+     background: linear-gradient(to right, #efefff 65%, #fafaff);
 }
 
-.main#torrents {
-     padding: 0;
+#fullhistory a {
+     margin-right: -4px;
 }
 
-#i2psnarkframe {
-     margin: 0;
+#fullhistory::before {
+     content: "";
+     display: inline-block;
+     background: url(/themes/console/images/buttons/fullview.png) left center no-repeat !important;
+     background-size: 14px 14px !important;
+     height: 20px;
+     width: 18px;
+     vertical-align: middle;
+     margin-bottom: 1px;
 }
 
-.main#proof {
-     background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.5)), url(/themes/snark/ubergine/images/hat.png) no-repeat right -3px bottom -3px, url(images/noise.png), #fff !important;
-     background-size: 100% 100%, auto 80%, 50px 50px !important;
+#oldconsole p, #proof p {
+     margin: 20px 5px 10px;
+     padding: 10px 0;
+     line-height: 180%;
+     background: #f2f2ff;
+     background: linear-gradient(135deg, #fafaff, rgba(240,240,255,0.5));
+     border: 1px solid #99b;
+     border-radius: 2px;
+     box-shadow: inset 0 0 0 1px #fff, 0 0 1px #557;
+}
+
+#oldconsole b {
+     margin-right: 5px;
+     display: inline-block;
+     min-width: 160px;
+     text-align: right;
+}
+
+#proof textarea, #proof textarea:focus, #proof p {
+     margin: 0 !important;
+     padding: 0 !important;
+}
+
+#proof p {
+     margin: 15px 0 5px !important;
+     padding: 15px 0 0 20px !important;
+     width: calc(100% - 22px);
+}
+
+#proof p::before {
+     content: "";
+     display: inline-block;
+     background: url(/themes/console/images/info/rosette.png) right 5px top no-repeat !important;
+     background-size: 24px 24px;
+     height: 32px;
+     width: 100%;
+     margin: -8px 0 -10px;
+     opacity: 0.7;
+}
+
+#proof textarea, #proof textarea:focus {
+     background: none;
+     border: none;
+     box-shadow: none;
+     color: #33333f !important;
+     filter: none;
+     outline: none;
+     line-height: 160%;
+     height: 200px;
 }
 
 .homelinkedit th:first-child, #sidebarconf th:first-child, #consolepass th:first-child {
@@ -5726,7 +6030,7 @@ h4#updateplugins {
      margin: -15px 0 14px;
      text-transform: none;
      letter-spacing: normal;
-     color: #31334f;
+     color: #41465f;
 }
 
 .formaction#pluginupdater, table#permabanned, table#i2pupdates {
@@ -5769,6 +6073,7 @@ a[href^="configpeer?peer"] {
 
 a[href^="configpeer?peer"]::after {
      content: url(/themes/console/images/buttons/edit.png);
+     display: inline-block;
      vertical-align: bottom;
      margin: 0 0 0 3px;
 }
@@ -5950,10 +6255,10 @@ b.netdb_transport {
      -moz-column-gap: 0;
      -webkit-column-gap: 0;
      column-gap: 0;
-     background: #efefff;
-     background: rgba(240,240,255,0.5);
-     background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px), #fff;
+     background: #f8f8ff;
+     background: repeating-linear-gradient(135deg, rgba(252,252,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fafaff 5px), #f9f9ff;
      padding: 4px 5px;
+     box-shadow: inset 0 0 0 1px #fff;
 }
 
 .sybilinfo_container b {
@@ -6050,6 +6355,418 @@ b.netdb_transport {
 
 /* end sybils */
 
+/* debug */
+
+#debug {
+     background: #fafaff;
+}
+
+#debug li:first-child {
+     margin-top: 0 !important;
+}
+
+#debug td:first-child, #debug th:first-child {
+     padding-left: 10px;
+     color: #41465f;
+}
+
+#debug td:last-child {
+     text-align: right;
+     vertical-align: top;
+}
+
+#debug ul li {
+     list-style: none;
+     margin-left: 0;
+     padding: 0;
+}
+
+#debug h2 {
+     border-radius: 0;
+     padding: 8px 10px;
+}
+
+#debug h3 {
+     border-radius: 0;
+}
+
+#debug table {
+     filter: drop-shadow(0 0 1px #ccf);
+}
+
+#debug h2 + table {
+     margin-top: -16px;
+}
+
+#debug hr {
+     display: none;
+}
+
+.debug_container, #debug td {
+     line-height: 140%;
+}
+
+.debug_container {
+     padding: 10px 15px;
+     margin-top: -16px;
+     background: linear-gradient(to bottom, #fafaff, rgba(250,250,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #efefff !important;
+     border: 1px solid #7789bf;
+     box-shadow: inset 0 0 0 1px #fff;
+     filter: drop-shadow(0px 0 1px #ccf);
+}
+
+.debug_container:empty {
+     display: none;
+}
+
+.debug_container.buckets {
+     word-break: break-all;
+     margin-bottom: 5px;
+     padding-bottom: 0;
+     max-height: 600px;
+     overflow: auto;
+}
+
+.main#debug h3 {
+     border-width: 1px;
+}
+
+.main#debug h3 + table {
+     margin-top: -16px;
+}
+
+#debug td {
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+
+#debug h2 {
+     background: url(/themes/console/images/info/debug.png) right 6px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(to right, #fcfcff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
+     background-size: 20px 20px, 100% 100%, 100% 100% !important;
+     background-blend-mode: luminosity, normal, normal;
+}
+
+#debug h3 {
+     padding-left: 10px;
+}
+
+.debug_section {
+     margin-bottom: 29px !important;
+}
+
+.debug_section + .debug_section {
+     margin-top: -13px !important;
+}
+
+.debug_section h2 + h3 {
+     margin-top: -16px !important;
+}
+
+.debug_section table {
+     margin-bottom: -13px !important;
+}
+
+.debug_section .debug_container {
+     margin-bottom: -13px;
+}
+
+.debug_container:empty+ h3 {
+     margin-top: -16px !important;
+}
+
+.expiry td {
+     padding-left: 3% !important;
+}
+
+#debug h2, #debug h3 {
+     position: relative;
+     z-index: 100;
+}
+
+#portmapper td:first-child {
+     font-weight: bold;
+}
+
+#portmapper tr:hover td:first-child {
+     color: #363b4f !important;
+}
+
+#portmapper td:last-child {
+     text-align: left !important;
+}
+
+#debug h3.debug_outboundsessions, #debug h3.debug_inboundsessions {
+     padding: 6px 10px 6px 28px;
+     background-blend-mode: luminosity, normal, normal;
+}
+
+#debug h3.debug_outboundsessions {
+     background: url(/themes/console/images/outbound.png) 6px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255, 255, 255, 0.6) 50%, rgba(240, 240, 240, 0.4)), linear-gradient(to right, #fff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
+}
+
+#debug h3.debug_inboundsessions {
+     background: url(/themes/console/images/inbound.png) 6px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255, 255, 255, 0.6) 50%, rgba(240, 240, 240, 0.4)), linear-gradient(to right, #fff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
+}
+
+.debug_version {
+     color: #050;
+}
+
+/* end debug */
+
+/* jardump */
+
+#jardump {
+     overflow-x: auto;
+     min-width: 576px;
+     padding: 0;
+}
+
+#jardump table {
+     margin: -1px 0 0;
+     border: none;
+     font-size: 8pt;
+}
+
+#jardump .subheading {
+     padding: 5px;
+     border-left: none !important;
+     border-right: none !important;
+}
+
+#jardump .subheading code {
+     font-weight: bold !important;
+}
+
+.subheading.routerfiles {
+     padding-left: 10px !important;
+     background: url(/themes/console/images/eepsite.png) right 5px center no-repeat, linear-gradient(to right, #7778bf 5px, #fafaff 5px, #eef) !important;
+     background-size: 16px auto, 100% 100% !important;
+}
+
+.subheading.pluginfiles {
+     padding-left: 10px !important;
+     background: url(/themes/console/images/plugin.png) right 5px center no-repeat, linear-gradient(to right, #7778bf 5px, #fafaff 5px, #eef) !important;
+     background-size: 16px auto, 100% 100% !important;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+#jardump table {
+     border: 1px solid #7778bf !important;
+     border-bottom: none !important;
+     border-top: none !important;
+}
+
+#jardump, #jardump tr {
+     border-left: none !important;
+     border-right: none !important;
+}
+
+.subheading.routerfiles {
+     padding-left: 5px !important;
+     background: url(/themes/console/images/eepsite.png) right 5px center no-repeat, linear-gradient(to right, #fafaff, #eef) !important;
+     background-size: 16px auto, 100% 100% !important;
+     box-shadow: none !important;
+}
+
+.subheading.pluginfiles {
+     padding-left: 5px !important;
+     background: url(/themes/console/images/plugin.png) right 5px center no-repeat, linear-gradient(to right, #fafaff, #eef) !important;
+     background-size: 16px auto, 100% 100% !important;
+     box-shadow: none !important;
+}
+}
+
+#jardump th {
+     padding-top: 7px !important;
+     padding-bottom: 7px !important;
+     font-size: 10pt;
+}
+
+#jardump th:nth-child(n+2) {
+     text-align: center;
+}
+
+#jardump td {
+     border-right: 1px inset #ddf;
+     text-align: center;
+}
+
+#jardump td:first-child {
+     padding-right: 3px;
+}
+
+#jardump td:first-child, #jardump td:last-child {
+     text-align: left;
+}
+
+#jardump td:nth-child(2) {
+     text-align: right;
+     font-style: italic;
+}
+
+.revision, .sha256, .unsignedmod {
+     -moz-user-select: all;
+     -webkit-user-select: all;
+     user-select: all;
+}
+
+.unsignedmod::-moz-selection {
+     background: #f00 !important;
+     color: #fff;
+}
+
+#jardump tt {
+     letter-spacing: -0.03em;
+     font-size: 8pt !important;
+     font-weight: normal !important;
+}
+
+#jardump a tt {
+     color: #359;
+}
+
+#jardump code {
+     font-weight: normal !important;
+}
+
+#jardump a:visited tt {
+    color: #218;
+}
+
+#jardump a:hover tt {
+     color: #f60;
+}
+
+#jardump a:active tt {
+     color: #f90;
+}
+
+#jardump hr {
+     margin: 0 !important;
+     background: #ddf;
+     width: 100%;
+     height: 1px;
+     display: block;
+}
+
+#jardump td:first-child {
+     padding-left: 26px;
+     background-image: url(/themes/console/images/info/box.png);
+     background-position: 5px center;
+     background-repeat: no-repeat;
+     background-size: 16px 16px;
+}
+
+#jardump tr:hover td:first-child {
+     background: url(/themes/console/images/info/box.png) 5px center no-repeat #ffd;
+     background-size: 16px 16px;
+}
+
+#jardump tr:hover td:first-child b, #portmapper tr:hover td:first-child, #portfaq tr:hover td:first-child {
+     color: #26262f;
+}
+
+#jardump tr:hover .unsignedmod:not(:empty) {
+     background: #8f0000;
+     color: #fff;
+}
+
+#jardump tr:hover hr {
+     background: transparent;
+}
+
+.unsignedmod {
+     display: inline-block;
+     padding: 2px;
+     border-radius: 1px;
+}
+
+#jardump td:last-child {
+     word-break: break-all;
+     padding: 1px;
+}
+
+/* end jardump */
+
+/* custom radios/checkboxes for chrome/blink  */
+
+@media screen and (-webkit-min-device-pixel-ratio: 0) and (min-resolution:.001dpcm) {
+input[type="checkbox"], input[type="checkbox"]:checked, input[type="checkbox"][disabled], input[type="checkbox"][disabled]:checked {
+     background: #f8f8ff;
+     width: 19px !important;
+     height: 19px !important;
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
+     border-radius: 2px;
+     -webkit-appearance: inherit;
+     border: 1px solid #999daf !important;
+     position: relative;
+     box-sizing: border-box;
+     filter: drop-shadow(0 0 1px #ccf);
+     vertical-align: middle !important;
+}
+
+#netconfig .optbox {
+     vertical-align: middle !important;
+}
+
+input[type="checkbox"]:checked::before {
+     position: absolute;
+     top: 1px;
+     left: 1px;
+     content: "\2714";
+     border-radius: 1px;
+     font-size: 15pt;
+     color: #41465f;
+     line-height: 80%;
+     font-family: sans-serif;
+     overflow: hidden;
+     width: 16px;
+     height: 16px;
+}
+
+input[type="radio"], input[type="radio"]:checked, input[type="radio"][disabled], input[type="radio"][disabled]:checked {
+     background: #f8f8ff;
+     width: 19px !important;
+     height: 19px !important;
+     box-shadow: inset 0 0 2px #7778bf;
+     border-radius: 50%;
+     -webkit-appearance: none;
+     border: 1px solid #999daf !important;
+     position: relative;
+     box-sizing: border-box;
+     filter: drop-shadow(0 0 1px #ccf);
+     vertical-align: middle !important;
+}
+
+input[type="radio"]:checked::before {
+     content: "";
+     position: absolute;
+     border-radius: 50%;
+     left: 25%;
+     top: 25%;
+     width: 9px;
+     height: 9px;
+     background: #41465f;
+}
+
+input[type="checkbox"]:hover, input[type="radio"]:hover, input[type="checkbox"]:focus, input[type="radio"]:focus {
+     background: #fff;
+     width: 19px !important;
+     height: 19px !important;
+     filter: drop-shadow(0 0 3px #89f) !important;
+}
+
+input[type="checkbox"][disabled], input[type="radio"][disabled], input[type="checkbox"][disabled]:hover, input[type="radio"][disabled]:hover,
+input[type="checkbox"][disabled]:checked, input[type="radio"][disabled]:checked, input[type="checkbox"][disabled]:checked:hover, input[type="radio"][disabled]:checked:hover {
+     filter: none !important;
+     box-shadow: none !important;
+     opacity: 0.5;
+}
+}
+
+/* end custom radios/checkboxes */
+
 /* responsive layout */
 
 @media screen and (max-width: 900px) {
@@ -6225,6 +6942,31 @@ input[name="pluginURL"] {
 .main#help h3, #faq h3, #leasesetdebug th, table#leasesetsummary th {
      font-size: 10pt !important;
 }
+
+#jardump td:first-child, #jardump td:nth-child(6), #jardump td:last-child {
+     word-break: break-all;
+     min-width: 100px;
+}
+
+.sha256, .revision {
+     display: inline-block;
+     width: 100px;
+     overflow: auto;
+}
+
+#proof p {
+     border: none;
+     box-shadow: none;
+     background: none;
+}
+
+#proof p::before {
+     display: inline;
+}
+
+#proof textarea {
+     padding-right: 15px !important;
+}
 }
 
 @media screen and (max-width: 1500px) {
@@ -6271,6 +7013,22 @@ body {
      border-left: none;
      border-right: none;
 }
+
+#jardump {
+     overflow: hidden;
+}
+}
+
+@media screen and (min-width: 1400px) {
+.main#help #changelog pre:not(old) {
+     columns: 550px auto;
+     column-gap: 25px;
+     column-rule: 1px solid rgba(64, 64, 128, 0.5);
+     margin-left: -10px !important;
+     padding-left: 10px;
+     padding-bottom: 5px;
+     height: 75%;
+}
 }
 
 @media screen and (min-width: 1500px) {
@@ -6280,7 +7038,7 @@ body, .main, .main td, .news p, #news p, .tab, .tab2, .main li b, div.joblog li,
 }
 
 .routersummary td, .routersummary a, .routersummary button, .routersummary h4, .routersummary h4 a, div.news, pre,
-#jardump tt, #jardump td, div.news, #logs li, tt, .cells tt, #profilelist tt, .leaseset tt {
+#jardump tt, #jardump td, div.news, #logs li, tt, .cells tt, #profilelist tt, .leaseset tt, .links code, #console code {
      font-size: 9pt !important;
 }
 
@@ -6296,7 +7054,7 @@ tt a, .cells tt, #profilelist tt, .cells tt a, #profilelist tt a, .leaseset td t
      letter-spacing: 0.1em !important;
 }
 
-.tunnel_peer tt {
+#tunnels .tunnel_peer tt {
      margin-left: 3px !important;
 }
 
@@ -6308,6 +7066,10 @@ tt a, .cells tt, #profilelist tt, .cells tt a, #profilelist tt a, .leaseset td t
      font-size: 0 !important;
 }
 
+h3#shutdownrouter, h3#systray, h3#servicedebug {
+     margin-bottom: -15px;
+}
+
 .main, .news, h1 {
      margin-left: 232px !important;
 }
@@ -6325,6 +7087,14 @@ tt a, .cells tt, #profilelist tt, .cells tt a, #profilelist tt a, .leaseset td t
      width: 218px !important;
 }
 
+#sb_services {
+     width: 222px !important;
+}
+
+.sb_newsheadings table {
+     width: 220px !important;
+}
+
 .routersummary h3::after {
      content: "";
      display: inline-block;
@@ -6366,6 +7136,10 @@ h3#restartrouter, p#tunnelconfig {
      margin-bottom: -15px !important;
 }
 
+h3.ptitle {
+     margin-bottom: -14px;
+}
+
 h1 {
      padding: 21px 15px 17px;
      font-size: 19pt;
@@ -6458,18 +7232,18 @@ button.control {
      width: 140px !important;
 }
 
-.main#config_ui .themechoice .optbox, .main#config_ui .langselect .optbox,
-.main#config_ui .themechoice .optbox:hover, .main#config_ui .langselect .optbox:hover,
-.main#config_ui .themechoice .optbox:focus, .main#config_ui .langselect .optbox:focus {
+#config_ui .themechoice .optbox, #config_ui .langselect .optbox,
+#config_ui .themechoice .optbox:hover, #config_ui .langselect .optbox:hover,
+#config_ui .themechoice .optbox:focus, #config_ui .langselect .optbox:focus {
      width: 144px !important;
 }
 
-.main#config_ui .themechoice .optbox {
+#config_ui .themechoice .optbox {
      margin-left: -49px !important;
      min-height: 92px !important;
 }
 
-.main#config_ui .langselect .optbox, .main#config_ui .langselect .optbox:hover, .main#config_ui .langselect .optbox:focus {
+#config_ui .langselect .optbox, #config_ui .langselect .optbox:hover, #config_ui .langselect .optbox:focus {
      margin-left: -2px !important;
 }
 
@@ -6506,6 +7280,7 @@ _:-ms-lang(x), .tab, .tab2 {
 }
 
 /* Edge/IE tweaks */
+
 _:-ms-lang(x), *, *:hover, *:focus, input, input:hover, input:focus, a:hover, a:focus, h1, h2, h3, h4 {
      filter: none !important;
      text-shadow: none !important;
diff --git a/installer/resources/themes/console/light/console_ar.css b/installer/resources/themes/console/light/console_ar.css
index 22f4d19552..625baebdfc 100644
--- a/installer/resources/themes/console/light/console_ar.css
+++ b/installer/resources/themes/console/light/console_ar.css
@@ -48,6 +48,7 @@ h2 {
 
 h3 {
      font-size: 14pt;
+     padding-right: 10px;
 }
 
 form {
@@ -59,6 +60,11 @@ form {
      margin: 0;
 }
 
+.routersummary img[src$="i2plogo.png"] {
+     margin-left: 0 !important;
+     margin-right: -1px !important;
+}
+
 table.search td:nth-child(2) {
      padding: 0 10px 0 0;
 }
@@ -72,6 +78,15 @@ input.search[type="text"] {
      padding: 5px 24px 5px 5px;
 }
 
+button, input[type="submit"], input[type="reset"] {
+     display: inline-block;
+}
+
+#config_homepage.main input.delete {
+     float: right;
+     margin-top: 5px !important;
+}
+
 button.search, input[type="submit"], input[type="reset"],
 button.search:hover, input[type="submit"]:hover, input[type="reset"]:hover,
 button.search:focus, input[type="submit"]:focus, input[type="reset"]:focus,
@@ -123,7 +138,7 @@ form[action="configpeer"] > h3.tabletitle {
      margin-right: 0;
 }
 
-div.routersummary form {
+.routersummary form {
     text-align: center;
 }
 
@@ -133,33 +148,53 @@ div.wideload {
 }
 
 .routersummary h3 a {
-     font-size: 140% !important;
+     font-size: 120% !important;
 }
 
 .routersummary h3, .routersummary h4 {
      text-align: center !important;
 }
 
+.sb_newsheadings {
+     margin: 5px -8px 0 0 !important;
+}
+ 
+.sb_newsheadings:hover {
+     margin: 5px -5px 0 0 !important;
+}
+
+.sb_newsheadings table {
+     margin: -12px 0 -8px -10px;
+     border-collapse: separate;
+     border-spacing: 0;
+}
+
+.sb_newsheadings table:hover {
+     padding-right: 3px;
+}
+
+.sb_newsheadings tr td, .sb_newsheadings tr:hover td {
+     padding-right: 24px !important;
+     padding-left: 6px !important;
+     background-position: right 6px center !important;
+     background-color: none !important;
+}
+
 #sb_services a {
      text-align: right !important;
-     padding-right: 20px !important;
-     background-position: right center !important;
+     padding-right: 24px !important;
+     background-position: right 2px center !important;
 }
 
-div.routersummary td:last-child {
+.routersummary td:last-child {
      text-align: left;
-     margin-left: 3px;
 }
 
-div.logo {
+.logo {
      float:right;
 }
 
-div.tunnels td:first-child {
-     text-align: right;
-}
-
-div.messages li, .messages li:first-child, .error li:first-child, .error li {
+.messages li, .messages li:first-child, .error li:first-child, .error li {
      padding: 0 24px 0 0 !important;
      font-size: 12pt;
 }
@@ -169,22 +204,22 @@ div.messages li, .messages li:first-child, .error li:first-child, .error li {
      font-size: 12pt;
 }
 
-div.warning {
+.warning {
      text-align: right;
 }
 
-div.main {
+.main {
      margin: 10px 212px 0 0;
      padding: 7px 20px 30px 20px;
 }
 
-div.sorry {
+.sorry {
      margin: 14px 212px 0 0;
      padding: 20px 70px 20px 20px !important;
      background: url(/themes/console/images/info/errortriangle.png) right 15px center no-repeat #fff;
 }
 
-div.main li {
+.main li {
      text-align: right;
 }
 
@@ -193,7 +228,7 @@ div.main li {
 }
 
 div.news {
-     margin: 10px 212px -12px 0;
+     margin: 10px 212px -12px 0 !important;
      padding: 7px 20px 10px 20px;
      direction: ltr;
 }
@@ -202,7 +237,7 @@ div.news {
      direction: ltr;
 }
 
-div.graphspanel form {
+.graphspanel form {
      text-align: right;
 }
 
@@ -231,8 +266,8 @@ p#helptranslate {
 }
 
 .confignav {
-     margin-left: -21px !important;
-     margin-right: -21px !important;
+     margin-left: -20px !important;
+     margin-right: -20px !important;
      margin-top: -5px !important;
      direction: ltr;
 }
@@ -269,6 +304,7 @@ div[lang="ar"] p, div[lang="ar"] ul {
 div[lang="ar"] .links li {
      list-style: none;
      margin-bottom: 15px;
+     padding-right: 5px !important;
 }
 
 div[lang="ar"] ul li {
@@ -312,11 +348,15 @@ th {
      text-align:right;
 }
 
+.links code, #console code {
+     font-size: 10pt !important;
+}
+
 th a.script {
      float: left;
 }
 
-div.joblog li, div.newsheadings li {
+div.joblog li {
     text-align: left;
     direction: ltr;
 }
@@ -544,8 +584,16 @@ table#addkeyring tr:last-child td {
 }
 
 .tab, .tab2 {
+     display: inline-block;
      font-size: 12pt !important;
      margin-top: -5px;
+     padding-top: 6px !important;
+     padding-bottom: 6px !important;
+}
+
+.tab a {
+     padding: 0 5px;
+     display: inline;
 }
 
 table.search {
@@ -567,11 +615,15 @@ h4.app2 {
 }
 
 h4.app, h4.app2, #news h3, .news h3 {
-     background-position: right 10px center, right center, right center !important;
-     padding: 6px 32px 6px 10px;
+     background-position: right 7px center, right center, right center !important;
+     padding: 6px 30px 6px 10px;
      direction: ltr !important;
 }
 
+.applabel a {
+    font-size: 11pt;
+}
+
 div.news h3, #news h3 {
      background: url(images/news.png) right 8px center no-repeat, linear-gradient(to left, #fff, #eef) !important;
      background: url(images/news.png) right 8px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to left, #fff 5%, rgba(231, 231, 255, 0.8) 15%) right center !important;
@@ -607,6 +659,15 @@ div.news h3, #news h3 {
      text-align: center;
 }
 
+#sb_localtunnels td {
+     vertical-align: top; !important;
+}
+
+#sb_localtunnels td:last-child {
+     text-align: left !important;
+     padding-left: 1px;
+}
+
 table#leasesetdebug th:last-child, table#leasesetsummary th:last-child,
 table.leaseset th:last-child, table.leaseset td:nth-child(2) {
      text-align: left;
@@ -865,10 +926,14 @@ table#bugreports td.infohelp {
      padding: 15px 50px 15px 15px !important;
 }
 
-.routersummary h4, .routersummary h4 span, .routersummary h4 span a {
+.routersummary h4 {
      font-size: 11pt !important;
 }
 
+.routersummary h4 span, .routersummary h4 span a {
+     font-size: 10pt !important;
+}
+
 .routersummary td:first-child, .routersummary td:nth-last-child(n+2), .routersummary td a {
      font-size: 10.5pt !important;
 }
@@ -883,6 +948,17 @@ table#bugreports td.infohelp {
      padding-right: 0 !important;
 }
 
+.sb_newsheadings td, .sb_newsheadings tr:hover td {
+     background-position: right center !important;
+     padding-right: 18px !important;
+     padding-left: 8px !important;
+     text-align: right !important;
+}
+
+.sb_newsheadings td a {
+     font-size: 9pt !important;
+}
+
 #config_ui.main .themechoice .optbox {
     margin-left: 0;
     margin-right: -38px;
@@ -917,6 +993,12 @@ table#bugreports td.infohelp {
      text-align: center !important;
 }
 
+@media screen and (min-width: 800px) {
+.main#console {
+     overflow: hidden;
+}
+}
+
 @media screen and (min-width: 1500px) {
 .main, .news, h1, .sorry {
      margin-right: 232px !important;
diff --git a/installer/resources/themes/console/light/console_big.css b/installer/resources/themes/console/light/console_big.css
index bfde33dacf..e8537e8626 100644
--- a/installer/resources/themes/console/light/console_big.css
+++ b/installer/resources/themes/console/light/console_big.css
@@ -74,6 +74,11 @@ button.control {
      line-height: 130%;
 }
 
+.sb_newsheadings td, .sb_newsheadings tr:hover td {
+     background-position: 4px center !important;
+     padding-left: 22px !important;
+}
+
 div.news, .newscontent p {
      font-size: 10pt !important;
 }
@@ -194,7 +199,7 @@ p#enablefullstats {
 }
 
 #console .twocol {
-     margin-bottom: -20px !important;
+     margin-bottom: -25px !important;
 }
 
 #console li {
@@ -212,7 +217,6 @@ p#enablefullstats {
 #console a:hover code {
      color: #f60 !important;
 }
-}
 
 .tunnel_cap b, b.tunnel_cap {
      color: #fff !important;
@@ -223,6 +227,8 @@ p#enablefullstats {
      font-weight: bold !important;
 }
 
+/* responsive layout */
+
 @media screen and (min-width: 1500px) {
 .langbox {
      line-height: 115% !important;
@@ -245,3 +251,4 @@ p#enablefullstats {
 }
 }
 
+/* end responsive layout */
\ No newline at end of file
diff --git a/installer/resources/themes/console/light/i2ptunnel.css b/installer/resources/themes/console/light/i2ptunnel.css
index 66436e880d..10006f55f6 100644
--- a/installer/resources/themes/console/light/i2ptunnel.css
+++ b/installer/resources/themes/console/light/i2ptunnel.css
@@ -7,7 +7,7 @@ body {
      padding: 0;
      text-align: center;
      font-family: "Droid Sans", "Noto Sans", "Ubuntu", "Segoe UI", Verdana, Helvetica, sans-serif;
-     color: #333;
+     color: #33333f;
      font-size: 9pt;
      background: #a4a4cb url(images/tile2.png) fixed;
      background-size: 32px 32px;
@@ -36,6 +36,10 @@ div {
      box-sizing: border-box;
 }
 
+b {
+     color: #41465f;
+}
+
 a {
      text-decoration: none;
 }
@@ -50,12 +54,13 @@ input[type="checkbox"], input[type="radio"] {
      vertical-align: sub;
      min-width: 16px;
      min-height: 16px;
+     filter: sepia(100%) hue-rotate(185deg) drop-shadow(0 0 1px #ccf);
 }
 
 input[type="checkbox"]:hover, input[type="checkbox"]:focus, input[type="radio"]:hover, input[type="radio"]:focus {
      box-shadow: 0 0 1px #89f;
-     filter: drop-shadow(0 0 2px #89f);
      outline: none;
+     filter: sepia(100%) hue-rotate(185deg) drop-shadow(0 0 3px #89f);
 }
 
 label {
@@ -63,7 +68,7 @@ label {
 }
 
 label:hover {
-     color: #000;
+     color: #19191f;
 }
 
 textarea, input, select, button {
@@ -82,18 +87,19 @@ button, input[type="submit"], input[type="reset"], a.control {
 }
 
 textarea {
+     background: #fafaff;
+     color: #33333f;
      font-family: "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
-     color: #333;
-     background: #fff;
-     border: 1px solid #999;
+     border: 1px solid #999daf;
      border-radius: 2px;
      resize: none;
-     box-shadow: inset 2px 2px 1px rgba(204, 204, 204, 0.6);
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
 }
 
-textarea:focus {
-     box-shadow: inset 0 0 0 1px #89f;
-     color: #111;
+textarea:focus, textarea[name="accessList"]:focus {
+     background: #fff;
+     color: #19191f;
+     border: 1px solid #676c7f;
 }
 
 textarea#statusMessages {
@@ -105,6 +111,12 @@ textarea#statusMessages {
      border: none;
      box-shadow: none;
      font-family: "Droid Sans Mono", "Noto Mono", Consolas, "Lucida Console", "DejaVu Sans Mono", monospace;
+     font-size: 8pt;
+     filter: none;
+}
+
+textarea#statusMessages:focus {
+     background: #fafaff;
 }
 
 br {
@@ -136,36 +148,41 @@ br {
      font-size: 0 !important;
      text-align: center;
      overflow: hidden;
-     filter: drop-shadow(0 0 1px rgba(204, 204, 204, 0.6));
+     filter: drop-shadow(0 0 1px #ccf);
 }
 
 hr {
      display: none;
 }
 
-.freetext, textarea {
+.freetext, textarea, .displayText {
      font: 9pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
+     filter: drop-shadow(0 0 1px #ccf);
 }
 
 .freetext {
      width: 150px;
-     border: 1px solid #999;
+     border: 1px solid #999daf;
      padding: 4px;
-     background: #fff;
-     color: #333;
+     background: #fafaff;
+     color: #33333f;
      border-radius: 2px;
-     box-shadow: inset 2px 2px 1px rgba(204, 204, 204, 0.6);
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
 }
 
-.freetext:focus {
+.freetext:focus, .displayText:focus, textarea:focus {
+     background: #fff;
+     color: #19191f;
+     border: 1px solid #676c7f;
      box-shadow: 0 0 1px #89f;
-     color: #111;
 }
 
 .freetext[readonly], .freetext[readonly]:focus {
      background: #e9e9e9;
-     box-shadow: inset 2px 2px 1px rgba(204, 204, 204, 0.6);
-     color: #333;
+     color: #4d4d5f;
+     border: 1px solid #999daf;
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
+     filter: none;
 }
 
 #clientHost {
@@ -191,13 +208,13 @@ hr {
      text-decoration: none;
      font-style: normal;
      font-weight: normal;
-     color: #333;
-     border: 1px solid #999;
+     color: #33333f;
+     border: 1px solid #999daf;
      border-radius: 2px;
      background: #eee;
      background: linear-gradient(to bottom, #fff, #ddd);
      box-shadow: inset 0 0 0 1px #fff;
-     filter: drop-shadow(0 0 1px rgba(204, 204, 204, 0.6));
+     filter: drop-shadow(0 0 1px #ccf);
      box-sizing: border-box;
      margin: 2px 4px !important;
      min-width: 70px !important;
@@ -210,7 +227,7 @@ button.control, input.control {
 
 .control:hover, .control:focus {
      text-decoration: none;
-     color: #111;
+     color: #19191f;
      border: 1px solid #f60 !important;
      background: #ddd;
      background: linear-gradient(to bottom, #ddd, #fff);
@@ -221,7 +238,7 @@ button.control, input.control {
 
 .control:active {
      box-shadow: inset 2px 2px 1px #999 !important;
-     color: #333;
+     color: #33333f;
 }
 
 a.control {
@@ -269,10 +286,11 @@ select {
      min-width: 140px;
      background: #fff;
      background: url(images/dropdown.png) right center no-repeat, linear-gradient(to bottom, #fff, #ddd);
-     color: #333;
+     background-blend-mode: hard-light, normal;
+     color: #33333f;
      font-family: "Droid Sans", "Noto Sans", "Ubuntu", "Segoe UI", Verdana, Helvetica, sans-serif;
      font-size: 9pt;
-     border: 1px solid #999;
+     border: 1px solid #999daf;
      border-radius: 2px;
      box-shadow: inset 0 0 0 1px #fff;
      overflow: hidden;
@@ -280,11 +298,11 @@ select {
      -moz-appearance: none;
      -webkit-appearance: none;
      appearance: none;
-     filter: drop-shadow(0 0 1px rgba(204, 204, 204, 0.6));
+     filter: drop-shadow(0 0 1px #ccf);
 }
 
 select:hover {
-     color: #111;
+     color: #19191f;
 }
 
 select:hover, select:active, select:focus {
@@ -329,13 +347,14 @@ h2, h3 {
      padding: 9px 10px 7px 30px;
      border: 1px solid #7778bf;
      border-radius: 2px 2px 0 0;
-     background: linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 5%, rgba(231, 231, 255, 0.8) 15%) #fff !important;
+     background: #fcfcff;
+     background: linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%) #fff !important;
      font-size: 11.5pt;
      text-transform: uppercase;
      letter-spacing: 0.08em;
      word-spacing: 0.1em;
      margin: 10px 0 -1px;
-     color: #31334f;
+     color: #41465f;
      box-shadow: inset 0 0 0 1px #fff;
      position: relative;
 }
@@ -347,27 +366,27 @@ h2, h3 {
 /* title images */
 
 #messages h2 {
-     background: url(/themes/console/images/info/logs.png) left 5px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
+     background: url(/themes/console/images/info/logs.png) left 5px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
 }
 
 #globalTunnelControl h2 {
-     background: url(/themes/console/images/info/control.png) left 5px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
+     background: url(/themes/console/images/info/control.png) left 5px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
 }
 
 #servers h2 {
-     background: url(/themes/console/images/info/server.png) left 5px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
+     background: url(/themes/console/images/info/server.png) left 5px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
 }
 
 #clients h2 {
-     background: url(/themes/console/images/info/client.png) left 5px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
+     background: url(/themes/console/images/info/client.png) left 5px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
 }
 
 #tunnelEditPage h2, #tunnelEditPage h3, #registration h2, #registration h3 {
-     background: url(/themes/console/images/info/configure.png) left 5px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
+     background: url(/themes/console/images/info/configure.png) left 5px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
 }
 
 #wizardPanel h2 {
-     background: url(/themes/console/images/info/wizard.png) left 5px center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
+     background: url(/themes/console/images/info/wizard.png) left 5px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 15%, rgba(231, 231, 255, 0.8) 35%) #fff !important;
 }
 
 #messages h2, #globalTunnelControl h2, #servers h2, #clients h2, #tunnelEditPage h2, #tunnelEditPage h3, #registration h2, #registration h3, #wizardPanel h2 {
@@ -397,13 +416,12 @@ h2, h3 {
 th {
      background: #eef url(images/header.png) center center repeat-x;
      background: linear-gradient(to bottom, #fff 50%, rgba(238, 238, 255, 0.2) 50%, #eef 100%) !important;
-     color: #333;
      padding: 6px 5px;
      text-align: left;
      border-top: 1px solid #7778bf;
      border-bottom: 1px solid #7778bf;
      font-size: 10pt;
-     color: #31334f;
+     color: #41465f;
 }
 
 th::first-letter {
@@ -423,11 +441,11 @@ a:hover, a:focus, a:active, button:hover, button:focus, button:active, select:ho
 }
 
 .tunnelConfig tr, #wizardPanel tr, #registration tr {
-     background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px) #fff;
+     background: repeating-linear-gradient(135deg, rgba(252,252,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fafaff 5px) #fafaff;
 }
 
 #wizardPanel tr:first-child {
-     background: #fff;
+     background: #fafaff;
 }
 
 td {
@@ -466,7 +484,7 @@ td.infohelp {
 }
 
 .tunnelProperties {
-     background: #fff !important;
+     background: #fafaff !important;
 }
 
 .tunnelProperties td {
@@ -475,7 +493,7 @@ td.infohelp {
 
 .tunnelProperties:hover {
      background: #ffd !important;
-     color: #111;
+     color: #19191f;
 }
 
 .newTunnel {
@@ -549,8 +567,8 @@ th.tunnelControl {
      text-align: right;
      padding: 7px 5px;
      background: #fff;
-     background: linear-gradient(to bottom, #fff, #eef);
-     background: linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important;
+     background: linear-gradient(to bottom, #fafaff, #eef);
+     background: linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) !important;
      border-top: 1px solid #7778bf !important;
      box-shadow: inset 0 0 0 1px #fff;
 }
@@ -691,7 +709,7 @@ td.blankColumn {
 }
 
 table {
-     background: #fff;
+     background: #fafaff;
 }
 
 table#statusMessages textarea, table#statusMessages textarea:active {
@@ -699,7 +717,6 @@ table#statusMessages textarea, table#statusMessages textarea:active {
      border: 0;
      box-shadow: none;
      height: 80px;
-     font-size: 9pt;
 }
 
 #tunnelMessages {
@@ -745,16 +762,28 @@ input.tunnelName, input.tunnelDescription, #userAgents {
 
 .username, .password {
      width: 200px;
+     padding-left: 22px;
+     background-blend-mode: luminosity;
 }
 
 .username {
-     background: url(/themes/console/images/buttons/user.png) 3px center no-repeat #fff;
-     padding-left: 22px;
+     background: url(/themes/console/images/buttons/user.png) 3px center no-repeat #fafaff;
 }
 
 .password {
+     background: url(/themes/console/images/buttons/password.png) 3px center no-repeat #fafaff;
+}
+
+.username:focus, .password:focus {
+     background-blend-mode: normal;
+}
+
+.username:focus {
+     background: url(/themes/console/images/buttons/user.png) 3px center no-repeat #fff;
+}
+
+.password:focus {
      background: url(/themes/console/images/buttons/password.png) 3px center no-repeat #fff;
-     padding-left: 22px;
 }
 
 .proxyList {
@@ -796,6 +825,7 @@ input.tunnelName, input.tunnelDescription, #userAgents {
      min-width: 150px;
      text-align: right;
      white-space: nowrap;
+     color: #41465f;
 }
 
 #wizardTunnelTypes td:last-child {
@@ -813,7 +843,7 @@ input.tunnelName, input.tunnelDescription, #userAgents {
 }
 
 #wizardTunnelTypes tr:last-child {
-     background: #fff;
+     background: #fafaff;
 }
 
 #wizardPanel #name, #wizardPanel #description {
@@ -848,6 +878,7 @@ input.tunnelName, input.tunnelDescription, #userAgents {
      font-weight: bold;
      text-align: right;
      margin-right: 10px;
+     color: #41465f;
 }
 
 #wizardPanel select {
@@ -898,11 +929,11 @@ textarea[name="accessList"], #hostField, #localDestination, .authentication {
 }
 
 .tunnelDestination b, .tunnelDescription b {
-     color: #444;
+     color: #41465f;
 }
 
 td.tunnelDestination, td.tunnelDescription {
-     background: linear-gradient(to right, #fff, rgba(255,255,255,0.1) 50%, #eef);
+     background: linear-gradient(to right, #fafaff, rgba(255,255,255,0.1) 50%, #eef);
 }
 
 #oldDestFile {
@@ -991,6 +1022,10 @@ th {
      font-size: 10.5pt;
 }
 
+textarea#statusMessages {
+     font-size: 9pt;
+}
+
 .statusNotRunning, .statusRunning, .statusStarting {
      background-size: auto 18px;
 }
@@ -1027,6 +1062,7 @@ _:-ms-lang(x), td.tunnelDestination, td.tunnelDescription {
 @media screen and (-webkit-min-device-pixel-ratio:0) { /* fixes chrome/blinkoverflow issue */
 select {
      white-space: normal;
+     padding: 5px 16px 5px 6px !important;
 }
 }
 
@@ -1066,10 +1102,10 @@ input[type="text"] + label {
      -moz-user-select: all;
      -webkit-user-select: all;
      user-select: all;
-     border: 1px solid #999;
-     background: #fff;
+     border: 1px solid #999daf;
+     background: #fafaff;
      border-radius: 2px;
-     box-shadow: inset 2px 2px 1px rgba(204, 204, 204, 0.6);
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
 }
 
 .displayText:empty, .displayText:empty:hover, .displayText:empty:focus {
@@ -1083,13 +1119,18 @@ input[type="text"] + label {
 }
 
 .displayText:hover, .displayText:focus {
+     box-shadow: 0 0 1px #89f;
+     background: #ffe;
+     outline: none;
+}
+
+.displayText:focus {
      overflow: auto;
      text-overflow: clip;
      margin: 0.5px 5px;
      padding: 2px 4px;
-     box-shadow: 0 0 1px #89f;
-     background: #ffe;
-     outline: none;
+     background: #fff;
+     border: 1px solid #676c7f;
 }
 
 #registration .displayText {
@@ -1133,3 +1174,82 @@ input[type="text"] + label {
 }
 }
 
+/* custom radios/checkboxes for chrome/blink  */
+
+@media screen and (-webkit-min-device-pixel-ratio: 0) and (min-resolution:.001dpcm) {
+
+label {
+     vertical-align: middle !important;
+}
+
+input[type="checkbox"], input[type="checkbox"]:checked, input[type="checkbox"][disabled], input[type="checkbox"][disabled]:checked {
+     background: #f8f8ff;
+     width: 19px !important;
+     height: 19px !important;
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
+     border-radius: 2px;
+     -webkit-appearance: inherit;
+     border: 1px solid #999daf !important;
+     position: relative;
+     box-sizing: border-box;
+     filter: drop-shadow(0 0 1px #ccf);
+     vertical-align: middle !important;
+}
+
+input[type="checkbox"]:checked::before {
+     position: absolute;
+     top: 1px;
+     left: 1px;
+     content: "\2714";
+     border-radius: 1px;
+     font-size: 15pt;
+     color: #41465f;
+     line-height: 80%;
+     font-family: sans-serif;
+     overflow: hidden;
+     width: 16px;
+     height: 16px;
+}
+
+input[type="radio"], input[type="radio"]:checked, input[type="radio"][disabled], input[type="radio"][disabled]:checked {
+     background: #f8f8ff;
+     width: 19px !important;
+     height: 19px !important;
+     box-shadow: inset 0 0 2px #7778bf;
+     border-radius: 50%;
+     -webkit-appearance: none;
+     border: 1px solid #999daf !important;
+     position: relative;
+     box-sizing: border-box;
+     filter: drop-shadow(0 0 1px #ccf);
+     vertical-align: middle !important;
+}
+
+input[type="radio"]:checked::before {
+     content: "";
+     position: absolute;
+     border-radius: 50%;
+     left: 4px !important;
+     top: 4px !important;
+     width: 9px;
+     height: 9px;
+     background: #41465f;
+}
+
+input[type="checkbox"]:hover, input[type="radio"]:hover, input[type="checkbox"]:focus, input[type="radio"]:focus {
+     background: #fff;
+     width: 19px !important;
+     height: 19px !important;
+     filter: drop-shadow(0 0 3px #89f) !important;
+}
+
+input[type="checkbox"][disabled], input[type="radio"][disabled], input[type="checkbox"][disabled]:hover, input[type="radio"][disabled]:hover,
+input[type="checkbox"][disabled]:checked, input[type="radio"][disabled]:checked, input[type="checkbox"][disabled]:checked:hover, input[type="radio"][disabled]:checked:hover {
+     filter: none !important;
+     box-shadow: none !important;
+     opacity: 0.5;
+}
+}
+
+/* end custom radios/checkboxes */
+
diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css
index b1b3044a36..0fd9e8f03b 100644
--- a/installer/resources/themes/console/midnight/console.css
+++ b/installer/resources/themes/console/midnight/console.css
@@ -46,6 +46,7 @@ div.clearer {
 
 ::selection {
      background: #22296f !important;
+     background: rgba(34, 41, 111, 0.9) !important;
      color: white;
 }
 
@@ -862,6 +863,7 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re
 
 .routersummary .reload:hover, .routersummary .reload:focus, .routersummary .reload[value$="restart"]:hover, .routersummary .reload[value$="restart"]:focus {
      background: #000 url(/themes/console/images/buttons/restart_hover.png) center center no-repeat !important;
+     background: url(/themes/console/images/buttons/shutdown_hover.png) 37% 55% no-repeat, url(/themes/console/images/buttons/restart_hover.png) 63% 55% no-repeat,  #000 !important;
 }
 
 .routersummary .reload:active, .routersummary .reload[value$="restart"]:active {
@@ -1143,6 +1145,8 @@ div.logo hr {
 
 /* end proxy errors */
 
+/* sidebar */
+
 .routersummaryouter {
      float: left;
      width: 200px;
@@ -1276,6 +1280,19 @@ div.logo hr {
      background-color: transparent !important;
 }
 
+.routersummary td {
+     padding: 0 2px 0 2px;
+     background-image: none !important;
+     border: 0 !important;
+     word-spacing: -0.1em;
+     max-width: 180px;
+}
+
+.routersummary td:first-child {
+     max-width: 90px;
+     text-transform: capitalize;
+}
+
 #sb_general, #sb_shortgeneral, #sb_bandwidth, #sb_peers, #sb_tunnels, #sb_queue {
      margin-top: -6px !important;
      margin-bottom: -5px !important;
@@ -1289,17 +1306,25 @@ div.logo hr {
      min-height: 16px !important;
 }
 
+#sb_general td, #sb_shortgeneral td {
+     white-space: nowrap;
+}
+
 #sb_localtunnels {
      width: 200px !important;
      border-collapse: separate;
      border-spacing: 0;
-     margin-top: -5px !important;
-     margin-bottom: -9px !important;
+     margin-top: -6px !important;
+     margin-bottom: -8px !important;
 }
 
 #sb_localtunnels a {
      display: inline-block;
      width: 100%;
+     max-width: 156px;
+     overflow: hidden;
+     text-overflow: ellipsis;
+     white-space: nowrap;
 }
 
 #sb_localtunnels img {
@@ -1362,10 +1387,30 @@ div.logo hr {
      border: 1px solid #241f69;
      border-radius: 2px;
      box-shadow: inset 0 0 0 1px #000;
-     margin: 5px -4px -3px;
+     margin: -3px -6px -5px;
      padding: 5px 3px;
 }
 
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+.sb_notice {
+     margin-bottom: -6px !important;
+}
+}
+
+#sb_warning {
+     border-bottom: 1px solid #443da0;
+     margin-left: -10px !important;
+     margin-right: -10px !important;
+}
+
+#sb_warning + .sb_notice {
+     margin-top: 12px;
+}
+
+#sb_warning + hr {
+     margin-top: 6px !important;
+}
+
 p:empty + .sb_notice {
      margin-top: 10px;
 }
@@ -1403,12 +1448,18 @@ p:empty + .sb_notice {
 
 .routersummary a:link, .routersummary a:visited {
      padding: 0 2px;
+     word-spacing: 0;
 }
 
-div.routersummary a:hover {
+.routersummary a:hover {
      color: #652787;
 }
 
+.routersummary hr:last-child {
+     margin-top: 5px;
+     margin-bottom: -5px !important;
+}
+
 /* "experimental" custom sidebar links for apps
 
 #sb_services {
@@ -1486,67 +1537,50 @@ div.routersummary a:hover {
 
 /* end custom sidebar links */
 
-.routersummary td {
-     padding: 0 2px 0 2px;
-     background-image: none !important;
-     border: 0 !important;
-     word-spacing: -0.1em;
-     max-width: 180px;
-     text-overflow: ellipsis; /* force ellipsis rather than truncate rare, overlong text strings eg. Swedish sidepanel */
-}
+/* sidebar news */
 
-.routersummary td:first-child {
-     max-width: 90px;
-     overflow: hidden;
-     text-transform: capitalize;
-}
-
-.routersummary hr:last-child {
-     margin-top: 5px;
-     margin-bottom: -5px !important;
-}
-
-.newsheadings {
-     text-align: center;
-     margin: -3px 0 -5px 10px;
-     word-spacing: 0;
-}
-
-div.newsheadings li {
-     list-style: none outside url(images/newsbullet_mini.png);
-     margin: 0 -6px 2px 4px;
-     line-height: 110%;
-     text-transform: capitalize;
-}
-
-div.tunnels {
-     padding-top: 3px !important;
-     margin-left: -4px;
-     text-align: center;
-}
-
-.tunnels table {
-     margin: -5px 0 -5px -3px !important;
-}
-
-.tunnels td {
-     padding: 1px 0 1px 0;
-     text-transform: capitalize;
-}
-
-.tunnels td:first-child {
-     width: 16px;
-     text-align: left;
-     padding-right: 2px;
-}
-
-.tunnels td:last-child {
+.sb_newsheadings {
+     width: 192px;
+     margin-left: 0;
+     margin-top: -6px !important;
+     margin-bottom: -8px !important;
      text-align: right;
-     padding-right: 1px;
 }
 
+.sb_newsheadings table {
+     margin-bottom: 3px !important;
+}
+
+.sb_newsheadings a {
+     display: inline-block;
+     padding: 0 3px 0 0;
+     line-height: 140%;
+}
+
+.sb_newsheadings td {
+     padding: 4px 5px 4px 20px;
+     text-align: left;
+     background: url(images/newsbullet_mini.png) 4px center no-repeat !important;
+     border-bottom: 1px solid #113 !important;
+}
+
+.sb_newsheadings tr:last-child td {
+     border-bottom: none !important;
+}
+
+/* end sidebar news */
+/* end sidebar */
+
 /* console error messages */
 
+img[src="/themes/console/images/i2plogo.png"], img[src="/themes/console/images/i2plogo.png"]:hover,
+img[src="/themes/console/images/i2plogo.png"]:focus, a:active img[src="/themes/console/images/i2plogo.png"] {
+     margin-top: 6px !important;
+     margin-left: -1px !important;
+     filter: sepia(100%) invert(100%) !important;
+     width: 180px !important;
+}
+
 .sorry {
      margin: -1px 5px 10px 215px;
      padding: 20px 20px 20px 75px;
@@ -1559,7 +1593,7 @@ div.tunnels {
      background-repeat:no-repeat;
      box-shadow: inset 0 0 0 1px #320951;
      word-wrap: break-word;
-     min-width: 555px;
+     min-width: 545px;
      color: #c9ceff;
      font-size: 10pt;
 }
@@ -1568,8 +1602,38 @@ div.sorry hr {
      color: #c9ceff;
      background: #c9ceff;
      height: 1px;
-     border: 1px solid #c9ceff;
+     border-top: 1px solid #c9ceff;
      margin: 10px 0;
+     opacity: 0.7;
+}
+
+#warning2 {
+     min-width: 580px;
+     background: #001;
+     background: #000 url(images/earth.jpg) no-repeat scroll bottom right !important;
+     background-size: auto 180px !important;
+     margin-top: -28px;
+     margin-bottom: 5px;
+     padding: 20px 30px 10px;
+     font-size: 9pt;
+}
+
+#warning2 h3 {
+     margin: -21px -31px 10px;
+     padding: 10px;
+     border-width: 1px;
+     box-shadow: inset 0 0 0 1px #320951;
+}
+
+#warning2 p {
+     line-height: 130% !important;
+}
+
+#warning2 b {
+     margin-right: 5px;
+     display: inline-block;
+     min-width: 140px;
+     text-align: right;
 }
 
 /* end error msgs */
@@ -1639,7 +1703,7 @@ div.sorry hr {
 }
 
 .news .newsentry:first-child {
-     margin-top: -7px !important;
+     margin-top: -10px !important;
 }
 
 .news h4 {
@@ -1672,6 +1736,10 @@ div.sorry hr {
      margin: 18px 5px; /* positional parity with homepage news */
 }
 
+#newsStatus, #news #newsDisplay a {
+     font-size: 8pt;
+}
+
 #newsStatus {
      float: left;
      color: #c9ceff;
@@ -2362,6 +2430,7 @@ h3, h3.welcome, div.news h3 {
 
 div.news h3 {
      padding: 6px 10px 6px 0;
+     box-shadow: none;
 }
 
 h4 {
@@ -2373,7 +2442,7 @@ h4 {
      font-size: 11pt;
 }
 
-h1, h2, h3:not([id*="help"]), h4.app, h4.app2, div.routersummary h3, .confignav {
+h1, h2, h3:not([id*="help"]), h4.app, h4.app2, .routersummary h3, .confignav {
      background: linear-gradient(to bottom, #191729 0%, #000 50%) !important;
 }
 
@@ -2381,7 +2450,6 @@ h2, h3, h4, .confignav {
      box-shadow: inset 0 0 0 1px #000;
 }
 
-
 .news h3, #newspage h3 {
      padding-left: 30px !important;
      text-align: left !important;
@@ -2442,6 +2510,19 @@ h2, h3, h4, .confignav {
      margin: 5px 0 -5px;
 }
 
+div[lang="es"] li, div[lang="pt"] li, div[lang="sv"] li, div[lang="zh"] li {
+     list-style: none;
+     text-align: justify;
+}
+
+div[lang="pt"] li br {
+     display: none;
+}
+
+div[lang="sv"] li::first-letter {
+     text-transform: uppercase !important;
+}
+
 div[lang="de"] .twocol, div[lang="pt"] .twocol, div[lang="es"] .twocol, div[lang="sv"] .twocol {
      background: rgba(0,0,48,0.3);
      border: 1px solid #002;
@@ -2688,15 +2769,15 @@ form[action="events"] {
      background: #000;
 }
 
-.smallhead {
+.smallhead th {
      font-size: 8pt
 }
 
-.smallhead a:hover {
+.smallhead th a:hover {
      text-decoration: none;
 }
 
-.smallhead a img:hover {
+.smallhead th a img:hover {
      filter: drop-shadow(0 0 1px #652787);
 }
 
@@ -3430,7 +3511,6 @@ table#reseedconfig textarea {
 
 /* /configpeer */
 
-
 ul#banlist {
      margin-top: -2px;
 }
@@ -3445,16 +3525,16 @@ ul#banlist {
      padding: 10px 10px 10px 0;
      margin: -1px 0 13px;
      -moz-column-count: auto;
-     -moz-column-width: 300px;
-     -moz-column-gap: 10px;
+     -moz-column-width: 260px;
+     -moz-column-gap: 8px;
      -moz-column-rule: 1px dotted #443da0;
      -webkit-column-count: auto;
-     -webkit-column-width: 300px;
-     -webkit-column-gap: 10px;
+     -webkit-column-width: 260px;
+     -webkit-column-gap: 8px;
      -webkit-column-rule: 1px dotted #443da0;
      column-count: auto;
-     column-width: 300px;
-     column-gap: 10px;
+     column-width: 260px;
+     column-gap: 8px;
      column-rule: 1px dotted #443da0;
 }
 
@@ -3468,7 +3548,6 @@ ul#banlist {
      margin: 0 10px 3px;
      padding-top: 3px;
      min-width: 250px;
-     min-height: 46px;
      width: 88%;
      padding-bottom: 5px;
      break-inside: avoid;
@@ -4427,6 +4506,79 @@ th > img[src^="/imagegen"] { /* scale down header images */
      margin-bottom: 9px;
 }
 
+/* leasesets */
+
+.netdb_leases, .netdb_leases li, .netdb_leases li:first-child {
+     margin: 0 !important;
+}
+
+.netdb_leases {
+     columns: auto 420px !important;
+     column-rule: 1px solid #114;
+     column-gap: 1em;
+}
+
+.netdb_leases li {
+     list-style: none;
+     display: inline-block;
+     padding: 1px 5px 1px 0 !important;
+     margin: 1px 0;
+     min-width: 400px;
+}
+
+.netdb_leases li b:first-child {
+     display: inline-block;
+     min-width: 80px !important;
+     text-align: right;
+     margin: 0 !important;
+     padding: 0 !important;
+}
+
+.netdb_gateway {
+     margin-left: 0 !important;
+     margin-right: -8px !important;
+     vertical-align: bottom;
+}
+
+.netdb_gateway img {
+     vertical-align: bottom;
+}
+
+.netdb_tunnel {
+     display: inline-block;
+     background: #003;
+     padding: 0 4px;
+     margin-left: 4px;
+     margin-right: -4px;
+     border-radius: 2px;
+}
+
+.netdb_leases .tunnel_id {
+     min-width: 74px;
+}
+
+.netdb_leases .tunnel_peer {
+     min-width: 64px;
+}
+
+.netdb_leases .tunnel_peer tt, .netdb_leases .tunnel_peer tt a {
+     font-size: 8pt !important;
+     font-weight: bold !important;
+}
+
+.netdb_leases .tunnel_peer tt, .netdb_leases .tunnel_peer a {
+     letter-spacing: 0.1em !important;
+     margin: 0 !important;
+     padding: 0 !important;
+}
+
+.main li .netdb_expiry {
+     font-weight: normal;
+     text-transform: lowercase;
+     font-style: italic;
+}
+
+/* end leasesets */
 /* end netdb */
 
 /* logs */
@@ -4667,15 +4819,16 @@ font[color="#000099"] { /* info */
      border: 1px inset #000;
 }
 
-a[href^="configpeer?peer"] {
+a[href^="configpeer?peer"]:not(old) {
      font-size: 0;
      filter: drop-shadow(0 0 1px #777);
 }
 
 a[href^="configpeer?peer"]::after {
      content: url(/themes/console/images/buttons/edit.png);
-     vertical-align: bottom;
-     margin-left: 4px;
+     vertical-align: top;
+     margin: 0 0 0 4px !important;
+     line-height: 0;
 }
 
 a[href^="configpeer?peer"]:hover {
@@ -4725,6 +4878,23 @@ table#profile_defs td, table#thresholds td {
      width: 16px;
 }
 
+#capabilities_key td:nth-child(2) b, #capabilities_key td:nth-child(4) b {
+     display: inline-block;
+     min-width: 16px;
+     background: #003;
+     border-radius: 2px;
+     padding: 1px 2px;
+     text-align: center;
+}
+
+#capabilities_key td:nth-child(2), #capabilities_key td:nth-child(4) {
+     text-align: right;
+}
+
+#capabilities_key td[colspan="5"] {
+     text-align: left;
+}
+
 #profile_defs b {
      text-transform: capitalize;
 }
@@ -4832,22 +5002,161 @@ a[href^="/profiles"] ~ table > tbody > tr > th:first-child {
      text-align: center;
 }
 
-table#jardump { /* /jars */
+/* jardump */
+
+#jardump {
+     padding: 0;
+     overflow: auto;
+}
+
+table#jardump {
      margin-top: -1px;
      margin-bottom: 0;
      font-size: 8pt !important;
      border: none;
 }
 
-.main#jardump {
-     padding: 0;
-     overflow: auto;
-}
-
-.main#jardump tt {
+#jardump tt {
      letter-spacing: -0.03em;
 }
 
+#jardump hr {
+     margin: 1px 0 0;
+     width: 100%;
+     height: 1px;
+     background: #120f35;
+     display: block !important;
+}
+
+#jardump th {
+     border-right: none;
+     border-left: none;
+}
+
+#jardump th, #jardump td {
+     vertical-align: middle !important;
+     text-align: center !important;
+}
+
+#jardump th:first-child {
+     padding-left: 5px;
+}
+
+#jardump th:first-child, #jardump td:first-child {
+     text-align: left !important;
+}
+
+#jardump .subheading {
+     padding: 6px 5px !important;
+}
+
+#jardump .subheading code {
+     font-weight: bold;
+}
+
+.subheading.routerfiles {
+     background: url(/themes/console/images/eepsite.png) right 5px center no-repeat, linear-gradient(to right, #000, #000010 40%) !important;
+     background-size: 16px auto, 100% 100% !important;
+     background-blend-mode: luminosity, normal;
+}
+
+.subheading.pluginfiles {
+     background: url(/themes/console/images/plugin.png) right 5px center no-repeat, linear-gradient(to right, #000, #000010 40%) !important;
+     background-size: 16px auto, 100% 100% !important;
+     background-blend-mode: luminosity, normal;
+}
+
+#jardump td {
+     border-right: 1px inset #120f35;
+}
+
+#jardump td:nth-child(2) {
+     text-align: right !important;
+     font-style: italic;
+}
+
+#jardump td:last-child {
+     word-break: break-all;
+     text-align: left !important;
+     border-right: none;
+}
+
+#jardump tr:hover td {
+     border: 1px solid #115;
+     border-left: 1px solid transparent;
+     border-right: 1px solid transparent;
+}
+
+#jardump td:first-child {
+     padding-left: 22px;
+}
+
+#jardump td:first-child, #jardump tr:hover td:first-child {
+     background-image: url(/themes/console/images/info/box.png) !important;
+     background-position: 5px center;
+     background-repeat: no-repeat;
+     background-size: 16px 16px;
+}
+
+#jardump tr:hover td:first-child {
+     padding-left: 20px;
+}
+
+#jardump td:first-child b {
+     display: inline-block;
+     padding: 4px;
+     border-radius: 2px;
+     margin-right: 4px;
+     margin-left: 0;
+}
+
+#jardump tr:hover td:first-child b {
+     background: #004;
+     border: 1px solid #001;
+     margin-right: 0;
+     margin-left: 4px;
+     box-shadow: 0 0 1px 0 #001;
+     width: 95%;
+     width: calc(100% - 10px);
+}
+
+#jardump tr:hover hr {
+     background: transparent;
+}
+
+.revision, .sha256, .unsignedmod {
+     display: inline-block;
+     -moz-user-select: all;
+     -webkit-user-select: all;
+     user-select: all;
+}
+
+#jardump td:last-child {
+     word-break: break-all;
+     text-align: left !important;
+     border-right: none;
+     padding: 1px 0 1px;
+}
+
+.unsignedmod {
+     padding: 2px 3px 2px 4px;
+     margin: 0;
+}
+
+#jardump tr:hover .unsignedmod:not(:empty) {
+     background: #400;
+     color: #fff;
+     border-radius: 2px;
+}
+
+.revision:hover, .sha256:hover {
+     overflow: auto;
+     text-overflow: clip;
+}
+}
+
+/* end jardump */
+
 .main#certs {
      padding-top: 3px;
 }
@@ -4930,47 +5239,159 @@ table#jardump { /* /jars */
      margin: -5px 0;
 }
 
-.main#debug th {
-     text-align: left;
-     padding: 5px;
-}
+/* debug */
 
-.main#debug li:last-child {
-     padding-bottom: 0;
-}
-
-.main#debug h2, .main#debug h3 {
+#debug h2, #debug h3 {
      border-radius: 0;
 }
 
-.main#debug h2 {
-     padding: 5px 10px;
+#debug h2 {
+     padding: 10px !important;
+     background: url(/themes/console/images/info/debug.png) right 5px center no-repeat, linear-gradient(to bottom, #191729 0%, #000000 50%) !important;
+     background-size: 24px 24px, 100% 100% !important;
+     background-blend-mode: luminosity, normal;
 }
 
-.main#debug h2:first-child {
+#debug h2:first-child, #dht {
      margin-top: 10px !important;
 }
 
-.main#debug h3 {
-     padding: 3px 8px;
-     font-size: 10pt;
-}
-
-.main#debug h2 + table {
+#debug h2 + table {
      margin-top: -13px;
 }
 
-.main#debug h2 + hr {
+#debug th:last-child, #debug td:last-child {
+     text-align: right;
+}
+
+#debug td:last-child {
+     vertical-align: top;
+}
+
+#debug_portmapper {
+     margin-top: -4px !important;
+}
+
+#portmapper td {
+     padding: 5px 10px !important;
+}
+
+#portmapper th, #portmapper td {
+     text-align: left !important;
+}
+
+#portmapper td:first-child {
+     font-weight: bold;
+}
+
+.debug_container {
+     margin-top: -11px;
+     border: 1px solid #443da0;
+     padding: 10px 15px;
+     background: #000008;
+}
+
+.debug_container:empty::after {
+     content: "None";
+     display: inline-block;
+     font-style: italic;
+}
+
+.buckets {
+     margin-top: -13px;
+     margin-bottom: 9px;
+     max-height: 600px;
+     overflow: auto;
+     word-break: break-all;
+}
+
+.buckets hr {
      display: none;
 }
 
-div.footnote {
+.debug_container + h3, .debug_outboundsessions {
+     margin-top: -1px;
+}
+
+.debug_outboundsessions {
+     margin-top: -2px;
+}
+
+#debug h3.debug_outboundsessions, #debug h3.debug_inboundsessions {
+     padding: 6px 10px 6px 28px !important;
+     background-blend-mode: luminosity, normal;
+}
+
+#debug h3.debug_outboundsessions {
+     background: url(/themes/console/images/outbound.png) 6px center no-repeat, linear-gradient(to bottom, #191729 0%, #000 50%) !important;
+}
+
+#debug h3.debug_inboundsessions {
+     background: url(/themes/console/images/inbound.png) 6px center no-repeat, linear-gradient(to bottom, #191729 0%, #000 50%) !important;
+}
+
+.debug_version {
+     color: #060;
+}
+
+#debug h2 + h3, .buckets {
+     margin-top: -13px;
+}
+
+#debug h3 + table {
+     margin-top: -11px;
+}
+
+#debug th {
+     padding: 7px 10px !important;
+}
+
+#debug h3 {
+     border-width: 1px !important;
+     padding: 5px 10px !important;
+}
+
+#debug ul, .debug_targetinfo {
+     columns: 400px 2;
+     column-rule: 1px solid #113;
+     column-gap: 30px;
+     margin: 0 !important;
+     text-align: left;
+}
+
+.debug_targetinfo {
+     line-height: 140% !important;
+}
+
+.debug_container {
+     line-height: 160% !important;
+}
+
+.debug_container.buckets {
+     line-height: 140% !important;
+}
+
+.debug_targetinfo b {
+     margin-right: 3px;
+}
+
+#debug li {
+     display: inline-block;
+     text-align: left !important;
+     margin: 0 !important;
+     padding: 2px 0 !important;
+     min-width: 400px !important;
+}
+
+/* end debug */
+
+.footnote {
      text-align: right;
      font-size: 7pt;
      margin-bottom: 5px !important;
 }
 
-div.footnote hr {
+.footnote hr {
      margin: 10px 0 5px 0 !important;
      color: #443da0;
      background: #443da0;
@@ -5193,8 +5614,7 @@ div.app:hover .app img {
      line-height: 95%;
      text-transform: lowercase;
      border: none;
-     width: 130px;
-     min-width: 72px;
+     width: 150px;
      background: #001 url(images/titles.png) center center;
      background: linear-gradient(to bottom, #121225 50%, #000011 50%, #00000d 50%);
      border-radius: 0 0 2px 2px;
@@ -5215,7 +5635,7 @@ div.app:hover .app img {
 .applabel a, .applabel a:hover {
      text-decoration: none !important;
      outline: none;
-     max-width: 126px;
+     max-width: 144px;
      overflow: hidden;
      text-overflow: ellipsis;
      display: inline-block;
@@ -5254,7 +5674,7 @@ body.iframed {
      background: transparent url(/themes/console/images/transparent.gif) !important;
 }
 
-.iframed div.routersummaryouter {
+.iframed .routersummaryouter {
      display: none !important;
 }
 
@@ -6074,6 +6494,14 @@ p#sybilinfo {
      background-size: 28px 28px !important;
 }
 
+#floodfillconfig tr:nth-child(2) td {
+     padding: 10px 10px 10px 18px;
+}
+
+#floodfillconfig tr:nth-child(2) b {
+     margin-right: 8px;
+}
+
 p#clientconf.infohelp, p#webappconfig.infohelp {
      background: #000 url(/themes/console/images/info/java_edit.png) 12px center no-repeat !important;
      padding: 15px 15px 15px 50px;
@@ -6211,7 +6639,7 @@ form[action="events"] {
 }
 
 .routersummary .testing {
-     border: 1px dotted #4f4b1d;
+     border: 1px dotted #342f7f;
 }
 
 .routersummary .hidden, .routersummary .vmcomm {
@@ -6782,6 +7210,20 @@ table#i2pupdates td:first-child {
 }
 }
 
+@media screen and (max-width: 1400px) {
+.revision, .sha256 {
+     display: inline-block;
+     max-width: 100px !important;
+     overflow: hidden;
+     text-overflow: ellipsis;
+}
+
+.revision:hover, .sha256:hover {
+     overflow: auto;
+     text-overflow: clip;
+}
+}
+
 @media screen and (max-width: 1500px) {
 #sb_general td::after, #sb_shortgeneral td::after, #sb_bandwidth td::after,
 #sb_peers td::after, #sb_tunnels td::after, #sb_queue td::after {
@@ -6824,6 +7266,18 @@ table#i2pupdates td:first-child {
 }
 }
 
+@media screen and (min-width: 1400px) {
+.main#help #changelog pre:not(old) {
+     columns: 550px auto;
+     column-gap: 40px;
+     column-rule: 1px dotted #443da0;
+     margin-left: 0;
+     padding-left: 10px;
+     width: calc(100% - 22px) !important;
+     overflow-y: hidden;
+}
+}
+
 @media screen and (min-width: 1500px) {
 body, .main, .main td, .news p, #news p, .statusnotes, textarea, th, .applabel a, tt, code, .messages, .messages #newsStatus, .messages #newsDisplay, #changelog pre {
      font-size: 10pt !important;
@@ -6857,7 +7311,7 @@ h1 {
      margin-top: 3px;
 }
 
-div.routersummary img[src$="i2plogo.png"] {
+.routersummary img[src$="i2plogo.png"] {
      margin-left: -4px;
      transform: none;
      width: 204px;
@@ -6889,7 +7343,7 @@ div.routersummary img[src$="i2plogo.png"] {
 }
 
 div.app {
-     min-width: 138px;
+     min-width: 150px;
 }
 
 div.app:hover {
@@ -6983,12 +7437,29 @@ button.control, button.control:hover, button.control:focus {
      margin-bottom: -1px !important;
 }
 
-.newsAuthor {
+/* news @ home */
+
+#newsStatus, #news #newsDisplay a, .newsAuthor {
      font-size: 9pt !important;
+}
+
+.news #newsStatus, .news #newsDisplay {
+     display: inline-block;
+     padding-top: 2px;
+     padding-bottom: 4px;
+}
+
+.news hr {
+     margin-bottom: 6px;
+}
+
+.newsAuthor {
      background-size: 15px 15px !important;
      padding-left: 19px !important;
 }
 
+/* end news */
+
 table#reseedconfig input[type="text"], table#reseedconfig input[type="password"] {
      width: 250px;
 }
@@ -7023,6 +7494,15 @@ table#reseedconfig input[type="text"], table#reseedconfig input[type="password"]
 .langselect input[name="lang"]:checked + img {
     margin-left: -79px !important;
 }
+
+ul#banlist {
+     -moz-column-width: 300px;
+     -moz-column-gap: 10px;
+     -webkit-column-width: 300px;
+     -webkit-column-gap: 10px;
+     column-width: 300px;
+     column-gap: 10px;
+}
 }
 
 @media screen and (-webkit-min-device-pixel-ratio:0) and (min-width: 1500px) {
diff --git a/installer/resources/themes/console/midnight/console_ar.css b/installer/resources/themes/console/midnight/console_ar.css
index 37126b4a79..bc85248d55 100644
--- a/installer/resources/themes/console/midnight/console_ar.css
+++ b/installer/resources/themes/console/midnight/console_ar.css
@@ -124,7 +124,7 @@ form {
     text-align: center;
 }
 
-div.joblog li, div.newsheadings li {
+div.joblog li {
     text-align: left;
     direction: ltr;
 }
@@ -477,6 +477,18 @@ h4.app, h4.app2 {
     margin-right: 12px;
 }
 
+.sb_newsheadings td, .sb_newsheadings tr:hover td {
+     background-position: right 4px center !important;
+     padding-right: 22px !important;
+     padding-left: 8px !important;
+     text-align: right !important;
+}
+
+.sb_newsheadings td a {
+     font-size: 9pt !important;
+     font-weight: bold;
+}
+
 /* responsive layout */
 
 @media screen and (max-width: 1500px) {
diff --git a/installer/resources/themes/console/midnight/console_big.css b/installer/resources/themes/console/midnight/console_big.css
index b8926519e9..05043f9300 100644
--- a/installer/resources/themes/console/midnight/console_big.css
+++ b/installer/resources/themes/console/midnight/console_big.css
@@ -5,45 +5,51 @@
 
 /* sidepanel */
 
-div.routersummary {
+.routersummary {
      font: 9.5pt/125%;
 }
 
-div.routersummary h3, div.routersummary h3 a {
+.routersummary h3, .routersummary h3 a {
      font-size: 12.5pt !important;
 }
 
-div.routersummary h4, div.routersummary h4 a {
+.routersummary h4, .routersummary h4 a {
      font-size: 11.5pt !important;
      letter-spacing: 0;
 }
 
-div.routersummary table {
+.routersummary table {
      font-size: 9pt;
-     margin: -5px 0px -5px 1px;
-     width: 188px !important;
+     margin: -5px 0 -5px 1px;
+     width: 200px !important;
 }
 
-div.routersummary table a:link, div.routersummary table a:visited {
+.routersummary table a:link, .routersummary table a:visited {
      font-size: 11pt !important;
 }
 
-div.tunnels a {
-     font-size: 9pt !important;
-}
-
-div.tunnels table {
-     margin: -2px -0px -4px 2px !important;
-     width: 185px;
-}
-
 #sb_internals a, #sb_services a, #sb_advanced a {
      font-size: 13pt !important;
 }
 
+.newsheadings li, .newsheadings li a {
+     letter-spacing: 0;
+     word-spacing: 0;
+     font-size: 10pt !important;
+}
+
+#sb_notice, #sb_notice a {
+     font-size: 10pt !important;
+}
+
 /* end sidepanel */
 
-#newsDisplay, #newsStatus {
+button.search {
+     white-space: nowrap;
+     font-size: 11pt !important;
+}
+
+#newsDisplay, #newsDisplay a, #newsStatus {
      font-size: 11pt !important;
 }
 
@@ -167,7 +173,7 @@ ul.links li {
 /* global overrides */
 
 @media screen and (min-width: 0) {
-a, b, div.routersummary h3 a, div.routersummary h4 {
+a, b, .routersummary h3 a, .routersummary h4 {
     font-weight: normal !important;
     font-size: 100%;
 }
diff --git a/installer/resources/themes/console/midnight/i2ptunnel.css b/installer/resources/themes/console/midnight/i2ptunnel.css
index 13f76b30fe..db61c867ec 100644
--- a/installer/resources/themes/console/midnight/i2ptunnel.css
+++ b/installer/resources/themes/console/midnight/i2ptunnel.css
@@ -1061,9 +1061,9 @@ td {
      min-width: 600px;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio:0) { /* fixes chrome/blinkoverflow issue */
+@media screen and (-webkit-min-device-pixel-ratio:0) { /* fixes chrome/blink overflow issue */
 select {
-     white-space: normal;
+     white-space: normal !important;
 }
 }
 
diff --git a/installer/resources/themes/susidns/classic/susidns.css b/installer/resources/themes/susidns/classic/susidns.css
index ade4d35491..19d4acf479 100644
--- a/installer/resources/themes/susidns/classic/susidns.css
+++ b/installer/resources/themes/susidns/classic/susidns.css
@@ -35,6 +35,12 @@ body.iframed {
      outline: none;
 }
 
+#navi, .buttons, #buttons, #host_list tr:first-child, #host_list img, #host_list td:nth-child(n+2) a {
+     -moz-user-select: none;
+     -webkit-user-select: none;
+     user-select: none;
+}
+
 hr {
      display: none;
 }
@@ -498,6 +504,10 @@ img[src*="imagegen"] {
      filter: drop-shadow(0 0 3px #ccc);
 }
 
+img[src="/imagegen/id?s=256&c="], img[src="/imagegen/id?s=20&c="] {
+     opacity: 0; /* hide broken identicons but ensure hostlist remains intact */
+}
+
 .illustrate {
      max-width: 700px;
      height: auto;
@@ -585,7 +595,7 @@ td.destinations textarea, td.destinations textarea:focus {
 }
 
 .fakebutton, input[type="submit"], input[type="reset"] {
-     padding: 4px 8px !important;
+     padding: 5px 8px !important;
      border-radius: 2px;
      border: 1px solid #bbb;
      box-shadow: inset 0 0 0 1px #fff, 0 0 1px 0 #ddd;
@@ -611,6 +621,15 @@ td.destinations textarea, td.destinations textarea:focus {
      color: #333;
 }
 
+.fakebutton {
+     margin: -4px 0 -4px 4px !important;
+     display: inline-block;
+}
+
+.iframed .fakebutton {
+     margin-bottom: -2px !important;
+}
+
 input[type="radio"], input[type="checkbox"] {
      min-width: 16px;
      min-height: 16px;
@@ -812,7 +831,7 @@ p.book {
      width: 20px;
      height: 20px;
      vertical-align: middle;
-     margin: 1px 10px 1px 1px;
+     margin: 3px 10px 3px 1px;
      padding: 1px;
      border: 1px solid #89f;
      border-radius: 2px;
@@ -877,6 +896,7 @@ p.book {
 #host_list td:nth-child(3) a::after {
      content: url(/themes/console/images/buttons/helper.png);
      cursor: pointer;
+     filter: drop-shadow(0 0 1px #555);
 }
 
 #host_list th:nth-child(4), #host_list td:nth-child(4) {
@@ -912,6 +932,19 @@ p.book {
      user-select: all;
 }
 
+#host_list .destaddress:not(old) {
+     overflow: hidden !important;
+     text-overflow: ellipsis;
+}
+
+#host_list .destaddress:not(old):focus {
+     padding-top: 0;
+     padding-bottom: 0;
+     overflow: auto !important;
+     text-overflow: clip;
+     margin: 1px 0 -1px;
+}
+
 /* end hostname list */
 
 .destaddress:focus {
@@ -934,6 +967,23 @@ td.destinations {
 }
 }
 
+@media screen and (max-width: 1200px) {
+#filter {
+     padding: 0 5px;
+}
+
+#filter p {
+     margin-left: 0;
+     margin-right: 0;
+}
+
+#filter a {
+     min-width: 6px;
+     padding: 0 6px !important;
+     line-height: 150%;
+}
+}
+
 @media screen and (min-width: 1400px) {
 body, p, td, textarea, input, button, li, a {
      font-size: 10pt !important;
diff --git a/installer/resources/themes/susidns/dark/susidns.css b/installer/resources/themes/susidns/dark/susidns.css
index 545aea13b4..8de592b65d 100644
--- a/installer/resources/themes/susidns/dark/susidns.css
+++ b/installer/resources/themes/susidns/dark/susidns.css
@@ -30,6 +30,12 @@ body.iframed {
      text-shadow: none;
 }
 
+#navi, .buttons, #buttons, #host_list tr:first-child, #host_list img, #host_list td:nth-child(n+2) a {
+     -moz-user-select: none;
+     -webkit-user-select: none;
+     user-select: none;
+}
+
 .page {
      color:#ee9;
      margin: 10px 0;
@@ -249,7 +255,7 @@ div#filter + div#search > form {
      border: 1px solid #2a5f29;
      margin: 1px 0 3px;
      padding: 1px 8px;
-     min-width: 18px;
+     min-width: 12px;
      border-radius: 2px;
      background: #000;
      background: linear-gradient(to bottom, #010 0%, #000 100%);
@@ -257,6 +263,7 @@ div#filter + div#search > form {
      text-transform: uppercase;
      white-space: nowrap;
      display: inline-block;
+     line-height: 160%;
 }
 
 #filter a:hover {
@@ -548,6 +555,10 @@ td > img[width="320"], td > img[src^="/imagegen"] {
      background: #000;
 }
 
+img[src="/imagegen/id?s=256&c="], img[src="/imagegen/id?s=20&c="] {
+     opacity: 0; /* hide broken identicons but ensure hostlist remains intact */
+}
+
 ol, ul {
      margin: 0 20px 0 10px;
      display: table-row;
@@ -1074,8 +1085,7 @@ p.book {
      text-overflow: ellipsis;
 }
 
-#host_list .destaddress:hover, #host_list .destaddress:focus {
-     color: #bb0;
+#host_list .destaddress:focus {
      overflow: auto;
      text-overflow: clip;
 }
@@ -1088,6 +1098,10 @@ td.destinations {
      border-right: 1px solid #121;
 }
 
+tr:hover .destinations {
+     color: #bb0;
+}
+
 /* MS Edge fix */
 _:-ms-lang(x), * {
      filter: none !important;
@@ -1120,6 +1134,22 @@ _:-ms-lang(x), * {
 }
 }
 
+@media screen and (max-width: 1200px) {
+#filter {
+     padding: 0 5px;
+}
+
+#filter p {
+     margin-left: 0;
+     margin-right: 0;
+}
+
+#filter a {
+     min-width: 6px;
+     padding: 0 6px;
+}
+}
+
 @media screen and (min-width: 1400px) {
 
 body, input[type="submit"], input[type="reset"], .fakebutton, input, select, h4, td.names a, p, li, #filter a, #host_details td, textarea, th, #search td, .destaddress {
diff --git a/installer/resources/themes/susidns/light/susidns.css b/installer/resources/themes/susidns/light/susidns.css
index 559b670f6c..faabac41e3 100644
--- a/installer/resources/themes/susidns/light/susidns.css
+++ b/installer/resources/themes/susidns/light/susidns.css
@@ -4,9 +4,8 @@
 body {
      font-family: "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Lucida Grande", "Bitstream Vera Sans", Verdana, sans-serif;
      font-size: 9pt;
-     background-color: #fff;
      background: #a4a4cb url(/themes/console/light/images/tile2.png) center center;
-     color: #333;
+     color: #33333f;
      margin: 0 5px;
 }
 
@@ -28,10 +27,20 @@ body.iframed {
      text-shadow: none;
 }
 
+#navi, .buttons, #buttons, #host_list tr:first-child, #host_list img, #host_list td:nth-child(n+2) a {
+     -moz-user-select: none;
+     -webkit-user-select: none;
+     user-select: none;
+}
+
 * {
      outline: none;
 }
 
+b, td.search {
+     color: #41465f;
+}
+
 #logo {
      margin: -5px 0 -1px;
      text-align: center;
@@ -43,6 +52,22 @@ body.iframed {
      box-shadow: inset 0 0 0 1px #fff;
 }
 
+#logo:not(old) {
+     background: linear-gradient(to bottom, #fff, #eef);
+}
+
+#logo::before {
+     content: "";
+     display: inline-block;
+     background: url(/themes/susidns/images/logo.png) center center no-repeat;
+     background-size: auto 50px;
+     height: 55px;
+     width: 100%;
+     opacity: 0.7;
+     filter: sepia(100%) hue-rotate(180deg);
+     mix-blend-mode: multiply;
+}
+
 #logo img {
      display: none;
 }
@@ -73,7 +98,7 @@ code, tt, .destaddress {
      padding: 5px 3px;
      text-align: center;
      border: 1px solid #7778bf;
-     background: linear-gradient(to right, rgba(255, 255, 255, 1) 0%, rgba(239, 239, 255, 0.5) 50%, rgba(255, 255, 255, 1) 100%), linear-gradient(to bottom, #fff 0%, #fff 51%, #eef 51%, #ddf 100%);
+     background: linear-gradient(to bottom, #fafaff 51%, #f8f8ff 51%, #f2f2ff 100%);
      border-radius: 2px 2px 0 0;
      box-shadow: inset 0 0 0 1px #fff;
      z-index: 100;
@@ -92,7 +117,7 @@ code, tt, .destaddress {
 }
 
 #navi a, #navi a:visited {
-     border: 1px solid #77789f;
+     border: 1px solid #7778bf;
      border-radius: 2px;
      color: #3b6bbf;
      display: inline-block;
@@ -111,7 +136,7 @@ code, tt, .destaddress {
 }
 
 #navi a:active {
-     color: #555;
+     color: #5a5a6f;
      box-shadow: inset 0 0 0 1px #fff, inset 3px 3px 2px #999;
      mix-blend-mode: luminosity;
 }
@@ -142,6 +167,7 @@ code, tt, .destaddress {
      padding: 8px 5px;
      background: #fff;
      background: linear-gradient(to right, #fff 70%, #eef);
+     background: linear-gradient(135deg, #fafaff, #f2f2ff);
 }
 
 .iframed .headline {
@@ -149,22 +175,36 @@ code, tt, .destaddress {
 }
 
 h3, h4, th, #filter span {
-     color: #31334f;
+     color: #41465f;
+}
+
+h3 {
+     font-size: 11pt !important;
+     box-shadow: inset 0 0 0 1px #fff;
 }
 
 .headline h3 {
-     margin: 0;
-     padding: 2px 5px 3px 30px;
-     background: url(/themes/susidns/images/addressbook.png) left center no-repeat;
-     font-size: 11pt;
+     font-size: 11.5pt !important;
+     background: url(/themes/susidns/images/addressbook.png) 6px center no-repeat #fcfcff;
+     background: url(/themes/susidns/images/addressbook.png) 6px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%);
+     background-size: 22px 22px, 100% 100%, 100% 100%;
 }
 
 .headline#subscriptions h3 {
-     background: url(/themes/susidns/images/subs_24.png) left center no-repeat;
+     background: url(/themes/susidns/images/subs_24.png) 6px center no-repeat #fcfcff;
+     background: url(/themes/susidns/images/subs_24.png) 6px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%);
+     background-size: 22px 22px, 100% 100%, 100% 100%;
 }
 
 .headline#configure h3 {
-     background: url(/themes/susidns/images/configure_24.png) left center no-repeat;
+     background: url(/themes/susidns/images/configure_24.png) 6px center no-repeat #fcfcff;
+     background: url(/themes/susidns/images/configure_24.png) 6px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%);
+     background-size: 22px 22px, 100% 100%, 100% 100%;
+}
+
+.headline#subscriptions h3, .headline#configure h3, .headline#addressbook h3, .headline h3 {
+     margin: -8px -5px -5px;
+     padding: 9px 5px 8px 32px;
 }
 
 span.location {
@@ -178,7 +218,6 @@ span.location {
 .headline h4 {
      border-top: 1px solid #7778bf;
      margin: 5px -6px 0;
-     padding: 8px 10px 0;
      padding: 8px 10px 0 33px;
      background: url(/themes/susidns/images/drive.png) 9px 7px no-repeat;
 }
@@ -187,7 +226,7 @@ span.location {
      border: 1px solid #7778bf;
      padding: 0 15px;
      margin: -1px 0 0;
-     background: #fff;
+     background: #fafaff;
 }
 
 .iframed #content {
@@ -201,32 +240,19 @@ form[action="subscriptions"] #content {
      margin-top: 1px;
 }
 
-#content textarea  {
-     margin: 2px -15px;
-     padding: 5px 0;
-     border: none;
-     width: 100%;
-     resize: none;
-     filter: none;
-     box-shadow: none;
-}
-
-.iframed #content textarea {
-     border: 1px solid #7778bf;
-     margin: 0;
-}
-
 #content + #buttons {
      border: 1px solid #7778bf;
      margin: -1px 0 10px;
-     background: linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
 }
 
 #content h3 {
-     border: 1px solid #77789f;
-     padding: 5px 8px;
+     border: 1px solid #7778bf;
+     padding: 5px 8px 5px 34px;
      border-radius: 2px;
-     background: linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 5%, rgba(231, 231, 255, 0.8) 15%) !important;
+     background: url(/themes/console/images/info/question.png) 8px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%) !important;
+     background-size: 20px 20px, 100% 100%, 100% 100% !important;
+     background-blend-mode: luminosity, normal, normal;
      box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
      text-transform: none;
      letter-spacing: 0;
@@ -239,13 +265,14 @@ form[action="subscriptions"] #content {
 #content p {
      margin-left: 15px;
      margin-right: 15px;
+     line-height: 130%;
 }
 
 div#add {
      border: 1px solid #7778bf;
      margin-top: -1px;
      padding: 0 15px;
-     background: #fff;
+     background: #fafaff;
 }
 
 .iframed #add {
@@ -283,6 +310,7 @@ div.help {
      border: 1px solid #7778bf;
      padding: 0 15px;
      background: #eef;
+     background: linear-gradient(135deg, #fafaff, #f8f8ff);
      margin: -11px 0 0;
 }
 
@@ -292,15 +320,17 @@ div.help {
 
 .help#helpsubs {
      background: #eef url(/themes/console/images/info/infohelp.png) 10px center no-repeat;
+     background: url(/themes/console/images/info/infohelp.png) 10px center no-repeat, linear-gradient(135deg, #fafaff, #f8f8ff);
      padding: 0 15px 0 45px;
      font-size: 10pt;
 }
 
-div.help h3 {
+div.help h3, #add h3 {
      border: 1px solid #7778bf;
      padding: 5px 10px;
      margin: -1px -16px 0;
-     background: #fff;
+     background: #fcfcff;
+     background: linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%);
 }
 
 p#help {
@@ -438,7 +468,7 @@ p.messages {
 #footer {
      border: 1px solid #7778bf;
      background: #eef;
-     background: linear-gradient(to right, #eef, #fff, #eef);
+     background: linear-gradient(to right, #eef, #fafaff, #eef);
      margin: -1px 0 -5px;
      box-shadow: inset 0 0 0 1px #fff;
 }
@@ -465,10 +495,19 @@ p.footer {
      box-shadow: inset 0 0 0 1px #ccc;
      background: #fff;
      opacity: 0.85;
-     filter: drop-shadow(0 0 1px #999);
+     filter: drop-shadow(0 0 1px #ccc);
      text-align: center;
 }
 
+.iframed .illustrate {
+     background: #fafaff;
+     background: linear-gradient(to bottom, #fafaff 70%, rgba(220,220,255,0.1)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.6) 3px, #fff 5px) #fff;
+}
+
+.iframed .illustrate:hover {
+     background: #fff;
+}
+
 _:-ms-lang(x), img.illustrate {
      width: auto;
      max-width: 600px;
@@ -493,49 +532,74 @@ _:-ms-lang(x), img.illustrate {
      min-width: 520px;
 }
 
+input[type="text"], input[type="password"], textarea {
+     padding: 5px !important;
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
+     border: 1px solid #999daf;
+     border-radius: 2px;
+     color: #33333f;
+     background: #f8f8ff;
+     font-family: "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Lucida Grande", "Bitstream Vera Sans", Verdana, sans-serif;
+     filter: drop-shadow(0px 0 1px #ccf);
+}
+
+input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
+     color: #19191f;
+     box-shadow: 0 0 1px #89f;
+     background: #fff !important;
+     border: 1px solid #676c7f;
+}
+
 textarea {
      font-family: "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
      font-size: 9pt;
      width: 100%;
      border-radius: 2px;
-     border: 1px solid #7778bf;
+     border: 1px solid #999daf;
      padding: 1px 3px;
-     color: #333;
+     color: #33333f;
      resize: none;
 }
 
-input[type="text"], input[type="password"], textarea {
-     padding: 5px !important;
-     box-shadow: inset 1px 1px 2px #bbb;
-     border: 1px solid #999;
-     border-radius: 2px;
-     color: #333;
-     background: #fff;
+#content textarea  {
+     margin: 0 0 0 -15px;
+     border: none;
+     width: 100%;
+     resize: none;
+     filter: none;
+     box-shadow: none;
 }
 
-input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
-     color: #111;
-     box-shadow: 0 0 1px #89f;
-     background: #fff !important;
+.iframed #content textarea {
+     border: 1px solid #7778bf;
+     margin: 0;
 }
 
-textarea[name="config"] {
+textarea[name="config"], textarea[name="content"] {
      border-radius: 0;
      box-shadow: none;
      border: 1px solid #7778bf;
+     background: #fafaff;
+     width: 100% !important;
+     padding: 3px 6px !important;
+     filter: none;
+}
+
+textarea[name="config"]:focus, textarea[name="content"]:focus {
+     background: #fff;
 }
 
 #config + #buttons {
      border: 1px solid #7778bf;
      margin: -2px 0 10px;
-     background: linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
 }
 
 #filter, #search {
     border: 1px solid #7778bf;
     padding: 5px 15px;
     margin-bottom: -1px;
-    background: #fff;
+    background: #fafaff;
 }
 
 #search {
@@ -566,15 +630,16 @@ td.search:first-child {
      text-align: center;
 }
 
-#filter a {
-     border: 1px solid #7778bf;
-     padding: 4px 8px;
+#filter a, #filter a:visited {
      display: inline-block;
-     min-width: 20px;
-     text-align: center;
-     border-radius: 2px;
-     text-transform: capitalize;
+     min-width: 10px;
      margin: 2px 1px;
+     padding: 4px 8px;
+     border: 1px solid #7778bf;
+     border-radius: 2px;
+     color: #3b6bbf;
+     text-align: center;
+     text-transform: capitalize;
      background: #fff;
      filter: drop-shadow(0 0 1px #ccc);
 }
@@ -588,7 +653,7 @@ td.search:first-child {
      background: #f60;
      text-decoration: none;
      box-shadow: inset 0 0 0 1px #fff;
-     box-shadow: inset 0 0 0 1px #fff, inset 3px 3px 3px #333;
+     box-shadow: inset 0 0 0 1px #fff, inset 3px 3px 3px #33333f;
 }
 
 #filter span {
@@ -598,14 +663,14 @@ td.search:first-child {
      letter-spacing: 0.08em;
      word-spacing: 0.1em;
      vertical-align: middle;
-     border: 1px solid #77789f;
+     border: 1px solid #7778bf;
      border-radius: 0 0 2px 2px;
      padding: 6px 10px;
      width: 40%;
      min-width: 300px;
      margin: -1px 10%;
      box-shadow: inset 0 0 0 1px #fff;
-     background: linear-gradient(to bottom, #fff 50%, #eef 50%);
+     background: linear-gradient(to bottom, #fcfcff 50%, #eef 50%);
 }
 
 #filter span a {
@@ -617,9 +682,8 @@ td.search:first-child {
 
 #filter span b {
      font-size: 11pt;
-     margin: 0 5px;
+     margin: 0 3px 0 0;
      text-transform: uppercase;
-     color: #111;
      line-height: 80%;
 }
 
@@ -653,12 +717,12 @@ form {
 }
 
 th {
-     background: linear-gradient(to bottom, #fff 50%, #eef 50%);
+     background: linear-gradient(to bottom, #fcfcff 50%, #eef 50%);
      font-size: 9pt;
 }
 
 table {
-     background: #fff;
+     background: #fafaff;
 }
 
 table.book {
@@ -671,7 +735,7 @@ table.book {
 
 .book th:last-child  {
      background: #fff url(/themes/console/images/buttons/delete.png) center center no-repeat;
-     background: url(/themes/console/images/buttons/delete.png) center center no-repeat, linear-gradient(to bottom, #fff 50%, #eef 50%);
+     background: url(/themes/console/images/buttons/delete.png) center center no-repeat, linear-gradient(to bottom, #fcfcff 50%, #eef 50%);
      width: 16px;
 }
 
@@ -684,6 +748,10 @@ table.book {
      background: #ffd;
 }
 
+tr:hover .destaddress {
+     color: #333 !important;
+}
+
 .book tr:first-child td, .book tr.head + .list1 td {
      border-top: none;
 }
@@ -712,7 +780,7 @@ table.book {
 }
 
 #host_list td:last-child {
-     width: 16px;
+     width: 1%;
      white-space: nowrap;
      font-weight: bold;
 }
@@ -744,6 +812,7 @@ table.book {
 
 #host_list td:nth-child(3) a::after {
      content: url(/themes/console/images/buttons/helper.png);
+     filter: drop-shadow(0 0 1px #555);
      cursor: pointer;
 }
 
@@ -768,7 +837,7 @@ table.book {
      filter: drop-shadow(0 0 1px #f60);
 }
 
-.destaddress:focus {
+#host_list .destaddress:focus {
      background: #ffd;
 }
 
@@ -777,16 +846,28 @@ table.book {
      white-space: nowrap;
      font-family: "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
      font-weight: normal;
-     color: #555;
+     color: #5a5a6f;
      padding: 3px !important;
 }
 
+#host_list .destaddress:not(old) {
+     overflow: hidden !important;
+     text-overflow: ellipsis;
+}
+
+#host_list .destaddress:not(old):focus {
+     overflow: auto !important;
+     text-overflow: clip;
+     padding: 1px 3px 3px !important;
+     margin-bottom: -2px;
+     color: #33333f;
+}
+
 td.destinations {
      max-width: 50px !important;
      border-left: 1px solid #ddf;
      border-right: 1px solid #ddf;
      padding: 0;
-     background: #fff;
 }
 
 td.destinations textarea {
@@ -799,7 +880,7 @@ td.destinations textarea {
 /* host details page */
 
 #host_details td {
-     padding: 5px 10px !important;
+     padding: 5px !important;
 }
 
 #host_details td:first-child {
@@ -837,7 +918,7 @@ td.destinations textarea {
      border: 1px solid #7778bf !important;
      margin-top: -1px;
      border-radius: 2px;
-     background: #fff;
+     background: #fafaff;
      padding-top: 0;
 }
 
@@ -849,12 +930,13 @@ td.destinations textarea {
      border-bottom: 1px solid #7778bf;
      padding: 8px 10px 6px;
      margin-top: 0;
-     background: linear-gradient(to bottom, #fff 50%, #eef 50%);
+     background: linear-gradient(to bottom, #fcfcff 50%, #eef 50%);
      box-shadow: inset 0 0 0 1px #fff;
 }
 
 #idAddress {
      text-transform: none;
+     letter-spacing: 0;
 }
 
 #visualid table {
@@ -879,10 +961,10 @@ td.destinations textarea {
 
 #visualid td[colspan="2"] {
      text-align: right;
-     padding: 20px 5px;
+     padding: 17px 5px;
      border-top: 1px solid #7778bf;
      background: #fff;
-     background: linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #fafaff !important;
 }
 
 img[src^="/imagegen"] {
@@ -895,6 +977,10 @@ img[src^="/imagegen"] {
      filter: drop-shadow(0 0 1px #ccc);
 }
 
+img[src="/imagegen/id?s=256&c="], img[src="/imagegen/id?s=20&c="] {
+     opacity: 0; /* hide broken identicons but ensure hostlist remains intact */
+}
+
 /* end host details */
 
 /* host list identicons */
@@ -941,7 +1027,7 @@ img[src^="/imagegen"] {
 div#book {
     padding: 8px;
     background: #efefff;
-    background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.5) 3px, #fff 5px), #fff;
+    background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(220, 220, 255, 0.5) 3px, #fff 5px) #fafaff;
     box-shadow: inset 0 0 0 1px #fff;
 }
 
@@ -950,15 +1036,15 @@ div#book {
 }
 
 p.book {
-     background: url(/themes/susidns/images/addressbook.png) 5px center no-repeat;
-     padding: 5px 5px 5px 33px;
+     background: url(/themes/susidns/images/abook.png) 2px center no-repeat;
+     padding: 5px 5px 5px 24px;
 }
 
 #buttons {
      padding: 5px;
      text-align: right;
-     background: #fff;
-     background: linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: #fafaff;
+     background: linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px) #fafaff !important;
 }
 
 p.buttons {
@@ -989,10 +1075,11 @@ input[type="radio"], input[type="checkbox"] {
      cursor: pointer;
      min-width: 16px !important;
      min-height: 16px !important;
+     filter: sepia(100%) hue-rotate(185deg) drop-shadow(0 0 1px #ccf);
 }
 
 input[type="checkbox"]:hover, input[type="checkbox"]:focus, input[type="radio"]:hover, input[type="radio"]:focus {
-     filter: drop-shadow(0 0 3px #89f);
+     filter: sepia(100%) hue-rotate(185deg) drop-shadow(0 0 3px #89f);
 }
 
 input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner, button::-moz-focus-inner  {
@@ -1006,17 +1093,17 @@ input[type="submit"], input[type="reset"], .fakebutton {
      padding: 4px 3px;
      text-decoration: none;
      border-radius: 2px;
-     border: 1px solid #999;
+     border: 1px solid #999daf;
      box-shadow: inset 0 0 0 1px #fff;
      background: #eee;
      background: linear-gradient(to bottom, #fff, #ddd);
-     color: #333;
-     filter: saturate(70%) drop-shadow(0 0 1px rgba(204, 204, 204, 0.6));
+     color: #33333f;
+     filter: saturate(70%) drop-shadow(0 0 1px #ccf);
      cursor: pointer;
 }
 
 a.fakebutton {
-     color: #333;
+     color: #33333f;
      font-weight: normal;
 }
 
@@ -1140,7 +1227,7 @@ input.search {
      background: #eee url(/themes/console/images/buttons/search.png) no-repeat 6px center;
      background: url(/themes/console/images/buttons/search.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #ddd);
      background-size: 14px 14px, 100% 100%;
-     padding: 6px 8px 6px 22px;
+     padding: 5px 8px 5px 24px;
 }
 
 input.search:hover, input.search:focus {
@@ -1150,8 +1237,8 @@ input.search:hover, input.search:focus {
 }
 
 input.search[type="text"] {
-     background: #fff url(/themes/console/images/buttons/search.png) no-repeat 6px center;
-     padding: 5px 5px 5px 28px !important;
+     background: #f8f8ff url(/themes/console/images/buttons/search.png) no-repeat 6px center;
+     padding: 5px 5px 5px 26px !important;
      margin: 1px 5px 0;
 }
 
@@ -1197,6 +1284,81 @@ form[action="addressbook"] table {
      margin-top: -2px !important;
 }
 
+
+/* custom radios/checkboxes for chrome/blink  */
+
+@media screen and (-webkit-min-device-pixel-ratio: 0) and (min-resolution:.001dpcm) {
+input[type="checkbox"], input[type="checkbox"]:checked, input[type="checkbox"][disabled], input[type="checkbox"][disabled]:checked {
+     background: #f8f8ff;
+     width: 19px !important;
+     height: 19px !important;
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
+     border-radius: 2px;
+     -webkit-appearance: inherit;
+     border: 1px solid #999daf !important;
+     position: relative;
+     box-sizing: border-box;
+     filter: drop-shadow(0 0 1px #ccf);
+     vertical-align: middle !important;
+}
+
+input[type="checkbox"]:checked::before {
+     position: absolute;
+     top: 1px;
+     left: 1px;
+     content: "\2714";
+     border-radius: 1px;
+     font-size: 15pt;
+     color: #41465f;
+     line-height: 80%;
+     font-family: sans-serif;
+     overflow: hidden;
+     width: 16px;
+     height: 16px;
+}
+
+input[type="radio"], input[type="radio"]:checked, input[type="radio"][disabled], input[type="radio"][disabled]:checked {
+     background: #f8f8ff;
+     width: 19px !important;
+     height: 19px !important;
+     box-shadow: inset 0 0 2px #7778bf;
+     border-radius: 50%;
+     -webkit-appearance: none;
+     border: 1px solid #999daf !important;
+     position: relative;
+     box-sizing: border-box;
+     filter: drop-shadow(0 0 1px #ccf);
+     vertical-align: middle !important;
+}
+
+input[type="radio"]:checked::before {
+     content: "";
+     position: absolute;
+     border-radius: 50%;
+     left: 25%;
+     top: 25%;
+     width: 9px;
+     height: 9px;
+     background: #41465f;
+}
+
+input[type="checkbox"]:hover, input[type="radio"]:hover, input[type="checkbox"]:focus, input[type="radio"]:focus {
+     background: #fff;
+     width: 19px !important;
+     height: 19px !important;
+     filter: drop-shadow(0 0 3px #89f) !important;
+}
+
+input[type="checkbox"][disabled], input[type="radio"][disabled], input[type="checkbox"][disabled]:hover, input[type="radio"][disabled]:hover,
+input[type="checkbox"][disabled]:checked, input[type="radio"][disabled]:checked, input[type="checkbox"][disabled]:checked:hover, input[type="radio"][disabled]:checked:hover {
+     filter: none !important;
+     box-shadow: none !important;
+     opacity: 0.5;
+}
+}
+
+/* end custom radios/checkboxes */
+
 /* responsive layout */
 
 @media screen and (max-width: 680px) {
@@ -1215,6 +1377,22 @@ form[action="addressbook"] table {
 }
 }
 
+@media screen and (max-width: 1200px) {
+#filter {
+     padding: 0 5px;
+}
+
+#filter p {
+     margin-left: 0;
+     margin-right: 0;
+}
+
+#filter a {
+     min-width: 6px;
+     padding: 2px 6px;
+}
+}
+
 @media screen and (min-width: 1400px) {
 body, p, td, textarea, input, button, li, a, th, h4 {
      font-size: 10pt !important;
@@ -1228,10 +1406,6 @@ code, tt, .destaddress {
      font-size: 11pt;
 }
 
-h3 {
-     font-size: 12pt !important;
-}
-
 #export {
      margin-top: -40px !important;
 }
@@ -1256,7 +1430,7 @@ input.export {
 }
 
 .headline h4 {
-     background: rgba(0, 0, 0, 0) url(/themes/susidns/images/drive.png) no-repeat scroll 10px 8px;
+     background: url(/themes/susidns/images/drive.png) no-repeat scroll 10px 8px;
 }
 }
 
diff --git a/installer/resources/themes/susidns/midnight/susidns.css b/installer/resources/themes/susidns/midnight/susidns.css
index a58b628b04..49fb1789d5 100644
--- a/installer/resources/themes/susidns/midnight/susidns.css
+++ b/installer/resources/themes/susidns/midnight/susidns.css
@@ -20,6 +20,23 @@ body.iframed {
      outline: none;
 }
 
+::selection {
+     background: #22296f !important;
+     background: rgba(34, 41, 111, 0.9) !important;
+     color: white;
+}
+
+::-moz-selection {
+     background: #22296f !important;
+     color: white;
+}
+
+#navi, .buttons, #buttons, #host_list tr:first-child, #host_list img, #host_list td:nth-child(n+2) a {
+     -moz-user-select: none;
+     -webkit-user-select: none;
+     user-select: none;
+}
+
 #logo {
      display: none;
 }
@@ -29,7 +46,7 @@ body.iframed {
 div#navi  {
      border: 1px solid #2d295f;
      padding: 3px 0 2px;
-     background: #002 url(/themes/console/midnight/images/header.png) repeat-x scroll center center !important;
+     background: #002 url(/themes/console/midnight/images/titles.png) repeat-x scroll center center !important;
      background: linear-gradient(to bottom, #191729 0%, #000 50%) !important;
      margin: -11px 0 27px;
      box-shadow: inset 0 0 0 1px #000;
@@ -248,7 +265,7 @@ p#filtered {
      white-space: nowrap;
      margin: -1px auto;
      box-shadow: inset 0 0 0 1px #000;
-     background: url(/themes/console/midnight/images/header.png) repeat-x scroll center center #000;
+     background: url(/themes/console/midnight/images/titles.png) repeat-x scroll center center #000;
      background-image: linear-gradient(to bottom, #010010 0%, #020019 50%, #060051%, #0100100%) !important;
 }
 
@@ -317,7 +334,7 @@ h3 {
      border: 1px solid #2d295f;
      padding: 7px 10px;
      border-radius: 2px;
-     background: #000 url(/themes/console/midnight/images/header.png) repeat-x scroll center center;
+     background: #000 url(/themes/console/midnight/images/titles.png) repeat-x scroll center center;
      background: linear-gradient(to bottom, #191729 0%, #000 50%);
      letter-spacing: 0.08em;
      word-spacing: 0.1em;
@@ -444,12 +461,6 @@ th {
      border-bottom: 1px solid #2d295f;
 }
 
-.book th:last-child {
-     background: #000 url(/themes/console/images/buttons/delete.png) center center no-repeat !important;
-     font-size: 0;
-     padding: 0 !important;
-}
-
 table.book td:first-child {
      font-weight: bold;
 }
@@ -479,6 +490,10 @@ td > img[width="320"], td > img[src^="/imagegen"] {
      background: #000;
 }
 
+img[src="/imagegen/id?s=256&c="], img[src="/imagegen/id?s=20&c="] {
+     opacity: 0; /* hide broken identicons but ensure hostlist remains intact */
+}
+
 ol, ul {
      margin: 0 20px 0 10px;
      display: table-row;
@@ -642,20 +657,30 @@ div#book {
 #book table {
      width: 100%;
      border: 1px solid #2d295f !important;
-/*     margin-top: -10px;*/
 }
 
 .iframed #book table {
      border: none !important;
 }
 
+.iframed #book #host_details {
+     border-top: 1px solid #2d295f !important;
+}
+
 #book table th {
      padding: 5px 0;
-     background: url(/themes/console/midnight/images/header.png) repeat-x scroll center center #000;
-     background-image: linear-gradient(to bottom, #010010 0%, #020019 50%, #060051%, #0100100%) !important;
+     background: url(/themes/console/midnight/images/titles.png) repeat-x scroll center center #000;
+     background: linear-gradient(to bottom, #191729 0%, #000 50%) !important;
      border-bottom: 1px solid #2d295f;
 }
 
+#book th:last-child {
+     background: url(/themes/console/images/buttons/delete.png) center center no-repeat, url(/themes/console/midnight/images/titles.png) repeat-x scroll center center #000 !important;
+     background: url(/themes/console/images/buttons/delete.png) center center no-repeat, linear-gradient(to bottom, #191729 0%, #000 50%) !important;
+     font-size: 0;
+     padding: 0 !important;
+}
+
 #book td {
      border-bottom: 1px solid #17142f;
      padding: 0;
@@ -1114,7 +1139,7 @@ p.book {
      user-select: all;
 }
 
-#host_list .destaddress:hover, #host_list .destaddress:focus {
+#host_list .destaddress:focus {
      overflow: auto !important;
      text-overflow: clip;
 }
@@ -1125,6 +1150,10 @@ td.destinations {
      border-right: 1px solid #2d295f;
 }
 
+tr:hover .destinations {
+     color: #aa0;
+}
+
 /* end hostname list */
 
 /* responsive layout */
@@ -1137,6 +1166,22 @@ td.destinations {
 }
 }
 
+@media screen and (max-width: 1200px) {
+#filter {
+     padding: 0 5px;
+}
+
+#filter p {
+     margin-left: 0;
+     margin-right: 0;
+}
+
+#filter a {
+     min-width: 6px;
+     padding: 0 6px;
+}
+}
+
 @media screen and (min-width: 1200px) {
 #filter a {
      font-size: 10pt;
diff --git a/installer/resources/themes/susimail/classic/susimail.css b/installer/resources/themes/susimail/classic/susimail.css
index 28b55b7f63..7b0839d063 100644
--- a/installer/resources/themes/susimail/classic/susimail.css
+++ b/installer/resources/themes/susimail/classic/susimail.css
@@ -4,7 +4,7 @@
 body {
      background: #eef url(/themes/console/classic/images/bg0.png);
      background-size: 120px 120px;
-     color: #0c153d;
+     color: #2c354f;
      font-family: "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
      font-size: 9pt;
 }
@@ -26,6 +26,7 @@ div.header {
      border-bottom: 1px solid #89f;
      background: #fff url(/themes/susimail/images/susimail.png) center center no-repeat !important;
      background-size: auto 80% !important;
+     display: none;
 }
 
 .header img {
@@ -34,10 +35,11 @@ div.header {
 }
 
 h3#config {
-     border: 1px solid #89f;
+     margin: 0 auto 10px;
      padding: 5px 10px;
      width: 300px;
-     margin: 0 auto 10px;
+     border: 1px solid #89f;
+     color: #35415f;
      background: url(/themes/console/classic/images/titlebg.png) right center no-repeat;
      background: linear-gradient(to bottom, #fff 0%, #fff 50%, #eff2ff 50%, #eff2ff 100%);
      border-radius: 0 0 2px 2px;
@@ -924,18 +926,21 @@ div#composemail {
      font-weight: bold;
 }
 
-div#dologin {
-     border: 1px solid #777;
-     padding: 20px 0 0;
+/* login panel */
+
+#dologin {
+     border: 1px solid #89f;
+     padding: 10px 0 0;
      width: 500px;
-     margin: 60px auto 40px;
+     margin: 55px auto 40px;
      box-shadow: 0 0 0 1px #fff;
-     background: #fff;
+     background: #fefefe;
+     background: linear-gradient(to bottom, rgba(240,240,255,0.4), rgba(220,220,255,0.5)) #fefefe;
+     box-shadow: inset 0 0 0 1px #fff, 0 0 1px #999;
 }
 
 .iframed #dologin {
      margin: 18px auto 15px;
-     padding-top: 10px;
 }
 
 #dologin input[type="text"] {
@@ -969,7 +974,7 @@ div#dologin {
 #dologin td {
      padding: 3px;
      font-weight: bold !important;
-     color: #333;
+     color: #2c354f;
 }
 
 #dologin td:first-child {
@@ -992,29 +997,76 @@ div#dologin {
 }
 
 #dologin h1 {
-     border-bottom: 1px solid #777;
-     padding: 10px 15px;
      margin: -10px 0 10px;
+     padding: 10px 15px;
+     background: #fff;
+     background: linear-gradient(to right, #fff 30%, #eff2ff);
+     border-bottom: 1px solid #89f;
+     color: #35415f;
      font-size: 14pt;
      text-align: left;
-     background: #fff;
      letter-spacing: 0.08em;
      word-spacing: 0.1em;
-     background: linear-gradient(to right, #fff 30%, #eff2ff);
      box-shadow: inset 0 0 0 1px #fff;
-     display: none;
 }
 
 #dologin hr {
      display: block !important;
-     background: #777;
-     box-shadow: 0 1px 0 1px #fff;
+     background: #89f;
+     box-shadow: 0 0 0 1px rgba(255,255,255,0.5);
 }
 
-.iframed #dologin h1 {
-     display: block;
+#dologin tr:nth-child(6) hr {
+     margin-bottom: 4px;
 }
 
+#dologin tr:last-child hr {
+     margin-top: 3px;
+}
+
+.iframed #dologin tr:nth-child(6) hr {
+     margin-top: 5px;
+}
+
+#dologin tr:last-child a {
+     display: inline-block;
+     margin: 6px -2px 6px;
+     padding: 3px 10px;
+     border: 1px solid rgba(255,255,255,0);
+     border: 1px solid rgba(119, 120, 159, 0.3);
+     border-radius: 25px;
+     background: #efefff;
+     background: linear-gradient(to right, #f2f2ff, #f6f6ff, #f2f2ff);
+     box-shadow: 0 0 1px rgba(255,255,255,0);
+     transition: ease all 0.1s;
+}
+
+#dologin tr:last-child a:hover {
+     border: 1px solid #77789f;
+     border: 1px solid rgba(119, 120, 159, 0.5);
+     background: #f2f2ff;
+     background: linear-gradient(to bottom, #fafaff 50%, #e8e8ff 50%) #f2f2ff;
+     box-shadow: 0 0 1px #ccf;
+     transition: ease all 0.1s;
+}
+
+#dologin tr:last-child a:active {
+     border: 1px solid rgba(119, 120, 159, 0.3);
+     background: #e2e2ff;
+     background: linear-gradient(to bottom, #eaeaff 50%, #d9d9ff 50%);
+     box-shadow: inset 3px 3px 3px #779;
+     transition: ease all 0.1s;
+     color: rgba(65, 70, 95, 0.8) !important;
+     color: #99a5df !important;
+}
+
+#dologin tr:last-child td {
+     color: transparent;
+     color: rgba(119, 120, 159, 0);
+}
+
+/* end login panel */
+
 .iframed div.footer {
      margin-top: -10px;
 }
diff --git a/installer/resources/themes/susimail/dark/susimail.css b/installer/resources/themes/susimail/dark/susimail.css
index 597cf7750b..8f71394367 100644
--- a/installer/resources/themes/susimail/dark/susimail.css
+++ b/installer/resources/themes/susimail/dark/susimail.css
@@ -3,9 +3,15 @@
 /* Thanks to Florian Kuhlmann for the hatface images. [http://www.flickr.com/photos/floriankuhlmann/] */
 /* Droid Sans font family and css3 compliant browser recommended for optimal results */
 
+html {
+     min-height: 100%;
+}
+
 body {
-     background-color: #000;
-     color:#ee9;
+     background: url(/themes/console/dark/images/camotile2.png) top left fixed #000;
+     background: linear-gradient(to bottom, rgba(0,0,0,0.5), rgba(0,0,0,0.7)), url(/themes/console/dark/images/camotile2.png) top left fixed #000;
+     background-size: 100% 100%, 175px 175px !important;
+     color: #ee9;
      font-family: "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
      font-size: 9pt;
      margin: 8px 5px;
@@ -284,22 +290,24 @@ tr.bottombuttons:last-child td {
 }
 
 a:link {
-     color: #f60;
      color: #5a5;
      text-decoration: none;
      font-weight: bold;
 }
 
-a:hover, a:visited:hover, a:focus {
+a:hover, a:visited:hover, a:focus, tr:hover td[onclick] a {
      color: #f60 !important;
      outline: none;
 }
 
 a:visited {
-     color: #960;
      color: #272;
 }
 
+a:active, a:visited:active, tr:hover td[onclick]:active a {
+     color: #f30 !important;
+}
+
 td {
      color: #ee9;
      margin: 0 5px;
@@ -694,12 +702,12 @@ input[type="submit"], input[type="reset"], select, button { /* webkit/blink fix
 
 /* login + misc mods */
 
-div.notifications {
+.notifications {
      text-align: center;
      padding: 0 0 20px;
 }
 
-div#dologin {
+#dologin {
      border: 1px solid #494;
      margin: 20px auto;
      width: 600px;
@@ -712,6 +720,10 @@ div#dologin {
 
 }
 
+.iframed #dologin {
+     margin-top: 35px;
+}
+
 #dologin h1 {
      border: 1px solid #494;
      padding: 10px 10px 10px 48px;
@@ -723,9 +735,9 @@ div#dologin {
      word-spacing: 0.1em;
      text-align:left;
      background: #002000 url(images/mail.png) 8px center no-repeat;
-     background: url(images/mail.png) 8px center no-repeat, linear-gradient(to bottom, #001000 0%, #001900 50%, #000 51%, #000 100%);
+     background: url(images/mail.png) 8px center no-repeat, linear-gradient(to bottom, #030 50%, #000 50%);
      text-shadow: 0 1px 1px #000;
-     box-shadow: inset 0 0 1px 2px #020;
+     box-shadow: inset 0 0 0 1px #000;
 }
 
 #dologin table {
@@ -762,7 +774,44 @@ div#dologin {
      opacity: 0.5;
 }
 
-div.notifications + div#dologin {
+#dologin tr:last-child hr {
+     margin-top: 3px;
+}
+
+.iframed #dologin tr:nth-child(6) hr {
+     margin-top: 5px;
+}
+
+#dologin tr:last-child a {
+     display: inline-block;
+     margin: 8px -2px 6px;
+     padding: 3px 10px;
+     border: 1px solid #010;
+     border-radius: 25px;
+     background: #020;
+     box-shadow: 0 0 1px rgba(0,0,0,0);
+}
+
+#dologin tr:last-child a:hover {
+     background: #030;
+     background: linear-gradient(to bottom, #030 50%, #000 50%) #000;
+     box-shadow: 0 0 1px #000;
+     transition: ease all 0.2s;
+}
+
+#dologin tr:last-child a:active {
+     border: 1px solid #000;
+     background: #010;
+     box-shadow: inset 3px 3px 3px #000;
+     transition: ease all 0.2s;
+     color: #050 !important;
+}
+
+#dologin tr:last-child td {
+     color: transparent;
+}
+
+div.notifications + #dologin {
      margin-top: 0;
 }
 
diff --git a/installer/resources/themes/susimail/light/susimail.css b/installer/resources/themes/susimail/light/susimail.css
index 4dceda0b5b..86b768ab44 100644
--- a/installer/resources/themes/susimail/light/susimail.css
+++ b/installer/resources/themes/susimail/light/susimail.css
@@ -3,7 +3,7 @@
 /* Author: dr|z3d */
 
 body {
-     color: #333;
+     color: #33333f;
      font-family: "Droid Sans", "NotoSans", Ubuntu, "Bitstream Vera Sans", "Segoe UI", Verdana, "Lucida Grande", Helvetica, sans-serif;
      font-size: 9pt;
      background: #a4a4cb url(/themes/console/light/images/tile2.png);
@@ -47,8 +47,33 @@ body.iframed {
      outline: none;
 }
 
+::selection {
+     background: #27377f !important;
+     color: white;
+     text-shadow: none;
+}
+
+::-moz-selection {
+     background: #27377f !important;
+     color: white;
+     text-shadow: none;
+}
+
+.footer, .bottombuttons, .topbuttons, th img, h3,
+#mailbox th:first-child, #mailbox th:nth-child(2), #mailbox th:nth-child(4), #mailbox th:nth-child(6), #mailbox th:nth-child(8),
+#mailbox td:first-child, #mailbox td:nth-child(2), #mailbox td:nth-child(4), #mailbox td:nth-child(6), #mailbox td:nth-child(8) {
+     -moz-user-select: none;
+     -webkit-user-select: none;
+     user-select: none;
+}
+
+b, h3, #pagenav td, th {
+     color: #41465f;
+     text-shadow: 0 1px 1px #fff;
+}
+
 li {
-     color: #333;
+     color: #33333f;
      line-height: 12pt;
      font-size: 8.5pt;
      margin-left: 5px;
@@ -56,7 +81,7 @@ li {
 }
 
 p {
-     color: #333;
+     color: #33333f;
      margin-left: 15px;
      margin-right: 15px;
      font-size: 8.5pt;
@@ -86,6 +111,7 @@ p.info {
 
 tr.mailbody, #message_full tr:first-child {
      box-shadow: inset 0 0 0 1px #fff;
+     background: #fafaff;
 }
 
 #mailhead tr {
@@ -126,7 +152,7 @@ div.footer {
      margin: -14px 0 10px;
      border: 1px solid #7778bf;
      background: #eef;
-     background: linear-gradient(to right, rgba(232,232,255,0.3) 35%, #fff 50%, rgba(232,232,255,0.3) 65%), repeating-linear-gradient(to bottom, #fff 1px, #ddf 2px, #fff 3px);
+     background: linear-gradient(to right, rgba(232,232,255,0.3) 35%, #fafaff 50%, rgba(232,232,255,0.3) 65%), repeating-linear-gradient(to bottom, #fff 1px, #ddf 2px, #fff 3px);
      box-shadow: inset 0 0 0 1px #fff;
 }
 
@@ -176,16 +202,16 @@ a:hover, a:focus, tr:hover td[onclick] a {
      color: #f60 !important;
 }
 
-a:active {
-     color: #f30;
-}
-
 a:visited {
      color: #6b97bf;
 }
 
+a:active, tr:hover td[onclick]:active a {
+     color: #f30 !important;
+}
+
 td {
-     color: #333;
+     color: #33333f;
      font-size:9pt;
      padding: 1px 3px;
 }
@@ -234,8 +260,8 @@ pre {
 }
 
 .page {
-     background-color: #fff;
-     color: #333;
+     background-color: #fcfcff;
+     color: #33333f;
      margin: 0;
      padding: 10px 10px 0;
      border-radius: 2px 2px 0 0;
@@ -251,7 +277,6 @@ pre {
      margin: 0;
      padding: 1px;
      border: none;
-     box-shadow: none;
      border-radius: 0;
 }
 
@@ -288,9 +313,8 @@ table#mailbox {
 }
 
 #mailbox th {
-     background: #fff;
-     background: linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), #efefff;
-     color: #555;
+     background: #fafaff;
+     background: linear-gradient(to bottom, #fafaff 50%, #f2f2ff 50%);
      border-bottom: 1px solid #7778bf;
      white-space: nowrap;
      padding: 6px 5px !important;
@@ -298,24 +322,28 @@ table#mailbox {
 
 #mailbox th:first-child {
      background: #fff url(/themes/console/images/buttons/delete.png) center center no-repeat;
-     background: url(/themes/console/images/buttons/delete.png) center center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), #efefff;
+     background: url(/themes/console/images/buttons/delete.png) center center no-repeat, linear-gradient(to bottom, #fafaff 50%, #f2f2ff 50%);
 }
 
 #mailbox th:nth-child(2) {
      background: #fff url(/themes/susimail/images/status.png) center center no-repeat;
-     background: url(/themes/susimail/images/status.png) center center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), #efefff;
+     background: url(/themes/susimail/images/status.png) center center no-repeat, linear-gradient(to bottom, #fafaff 50%, #f2f2ff 50%);
      background-blend-mode: luminosity, normal;
 }
 
 #mailbox th:nth-child(4) {
      background: #fff url(/susimail/icons/attach.png) center center no-repeat;
-     background: url(/susimail/icons/attach.png) center center no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), #efefff;
+     background: url(/susimail/icons/attach.png) center center no-repeat, linear-gradient(to bottom, #fafaff 50%, #f2f2ff 50%);
 }
 
 #mailbox th:nth-child(5) {
      text-align: left;
 }
 
+#mailbox td {
+     color: #41465f !important;
+}
+
 #mailbox td:nth-child(5) {
      white-space: normal;
      word-break: break-all;
@@ -353,7 +381,7 @@ table#mailbox {
 
 #mailbox td:nth-child(3) a, #mailbox td:nth-child(3) a:hover {
      font-weight: normal;
-     color: #333 !important;
+     color: #41465f !important;
 }
 
 #mailbox td[onclick]:last-child {
@@ -375,6 +403,10 @@ table#mailbox {
      display: none;
 }
 
+#mailbox tr:hover td, #mailbox tr:hover td:nth-child(3) a {
+     color: #33333f !important;
+}
+
 form {
      line-height: 160%
 }
@@ -382,8 +414,8 @@ form {
 .header + form {
      border: 1px solid #7778bf;
      border-radius: 2px 2px 0 0;
-     background: #fff;
-     background: rgba(220,220,255,0.05);
+     background: #f4f4ff;
+     background: linear-gradient(to bottom, #f8f8ff, #f2f2ff);
      box-shadow: 0 0 0 1px #fff;
 }
 
@@ -436,6 +468,7 @@ form {
      width: 45px;
      white-space: nowrap;
      font-weight: bold;
+     color: #41465f;
 }
 
 button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner  {
@@ -457,10 +490,11 @@ input[type="radio"], input[type="checkbox"] {
      outline: none;
      min-width: 16px;
      min-height: 16px;
+     filter: sepia(100%) hue-rotate(185deg) drop-shadow(0 0 1px #ccf);
 }
 
 input[type="checkbox"]:hover, input[type="checkbox"]:focus, input[type="radio"]:hover, input[type="radio"]:focus {
-     filter: drop-shadow(0 0 3px #89f);
+     filter: sepia(100%) hue-rotate(185deg) drop-shadow(0 0 3px #89f);
 }
 
 input[type="text"], input[type="password"] {
@@ -470,11 +504,11 @@ input[type="text"], input[type="password"] {
 }
 
 input[type="submit"], input[type="reset"] {
-     border: 1px solid #999;
+     border: 1px solid #999daf;
      box-shadow: inset 0 0 0 1px #fff;
      background: #eee;
      background: linear-gradient(to bottom, #fff 0%, #ddd 100%);
-     color: #333;
+     color: #33333f;
      margin: 3px;
      font: 9pt "Droid Sans", "NotoSans", Ubuntu, "Bitstream Vera Sans", "Segoe UI", Verdana, "Lucida Grande", Helvetica, sans-serif;
      padding: 4px 5px;
@@ -483,7 +517,7 @@ input[type="submit"], input[type="reset"] {
      border-radius: 2px;
      opacity: 1;
      background-size: 14px auto, 100% 100% !important;
-     filter: saturate(70%) drop-shadow(0 0 1px rgba(204, 204, 204, 0.6));
+     filter: saturate(70%) drop-shadow(0 0 1px rgba(180, 180, 255, 0.6));
      cursor: pointer;
 }
 
@@ -504,7 +538,7 @@ input[type="submit"]:active, input[type="reset"]:active {
 input[disabled], input[disabled]:hover, input[disabled]:focus {
      opacity: 0.4;
      cursor: default;
-     border: 1px solid #999;
+     border: 1px solid #999daf;
 }
 
 input.cancel {
@@ -755,6 +789,10 @@ input.setpagesize, input.save {
      padding: 5px 7px 5px 24px;
 }
 
+input.setpagesize {
+     padding-right: 9px !important;
+}
+
 input.send {
      background: #eee url(/themes/susimail/images/send.png) no-repeat 6px center;
      background: url(/themes/susimail/images/send.png) no-repeat 6px center, linear-gradient(to bottom, #fff 0%, #ddd 100%);
@@ -809,7 +847,7 @@ a.sort {
 }
 
 img.sort {
-     border: 1px solid #999;
+     border: 1px solid #999daf;
      border-radius: 2px;
      background: linear-gradient(to bottom, #fff 0%, #ddd 100%);
      margin: 0;
@@ -835,20 +873,26 @@ input[type="file"] {
 
 input[type="text"], input[type="password"], textarea {
      padding: 5px !important;
-     box-shadow: inset 2px 2px 1px rgba(204, 204, 204, 0.6);
-     border: 1px solid #999;
+     background: #fafaff;
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
+     border: 1px solid #999daf;
      border-radius: 2px;
-     color: #333;
+     color: #33333f;
+     filter: drop-shadow(0px 0 1px #ccf);
 }
 
 input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
-     color: #111;
+     color: #19191f;
      box-shadow: 0 0 1px #89f;
+     background: #fff;
+     border: 1px solid #676c7f;
 }
 
 input[type="text"][disabled] {
      opacity: 1;
      background: #e9e9e9;
+     color: #4d4d5f;
+     filter: none;
 }
 
 textarea {
@@ -856,6 +900,17 @@ textarea {
      font-size: 9pt;
 }
 
+hr {
+     color: #999daf;
+     background: #999daf;
+     height: 1px;
+     border: none;
+     width: 100%;
+     margin: 5px;
+     text-align: center;
+     opacity: 0.5;
+}
+
 #composemail {
      text-align: center !important;
      padding: 10px;
@@ -908,17 +963,20 @@ div#mailheader {
 
 #newmail td:first-child {
      font-weight: bold;
+     color: #41465f;
 }
 
-div#dologin {
-     border: 1px solid #555;
-     padding: 10px 10px 0;
-     border-radius: 2px;
-     width: 600px;
+/* login panel */
+
+#dologin {
      margin: 40px auto 40px;
-     box-shadow: inset 0 0 2px 2px rgba(225, 225, 255, 0.5), 0 0 1px rgba(204, 204, 204, 0.6);
-     background: #fff;
-     background: linear-gradient(to bottom, #fff, rgba(232,232,255,0.5)), linear-gradient(to bottom, rgba(255,255,255,0.7) 5%, rgba(220,220,255,0.9)), linear-gradient(to right, #fff, #efefff, #fff);
+     padding: 10px 10px 0;
+     width: 600px;
+     border: 1px solid #77789f;
+     border-radius: 2px;
+     box-shadow: inset 0 0 2px 2px rgba(225, 225, 255, 0.5), 0 0 2px rgba(100, 100, 200, 0.6);
+     background: #fafaff;
+     background: linear-gradient(to bottom, #fafaff, rgba(232,232,255,0.5)), linear-gradient(to bottom, rgba(255,255,255,0.7) 5%, rgba(220,220,255,0.9)), linear-gradient(to right, #fff, #efefff, #fff);
      background-size: 100% 100%, auto 2px, 100%, 100%;
 }
 
@@ -926,10 +984,14 @@ div#dologin {
      margin: 30px auto 30px;
 }
 
+.iframed #dologin table {
+     margin-top: 30px;
+}
+
 #dologin td {
      padding: 3px;
      font-weight: bold;
-     color: #444;
+     color: #41465f;
 }
 
 #dologin td:first-child {
@@ -941,14 +1003,17 @@ div#dologin {
 }
 
 #dologin h1 {
-     border-bottom: 1px solid #999;
+     background: #fafaff;
+     background: linear-gradient(to bottom, #fafaff 50%, #f2f2ff 50%);
+     border-bottom: 1px solid #77789f;
+     color: #4c526f;
      text-transform: uppercase;
-     letter-spacing: 0.08em;
+     letter-spacing: 0.1em;
      word-spacing: 0.1em;
      font-size: 14pt;
      text-align: left;
-     padding: 0 10px 12px 15px;
-     margin: 5px -9px;
+     padding: 12px 10px 12px 15px;
+     margin: -9px -9px 5px;
 }
 
 .iframed #dologin h1 {
@@ -959,30 +1024,82 @@ div#dologin {
      text-align: left !important;
 }
 
-#dologin input[name="user"] {
-     background: #fff url(/themes/console/images/buttons/user.png) 5px 6px no-repeat;
+#dologin input[name="user"], #dologin input[name="pass"] {
      padding: 5px 5px 5px 26px !important;
+     background-blend-mode: luminosity;
+}
+
+#dologin input[name="user"] {
+     background: #fafaff url(/themes/console/images/buttons/user.png) 5px 6px no-repeat !important;
 }
 
 #dologin input[name="pass"] {
-     background: #fff url(/themes/console/images/buttons/password.png) 5px 5px no-repeat;
-     padding: 5px 5px 5px 26px !important;
+     background: #fafaff url(/themes/console/images/buttons/password.png) 5px 5px no-repeat !important;
+}
+
+#dologin input[name="user"]:focus, #dologin input[name="pass"]:focus {
+     background-color: #fff !important;
+     background-blend-mode: normal;
 }
 
 #dologin input[name="user"], #dologin input[name="pass"], #dologin input[name="host"] {
      width: 240px;
+     margin-right: 5px;
 }
 
-hr {
-     color: #999;
-     background: #999;
-     height: 1px;
-     border: 0 solid #999;
-     width: 100%;
-     margin: 5px 0;
-     text-align: center;
+#dologin hr {
+     margin: 0 0 4px;
+     background: #77789f;
+     background: linear-gradient(to right, rgba(119, 120, 159, 0), #1d1f4f, rgba(119, 120, 159, 0));
 }
 
+#dologin tr:last-child hr {
+     margin-top: 3px;
+}
+
+.iframed #dologin tr:nth-child(6) hr {
+     margin-top: 5px;
+}
+
+#dologin tr:last-child a {
+     display: inline-block;
+     margin: 8px -2px 6px;
+     padding: 3px 10px;
+     border: 1px solid rgba(255,255,255,0);
+     border: 1px solid rgba(119, 120, 159, 0.3);
+     border-radius: 25px;
+     background: #efefff;
+     background: linear-gradient(to right, rgba(252,252,255,0.3), #f6f6ff, rgba(252,252,255,0.3));
+     box-shadow: 0 0 1px rgba(255,255,255,0);
+     transition: ease all 0.1s;
+}
+
+#dologin tr:last-child a:hover {
+     border: 1px solid #77789f;
+     border: 1px solid rgba(119, 120, 159, 0.5);
+     background: #f2f2ff;
+     background: linear-gradient(to bottom, #fafaff 50%, #e8e8ff 50%) #f2f2ff;
+     box-shadow: 0 0 1px #ccf;
+     transition: ease all 0.1s;
+}
+
+#dologin tr:last-child a:active {
+     border: 1px solid rgba(119, 120, 159, 0.3);
+     background: #e2e2ff;
+     background: linear-gradient(to bottom, #eaeaff 50%, #d9d9ff 50%);
+     box-shadow: inset 3px 3px 3px #779;
+     transition: ease all 0.1s;
+     color: rgba(65, 70, 95, 0.8) !important;
+     color: #99a5df !important;
+}
+
+#dologin tr:last-child td {
+     color: transparent;
+     color: rgba(119, 120, 159, 0);
+}
+
+/* end login panel */
+
 textarea[name="config_text"] {
      margin-bottom: 15px;
      resize: none;
@@ -996,7 +1113,6 @@ div#pagenav {
      border-radius: 0 0 2px 2px;
 }
 
-
 h3#config {
      text-align: center;
      border: 1px solid #7778bf;
@@ -1011,7 +1127,8 @@ h3#config {
      background: #efefff;
      box-shadow: inset 0 0 0 1px #fff;
      text-shadow: 0 1px 1px #fff;
-     background: linear-gradient(to right, #efefff, #fff, #efefff);
+     background: #fafaff;
+     background: linear-gradient(to right, rgba(240,240,255,0.1), rgba(252,252,252,0.5), rgba(240,240,255,0.1)), linear-gradient(to bottom, #fafaff 50%, #f2f2ff 50%);
 }
 
 .topbuttons {
@@ -1168,7 +1285,7 @@ _:-ms-lang(x), tr.bottombuttons, .topbuttons {
 }
 
 tr.bottombuttons:last-child {
-     background: linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
+     background: linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
 }
 
 tr.bottombuttons table#pagenav {
@@ -1196,19 +1313,27 @@ tr.bottombuttons:empty {
      z-index: 10;
      opacity: 0.85;
      border-top: 1px solid #fff;
-     background: #113;
+     background: url(/themes/snark/light/images/delete.png) right 24px top 4px no-repeat #113;
+     background-blend-mode: luminosity;
 }
 
 .iframed .notifications {
+     background: url(/themes/snark/light/images/delete.png) right 6px top 5px no-repeat #113;
      margin-bottom: 9px;
      border-radius: 4px 4px 0 0;
      border: none;
      margin: 0 20% 9px;
 }
 
-.notifications p.info {
+.notifications:hover {
+     background-image: url(/themes/snark/light/images/delete_hover.png);
+     background-blend-mode: normal;
+}
+
+.notifications p.info, .notifications p.info b {
      font-size: 10pt !important;
      color: #fff;
+     text-shadow: none !important;
 }
 
 .notifications p {
@@ -1260,9 +1385,92 @@ td p.error {
 }
 
 #prefsave {
-     margin-bottom: 25px !important;
+     margin-top: 4px;
+     padding-top: 10px;
+     padding-bottom: 10px;
+     border-top: 1px solid #7778bf;
+     background: #f6f6ff;
+     box-shadow: inset 0 0 0 1px #fff;
 }
 
+.iframed #prefsave {
+     padding-bottom: 9px;
+}
+
+/* custom radios/checkboxes for chrome/blink  */
+
+@media screen and (-webkit-min-device-pixel-ratio: 0) and (min-resolution:.001dpcm) {
+input[type="checkbox"], input[type="checkbox"]:checked, input[type="checkbox"][disabled], input[type="checkbox"][disabled]:checked {
+     background: #f8f8ff;
+     width: 19px !important;
+     height: 19px !important;
+     box-shadow: inset 1px 1px 1px rgba(204, 204, 204, 0.6);
+     border-radius: 2px;
+     -webkit-appearance: inherit;
+     border: 1px solid #999daf !important;
+     position: relative;
+     box-sizing: border-box;
+     filter: drop-shadow(0 0 1px #ccf);
+     vertical-align: middle !important;
+}
+
+input[type="checkbox"]:checked::before {
+     position: absolute;
+     top: 1px;
+     left: 1px;
+     content: "\2714";
+     border-radius: 1px;
+     font-size: 15pt;
+     color: #41465f;
+     line-height: 80%;
+     font-family: sans-serif;
+     overflow: hidden;
+     width: 16px;
+     height: 16px;
+}
+
+input[type="radio"], input[type="radio"]:checked, input[type="radio"][disabled], input[type="radio"][disabled]:checked {
+     background: #f8f8ff;
+     width: 19px !important;
+     height: 19px !important;
+     box-shadow: inset 0 0 2px #7778bf;
+     border-radius: 50%;
+     -webkit-appearance: none;
+     border: 1px solid #999daf !important;
+     position: relative;
+     box-sizing: border-box;
+     filter: drop-shadow(0 0 1px #ccf);
+     vertical-align: middle !important;
+}
+
+input[type="radio"]:checked::before {
+     content: "";
+     position: absolute;
+     border-radius: 50%;
+     left: 25%;
+     top: 25%;
+     width: 9px;
+     height: 9px;
+     background: #41465f;
+}
+
+input[type="checkbox"]:hover, input[type="radio"]:hover, input[type="checkbox"]:focus, input[type="radio"]:focus {
+     background: #fff;
+     width: 19px !important;
+     height: 19px !important;
+     filter: drop-shadow(0 0 3px #89f) !important;
+}
+
+input[type="checkbox"][disabled], input[type="radio"][disabled], input[type="checkbox"][disabled]:hover, input[type="radio"][disabled]:hover,
+input[type="checkbox"][disabled]:checked, input[type="radio"][disabled]:checked, input[type="checkbox"][disabled]:checked:hover, input[type="radio"][disabled]:checked:hover {
+     filter: none !important;
+     box-shadow: none !important;
+     opacity: 0.5;
+}
+}
+
+/* end custom radios/checkboxes */
+
 /* responsive layout */
 
 @media screen and (min-width: 1024px) {
diff --git a/installer/resources/themes/susimail/midnight/susimail.css b/installer/resources/themes/susimail/midnight/susimail.css
index e56c2a32fb..6e97c3399a 100644
--- a/installer/resources/themes/susimail/midnight/susimail.css
+++ b/installer/resources/themes/susimail/midnight/susimail.css
@@ -759,6 +759,44 @@ div#dologin {
      opacity: 0.5;
 }
 
+#dologin tr:last-child hr {
+     margin-top: 6px;
+     margin-bottom: 5px;
+}
+
+.iframed #dologin tr:nth-child(6) hr {
+     margin-top: 5px;
+}
+
+#dologin tr:last-child a {
+     display: inline-block;
+     margin: 8px -2px 6px;
+     padding: 3px 10px;
+     border: 1px solid #003;
+     border-radius: 25px;
+     background: #002;
+     box-shadow: 0 0 1px rgba(0,0,0,0);
+}
+
+#dologin tr:last-child a:hover {
+     background: #030;
+     background: linear-gradient(to bottom, #003 50%, #000 50%) #000;
+     box-shadow: 0 0 1px #000;
+     transition: ease all 0.2s;
+}
+
+#dologin tr:last-child a:active {
+     border: 1px solid #000;
+     background: #001;
+     box-shadow: inset 3px 3px 3px #000;
+     transition: ease all 0.2s;
+     color: #337 !important;
+}
+
+#dologin tr:last-child td {
+     color: transparent;
+}
+
 div.notifications + div#dologin {
      margin-top: 0;
 }
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index d0360b497a..f568df6c65 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -523,6 +523,8 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
             buf.append(countryName);
             buf.append("\" src=\"/flags.jsp?c=").append(c).append("\"> ");
         }
+        else
+            buf.append("<img class=\"unknownflag\" height=\"11\" width=\"16\" alt=\"??\" src=\"/flags.jsp?c=a0\" title=\"").append(_t("unknown")).append("\"> ");
         buf.append("<tt>");
         boolean found = _context.netDb().lookupRouterInfoLocally(peer) != null;
         if (found)