diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 5951ce1e2d..0d0425b5f1 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -84,8 +84,6 @@ public class IndexBean {
     /** From CSSHelper */
     private static final String PROP_DISABLE_OLD = "routerconsole.disableOldThemes";
     private static final boolean DEFAULT_DISABLE_OLD = true;
-    public static final String PROP_CSS_DISABLED = "routerconsole.css.disabled";
-    public static final String PROP_JS_DISABLED = "routerconsole.javascript.disabled";
     private static final String PROP_PW_ENABLE = "routerconsole.auth.enable";
     
     public IndexBean() {
@@ -349,17 +347,9 @@ public class IndexBean {
             if (_context.getProperty(PROP_DISABLE_OLD, DEFAULT_DISABLE_OLD))
                 theme = "light";
         }
-        return "/themes/console/" + theme + "/";
+        return "/themes/i2ptunnel/" + theme + "/";
     }
 
-    public boolean allowCSS() {
-        return !_context.getBooleanProperty(PROP_CSS_DISABLED);
-    }
-    
-    public boolean allowJS() {
-        return !_context.getBooleanProperty(PROP_JS_DISABLED);
-    }
-    
     public int getTunnelCount() {
         if (_group == null) return 0;
         return _group.getControllers().size();
diff --git a/apps/i2ptunnel/jsp/edit.jsp b/apps/i2ptunnel/jsp/edit.jsp
index 83a2ba439b..a80d608c45 100644
--- a/apps/i2ptunnel/jsp/edit.jsp
+++ b/apps/i2ptunnel/jsp/edit.jsp
@@ -37,12 +37,8 @@ if (tun != null) {
     <title><%=intl._t("Hidden Services Manager")%> - <%=(__isClient ? intl._t("Edit Client Tunnel") : intl._t("Edit Hidden Service"))%></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
-
-    <% if (editBean.allowCSS()) {
-  %><link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
+    <link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
     <link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" /> 
-    <% }
-  %>
 <style type='text/css'>
 input.default { width: 1px; height: 1px; visibility: hidden; }
 </style>
diff --git a/apps/i2ptunnel/jsp/editClient.jsi b/apps/i2ptunnel/jsp/editClient.jsi
index 2727973380..c330de194c 100644
--- a/apps/i2ptunnel/jsp/editClient.jsi
+++ b/apps/i2ptunnel/jsp/editClient.jsi
@@ -63,8 +63,8 @@
             </td>
         </tr><tr>
 <%
-            String aStopFirst = intl._t("Tunnel and all other shared client tunnels must be stopped to change this configuration");
-            String bStopFirst = intl._t("Tunnel must be stopped to change this configuration");
+            String aStopFirst = intl._t("The client tunnel and all other shared client tunnels must be stopped to change this setting");
+            String bStopFirst = intl._t("The client tunnel must be stopped to change this setting");
             String stopFirst = editBean.isSharedClient(curTunnel) ? aStopFirst : bStopFirst;
             boolean canChangePort = editBean.canChangePort(curTunnel);
             String tastopFirst = " title=\"" + aStopFirst + "\" ";
@@ -688,7 +688,7 @@
             <td class="buttons" colspan="2">
                     <input type="hidden" value="true" name="removeConfirm" />
                     <button id="controlCancel" class="control" type="submit" name="action" value=""><%=intl._t("Cancel")%></button>
-                    <button id="controlDelete" <%=(editBean.allowJS() ? "onclick=\"if (!confirm('Are you sure you want to delete?')) { return false; }\" " : "")%>class="control" type="submit" name="action" value="Delete this proxy" title="<%=intl._t("Delete this Proxy (cannot be undone)")%>"><%=intl._t("Delete")%></button>
+                    <button id="controlDelete" onclick="if (!confirm('Are you sure you want to delete?')) { return false; }" class="control" type="submit" name="action" value="Delete this proxy" title="<%=intl._t("Delete this Proxy (cannot be undone)")%>"><%=intl._t("Delete")%></button>
                     <button id="controlSave" class="control" type="submit" name="action" value="Save changes"><%=intl._t("Save")%></button>
             </td>
         </tr>
diff --git a/apps/i2ptunnel/jsp/editServer.jsi b/apps/i2ptunnel/jsp/editServer.jsi
index 431ad426be..190b506f86 100644
--- a/apps/i2ptunnel/jsp/editServer.jsi
+++ b/apps/i2ptunnel/jsp/editServer.jsi
@@ -62,7 +62,7 @@
             </td>
         </tr><tr>
 <%
-            String stopFirst = intl._t("Tunnel must be stopped to change this configuration");
+            String stopFirst = intl._t("The hidden service must be stopped to change this setting");
             String tstopFirst = " title=\"" + stopFirst + "\" ";
             boolean canChangeDest = editBean.canChangePort(curTunnel);
             boolean isStreamrServer = "streamrserver".equals(tunnelType);
@@ -1015,7 +1015,7 @@
             <td class="buttons" colspan="2">
                     <input type="hidden" value="true" name="removeConfirm" />
                     <button id="controlCancel" class="control" type="submit" name="action" value=""><%=intl._t("Cancel")%></button>
-                    <button id="controlDelete" <%=(editBean.allowJS() ? "onclick=\"if (!confirm('Are you sure you want to delete?')) { return false; }\" " : "")%>class="control" type="submit" name="action" value="Delete this proxy" title="<%=intl._t("Delete this Proxy (cannot be undone)")%>"><%=intl._t("Delete")%></button>
+                    <button id="controlDelete" onclick="if (!confirm('Are you sure you want to delete?')) { return false; }" class="control" type="submit" name="action" value="Delete this proxy" title="<%=intl._t("Delete this Proxy (cannot be undone)")%>"><%=intl._t("Delete")%></button>
                     <button id="controlSave" class="control" type="submit" name="action" value="Save changes"><%=intl._t("Save")%></button>
             </td>
         </tr>
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index c00741d6aa..f21c6a53bf 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -10,15 +10,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <title><%=intl._t("Hidden Services Manager")%></title>
-
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
-
-    <% if (indexBean.allowCSS()) {
-  %><link rel="icon" href="<%=indexBean.getTheme()%>images/favicon.ico" />
+    <link rel="icon" href="<%=indexBean.getTheme()%>images/favicon.ico" />
     <link href="<%=indexBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" /> 
-    <% }
-  %>
 </head><body id="tunnelListPage">
 <div class="panel" id="overview"><h2><%=intl._t("Hidden Services Manager")%></h2><p>
 <%=intl._t("These are the local services provided by your router.")%>
diff --git a/apps/i2ptunnel/jsp/register.jsp b/apps/i2ptunnel/jsp/register.jsp
index 57fa92512d..60e1f30587 100644
--- a/apps/i2ptunnel/jsp/register.jsp
+++ b/apps/i2ptunnel/jsp/register.jsp
@@ -27,12 +27,8 @@
     <title><%=intl._t("Hidden Services Manager")%> - <%=intl._t("Registration Helper")%></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
-
-    <% if (editBean.allowCSS()) {
-  %><link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
+    <link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
     <link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" /> 
-    <% }
-  %>
 <style type='text/css'>
 input.default { width: 1px; height: 1px; visibility: hidden; }
 </style>
diff --git a/apps/i2ptunnel/jsp/ssl.jsp b/apps/i2ptunnel/jsp/ssl.jsp
index f285eaab8a..8b1e1fc60e 100644
--- a/apps/i2ptunnel/jsp/ssl.jsp
+++ b/apps/i2ptunnel/jsp/ssl.jsp
@@ -26,11 +26,8 @@
     <title><%=intl._t("Hidden Services Manager")%> - <%=intl._t("SSL Helper")%></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
-    <% if (editBean.allowCSS()) {
-  %><link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
+    <link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
     <link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" /> 
-    <% }
-  %>
 <style type='text/css'>
 input.default { width: 1px; height: 1px; visibility: hidden; }
 </style>
diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp
index d919698b38..96d2c8504d 100644
--- a/apps/i2ptunnel/jsp/wizard.jsp
+++ b/apps/i2ptunnel/jsp/wizard.jsp
@@ -44,15 +44,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <title><%=intl._t("I2P Tunnel Manager - Tunnel Creation Wizard")%></title>
-
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
-
-    <% if (editBean.allowCSS()) {
-  %><link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
+    <link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
     <link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
-    <% }
-  %>
 </head>
 <body id="tunnelWizardPage">
 
diff --git a/installer/resources/themes/console/dark/i2ptunnel.css b/installer/resources/themes/i2ptunnel/dark/i2ptunnel.css
similarity index 95%
rename from installer/resources/themes/console/dark/i2ptunnel.css
rename to installer/resources/themes/i2ptunnel/dark/i2ptunnel.css
index 39d0f8afa3..64ee6f0013 100644
--- a/installer/resources/themes/console/dark/i2ptunnel.css
+++ b/installer/resources/themes/i2ptunnel/dark/i2ptunnel.css
@@ -6,7 +6,6 @@ body {
      padding: 0;
      text-align: center;
      font-family: "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
-     /*background: #010 url(images/camotile.png) center bottom;*/
      background: #1F1A24;
      color: #e6e6e7;
      font-size: 9pt;
@@ -92,21 +91,21 @@ div.statusNotRunning {
      height: 16px;
      overflow: hidden;
      color: #d00;
-     background: url(images/console_status_stopped.png) center center no-repeat;
+     background: url(/themes/console/dark/images/console_status_stopped.png) center center no-repeat;
 }
 
 div.statusRunning {
      height: 16px;
      overflow: hidden;
      color: #0b0;
-     background: url(images/console_status_running.png) center center no-repeat;
+     background: url(/themes/console/dark/images/console_status_running.png) center center no-repeat;
 }
 
 div.statusStarting {
      height: 16px;
      overflow: hidden;
      color: #393;
-     background: url(images/console_status_starting.png) center center no-repeat;
+     background: url(/themes/console/dark/images/console_status_starting.png) center center no-repeat;
 }
 
 div[class^="status"] {
@@ -191,8 +190,6 @@ h2, h3 {
      word-spacing: 0.1em;
      text-shadow: 0 1px 1px #000;
      box-shadow: inset 0 0 0 1px #000;
-     /*background: linear-gradient(to bottom, #1a261a 50%, #000 50%) !important;
-     background: linear-gradient(to bottom, rgba(0,0,0,0) 50%, #000 50%), repeating-linear-gradient(to right, rgba(0,0,0,0.5) 1px, rgba(0,0,0,0.5) 2px, rgba(0,16,0,0.5) 2px, rgba(0,16,0,0.5) 4px), linear-gradient(to bottom, #004000, #000 75%), url(/themes/console/dark/images/camotile2.png) top left !important;*/
 }
 
 /* title images */
@@ -302,7 +299,7 @@ td > b {
 }
 
 td.infohelp {
-     background: url(images/infohelp.png) 10px center no-repeat;
+     background: url(/themes/console/dark/images/infohelp.png) 10px center no-repeat;
      background-size: 20px 20px;
      padding: 10px 10px 10px 38px !important;
 }
@@ -320,14 +317,14 @@ td.infohelp {
 }
 
 html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbody tr th{
-    background: url(images/dropdown.png) #433e47;
+    background: url(/themes/console/dark/images/dropdown.png) #433e47;
     background-repeat: no-repeat !important;
     background-position: 1%, 15% !important;
     padding-left: 30px;
 }
 
 html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbody tr th:hover {
-    background: url(images/dropdown_hover.png) #433e47;
+    background: url(/themes/console/dark/images/dropdown_hover.png) #433e47;
     background-repeat: no-repeat !important;
     background-position: 1%, 15% !important;
     padding-left: 30px;
@@ -336,7 +333,7 @@ html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbod
 table.tunnelConfig th,
 html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbody tr th[colspan='2'],
 html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbody tr th[colspan='2'] {
-    background: url(images/dropdown.png) #433e47;
+    background: url(/themes/console/dark/images/dropdown.png) #433e47;
     background-repeat: no-repeat !important;
     background-position: .5%, 15% !important;
     padding-left: 30px;
@@ -345,19 +342,19 @@ html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbod
 table.tunnelConfig th:hover,
 html body#tunnelEditPage form div.panel table#clientTunnelEdit.tunnelConfig tbody tr th[colspan='2']:hover,
 html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbody tr th[colspan='2']:hover {
-    background: url(images/dropdown_hover.png) #433e47;
+    background: url(/themes/console/dark/images/dropdown_hover.png) #433e47;
     background-repeat: no-repeat !important;
     background-position: .5%, 15% !important;
     padding-left: 30px;
 }
 
 .tunnelConfigExpanded {
-    background: url(images/dropdown_active.png) #433e47 !important;
+    background: url(/themes/console/dark/images/dropdown_active.png) #433e47 !important;
     padding-left: 30px;
 }
 
 .tunnelConfigContracted {
-    background: url(images/dropdown.png) #433e47 !important;
+    background: url(/themes/console/dark/images/dropdown.png) #433e47 !important;
     padding-left: 30px;
 }
 
@@ -704,7 +701,7 @@ select {
      -moz-appearance: none;
      -webkit-appearance: none;
      appearance: none;
-     background: #332940 url(images/dropdown.png) right center no-repeat !important;
+     background: #332940 url(/themes/console/dark/images/dropdown.png) right center no-repeat !important;
      border-radius: 2px;
      cursor: pointer;
      filter: drop-shadow(0 0 1px #000);
@@ -733,7 +730,7 @@ select:hover {
 }
 
 select:hover, select:focus, select:active {
-     background: #332940 url(images/dropdown_hover.png) right center no-repeat !important;
+     background: #332940 url(/themes/console/dark/images/dropdown_hover.png) right center no-repeat !important;
 }
 
 select::-ms-expand {
@@ -915,11 +912,6 @@ td.blankColumn {
      width: 80px;
 }
 
-table {
-     /*background: #000 url(images/camotile2.png);
-     background: linear-gradient(to bottom, rgba(0,0,0,0.5),rgba(0,0,0,0.7)), url(images/camotile2.png);*/
-}
-
 #tunnelMessages {
      padding: 0;
 }
diff --git a/installer/resources/themes/console/light/i2ptunnel.css b/installer/resources/themes/i2ptunnel/light/i2ptunnel.css
similarity index 96%
rename from installer/resources/themes/console/light/i2ptunnel.css
rename to installer/resources/themes/i2ptunnel/light/i2ptunnel.css
index 2df0e7824e..80a3fc4ccd 100644
--- a/installer/resources/themes/console/light/i2ptunnel.css
+++ b/installer/resources/themes/i2ptunnel/light/i2ptunnel.css
@@ -125,17 +125,17 @@ br {
 
 .statusNotRunning {
      color: #d00;
-     background: url(images/console_status_stopped.png) 0 0 no-repeat;
+     background: url(/themes/console/light/images/console_status_stopped.png) 0 0 no-repeat;
 }
 
 .statusRunning {
      color: #0b0;
-     background: url(images/console_status_running.png) 0 0 no-repeat;
+     background: url(/themes/console/light/images/console_status_running.png) 0 0 no-repeat;
 }
 
 .statusStarting {
      color: #ff3;
-     background: url(images/console_status_starting.png) 0 0 no-repeat;
+     background: url(/themes/console/light/images/console_status_starting.png) 0 0 no-repeat;
 }
 
 .statusNotRunning, .statusRunning, .statusStarting {
@@ -285,7 +285,7 @@ select {
      padding: 4px 16px 4px 4px !important;
      min-width: 140px;
      background: #fff;
-     background: url(images/dropdown.png) right center no-repeat, linear-gradient(to bottom, #fff, #efefff);
+     background: url(/themes/console/light/images/dropdown.png) right center no-repeat, linear-gradient(to bottom, #fff, #efefff);
      background-blend-mode: hard-light, normal;
      color: #33333f;
      font-family: "Droid Sans", "Noto Sans", "Ubuntu", "Segoe UI", Verdana, Helvetica, sans-serif;
@@ -306,7 +306,7 @@ select:hover {
 }
 
 select:hover, select:active, select:focus {
-     background: url(images/dropdown_hover.png) right center no-repeat, linear-gradient(to bottom, #eee, #fff) !important;
+     background: url(/themes/console/light/images/dropdown_hover.png) right center no-repeat, linear-gradient(to bottom, #eee, #fff) !important;
 }
 
 select:focus {
@@ -422,7 +422,7 @@ th.tableTop {
 }
 
 th {
-     /*background: #eef url(images/header.png) center center repeat-x;*/
+     /*background: #eef url(/themes/console/light/images/header.png) center center repeat-x;*/
      background: linear-gradient(to bottom, #fff 50%, rgba(238, 238, 255, 0.2) 50%, #eef 100%);
      padding: 6px 5px;
      text-align: left;
@@ -492,14 +492,14 @@ td.infohelp {
 }
 
 html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbody tr th{
-    background: url(images/dropdown.png) #f8f8ff;
+    background: url(/themes/console/light/images/dropdown.png) #f8f8ff;
     background-repeat: no-repeat !important;
     background-position: 1%, 15% !important;
     padding-left: 30px;
 }
 
 html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbody tr th:hover {
-    background: url(images/dropdown_hover.png) #f8f8ff;
+    background: url(/themes/console/light/images/dropdown_hover.png) #f8f8ff;
     background-repeat: no-repeat !important;
     background-position: 1%, 15% !important;
     padding-left: 30px;
@@ -508,7 +508,7 @@ html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbod
 table.tunnelConfig th,
 html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbody tr th[colspan='2'],
 html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbody tr th[colspan='2'] {
-    background: url(images/dropdown.png) #f8f8ff;
+    background: url(/themes/console/light/images/dropdown.png) #f8f8ff;
     background-repeat: no-repeat !important;
     background-position: .5%, 15% !important;
     padding-left: 30px;
@@ -517,19 +517,19 @@ html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbod
 table.tunnelConfig th:hover,
 html body#tunnelEditPage form div.panel table#clientTunnelEdit.tunnelConfig tbody tr th[colspan='2']:hover,
 html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbody tr th[colspan='2']:hover {
-    background: url(images/dropdown_hover.png) #f8f8ff;
+    background: url(/themes/console/light/images/dropdown_hover.png) #f8f8ff;
     background-repeat: no-repeat !important;
     background-position: .5%, 15% !important;
     padding-left: 30px;
 }
 
 .tunnelConfigExpanded {
-    background: url(images/dropdown_active.png) #f8f8ff !important;
+    background: url(/themes/console/light/images/dropdown_active.png) #f8f8ff !important;
     padding-left: 30px;
 }
 
 .tunnelConfigContracted {
-    background: url(images/dropdown.png) #f8f8ff !important;
+    background: url(/themes/console/light/images/dropdown.png) #f8f8ff !important;
     padding-left: 30px;
 }