diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 5da45d2af..d4944face 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -1,11 +1,10 @@
-/* I2P Theme: Classic */
-/* Description: Classic theme, loosely based on duck's original */
-/* Optimized for less capable browsers and system specifications */
+/* I2P Theme: Classic (aka corporat) */
+/* I2P Description: Light blue "classic" I2P theme; optimized for less capable browsers and system specifications. */
 /* Author: dr|z3d */
 
 
 body {
-     margin: 2px 0 0 2px;
+     margin: 5px 3px 5px 6px;
      padding: 0;
      text-align: left;
      background: #bbf;
@@ -28,6 +27,8 @@ pre {
      padding-top: 10px;
 }
 
+/* Sidepanel for proxy errors */
+
 div.logo {
      float: left;
      position-relative: top 20px ;
@@ -37,9 +38,7 @@ div.logo {
      text-align: center;
      border: 5px solid #ddf;
      background-color: #eef;
-     -moz-border-radius: 15px;
      -moz-box-shadow: inset 0px 0px 0px 2px #99f;
-     -khtml-border-radius: 15px;
      -khtml-box-shadow: inset 0px 0px 0px 2px #99f;
 }
 
@@ -65,6 +64,8 @@ div.logo a:hover {
      color: #900;
 }
 
+/* HTTP Proxy warning Main box */
+
 div.warning {
      margin: 20px 20px 10px 260px;
      padding: 0px 20px 20px 75px;
@@ -75,9 +76,7 @@ div.warning {
      background-image:url("../images/itoopie_sm.png");     
      background-position: 12px center;
      background-repeat:no-repeat;
-     -moz-border-radius: 15px;
      -moz-box-shadow: inset 0px 0px 0px 2px #f60;
-     -kthml-border-radius: 15px;
      -khtml-box-shadow: inset 0px 0px 0px 2px #f60;
 }
 
@@ -92,7 +91,7 @@ div.warning a:visited{
 
 div.warning a:hover{
      color: #d30;
-  text-shadow: 0px 0px 1px rgba(255, 96, 0, 0.7);
+     text-shadow: 0px 0px 1px rgba(255, 96, 0, 0.7);
 }
 
 div.warning a:active{
@@ -107,25 +106,32 @@ div.warning hr {
      margin: 5px 0;
 }
 
+div.warning h3 {
+     border: 0;
+     border-bottom: 5px solid #fb7;
+     padding-bottom: 10px;
+     background: #ffd;
+     padding-left: 0;
+}
+
 /* console error messages */
 
 div.sorry {
      padding: 20px;
      background: #ddf;
-     margin: -2px 1px 0 195px;
-     border: 5px solid #bbf;
+     margin: -1px 1px 0 200px;
+     border: 1px solid #89f;
      text-align: justify;
-     -moz-box-shadow: inset 0px 0px 0px 1px #d00;
      word-wrap: break-word;
      font-weight: bold;
      color: #001;
 }
 
 div.sorry hr {
-     color: #001;
-     background: #001;
+     color: #89f;
+     background: #89f;
      height: 1px;
-     border: 1px solid #001;
+     border: 0px solid #89f;
      margin: 10px 0;
 }
 
@@ -135,9 +141,11 @@ div.toolbar {
      display: none !important;
 }
 
+/* Side panel */
+
 div.routersummaryouter {
      float: left; 
-     width: 200px;
+     width: 193px;
      margin: 0;
      padding: 0;
      border: 0;
@@ -146,16 +154,16 @@ div.routersummaryouter {
 
 div.routersummary {
      background: #ddf;
-     width: 185px;
+     width: 193px;
      color: inherit;
      margin: 0;
      padding: 10px 1px 7px 1px;
      text-align: center !important;
-     border: 5px solid #bbf;
-     font-size: 9pt;
+     border: 1px solid #89f;
+     border-bottom: 1px solid #89f;
+     border-right: 1px solid #89f;
      word-wrap: break-word;
-     font: 9pt/125%;
-     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
+     font: 9pt/125% !important;
 }
 
 div.routersummary input[type=text] {
@@ -163,45 +171,49 @@ div.routersummary input[type=text] {
 }
 
 div.routersummary hr {
-     color: #eef;
-     background: #eef;
-     height: 2px;
-     border-bottom: 1px solid #eef;
-     margin: 8px 1px 7px 1px;
-     -moz-box-shadow: inset 0px 1px 1px 1px #99f;
+     color: #89f;
+     background: #89f;
+     height: 0px;
+     border-bottom: 1px solid #89f;
+     margin: 8px -1px 7px -1px;
 }
 
 div.routersummary h3 {
      border: 0px solid #f00;
      font-size: 9.5pt;
      letter-spacing: 0.05em;
-     margin: -7px 1px -7px 1px;
+     margin: -7px 0px -8px 0px;
      padding: 1px 0;
      background: #c5d5fb;
      text-transform: uppercase;
 }
 
 div.routersummary h4 {
-     border: 0px solid #f00;
+     border: 0;
      border-bottom: 0 !important;
      font-size: 8.5pt;
      letter-spacing: 0.05em;
-     margin: -7px 1px -7px 1px !important;
-     padding: 1px 3px;
+     margin: -7px 0px -8px 0px !important;
+     padding: 3px 0;
      background: #c1d1f7;
      text-transform: capitalize;
      text-decoration: none !important;
      color: #2b2;
+     line-height: 90%;
+}
+
+div.routersummary h3 a, div.routersummary h4 a {
+     text-decoration: none;
 }
 
 div.routersummary table {
      border: 0;
      text-align: center !important;
-     margin: -5px 4px -5px 3px;
-     width: 180px !important;
+     margin: -5px 0px -5px 0px;
+     width: 193px !important;
      overflow: hidden;
      font-size: 8pt;
-     padding: 0 -10px;
+     padding: 0 -12px;
      background-image: none !important;
      background-color: transparent !important;
 }
@@ -212,20 +224,47 @@ div.routersummary tr {
      border: 0 !important;
 }
 
+div.tunnels table {
+     margin: 0 -7px !important;
+     width: 193px;
+}
+
 div.tunnels table{
-     margin: 0 !important;
+     margin: -2px 0px -4px 0px !important;
+     text-align: center !important;
+     width: 190px;
 }
 
 .tunnels tr {
      padding: 2px 0 !important;
-     margin-left: -7px !important;
 }
+
+.tunnels a {
+     text-transform: capitalize;
+}
+
+.tunnels td:first-child {
+     width: 16px !important;
+     padding-right: 0px;
+     text-align: left;
+}
+
+.tunnels td:last-child {
+     width: 12px;
+     text-align: right;
+     margin-right: -2px;
+}    
      
 div.routersummary form {
      margin-top: -6px !important;
      margin-bottom: -4px !important;     
 }
 
+div.routersummary form:last-child {
+     padding-top: 3px !important;
+     margin-bottom: -10px !important;     
+}
+
 div.refresh {
      margin-top: 10px !important;
      margin-bottom: 10px !important;
@@ -251,21 +290,17 @@ div.routersummary td {
      border: 0 !important;
 }
 
-div.warning h3 {
-     border-bottom: 5px solid #fb7;
-     padding-bottom: 10px;
-}
-
 div.main {
-     margin: 0px 0px 0px 195px;
+     margin: 0px 1px 0px 200px;
      padding: 15px 15px 10px 15px;
      background: #eef;
-     border: 5px solid #bbf;
+     border: 1px solid #89f;
+     border-bottom: 1px solid #89f;
+     border-right: 1px solid #89f;
      border-top: 0;
      text-align: left;
      color: #001;
-     min-width: 570px;
-     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
+     min-width: 500px;
 }
 
 div.main ul {
@@ -295,7 +330,7 @@ div.main textarea {
 
 div.main h2 {
      margin-top: 20px;
-     margin-bottom: -5px;
+     margin-bottom: 0px;
 }
 
 div.welcome {
@@ -325,17 +360,18 @@ div.wideload p !important {
 }
 
 div.news {
-     margin: -5px 0px 0 195px;
+     margin: -1px 1px 0 200px;
      padding: -10px 0px 8px 0px;
      background: #ffffc0;
-     border: 5px solid #bbf;
+     border: 1px solid #89f;
+     border-bottom: 1px solid #89f;
+     border-right: 1px solid #89f;
      text-align: right;
      color: #770;
-     min-width: 600px;
+     min-width: 500px;
      padding-bottom: 8px;
      padding-left: 10px;
      padding-right: 10px;
-     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
      font-size: 7pt;
 }
 
@@ -387,16 +423,19 @@ div.news hr {
      color: #cc7;
      background: #cc7;
      height: 1px;
-     border: 0px solid #cccc77;
-     margin: 20px 0 2px 0;
+     border: 0px solid #cc7;
+     margin: 20px 0 0 0;
 }
 
 div.confignav {
-     padding: 12px 0 15px 0;
-     background: #cfc;
-     margin: -20px -20px 0 -20px;
-     border: 5px solid #bbf;
-     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
+     padding: 10px 0 11px 0;
+     background: #ddf;
+     margin: -16px -16px 0 -16px;
+     border: 1px solid #89f;
+     font-size: 9.5pt;
+}
+
+div.confignav a {
 }
 
 div.configure {
@@ -411,7 +450,7 @@ div.configure hr {
 div.configure table {
      font-size: 9pt;
      font-weight: bold;
-     border: 1px solid #bbf;
+     border: 1px solid #89f;
 }
 
 div.configure tr, div.configure td {
@@ -419,7 +458,6 @@ div.configure tr, div.configure td {
 }
 
 div.configure tr {
-     -moz-box-shadow: inset 0px 0px 1px 0px #bbf;
 }
 
 div.configure li:first-child, div.main li:first-child {
@@ -442,14 +480,13 @@ div.configure h2:first-child {
 div.messages {
      padding: 0px 10px;
      background: #fff;
-     border: 5px solid #bbf;
+     border: 1px solid #89f;
      border-right: 0;
-     margin: -5px -15px 10px -20px;
+     margin: -1px -15px 10px -16px;
      text-align: center;
      font-size: 9pt;
      font-weight: bold;
      color: #474;
-     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
 }
 
 div.messages li, div.messages ul {
@@ -469,32 +506,42 @@ h1 {
      font-size: 18pt;
      text-shadow: 0px 0px 1px rgba(0, 0, 32, 0.7);
      text-align: center;
-     border: 5px solid #bbf;
-     padding: 13px 10px 12px 10px;
-     margin: 0 0px 0 195px;
+     border: 1px solid #89f;
+     border-bottom: 1px solid #89f;
+     border-right: 1px solid #89f;
+     padding: 16px 10px 16px 10px;
+     margin: 0 1px 0 200px;
      line-height: 93%;
      text-transform: uppercase;
      letter-spacing: 0.3em;
      background: #fff;
-     min-width: 600px;
-     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
+     min-width: 500px;
 }
 
 h2 {
      font-size: 14pt;
-     padding: 0px 10px 10px 10px;
-     border-bottom: 3px solid #aaf;
-     border-top: 0px solid #aaf;
+     padding: 10px;
+     border: 1px solid #89f;
      letter-spacing: 0.04em;
+     font-variant: small-caps; 
+     text-transform: capitalize; 
+     background: #fff;
+     text-shadow: 0px 0px 1px rgba(0, 0, 32, 0.7);
 }
 
 h3 {
      font-size: 12pt;
-     padding: 0 10px 10px 10px;
-     border-bottom: 3px solid #aaf;
-     border-top: 0px solid #aaf;
+     padding: 5px 10px;
+     border: 1px solid #89f;
      letter-spacing: 0.04em;
      margin-bottom: 10px;
+     background: #fff;
+}
+
+h2, h3 {
+     background-image: url("images/titlebg.png"); 
+     background-repeat: no-repeat; 
+     background-position: right center;
 }
 
 .proxyfooter{
@@ -504,7 +551,7 @@ h3 {
 
 table {
      border-collapse: collapse; 
-     border: 1px solid #bbf;
+     border: 1px solid #89f;
      margin: 0 0 5px 0;
      cell-padding: 1px;
      font-size: 7.5pt;
@@ -513,11 +560,11 @@ table {
 }
 
 table hr {
-     padding: 0px 0;
-     color: #bbf;
-     background: #bbf;
-     border: 0px solid #bbf;
-     margin: 0px -5px;
+     padding: 0;
+     color: #89f;
+     background: #89f;
+     border: 0px solid #89f;
+     margin: -5px -5px -10px -5px !important;
      height: 1px;
 }
 
@@ -525,11 +572,15 @@ table tt {
      font-size: 7.5pt;
 }
 
+table code {
+     font-size: 120%;
+}
+
 th {
      background-color: #fff;
      padding: 8px 2px;
      text-align: center;
-     border-bottom: 1px solid #bbf;
+     border-bottom: 1px solid #89f;
 }
 
 tt {
@@ -553,10 +604,10 @@ tr:nth-child(odd) {
 }
 
 hr {
-     color: #aaf;
-     background: #aaf;
-     height: 3px;
-     border: 0px solid #aaf;
+     color: #89f;
+     background: #89f;
+     height: 2px;
+     border: 0px solid #89f;
      margin: 3px 0;
 }
 
@@ -655,10 +706,10 @@ p {
 }
 
 .langbox {
-     margin: 10px -20px 0px 5px;
+     margin: 18px -20px 0px 5px;
      color: #001;
      font-size: 7pt;
-     width: 220px;
+     width: 280px;
      text-align: center;
      float: right;
      valign: middle;
@@ -695,6 +746,7 @@ a:hover{
      color: #f60;
      text-decoration: underline;
      font-weight: bold;
+     text-shadow: 0px 0px 1px rgba(255, 96, 0, 0.7);
 }
 
 a:active{
@@ -713,9 +765,9 @@ tt {
      font-weight: bold;
      color: darkgreen;
 }
-
+ 
 .tablefooter {
-     border: 1px solid #bbf;
+     border: 1px solid #a8f;
 }
 
 .tablefooter tr, .tablefooter td {
@@ -725,7 +777,7 @@ tt {
      line-height: 150%;
      word-wrap: nowrap;
      padding: 8px 1px;
-     border-top: 2px solid #bbf;
+     border-top: 2px solid #89f;
 }
 
 .tidylist {
@@ -735,14 +787,9 @@ tt {
 }
 
 div.graphspanel {
-     padding: 15px 5px 20px 5px;
-     margin: -20px;
-     background: #ddf url('images/lightbluetile.png');
-     -moz-border-radius: 4px;
-     -khtml-border-radius: 4px;
-     border-radius: 4px;
-     border: 5px solid #bbf;
-     -moz-box-shadow: inset 0px 0px 1px 0px #002;
+     padding: 10px 5px 20px 5px;
+     margin: -16px -16px -11px -16px;
+     border: 1px solid #89f;
      text-align: center !important;   
 }
 
@@ -756,7 +803,7 @@ div.graphspanel img {
 }
 
 div.graphspanel img:hover {
-     border: 1px solid #003;
+     border: 1px solid #89f;
      padding: 2px;
      margin: 6px;
      text-align: center !important;
@@ -777,4 +824,4 @@ div.graphspanel form:last-child {
 div.graphspanel h3 {
      text-align: left;
      margin: 10px 20px 10px 20px;
-}
+}
\ No newline at end of file
diff --git a/installer/resources/themes/console/classic/console_big.css b/installer/resources/themes/console/classic/console_big.css
index e1f56c69e..a5b221a9d 100644
--- a/installer/resources/themes/console/classic/console_big.css
+++ b/installer/resources/themes/console/classic/console_big.css
@@ -1,5 +1,5 @@
 /* I2P Theme: I2P Classic Theme Override */
-/* Description: Larger fontsize override for console to accomodate foreign charactersets */
+/* I2P Description: Larger fontsize override for console to accomodate foreign charactersets */
 /* Author: Dr|Z3d */
 
 
@@ -20,8 +20,6 @@ div.routersummary h4 {
 
 div.routersummary table {
      font-size: 9pt;
-     margin: -5px 0px -5px -1px;
-     width: 188px !important;
 }
 
 div.routersummary table a:link, div.routersummary table a:visited {
@@ -33,9 +31,6 @@ div.tunnels a {
 }
 
 div.tunnels table {
-     width: 186px !important;
-     text-align: center;
-     margin: -4px 1px !important;
 }
 
 div.tunnels td:first-child, div.tunnels td:last-child  {
diff --git a/installer/resources/themes/console/classic/images/titlebg.png b/installer/resources/themes/console/classic/images/titlebg.png
new file mode 100644
index 000000000..b524e04e2
Binary files /dev/null and b/installer/resources/themes/console/classic/images/titlebg.png differ
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 7f961ace3..4fd5fa09e 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -1,12 +1,13 @@
-/* Not yet complete. Subject to flux and change. dr|z3d - 07.25.09 */
+/* I2P Console theme: "Camo" by dr|z3d. Aka "dark". As in ops. */
 
 body {
      margin: 20px 5px 0 15px;
      padding: 0;
      text-align: center;
-     background: #002;
-     color: #FFF;
+     background: #010 url('images/camotile.png') center bottom;
+     color: #EE9;
      font: 9pt/130% "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
+     
 }
 
 .hide {
@@ -22,20 +23,20 @@ pre {
      overflow-x: scroll;
      text-align: left;
      font: 9pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
-     color: #fff;
+     color: #EE9;
 }
 
 div.logo {
      float: left;
      padding: 10px;
      text-align: center;
-     font-color: #fff;
+     font-color: #EE9;
      margin: 0 20px 0 20px;
-     border: 1px solid #99f;
+     border: 1px solid #494;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      border-radius: 4px;
-     background: #003 url('images/darkbluebg.png');
+     background: #030 url('images/darkbluebg.png');
      width: 175px;
      -moz-box-shadow: inset 0px 0px 1px 0px #009;
      -khtml-box-shadow: inset 0px 0px 1px 0px #009;
@@ -46,8 +47,8 @@ div.toolbar {
      margin: 0;
      padding: 10px;
      font-weight: bold;
-     background: #eef;
-     border: 1px solid #002;
+     background: #000;
+     border: 1px solid #000;
      display: none;
 }
 
@@ -59,7 +60,7 @@ div.toolbar a:link {
      border-radius: 4px;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
-     color: #002;
+     color: #000;
 }
 
 div.toolbar a:visited {
@@ -68,7 +69,7 @@ div.toolbar a:visited {
 
 div.toolbar a:hover, button:hover{
      border: 1px solid #f60;
-     background: #003;
+     background: #030;
      color: #f60;
 }
 
@@ -91,19 +92,20 @@ div.routersummary {
      width: 175px;
      padding: 10px;
      text-align: center;
-     border: 1px solid #99f;
-     background: #003;
-     background: url(images/darkbluebg.png);
-     color: #eef;
+     border: 1px solid #494;
+     background: #000;
+     background: #000 url(images/camotile2.png);
+     color: #EE9;
      font-size: 8pt;
      clear: left;/* fixes a bug in Opera */
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      border-radius: 4px;
      float: left;
-     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #eef;     
-     box-shadow: inset 0px 0px 1px 0px #eef;
+/*     -moz-box-shadow: inset 0px 0px 0px 0px #EE9;
+     -khtml-box-shadow: inset 0px 0px 1px 0px #EE9;     
+     box-shadow: inset 0px 0px 1px 0px #EE9;*/
+     -moz-box-shadow: 0 1px 5px #000;
 }
 
 div.routersummary input[type=text] {
@@ -114,27 +116,26 @@ div.routersummary input[type=text] {
 }
 
 div.routersummary hr {
-     color: #99f;
-     background: #99f;
+     color: #494;
+     background: #494;
      height: 2px;
-     border-bottom: 1px solid #99f;
+     border-bottom: 1px solid #494;
      margin: 8px -10px 7px -10px;
-     -moz-box-shadow: inset 0px 1px 1px 1px #001;
+     -moz-box-shadow: inset 0px 1px 1px 1px #000;
 }
 
 div.routersummary h3 {
      border: 0;
      font-size: 9.5pt;
      letter-spacing: 0.04em;
-     margin: -7px -9px -8px -9px;
+     margin: -7px -10px -8px -10px;
      padding: 2px 0 3px 0 !important;
-     background: #007;
      text-transform: uppercase;
      -moz-border-radius: 0;
      -khtml-border-radius: 0;
      border-radius: 0;
-     background: #007;
-     background-image: -moz-linear-gradient(top, bottom, from(#007), to(#005), color-stop(7%, #007), color-stop(100%, #005));
+     background: #000 url('images/header.png') center center ;
+     background-image: -moz-linear-gradient(top, bottom, from(#005), to(#030), color-stop(7%, #000), color-stop(100%, #005));
 }
 
 div.routersummary h4 {
@@ -144,19 +145,19 @@ div.routersummary h4 {
      letter-spacing: 0.02em;
      margin: -7px -9px -10px -9px !important;
      padding: 2px 3px 5px 3px;
-     background: #005;
+     background: #000;
      text-transform: capitalize;
      text-decoration: none !important;
      color: #2b2;
-     background-image: -moz-linear-gradient(top, bottom, from(#001), to(#005), color-stop(10%, #005), color-stop(100%, #004));
+     background-image: -moz-linear-gradient(top, bottom, from(#000), to(#005), color-stop(10%, #005), color-stop(100%, #004));
      line-height: 100%;
 }
 
 div.routersummary table {
      border: 0;
      text-align: center !important;
-     margin: -5px -4px -5px -5px !important;
-     width: 185px !important;
+     margin: -5px -7px -5px -7px !important;
+     width: 188px !important;
      overflow: hidden;
      font-size: 8pt;
      padding: 0 -10px;
@@ -189,7 +190,8 @@ div.refresh {
 }
 
 div.routersummary a:link, div.routersummary a:visited {
-     text-shadow: 0px 0px 1px rgba(192, 192, 255, 0.5);
+     text-shadow: 1px 1px 1px rgba(0, 16, 0, 0.8);
+     text-shadow: 0px 0px 2px #010 !important;
 }
 
 div.routersummary a:hover {
@@ -210,28 +212,39 @@ div routersummary hr:last-child {
 
 div.tunnels {
      padding-top: 3px !important;
-     margin-left: -2px;
+     margin-left: -4px;
      text-align: center;
 }
 
 div.tunnels table {
-     margin: -3px 0 !important;
+     margin: -5px 0 -5px -2px !important;
 }
 
 div.tunnels td {
-     padding: 1px 2px 1px 2px;
+     padding: 1px 0px 1px 0px;
 }
+
 div.tunnels td:first-child {
      width: 16px;
+     text-align: left;
+     padding-right: 2px;
+}
+
+div.tunnels td:last-child {
+     text-align: right;
+}
+
+div.tunnels tr {
+/*     border: 1px solid #494 !important;*/
 }
 
 div.warning {
      margin: 5px 20px 10px 240px;
      padding: 5px 25px 20px 75px;
      background: #005;
-     border: 1px solid #99f;
+     border: 1px solid #494;
      text-align: left;
-     color: #fff;
+     color: #EE9;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      border-radius: 4px;
@@ -250,8 +263,8 @@ div.warning {
 div.sorry {
      margin: 15px 15px 10px 220px;
      padding: 20px 20px 20px 75px;
-     background: #005;
-     border: 1px solid #99f;
+     background: #020;
+     border: 1px solid #494;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      border-radius: 4px;
@@ -262,65 +275,74 @@ div.sorry {
      -moz-box-shadow: inset 0px 0px 0px 1px #d00;
      word-wrap: break-word;
      font-weight: bold;
-     color: #eef;
+     color: #EE9;
 }
 
 div.sorry hr {
-     color: #eef;
-     background: #eef;
+     color: #EE9;
+     background: #EE9;
      height: 1px;
-     border: 1px solid #eef;
+     border: 1px solid #EE9;
      margin: 10px 0;
 }     
 
 div.main {
-     margin: 0px 0px 20px 195px;
-     padding: 0 15px 15px 25px;
-     background: #002;
+     margin: 15px 15px 20px 220px;
+     padding: 0 15px 15px 15px;
      text-align: left;
-     color: #eef;
+     color: #EE9;
      width: auto;
 /*  overflow-x: scroll; */
+     border: 1px solid #494;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     background: #000;/* url(images/camotile2.png);*/
+     min-width: 620px;
+     -moz-box-shadow: 0 1px 5px #000;
 }
 
 div.main textarea {
-     background: #002;
-     color: #fff;
+     background: #000;
+     color: #EE9;
      font: 8pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
 }
 
 div.news {
      margin: 15px 15px 15px 220px;
      padding: 5px 30px 10px 30px;
-     border: 1px solid #99f;
-     background: #004;
-     background-image: -moz-linear-gradient(top, bottom, from(#003), to(#005), color-stop(30%, #003), color-stop(100%, #001));
-/*     background: #003 url("images/darkbluetile.png");*/
-     color: #aaf;
+     border: 1px solid #494;
+     background: #000;
+/*     background-image: -moz-linear-gradient(top, bottom, from(#030), to(#005), color-stop(30%, #030), color-stop(100%, #000));///*/
+     background: #000 url("images/bg2.png")no-repeat scroll bottom right;
+     color: #7b7;
      border-radius: 4px;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      font-size: 7.5pt;
      text-align: right;
-     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #eef;
-     box-shadow: inset 0px 0px 1px 0px #eef;
+/*     -moz-box-shadow: inset 0px 0px 0px 0px #EE9;
+     -khtml-box-shadow: inset 0px 0px 1px 0px #EE9;
+     box-shadow: inset 0px 0px 1px 0px #EE9;*/
+     -moz-box-shadow: 0 1px 5px #000;
+     min-width: 590px;
 }
 
 div.news li {
      text-align: justify;
      list-style: url('images/info_dark.png');
-     margin: 0 10px 0 20px;
+     list-style: none;
+     margin: 0 10px 0 0px;
      padding: 5px 5px 5px 0;
      vertical-align: middle;
      word-wrap: break-word;
-     color: #99f;
+     color: #494;
 }
 
 div.news h4 {
      border-bottom: 1px;
      border-bottom-style: dotted;
-     border-bottom-color: #99f;
+     border-bottom-color: #494;
      padding: 0 0 0px 0;
      margin: 5px 0 10px 0;
      font-size: 10pt;
@@ -337,7 +359,7 @@ div.news h4:first-child {
 div.news p {
      margin-top: -5px;
      font-size: 8.5pt;
-     color: #eef;
+     color: #EE9;
 }
 
 div.news hr {
@@ -347,31 +369,25 @@ div.news hr {
 div.confignav {
      padding: 15px 10px !important;
      margin: 15px 0;
-     background: #004 url('images/darkbluebg.png');
+     background: #000 url('images/header.png') center center repeat-x ;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      border-radius: 4px;
-     border: 1px solid #99f;
+     border: 1px solid #494;
      font-size: 9.5pt !important;
      font-weight: bold !important;
      line-height: 160% !important;
-     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #eef;
-     box-shadow: inset 0px 0px 1px 0px #eef;
+
 }
 
 div.configure {
-     padding: 5px 15px 0 15px;
+/*     padding: 5px 15px 0 15px;
      margin: 10px 0px;
-     background: #005;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      border-radius: 4px;
-     border: 1px solid #99f;
-     background: #003 url(images/darkbluebg.png);
-     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #eef;
-     box-shadow: inset 0px 0px 1px 0px #eef;     
+     border: 1px solid #494; */
+     background: #000;/* url(images/camotile2.png);*/
 }
 
 div.messages {
@@ -380,11 +396,8 @@ div.messages {
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      border-radius: 4px;
-     border: 1px solid #99f;
-     background: #008 url('images/lightbluetile.png');
-     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #eef;
-     box-shadow: inset 0px 0px 1px 0px #eef;
+     border: 1px solid #494;
+     background: #000;/* url('images/lightbluetile.png');*/
      font-weight: bold;
      font-size: 9pt;
      color: #ddf;
@@ -408,20 +421,20 @@ div.messages li {
 }
 
 div.graphspanel {
-     padding: 10px 15px 0 15px;
-     margin: 15px 0px;
-     background: #005;
+     padding: 0;
+     margin: 15px 0px -15px 0;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      border-radius: 4px;
-     border: 1px solid #99f;
-     background: #003 url(images/darkbluebg.png);
-     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #eef;
-     box-shadow: inset 0px 0px 1px 0px #eef;
+/*     border: 1px solid #494;*/
+     background: #000;/* url(images/camotile.png);*/
      text-align: center;
 }
 
+div.widepanel h3 {
+     text-align: left !important;
+}
+
 div.graphspanel form {
      text-align: left;
      padding: 0 15px 0px 15px;
@@ -432,23 +445,21 @@ div.graphspanel hr {
 }
 
 div.graphspanel img {
-     border: 1px solid #001;
+     border: 1px solid #494;
      padding: 3px;
      margin: 5px;
      text-align: center !important;
-     background: #002;
-     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #eef;
-     box-shadow: inset 0px 0px 1px 0px #eef;
+     background: #000;
+
      opacity: 0.8;
 }
 
 div.graphspanel img:hover {
-     border: 1px solid #001;
+     border: 1px solid #000;
      padding: 3px;
      margin: 5px;
      text-align: center !important;
-     background: #002;
+     background: #000;
      -moz-box-shadow: inset 0px 0px 1px 1px #f60;
      -khtml-box-shadow: inset 0px 0px 1px 1px #f60;
      box-shadow: inset 0px 0px 1px 1px #f60;
@@ -458,18 +469,18 @@ div.graphspanel img:hover {
 table {
      border-collapse: collapse;
      width: 100%;
-     border: 1px solid #99f;
+     border: 1px solid #494;
      cell-padding: 1px;
      font-size: 7pt;
-     background: #003;
+     background: #030;
      margin: 1px 0;
 }
 
 table hr {
      padding: 0px 0;
-     color: #99f;
-     background: #99f;
-     border: 0px solid #99f;
+     color: #494;
+     background: #494;
+     border: 0px solid #494;
      margin: 0px 0px;
      height: 1px;
      display: none;
@@ -477,12 +488,13 @@ table hr {
 
 th {
      padding: 6px 2px;
-     color: #eef;
+     color: #EE9;
      text-align: center;
      font-size: 9pt;
-     background: #004 url('images/tabletitledark.png') repeat-x;
-     border-top: 1px solid #99f;
-     border-bottom: 1px solid #99f !important;     
+     background: #000; /*url('images/tabletitledark.png') repeat-x;*/
+     background: #000 url('images/header.png') center center repeat-x ;
+     border-top: 1px solid #494;
+     border-bottom: 1px solid #494 !important;     
      line-height: 110%;
 }
 
@@ -491,27 +503,27 @@ tr {
 }
 
 tr:nth-child(even) {
-     background: #002 url('images/darkerbluetile.png') !important;
+     background: #010;/* url('images/darkerbluetile.png') !important;*/
      vertical-align: middle;
 }
 
 tr:nth-child(odd) {
-     background: #003 url('images/darkbluetile.png') !important;
+     background: #000800;/* url('images/darkbluetile.png') !important;*/
      vertical-align: middle;
 }
 /*
 tr:last-child {
      background: #004 url('images/lightbluetile.png') !important;
      font-weight: bold;
-     border: 1px solid #99f !important;
+     border: 1px solid #494 !important;
 }
 */
 td {
-     padding: 6px 3px;
-     color: #eef;
+     padding: 4px 6px;
+     color: #EE9;
      vertical-align: middle;
-     border-top: 1px inset #006;
-     border-bottom: 1px outset #006;   
+     border-top: 1px inset #494;
+     border-bottom: 1px outset #494;   
 }
 
 td img {
@@ -529,7 +541,7 @@ div.main li {
      list-style: square;
      margin: 2px 0px 2px 30px;
      padding: 1px 20px 1px 0px;
-     line-height: 150%;
+/*     line-height: 150%;*/
      word-wrap: break-word;
 }
 
@@ -559,18 +571,19 @@ ul {
 
 code {
      text-align: left;
-     font: 8pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+     font: 8.5pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+     color: #dd0;
 }
 
 a:link, h2 a:link{
-     color: #99f;
+     color: #494;
      text-decoration: none;
      font-weight: bold;     
      word-wrap: break-word;
 }
 
 a:visited{
-     color: #77f;
+     color: #7b7;
      text-decoration: none;
      font-weight: bold;     
      word-wrap: break-word;
@@ -601,7 +614,7 @@ p {
 
 h1 {
      text-align: left;
-     color: #fff;
+     color: #EE9;
      padding: 10px 15px;
      margin: 0 15px 10px 220px;
      font-size: 16pt;
@@ -609,65 +622,68 @@ h1 {
      font-style: normal;
      text-transform: uppercase;
      letter-spacing: 0.15em;
-     text-shadow: 0px 0px 3px rgba(255, 255, 255, 0.8);
+     text-shadow: 0px 0px 2px #010;
      white-space: normal;
-     background: #002 //url('images/darkbluebg.png');
-     background-image: -moz-linear-gradient(top, bottom, from(#001), to(#003), color-stop(30%, #001), color-stop(100%, #001));
-     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #eef;
-     box-shadow: inset 0px 0px 1px 0px #eef;
-     border: 1px solid #99f;
+     background: #000 url("images/scope.png")no-repeat scroll right top;
+     background: #000 url("images/bg2.png")no-repeat scroll top right;
+     background: #000 url('images/header.png') center center ;
+     background-image: -moz-linear-gradient(top, bottom, from(#000), to(#030), color-stop(30%, #000), color-stop(100%, #000));
+     border: 1px solid #494;
      border-radius: 4px;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      line-height: 120%;
+     min-width: 620px;
+     -moz-box-shadow: 0 1px 5px #000;
 }
 
 h2 {
      font-size: 12pt;
-     color: #fff;
-     text-shadow: 0px 0px 1px rgba(255, 255, 255, 0.5);
+     color: #EE9;
+     text-shadow: 0px 0px 2px #010;
      letter-spacing: 0.05em;
-     background: #002; // url('images/darkbluebg.png');
-     background-image: -moz-linear-gradient(top, bottom, from(#001), to(#003), color-stop(30%, #001), color-stop(100%, #001));
+     background: #000 url(images/camotile2.png);
+     background-image: -moz-linear-gradient(top, bottom, from(#000), to(#030), color-stop(30%, #000), color-stop(100%, #000));
+     background: #000 url('images/header.png') center center ;
      padding: 5px 10px 8px 10px;
      wordwrap: none;
-     border: 1px solid #99f;
+     border: 1px solid #494;
      border-radius: 4px;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      vertical-align: middle;
      margin: 15px 0 12px 0 !important;
-     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #eef;
-     box-shadow: inset 0px 0px 1px 0px #eef;
+    text-transform: uppercase;
      word-wrap: break-word;
 }
 
 h2 a:visited {
-     color: #44f;
+     color: #191;
 }
 
 h2 a:hover {
      color: #f60;
-     text-shadow: 0px 0px 1px rgba(255, 255, 72, 0.9);
+     text-shadow: 0px 0px 1px rgba(255, 64, 0, 0.7);
 }
 
 h3 {
-     border: 1px solid #99f;
-     border-left: 5px solid #99f;
-     padding: 3px 5px 3px 5px;
+     border: 1px solid #494;
+     border-left: 5px solid #494;
+     padding: 5px 6px;
      margin: 12px 0 10px 0;
      border-radius: 0 4px 4px 0;
      -moz-border-radius: 0 4px 4px 0;
      -khtml-border-radius: 0 4px 4px 0;
-     background: #002;
+     background: #000 url(images/camotile.png);
+     background: #000 url('images/header.png') center center ;
+     text-transform: uppercase;
+     text-shadow: 0px 0px 2px #010;
 }
 
 h4 {
      border-bottom: 1px;
      border-bottom-style: solid;
-     border-bottom-color: #99f;
+     border-bottom-color: #494;
      padding: 0 0 10px 0;
      margin: 5px 0 10px 0;
      font-size: 11pt;
@@ -675,9 +691,8 @@ h4 {
 
 button, button:visited {
      font: bold 9pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
-     border: 1px outset #77f;
+     border: 1px outset #191;
      padding: 1px 3px;
-     background: #bbf;
      text-decoration: none;
      border-radius: 4px;
      -moz-border-radius: 4px;
@@ -688,26 +703,26 @@ button, button:visited {
      text-align: center;
      vertical-align: middle;
      min-width: 76px;
-     -moz-box-shadow: inset 0px 1px 1px 0px #55f;
-     -khtml-box-shadow: inset 0px 1px 1px 0px #55f;
-     box-shadow: inset 0px 1px 1px 0px #55f;
-     background: #003;
-     color: #99f;
+     -moz-box-shadow: inset 0px 1px 1px 0px #494;
+     -khtml-box-shadow: inset 0px 1px 1px 0px #191;
+     box-shadow: inset 0px 1px 1px 0px #191;
+     background: #000;
+     color: #494;
 }
 
 button:hover {
      border: 1px solid #f60;
-     -moz-box-shadow: inset 0px 1px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 1px 1px 0px #eef;
-     box-shadow: inset 0px 1px 1px 0px #eef;
-     background: #001;
+     -moz-box-shadow: inset 0px 1px 1px 0px #EE9;
+     -khtml-box-shadow: inset 0px 1px 1px 0px #EE9;
+     box-shadow: inset 0px 1px 1px 0px #EE9;
+     background: #000;
      color: #f60;
 }     
           
 button:active {
      border: 1px inset #f60;
      background: #f60;
-     color: #fff;
+     color: #EE9;
      -moz-box-shadow: inset 0px 0px 0px 0px #f60;
      -khtml-box-shadow: inset 0px 0px 0px 0px #f60;
      box-shadow: inset 0px 0px 0px 0px #f60;
@@ -720,9 +735,9 @@ button:active {
 }
 
 .langbox {
-     margin: 2px 2px 2px 5px;
+     margin: 17px 2px 2px 5px;
      padding: 7px 10px 5px 10px;
-     color: #eef;
+     color: #EE9;
      font-size: 7pt;
      width: 220px;
      text-align: right;
@@ -730,11 +745,21 @@ button:active {
      vertical-align: middle;
 }
 
+.langbox img {
+     opacity: 0.7;
+     -moz-box-shadow: 0 0 1px #000;
+}
+
+.langbox img:hover {
+     opacity: 1;
+     -moz-box-shadow: 0 0 1px #f60;
+}
+
 hr {
-     color: #99f;
-     background: #99f;
+     color: #494;
+     background: #494;
      height: 1px;
-     border: 0px solid #99f;
+     border: 0px solid #494;
      margin: 10px 0;
 }
 
@@ -748,12 +773,12 @@ sidebarlogo {
 }
 
 input {
-     border: 1px outset #55f;
-     -moz-box-shadow: inset 0px 1px 1px 0px #55f;
-     -khtml-box-shadow: inset 0px 1px 1px 0px #55f;
-     box-shadow: inset 0px 1px 1px 0px #55f;
-     background: #003;
-     color: #99f;
+     border: 1px outset #5f5;
+     -moz-box-shadow: inset 0px 1px 1px 0px #373;
+     -khtml-box-shadow: inset 0px 1px 1px 0px #373;
+     box-shadow: inset 0px 1px 1px 0px #373;
+     background: #000;
+     color: #494;
      margin: 5px;
      font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
      padding: 1px 2px;
@@ -765,16 +790,16 @@ input {
 }
 
 input:hover {
-     background: #001;
+     background: #000;
      color: #f60;
      border: 1px solid #f60;
-     -moz-box-shadow: inset 0px 1px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 1px 1px 0px #eef;
-     box-shadow: inset 0px 1px 1px 0px #eef;
+     -moz-box-shadow: inset 0px 1px 1px 0px #9e9;
+     -khtml-box-shadow: inset 0px 1px 1px 0px #9e9;
+     box-shadow: inset 0px 1px 1px 0px #9e9;
 }
 
 input:active {
-     background: #002;
+     background: #000;
      color: #f30;
      border: 1px solid #f30;
 }
@@ -782,16 +807,16 @@ input:active {
 input:active {
      border: 1px inset #f60;
      background: #f60;
-     color: #fff;
+     color: #EE9;
 }
 
 input[type=text] {
-     background: #002;
-     color: #eef;
+     background: #000;
+     color: #EE9;
      margin: 5px 10px;
      padding: 4px 2px;
      font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
-     border: 1px solid #bbf;
+     border: 1px solid #494 !important;
      text-decoration: none;
      border-radius: 4px;
      -moz-border-radius: 4px;
@@ -802,7 +827,7 @@ input[type=text] {
 }
 
 input[type=text]:active, input[type=text]:hover {
-     background: #001;
+     background: #000;
 }
 
 fieldset {
@@ -811,10 +836,10 @@ position: relative;
 }
 
 select {
-     background: #002;
-     color: #eef;
+     background: #000;
+     color: #EE9;
      margin: 5px 10px;
-     border: 1px solid #bbf;
+     border: 1px solid #494;
      border-radius: 4px;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
@@ -824,8 +849,8 @@ select {
 }
 
 textarea {
-     background: #001;
-     color: #eef;
+     background: #000;
+     color: #EE9;
      padding: 5px;
      margin: 10px;
      border-radius: 4px;
@@ -835,7 +860,7 @@ textarea {
      min-height: 100px;
      min-width: 97%;
      text-align: left;
-     border: 1px solid #99f;
+     border: 1px solid #494;
 }
 
 form {}
@@ -849,39 +874,37 @@ form {}
      border-radius: 4px;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
-     border: 1px solid #001;
+     border: 1px solid #000;
      display: none;
 }        
 
 .statusnotes {
      font-style: italic;
      font-size: 8pt;
-     color: #eef;
+     color: #EE9;
      text-align: center;
-     border: 1px solid #99f !important;
+     border: 1px solid #494 !important;
 /*     border-top: 0px !important;*/
      margin: -3px 0 5px 0; 
      padding: 7px;
-     background: #004;
-     -moz-box-shadow: inset 0px 0px 0px 1px #009;
-     -khtml-box-shadow: inset 0px 0px 0px 1px #009;
-     box-shadow: inset 0px 0px 0px 1px #009;
+     background: #010;
+     -moz-box-shadow: inset 0px 0px 0px 1px #090;
+     -khtml-box-shadow: inset 0px 0px 0px 1px #090;
+     box-shadow: inset 0px 0px 0px 1px #090;
+/*     background: #000 url('images/header.png') repeat-x center center !important;*/
 }
 
 div.joblog {
-     margin: 	15px 0 15px 0;
+/*     margin: 	15px 0 15px 0;
      padding: 5px 20px 10px 20px !important;
-     border: 1px solid #99f;
-     background-color: #004;
-     background: url("images/darkbluebg.png");
-     color: #dfd;
-     border-radius: 4px;
-     -moz-border-radius: 4px;
-     -khtml-border-radius: 4px;
+     border: 1px solid #494;
+     background-color: #000;
+     background: #000; url("images/camotile.png");*/
+/*     color: #dfd;*/
+     border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+     -khtml-border-radius: 4px 4px 0 0;
      text-align: justify !important;
-     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #eef;
-     box-shadow: inset 0px 0px 1px 0px #eef;
      overflow-x: scroll; /* Opera fix */
  }
  
@@ -953,14 +976,14 @@ position: relative;
 }
 
 .cells {
-     border: 1px inset #005;
-     border-left: 1px outset #002;     
+     border: 1px inset #494;
+     border-left: 1px outset #494;     
 }
 
 .tablefooter tr, .tablefooter td {
-     background: #004 url('images/tabletitledark.png') repeat-x !important;
-     border-top: 1px solid #99f;
-     border-bottom: 1px solid #99f !important;     
+     background: #000 url('images/header.png') repeat-x center center !important;
+     border-top: 1px solid #494;
+     border-bottom: 1px solid #494 !important;     
      font-size: 7pt;
      line-height: 110%;
 }
diff --git a/installer/resources/themes/console/dark/default.css b/installer/resources/themes/console/dark/default.css
index dc9ceede8..68de1b28e 100644
--- a/installer/resources/themes/console/dark/default.css
+++ b/installer/resources/themes/console/dark/default.css
@@ -1,9 +1,11 @@
+/* I2P Console theme: "Camo" by dr|z3d. Aka "dark". As in ops. */
+
 body {
      margin: 0px;
      padding: 0px;
      text-align: center;
      font-family: "Lucida Sans Unicode", Verdana, Helvetica, sans-serif;
-     background-color: #001;
+     background: #010 url('images/camotile.png') center bottom;
      color: #000000;
      font-size: 9pt;
 /* we've avoided Tantek Hacks so far,
@@ -39,14 +41,14 @@ h4 {
      font-size: 14px;
      font-weight: bold !important;
      text-align: center;
-     border: 1px solid #99f;
+     border: 1px solid #494;
      margin: 5px 0 15px 0;
      padding: 5px 10px;
-     background: #004 url(images/tabletitledark.png) repeat-x;
+     background: #000 url('images/header.png') center center repeat-x ;
      text-transform: uppercase;
-     text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.9);
+     text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.9);
      letter-spacing: 0.08em;
-     -moz-box-shadow: inset 0px 0px 4px 0px #009;
+     -moz-box-shadow: inset 0px 0px 4px 0px #090;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      border-radius: 4px;
@@ -73,7 +75,7 @@ button {
 }
 
 textarea {
-     border: 1px solid #9999ff;
+     border: 1px solid #494;
 }
 
 br {
@@ -121,21 +123,21 @@ hr {
      clear: both;
      height: 1px;
      margin: 3px 0px 3px 0px;
-     border-bottom: 1px solid #99f;
+     border-bottom: 1px solid #494;
 }
 
 .subdivider {
-     border-bottom: 1px solid #99f;
+     border-bottom: 1px solid #494;
      padding: 5px 0px 0px 0px;
 }
 
 .freetext {
      width: 150px;
      height : 22px; 
-     border: 1px solid #9999ff;
+     border: 1px solid #494;
      padding: 2px;
      margin: 4px 0 2px 4px;
-     background-color: #002;
+     background-color: #020;
      font: bold 9pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
 }
 
@@ -147,8 +149,8 @@ hr {
      max-height: 24px;
      font-size: 9pt;
      font-weight: bold;
-     background-color: #b4c8ff;
-     color: black;
+     background-color: #000;
+     color: #9f9 !important;
      border: 1px outset #ddddc0;
      text-align: center;
      white-space: nowrap;
@@ -159,18 +161,25 @@ hr {
      background: url(images/tabletitlelight.png) repeat: x;
      vertical-align: middle;
      text-decoration: none;
+     border: 1px outset #5f5;
+     -moz-box-shadow: inset 0px 1px 1px 0px #373;
+     -khtml-box-shadow: inset 0px 1px 1px 0px #373;
+     box-shadow: inset 0px 1px 1px 0px #373;
 }
 
 .control:link {
-     color: #001;
+     color: #9f9;
      text-decoration: none;
 }
 
 .control:hover {
-     border: 1px solid #eeeeff;
-     background-color: #003;
-     color: #ff6600 !important;
+     border: 1px solid #f60;
+     background-color: #000;
+     color: #f60 !important;
      text-decoration: none;
+     -moz-box-shadow: inset 0px 1px 1px 0px #fff;
+     -khtml-box-shadow: inset 0px 1px 1px 0px #fff;
+     box-shadow: inset 0px 1px 1px 0px #fff;
 }
 
 .control:active {
@@ -181,7 +190,7 @@ hr {
 }
 
 .control:visited {
-     color: #001;
+     color: #010;
      text-decoration: none;
 }
 
@@ -192,12 +201,12 @@ hr {
      text-align: left;
      font-size: 9pt;
      color: white;
-     background-color: #002;
-     background: url(images/darkbluebg.png);
+     background-color: #020;
+     background: #000; /*url(images/camotile2.png);*/
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
      border-radius: 4px;
-     border: 1px solid #99f;
+     border: 1px solid #494;
      padding: 10px 20px;
 }
 
@@ -235,15 +244,15 @@ hr {
 }
 
 #globalOperationsPanel {
-     background-color: #003;
-     border: 1px solid #99f;
-     background: url(images/darkbluebg.png);
-     -moz-box-shadow: inset 0px 0px 0px 1px #f00;
+     background-color: #030;
+     border: 1px solid #494;
+     -moz-box-shadow: inset 0px 0px 0px 1px #932;
      padding: 5px 20px 11px 10px !important;
+     background: #000; /*url(images/camotile2.png);*/
 }
 
 #globalOperationsPanel .control {
-     width: 100px;
+     width: 120px;
 }
 
 .header {
@@ -254,12 +263,12 @@ hr {
 }
 
 a:link{
-     color: #99f;
+     color: #494;
      text-decoration: none;
 }
 
 a:visited{
-     color: #7bb;
+     color: #7b7;
      text-decoration: none;
 }
 
@@ -274,12 +283,12 @@ a:active{
 }
 
 input {
-     background-color: #002;
+     background-color: #020;
      color: #eef;
      margin: 0 2px 0 2px;
      font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
      font-weight: bold;
-     border: 1px solid #99f;
+     border: 1px solid #494;
 /*
      padding: 0px 2px 1px 2px;
 */
@@ -292,17 +301,17 @@ input hover {
      margin: 0 2px 0 2px;
      font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
      font-weight: bold;
-     border: 1px solid #99f;
+     border: 1px solid #494;
      padding: 2px;
      text-decoration: none;
 }
 
 select {
-     background-color: #001;
+     background-color: #020;
      color: #eef;
      margin: 6px 2px 0 2px;
      font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
-     border: 1px solid #99f;
+     border: 1px solid #494;
      padding: 2px 2px 2px 4px;
      max-height: 24px;
 }
diff --git a/installer/resources/themes/console/dark/i2ptunnel.css b/installer/resources/themes/console/dark/i2ptunnel.css
index cc2f5d97e..d35372310 100644
--- a/installer/resources/themes/console/dark/i2ptunnel.css
+++ b/installer/resources/themes/console/dark/i2ptunnel.css
@@ -1,5 +1,6 @@
-/* I2P Tunnel Edit Page
-*/
+/* I2P Console theme: "Camo" by dr|z3d. Aka "dark". As in ops. */
+/* I2P Tunnel Edit Page */
+
 #tunnelEditPage input {
      width: 458px;
 }
@@ -82,8 +83,9 @@
      height: 100px;
      padding: 4px;
      margin: 0 0 3px 0;
-     background-color: #000088;
-     color: #fff;
+     background-color: #040;
+/*     background: #000 url("images/helitile.png")no-repeat scroll right top;*/
+     color: #ee9;
      font-family: "Lucida Console", "Andale Mono", "Courier New", Courier, mono;
      border: 1px inset #002;
 }
diff --git a/installer/resources/themes/console/dark/images/bg2.png b/installer/resources/themes/console/dark/images/bg2.png
new file mode 100644
index 000000000..9af9046d2
Binary files /dev/null and b/installer/resources/themes/console/dark/images/bg2.png differ
diff --git a/installer/resources/themes/console/dark/images/camotile.png b/installer/resources/themes/console/dark/images/camotile.png
new file mode 100644
index 000000000..2d7ae1be1
Binary files /dev/null and b/installer/resources/themes/console/dark/images/camotile.png differ
diff --git a/installer/resources/themes/console/dark/images/camotile2.png b/installer/resources/themes/console/dark/images/camotile2.png
new file mode 100644
index 000000000..6d1a9989b
Binary files /dev/null and b/installer/resources/themes/console/dark/images/camotile2.png differ
diff --git a/installer/resources/themes/console/dark/images/darkbluebg.png b/installer/resources/themes/console/dark/images/darkbluebg.png
deleted file mode 100644
index 32a0972b9..000000000
Binary files a/installer/resources/themes/console/dark/images/darkbluebg.png and /dev/null differ
diff --git a/installer/resources/themes/console/dark/images/darkbluetile.png b/installer/resources/themes/console/dark/images/darkbluetile.png
deleted file mode 100644
index 5f7d1a01f..000000000
Binary files a/installer/resources/themes/console/dark/images/darkbluetile.png and /dev/null differ
diff --git a/installer/resources/themes/console/dark/images/darkerbluetile.png b/installer/resources/themes/console/dark/images/darkerbluetile.png
deleted file mode 100644
index 2e28effaf..000000000
Binary files a/installer/resources/themes/console/dark/images/darkerbluetile.png and /dev/null differ
diff --git a/installer/resources/themes/console/dark/images/h1bg.png b/installer/resources/themes/console/dark/images/h1bg.png
deleted file mode 100644
index dd2ce3388..000000000
Binary files a/installer/resources/themes/console/dark/images/h1bg.png and /dev/null differ
diff --git a/installer/resources/themes/console/dark/images/header.png b/installer/resources/themes/console/dark/images/header.png
new file mode 100644
index 000000000..4a8e7a9ec
Binary files /dev/null and b/installer/resources/themes/console/dark/images/header.png differ
diff --git a/installer/resources/themes/console/dark/images/i2plogo.png b/installer/resources/themes/console/dark/images/i2plogo.png
index 52d1fd6c7..fb343194e 100644
Binary files a/installer/resources/themes/console/dark/images/i2plogo.png and b/installer/resources/themes/console/dark/images/i2plogo.png differ
diff --git a/installer/resources/themes/console/dark/images/lightbluetile.png b/installer/resources/themes/console/dark/images/lightbluetile.png
deleted file mode 100644
index f31f7cd8e..000000000
Binary files a/installer/resources/themes/console/dark/images/lightbluetile.png and /dev/null differ
diff --git a/installer/resources/themes/console/dark/images/tabletitledark.png b/installer/resources/themes/console/dark/images/tabletitledark.png
deleted file mode 100644
index 2616ec7a6..000000000
Binary files a/installer/resources/themes/console/dark/images/tabletitledark.png and /dev/null differ
diff --git a/installer/resources/themes/console/dark/images/tabletitlelight.png b/installer/resources/themes/console/dark/images/tabletitlelight.png
deleted file mode 100644
index 9c9092e73..000000000
Binary files a/installer/resources/themes/console/dark/images/tabletitlelight.png and /dev/null differ
diff --git a/installer/resources/themes/console/dark/images/tile.png b/installer/resources/themes/console/dark/images/tile.png
new file mode 100644
index 000000000..c8f98b265
Binary files /dev/null and b/installer/resources/themes/console/dark/images/tile.png differ
diff --git a/installer/resources/themes/console/dark/images/titletile.png b/installer/resources/themes/console/dark/images/titletile.png
deleted file mode 100644
index 945acc5b9..000000000
Binary files a/installer/resources/themes/console/dark/images/titletile.png and /dev/null differ
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 00979a190..942a7a873 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -1,4 +1,4 @@
-/* Not yet complete. Subject to flux and change. dr|z3d - 07.25.09 */
+/* I2P Console Theme "Corporat" by dr|z3d. Aka "light". As in beer.*/
 
 body {
      margin: 15px 0 0 10px;
@@ -714,11 +714,11 @@ button:active{
 }
 
 .langbox {
-     margin: 4px 2px 4px 5px;
+     margin: 4px 10px 4px 5px;
      padding: 5px 5px;
      color: #001;
      font-size: 7pt;
-     width: 220px;
+     width: 260px;
      text-align: right;
      float: right;
      valign: middle;
diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css
index 69e633057..0c66d9589 100644
--- a/installer/resources/themes/console/midnight/console.css
+++ b/installer/resources/themes/console/midnight/console.css
@@ -738,10 +738,10 @@ p {
 }
 
 .langbox {
-     margin: 17px -20px 0px 5px;
+     margin: 17px -30px 0px 5px;
      color: #eef;
      font-size: 7pt;
-     width: 220px;
+     width: 280px;
      text-align: center;
      float: right;
      valign: middle;