From 48bcd3a8c2e67a496be00dc5d40393839f960c37 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 7 Aug 2012 04:22:40 +0000
Subject: [PATCH 1/9] Updates to console and snark themes from dr|z3d

---
 .../resources/themes/console/dark/console.css |   35 +-
 .../themes/console/dark/console_ar.css        |    8 +
 .../themes/console/midnight/console.css       |  322 ++--
 .../themes/console/midnight/default.css       |  502 +++---
 .../resources/themes/snark/light/snark.css    | 1376 ++++++++---------
 5 files changed, 1161 insertions(+), 1082 deletions(-)

diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index daae07c24..42d0f9252 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -108,7 +108,7 @@ div.routersummaryouter {
 
 div.routersummary {
      width: 173px;
-     padding: 10px 10px 8px;
+     padding: 8px 10px 8px;
      text-align: center;
      border: 1px solid #494;
      background: #000 url(images/camotile2.png);
@@ -746,7 +746,7 @@ p img:first-child {
 h1 {
      text-align: left;
      color: #EE9;
-     padding: 14px 15px;
+     padding: 13px 15px;
      margin: 0 5px 0 205px !important;
      font-size: 17pt;
      font-weight: bold;
@@ -1233,8 +1233,9 @@ div.ag2 {
 
 div.app {
      float: left;
-     padding: 5px 0 0 !important;
-     width: 137px;
+     padding: 2px 0 0 !important;
+/*     width: 137px; */
+     min-width: 70px;
      border: 1px solid #494;
      background: #000;
      background-image: -moz-linear-gradient(center top , #000B00, #000);
@@ -1242,7 +1243,7 @@ div.app {
      -moz-border-radius: 3px;
      -khtml-border-radius: 3px;
      margin: 3px;
-     height: 60px;
+     height: 53px;
      text-align: center !important;
      padding-top: 3px;
      opacity: 0.9;
@@ -1280,10 +1281,14 @@ table.search {
      margin-right:auto;
 }
 
+.appimg {
+     height: 35px;
+}
+
 img.app {
      height: 32px;
      width: 32px;
-     padding: 2px 0 0 0;
+     padding: 2px 0 0;
      margin-bottom: 2px;
 }
 
@@ -1316,14 +1321,30 @@ td.app {
 div.applabel {
      font-size: 7.5pt;
      margin: 0;
-     padding: 1px 0 0 0;
+     padding: 2px;
      text-align: center;
      vertical-align: bottom;
      line-height: 95%;
      text-transform: lowercase;
      border: none;
+/*     width: 131px; */
+     min-width: 72px;
+     background: #010;
+     border-radius: 0 0 2px 2px;
+     border-top: 1px solid #494;
 }
 
+div.applabel:hover {
+     background: #000;
+     border-top: 1px solid #f60;
+}
+
+div.applabel a, div.applabel a:hover {
+     text-decoration: none !important;
+     outline: none;
+}
+
+
 /* end home page */
 
 iframe.iframed {
diff --git a/installer/resources/themes/console/dark/console_ar.css b/installer/resources/themes/console/dark/console_ar.css
index 4d573f3af..4afffe012 100644
--- a/installer/resources/themes/console/dark/console_ar.css
+++ b/installer/resources/themes/console/dark/console_ar.css
@@ -44,11 +44,19 @@ div.routersummary h3 {
      text-align: center;
 }
 
+div.routersummary td {
+     text-align: right;
+}
+
 div.routersummary td:last-child {
      text-align: left;
      margin-left: 3px;
 }
 
+div.routersummary td:first-child {
+     text-align: right;
+}
+
 div.tunnels {
      padding: -3px 0 !important;
 }
diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css
index 78c7fd738..04f546c79 100644
--- a/installer/resources/themes/console/midnight/console.css
+++ b/installer/resources/themes/console/midnight/console.css
@@ -9,7 +9,7 @@ body {
      text-align: left;
      background: #000;
      color: #eef;
-     font: 9pt/140% "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
+     font: 8pt/137% "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
 }
 
 .hide {
@@ -44,29 +44,29 @@ div.logo {
      text-align: center;
      border: 1px solid #99f;
      background-color: #00000A;
-     -moz-box-shadow: inset 0px 0px 0px 2px #00000A;
-     -khtml-box-shadow: inset 0px 0px 0px 2px #00000A;
+     -moz-box-shadow: inset 0 0 0 2px #00000A;
+     -khtml-box-shadow: inset 0 0 0 2px #00000A;
 }
 
 div.logo hr {
      color: #99f;
      background: #99f;
      height: 1px;
-     border: 0px solid #99f;
+     border: 0 solid #99f;
      margin: 8px -5px;
 }
 
 div.logo a:link, div.logo a:visited {
-     text-shadow: 0px 0px 1px rgba(0, 0, 32, 0.3);
+     text-shadow: 0 0 1px rgba(0, 0, 32, 0.3);
 }
 
 div.logo a:active {
-     text-shadow: 0px 0px 1px rgba(255, 96, 0, 0.5);
+     text-shadow: 0 0 1px rgba(255, 96, 0, 0.5);
      color: #f60;
 }
 
 div.logo a:hover {
-     text-shadow: 0px 0px 1px rgba(128, 0, 0, 0.5);
+     text-shadow: 0 0 1px rgba(128, 0, 0, 0.5);
      color: #f90;
 }
 
@@ -74,7 +74,7 @@ div.logo a:hover {
 
 div.warning {
      margin: 25px 25px 15px 260px;
-     padding: 0px 20px 20px 75px;
+     padding: 0 20px 20px 75px;
      background: #001;
      border: 1px solid #99f;
      text-align: left;
@@ -82,13 +82,13 @@ div.warning {
      background-image:url("../images/itoopie_sm.png");
      background-position: 12px center;
      background-repeat:no-repeat;
-     -moz-box-shadow: inset 0px 0px 0px 1px #f60;
-     -khtml-box-shadow: inset 0px 0px 0px 1px #f60;
+     -moz-box-shadow: inset 0 0 0 1px #f60;
+     -khtml-box-shadow: inset 0 0 0 1px #f60;
 }
 
 div.warning a:link {
      color: #f60;
-     text-shadow: 0px 0px 1px rgba(255, 96, 0, 0.3);
+     text-shadow: 0 0 1px rgba(255, 96, 0, 0.3);
 }
 
 div.warning a:visited {
@@ -97,7 +97,7 @@ div.warning a:visited {
 
 div.warning a:hover {
      color: #f90;
-  text-shadow: 0px 0px 1px rgba(255, 128, 0, 0.5);
+  text-shadow: 0 0 1px rgba(255, 128, 0, 0.5);
 }
 
 div.warning a:active {
@@ -108,7 +108,7 @@ div.warning hr {
      color: #fb7;
      background: #fb7;
      height: 1px;
-     border: 0px solid #fb7;
+     border: 0 solid #fb7;
      margin: 10px 0;
 }
 
@@ -132,7 +132,7 @@ div.sorry {
      border: 1px solid #99f;
      border-top: 0;
      text-align: justify;
-     -moz-box-shadow: inset 0px 0px 0px 1px #d00;
+     -moz-box-shadow: inset 0 0 0 1px #d00;
      word-wrap: break-word;
      font-weight: bold;
      color: #eef;
@@ -158,7 +158,7 @@ div.toolbar {
 div.routersummaryouter {
      float: left;
      width: 200px;
-     margin: 0 0 5px 0px;
+     margin: 0 0 5px 0;
      padding: 0;
      border: 0;
      clear: left; /* fixes a bug in Opera */
@@ -170,13 +170,14 @@ div.routersummary {
      width: 190px;
      color: inherit;
      margin: 0;
-     padding: 8px 1px 4px 1px;
+     padding: 6px 1px 8px 1px;
      text-align: center !important;
      border: 1px solid #99f;
-     font-size: 9pt;
+     font-size: 8pt;
      word-wrap: break-word;
      font: 9pt/125%;
-     -moz-box-shadow: inset 0px 0px 0px 1px #00000A;
+     -moz-box-shadow: inset 0 0 0 1px #00000A;
+     border-radius: 3px;
 }
 
 div.routersummary input[type=text] {
@@ -187,7 +188,7 @@ div.routersummary hr {
      color: #99f;
      background: #99f;
      height: 1px;
-     border-bottom: 0px solid #99f;
+     border-bottom: 0 solid #99f;
      margin: 8px -1px 7px -1px;
 }
 
@@ -196,10 +197,10 @@ div.routersummary hr:last-child {
 }
 
 div.routersummary h3 {
-     border: 0px solid #f00;
-     font-size: 9.5pt;
-     letter-spacing: 0.05em;
-     margin: -6px 0px -6px 0px;
+     border: 0 solid #f00;
+     font-size: 8.5pt;
+     letter-spacing: 0.01em;
+     margin: -6px 0 -6px 0;
      padding: 3px 0;
      background: #002;
      text-transform: uppercase;
@@ -213,11 +214,11 @@ div.routersummary h3 a, div.routersummary h4 a {
 }
 
 div.routersummary h4 {
-     border: 0px solid #f00;
+     border: 0 solid #f00;
      border-bottom: 0 !important;
-     font-size: 8.5pt;
+     font-size: 7.5pt;
      letter-spacing: 0.05em;
-     margin: -6px 0px -6px 0px !important;
+     margin: -6px 0 -6px 0 !important;
      padding: 5px 2px;
      background: #000;
      text-transform: capitalize;
@@ -233,10 +234,9 @@ div.routersummary ul {
 div.routersummary table {
      border: 0;
      text-align: center !important;
-     margin: -5px 0px -5px 2px;
+     margin: -5px 0 -5px 2px;
      width: 186px !important;
      overflow: hidden;
-     font-size: 8pt;
      padding: 0 -12px;
      background-image: none !important;
      background-color: transparent !important;
@@ -269,18 +269,25 @@ div.routersummary td:first-child {
      overflow: hidden;
 }
 
+.routersummary form {
+     margin: 0;
+}
+
 div.newsheadings {
      text-align: right;
-     margin: 0 0 0 -20px;
+     margin: 0 7px 0 -20px;
+     line-height: 110%;
 }
 
 div.newsheadings li {
      list-style: none outside url('images/newsbullet_mini.png');
      margin: 0 -4px 2px 8px;
+     line-height: 115%;
+     font-weight: normal !important;
 }
 
 div.tunnels table{
-     margin: -2px 0px -4px 2px !important;
+     margin: -2px 0 -4px 2px !important;
      text-align: center !important;
      width: 186px;
 }
@@ -315,11 +322,11 @@ div.routersummary a {
 }
 
 div.routersummary a:link, div.routersummary a:visited {
-     text-shadow: 0px 0px 1px rgba(0, 0, 32, 0.3);
+     text-shadow: 0 0 1px rgba(0, 0, 32, 0.3);
 }
 
 div.routersummary a:hover {
-     text-shadow: 0px 0px 1px rgba(255, 96, 0, 0.7);
+     text-shadow: 0 0 1px rgba(255, 96, 0, 0.7);
      color: #f60;
 }
 
@@ -330,8 +337,8 @@ div.routersummary td {
 }
 
 div.main {
-     margin: 0px 5px 5px 200px;
-     padding: 15px 15px 10px 15px;
+     margin: 0 5px 5px 200px;
+     padding: 5px 15px 10px 15px;
      background: #00000A;
      border: 1px solid #99f;
      border-top: 0;
@@ -339,6 +346,7 @@ div.main {
      color: #eef;
      min-width: 590px;
      background: #000 url(images/scarface.jpg) right bottom no-repeat !important;
+     border-radius: 0 0 3px 3px;
 }
 
 div.main ul {
@@ -369,11 +377,16 @@ div.main textarea {
 }
 
 div.main h2 {
-     margin-top: 20px;
-     margin-bottom: -5px;
+     margin-bottom: 5px;
      padding-bottom: 10px !important;
 }
 
+/*
+div.main h2:last-child {
+     margin: 20px 0 0 !important;     
+} 
+*/
+
 table h2 {
      padding-bottom: 15px;
 }
@@ -383,12 +396,11 @@ div.welcome {
 }
 
 div.main h2:first-child, div.main h3:first-child {
-     margin-top: 0px;
-     margin-bottom: -5px;
+/*     margin: 5px 10px -10px; */
 }
 
 div.wideload h2 {
-     margin-bottom: 0px !important;
+     margin-bottom: 10px !important;
 }
 
 div.wideload h3:first-child {
@@ -397,26 +409,27 @@ div.wideload h3:first-child {
 
 div.wideload h3 {
      margin-top: 15px !important;
-     margin-bottom: 0px !important;
+     margin-bottom: 10px !important;
 }
 
-div.wideload p !important {
+div.wideload p {
      margin-top: 5px;
 }
 
+div.wideload table {
+     margin-top: 5px !important;     
+}
+
 div.news {
      margin: -1px 5px 0 200px;
-     padding: -10px 0px 8px 0px;
      background: #001;
      border: 1px solid #99f;
      text-align: right;
      color: #99f;
      min-width: 600px;
-     padding-bottom: 8px;
-     padding-left: 10px;
-     padding-right: 10px;
-     -moz-box-shadow: inset 0px 0px 4px 2px #00000A;
-     font-size: 7pt;
+     padding: 3px 8px 3px;
+     -moz-box-shadow: inset 0 0 4px 2px #00000A;
+     font-size: 8pt;
      background: #001 url("images/planet.png")no-repeat scroll bottom right;
 }
 
@@ -426,9 +439,9 @@ div.news li {
      text-align: justify;
      list-style: none;
      margin: 15px 15px -10px -20px;
-     padding: 0px 0 15px 0;
+     padding: 0 0 15px 0;
      border-bottom: 1px dotted #99f;
-     border-top: 0px solid #99f;
+     border-top: 0 solid #99f;
      padding: 3px 5px 5px 0;
      font-size: 10pt;
      color: #eef;
@@ -441,7 +454,7 @@ div.news h3 {
      text-align: left;
      border: none !important;
      padding-left: 0;
-     padding-top: 0px;
+     padding-top: 0;
      border-bottom: 1px dotted !important;
      -moz-box-shadow: none;
      -hktml-box-shadow: none;
@@ -455,7 +468,7 @@ div.news h3 {
 
 div.news p {
      color: #eef;
-     font-size: 9pt;
+     font-size: 8pt;
      margin-bottom: -10px;
      margin-top: 10px;
 }
@@ -466,33 +479,33 @@ div.news p:last-child {
 
 div.news a:link {
      color: #aaf;
-     text-shadow: 0px 0px 1px rgba(128, 128, 48, 0.3);
+     text-shadow: 0 0 1px rgba(128, 128, 48, 0.3);
 }
 
 div.news a:visited {
      color: #99f !important;
-     text-shadow: 0px 0px 1px rgba(128, 128, 48, 0.3);
+     text-shadow: 0 0 1px rgba(128, 128, 48, 0.3);
 }
 
 div.news hr {
      color: #99f;
      background: #99f;
      height: 1px;
-     border: 0px solid #99f;
+     border: 0 solid #99f;
      margin: 10px 0 2px 0;
 }
 
 div.confignav {
      padding: 14px 0 15px;
      background: #000018;
-     margin: -16px -16px 0 -16px;
+     margin: -6px -16px 5px -16px;
      border: 1px solid #99f;
-     -moz-box-shadow: inset 0px 0px 4px 2px #00000A;
+     -moz-box-shadow: inset 0 0 4px 2px #00000A;
 }
 
 div.configure {
-     margin: 1px -20px 0 -20px;
-     padding: 0px 20px 0px 20px;
+     margin: 15px -20px;
+     padding: 0 20px 0 20px;
 }
 
 div.configure hr {
@@ -500,21 +513,21 @@ div.configure hr {
 }
 
 div.configure table {
-     font-size: 9pt;
+     font-size: 8pt;
      font-weight: bold;
      border: 1px solid #99f;
 }
 
 div.configure tr, div.configure td {
-     padding: 10px 2px;
+     padding: 5px;
 }
 
 div.configure tr {
-     -moz-box-shadow: inset 0px 0px 1px 0px #000;
+     -moz-box-shadow: inset 0 0 1px 0 #000;
 }
 
 div.configure li:first-child, div.main li:first-child {
-     margin-top: -10px;
+     margin-top: 0;
 }
 
 div.configure li:last-child {
@@ -525,9 +538,13 @@ div.configure h2:first-child {
      margin-top: 15px;
 }
 
+.configure form {
+     margin: 20px 15px;
+}
+
 .sidebarconf input[type="image"] {
      margin: 2px;
-     padding: 1px;     
+     padding: 1px;
 }
 
 .sidebarconf th:nth-child(1) {
@@ -570,8 +587,8 @@ div.configure h2:first-child {
 }
 
 div.messages {
-     padding: 0px 10px;
-     background: #001;
+     padding: 10px;
+     background: #000;
      border: 1px solid #99f;
      border-right: 0;
      margin: -1px -15px 10px -16px;
@@ -579,7 +596,7 @@ div.messages {
      font-size: 9pt;
      font-weight: bold;
      color: #474;
-     -moz-box-shadow: inset 0px 0px 4px 2px #00000A;
+     -moz-box-shadow: inset 0 0 4px 2px #00000A;
 }
 
 div.messages li, div.messages ul {
@@ -590,7 +607,7 @@ div.messages li, div.messages ul {
 div.main li b{
      color: #bb7 !important;
      letter-spacing: 0.07em;
-     font-size: 9.5pt;
+     font-size: 9pt;
 }
 
 div.error {
@@ -601,12 +618,16 @@ div.notice {
      font-style: italic;
 }
 
+h1,h2,h3 {
+     border-radius: 3px;     
+}
+
 h1 {
      font-size: 18pt;
-     text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.4);
-     text-align: center;
+     text-shadow: 0 0 2px rgba(255, 255, 255, 0.4);
+     text-align: left;
      border: 1px solid #99f;
-     padding: 15px 10px;
+     padding: 13px;
      margin: 5px 5px 0 200px;
      line-height: 93%;
      text-transform: uppercase;
@@ -615,6 +636,7 @@ h1 {
      min-width: 600px;
      line-height: 100%;
      color: #fff;
+     border-radius: 3px 3px 0 0;
 }
 
 span.newtab {
@@ -630,7 +652,7 @@ x:-o-prefocus, span.newtab {
 }
 
 h2 {
-     font-size: 13pt;
+     font-size: 12pt;
      padding: 10px 10px 10px 10px;
      border: 1px solid #77f;
      border-top: 1px solid #99f;
@@ -641,13 +663,12 @@ h2 {
 }
 
 h3 {
-     font-size: 11pt;
-     padding: 6px 10px;
+     font-size: 10pt;
+     padding: 7px 10px;
      border: 1px solid #99f;
      border-right: 1px solid #77f;
      border-bottom: 1px solid #77f;
      letter-spacing: 0.05em;
-     margin-bottom: 10px;
      font-weight: bold !important;
      text-transform: uppercase;
 }
@@ -658,6 +679,7 @@ h3 a {
 
 h2, h3, .confignav {
      background: #002 url("images/tinytitles.png") center center repeat-x !important;
+     margin-bottom: 10px;
 }
 
 thead, tfoot, th {
@@ -672,24 +694,24 @@ thead, tfoot, th {
 table {
      border-collapse: collapse;
      border: 1px solid #99f;
-     margin: 0 0 5px 0;
+     margin: 15px 0 5px 0;
      cell-padding: 1px;
-     font-size: 7.5pt;
+     font-size: 8pt;
      background: #000;
      width: 100%;
 }
 
 table hr {
-     padding: 0px 0;
+     padding: 0 0;
      color: #000;
      background: #000;
-     border: 0px solid #99f;
-     margin: 0px -5px;
+     border: 0 solid #99f;
+     margin: 0 -5px;
      height: 1px;
 }
 
 table tt {
-     font-size: 7.5pt;
+     font-size: 8pt;
 }
 
 th {
@@ -731,25 +753,47 @@ h2.app {
 */
 
 h4.app, h4.app2 {
-     margin: 0 10px 2px 10px;
-     padding: 10px 0 8px 0;
+     font-size: 11pt;
+     padding: 5px;
+     border: 1px solid #99f;
+     border-right: 1px solid #99f;
+     border-bottom: 1px solid #99f;
+     letter-spacing: 0.04em;
+     font-weight: bold !important;
+     text-transform: uppercase;
+     margin: 5px 10px 5px;
+     color: #fff;
+     background: #022;
+     background: url("images/tinytitles.png") repeat-x scroll center center #000022 !important;
+     border-radius: 3px;
 }
 
 h4.app2 {
      clear: left;
-     margin-top: 5px !important;
+     margin-top: 0 !important;
 }
 
 div.ag2 {
-     margin: 0;
+     margin: 5px -15px -10px;
 }
 
 div.app {
      float: left;
-     padding: 2px;
-     height: 90px;
-     width: 112px;
+     padding: 0;
+     min-width: 80px;
      text-align: center !important;
+     border: 1px solid #339;
+     margin: 3px;
+     border-radius: 3px;
+}
+
+div.app:last-child {
+     margin-bottom: 10px;
+}
+
+div.app a:link {
+     font-size: 8pt !important;
+     text-transform: lowercase;
 }
 
 div.appgroup {
@@ -779,8 +823,8 @@ img.app {
 }
 
 img.app2p {
-     height: 40px;
-     padding: 3px 6px 0 6px;
+     height: 32px;
+     padding: 6px;
 }
 
 table.app {
@@ -802,17 +846,19 @@ td.app {
      margin: 0;
 }
 
-div.applabel {
-     background: url('images/header.png') center center repeat-x;
-     -moz-border-radius: 4px;
-     -khtml-border-radius: 4px;
-     border: 2px #00f;
-     border-radius: 4px;
-     border-width: 1px;
-     font-size: 9pt;
-     margin: 0;
-     padding: 3px 6px 4px 6px;
+.applabel {
+     background: #003;
+     font-size: 8pt;
+     margin: -5px -3px -3px;
+     padding: 2px 5px;
      text-align: center;
+     min-width: 80px;
+     border-top: 1px solid #003;
+     border-radius: 0 0 2px 2px;
+}
+
+.applabel:hover, .appimg {
+     background: #000;
 }
 
 /* end home page */
@@ -841,7 +887,7 @@ hr {
      color: #99f;
      background: #99f;
      height: 1px;
-     border: 0px solid #99f;
+     border: 0 solid #99f;
      margin: 3px 0;
 }
 
@@ -859,8 +905,7 @@ hr {
 
 div.joblog {
      margin: 10px 0;
-     line-height: 130% !important;
-     font-size: 90%;
+     line-height: 140% !important;
 }
 
 div.joblog li {
@@ -915,9 +960,9 @@ div.joblog hr {
 }
 
 div.joblog ol {
-     margin-bottom: 0px;
+     margin-bottom: 0;
 }
-
+/*
 button, button:visited {
      font: bold 9pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
      border: 1px outset #66a;
@@ -932,9 +977,9 @@ button, button:visited {
      margin: 2px;
      text-align: center;
      min-width: 60px;
-     -moz-box-shadow: inset 0px 0px 2px 1px #fff;
-     -khtml-box-shadow: inset 0px 2px 8px 0px #fff;
-     box-shadow: inset 0px 2px 8px 0px #fff;
+     -moz-box-shadow: inset 0 0 2px 1px #fff;
+     -khtml-box-shadow: inset 0 2px 8px 0 #fff;
+     box-shadow: inset 0 2px 8px 0 #fff;
      color: #316;
 }
 
@@ -1002,25 +1047,26 @@ button:hover {
      border: 1px solid #f60;
      background-color: #f60 !important;
      color: #fff;
-     -moz-box-shadow: inset 0px 0px 0px 1px #fff;
-     -khtml-box-shadow: inset 0px 0px 0px 1px #fff;
-     box-shadow: inset 0px 0px 0px 1px #fff;
+     -moz-box-shadow: inset 0 0 0 1px #fff;
+     -khtml-box-shadow: inset 0 0 0 1px #fff;
+     box-shadow: inset 0 0 0 1px #fff;
 }
 
 button:active {
      border: 1px solid #f60;
      background: #202 !important;
      color: #f60;
-     -moz-box-shadow: inset 0px 0px 0px 1px #f60;
-     box-shadow: inset 0px 0px 0px 1px #f60;
-     -khtml-box-shadow: inset 0px 0px 0px 1px #f60;
+     -moz-box-shadow: inset 0 0 0 1px #f60;
+     box-shadow: inset 0 0 0 1px #f60;
+     -khtml-box-shadow: inset 0 0 0 1px #f60;
 }
-
+*/
 input {
      margin: 3px 5px 3px 0;
      vertical-align: middle;
 }
 
+/*
 input.accept {
      background: #ffe url('../images/accept.png') no-repeat 2px center;
      padding: 2px 3px 2px 20px;
@@ -1086,7 +1132,7 @@ input:hover {
      color: #fff;
      border: 1px solid #f60;
      opacity: 1.0;
-     -moz-box-shadow: inset 0px 0px 0px 1px #fff;
+     -moz-box-shadow: inset 0 0 0 1px #fff;
 
 }
 
@@ -1094,17 +1140,24 @@ input[type=text], input[type=password] {
      margin: 3px 5px 3px 5px;
      vertical-align: middle;
 }
+*/
 
 select {
-     margin: 3px 5px 3px 5px;
+     margin: 3px 5px 3px 0;
      vertical-align: middle;
+     min-width: 90px;
 }
 
-input[type=text], input[type=password] select {
+input {
+     border-radius: 3px;
+}
+
+input[type=text], input[type=password] {
      background: #001;
      color: #eef;
      border: 1px solid #99f;
 }
+
 submit {
      margin: 3px 5px 3px 5px;
      padding: 2px 0;
@@ -1112,27 +1165,35 @@ submit {
 }
 
 p {
-     padding: 5px 20px 0px 20px;
+     padding: 5px 20px 0 20px;
      text-align: justify;
 }
 
+p img:first-child {
+     display: none !important;     
+}
+
 .formaction {
      text-align: right;
-     margin: -10px -5px;
 }
 
 .langbox {
-     margin: 4px 5px 0px 5px;
+     margin: 5px 3px 0;
      color: #eef;
      font-size: 7pt;
      width: auto;
-     text-align: center;
+     text-align: right;
      float: right;
      vertical-align: middle;
 }
 
 .langbox img {
      padding: 0 2px; /* Ignored by IE8 */
+     opacity: 0.7;
+}
+
+.langbox img:hover {
+     opacity: 1;
 }
 
 .links {
@@ -1153,6 +1214,7 @@ p {
 
 .links li:last-child {
      padding-bottom: 10px !important;
+     margin-bottom: 20px;
 }
 
 .links b {
@@ -1187,7 +1249,7 @@ a:active {
 
 pre {
      font-size: 9pt;
-     margin: 0px 20px;
+     margin: 0 20px;
 }
 
 tt {
@@ -1217,7 +1279,7 @@ tt {
 }
 
 div.graphspanel {
-     padding: 10px 0px 20px 0px;
+     padding: 10px 0 20px 0;
      margin: -16px -16px -11px -16px;
      background: #000012;
      -moz-border-radius: 4px;
@@ -1290,18 +1352,18 @@ div.footnote hr{
      color: #99f;
      background: #99f;
      height: 1px;
-     border: 0px solid #99f;
+     border: 0 solid #99f;
 }
 
 .topness {
-     font-size: 7.5pt;
+     font-size: 8pt;
      text-align: right;
      margin-top: -5px;
      margin-bottom: -10px;
      margin-right: 5px;
 }
 
-/* Fixes for when app is not started and console error loads inside iframe */
+/* Fixes for when app is not started and console loads inside iframe */
 
 body.iframed {
      background: transparent url('../dark/images/transparent.gif') !important;
@@ -1311,12 +1373,4 @@ body.iframed {
      display: none !important;
 }
 
-.iframed h1 {
-     margin: 5px 5px 0 0 !important;
-}
-
-.iframed div.sorry {
-     margin: 0 5px 0 0 !important;
-}
-
 /* end iframed console fixes */
diff --git a/installer/resources/themes/console/midnight/default.css b/installer/resources/themes/console/midnight/default.css
index 3af94480b..59394ef52 100644
--- a/installer/resources/themes/console/midnight/default.css
+++ b/installer/resources/themes/console/midnight/default.css
@@ -1,253 +1,253 @@
-/* I2P Theme: Midnight - I2P Tunnel Manager */
-/* Description: Minimalist Midnight Blue, based on Classic theme.*/
-/* Author: Dr|Z3d */
-
-body {
-     margin: 0px;
-     padding: 0px;
-     text-align: center;
-     font: 10pt/140% "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
-     background: #000;
-     color: #eef;
-     -moz-box-sizing: border-box;
-     box-sizing: border-box;
-}
-
-body.iframed {
-     background: transparent url('../dark/images/transparent.gif') !important;
-     padding-top: 5px;
-}
-
-div {
-     -moz-box-sizing: border-box;
-     box-sizing: border-box;
-}
-
-h4, label {
-     margin: 0px;
-     padding: 2px;
-     float: left;
-     width: 150px;
-     height: 24px;
-     font-weight: normal;
-     text-align: right;
-     font-size: 8.5pt;
-     -moz-box-sizing: border-box;
-     box-sizing: border-box;
-}
-
-h4 {
-     font-size: 10.5pt;
-     text-align: center !important;
-     font-weight: bold;
-     border: 1px solid #99f;
-     border-top: 2px solid #99f;
-     margin: -6px 0 5px -10px !important;
-     padding: 5px 10px 25px 10px;
-     background: #001;
-     text-shadow: 0px 0px 1px rgba(32, 32, 192, 0.3);
-     text-transform: uppercase;
-     white-space: nowrap;
-     width: 782px;
-     letter-spacing: 0.09em;
-     background: #001 url("/themes/console/midnight/images/tinytitles.png") repeat-x center center !important;
-}
-
-label {
-     font-style: italic;
-     margin: 0 3px 0 -3px;
-}
-
-a {
+/* I2P Theme: Midnight - I2P Tunnel Manager */
+/* Description: Minimalist Midnight Blue, based on Classic theme.*/
+/* Author: Dr|Z3d */
+
+body {
+     margin: 0px;
+     padding: 0px;
+     text-align: center;
+     font: 10pt/140% "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
+     background: #000;
+     color: #eef;
+     -moz-box-sizing: border-box;
+     box-sizing: border-box;
+}
+
+body.iframed {
+     background: transparent url('../dark/images/transparent.gif') !important;
+     padding-top: 5px;
+}
+
+div {
+     -moz-box-sizing: border-box;
+     box-sizing: border-box;
+}
+
+h4, label {
+     margin: 0px;
+     padding: 2px;
+     float: left;
+     width: 150px;
+     height: 24px;
+     font-weight: normal;
+     text-align: right;
+     font-size: 8.5pt;
+     -moz-box-sizing: border-box;
+     box-sizing: border-box;
+}
+
+h4 {
+     font-size: 10.5pt;
+     text-align: left !important;
+     font-weight: bold;
+     margin: -6px 0 5px -10px !important;
+     padding: 5px 10px 5px 10px;
+     background: #001;
+     text-shadow: 0px 0px 1px rgba(32, 32, 192, 0.3);
+     text-transform: uppercase;
+     white-space: nowrap;
+     width: 800px;
+     letter-spacing: 0.09em;
+     background: #001 url("/themes/console/midnight/images/tinytitles.png") repeat-x center center !important;
+}
+
+label {
+     font-style: italic;
+     margin: 0 3px 0 -3px;
+}
+
+a {
+     text-decoration: none;
+}
+
+form {
+     margin: 0px;
+}
+
+textarea, input, select, button, a {
+     -moz-box-sizing: border-box;
+     box-sizing: border-box;
+     font: 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
+     float: left;
+     margin: 2px 0 5px 0;
+     background: #001;
+     color: #eef;
+}
+
+button {
+     float: none;
+     height: 20px !important;
+}
+
+textarea {
+     border: 1px solid #99f;
+     background: #000;
+     color: #eef;
+}
+
+br {
+     clear: left;
+}
+
+div.statusNotRunning {
+     float: left;
+     width: 82px;
+     height: 24px;
+     color: #d00;
+}
+
+div.statusRunning {
+     float: left;
+     width: 82px;
+     height: 24px;
+     color: #0d0;
+}
+
+div.statusStarting {
+     float: left;
+     width: 82px;
+     height: 24px;
+     color: #393;
+}
+
+hr {
+     display: none;
+}
+
+.separator, .subdivider {
+     clear: both;
+     height: 1px;
+     margin: 5px -8px 5px -8px;
+     border-bottom: 1px solid #99f;
+}
+
+.subdivider {
+     border-bottom: 1px dotted #99f;
+     margin: 0 0 10px 0;
+}
+
+.freetext {
+     width: 150px;
+     height: 22px;
+     border: 1px solid #99f;
+}
+
+.control {
+     margin: 2px;
+     padding: 2px;
+     overflow: hidden;
+     height: 20px;
+     min-width: 60px;
+     font-weight: bold;
+     background: #ddd;
+     color: #001 !important;
+     border: 1px outset #ddddc0;
+     text-align: center;
+     vertical-align: middle;
+     white-space: nowrap;
      text-decoration: none;
-}
-
-form {
-     margin: 0px;
-}
-
-textarea, input, select, button, a {
-     -moz-box-sizing: border-box;
-     box-sizing: border-box;
-     font: 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
-     float: left;
-     margin: 2px 0 5px 0;
-     background: #001;
-     color: #eef;
-}
-
-button {
-     float: none;
-     height: 20px !important;
-}
-
-textarea {
-     border: 1px solid #99f;
-     background: #000;
-     color: #eef;
-}
-
-br {
-     clear: left;
-}
-
-div.statusNotRunning {
-     float: left;
-     width: 82px;
-     height: 24px;
-     color: #d00;
-}
-
-div.statusRunning {
-     float: left;
-     width: 82px;
-     height: 24px;
-     color: #0d0;
-}
-
-div.statusStarting {
-     float: left;
-     width: 82px;
-     height: 24px;
-     color: #393;
-}
-
-hr {
-     display: none;
-}
-
-.separator, .subdivider {
-     clear: both;
-     height: 1px;
-     margin: 5px -8px 5px -8px;
-     border-bottom: 1px solid #99f;
-}
-
-.subdivider {
-     border-bottom: 1px dotted #99f;
-     margin: 0 0 10px 0;
-}
-
-.freetext {
-     width: 150px;
-     height: 22px;
-     border: 1px solid #99f;
-}
-
-.control {
-     margin: 2px;
-     padding: 1px 2px 2px 2px;
-     overflow: hidden;
-     height: 20px;
-     width: 60px;
-     font-weight: bold;
-     background: #ddd;
-     color: #001 !important;
-     border: 1px outset #ddddc0;
-     text-align: center;
-     vertical-align: middle;
-     white-space: nowrap;
-     text-decoration: none;
-}
-
-.control:hover {
-     background: #229;
-     color: #fff;
-     text-decoration: none;
-}
-
-.control:active {
-     border: 2px inset;
-}
-
-.panel {
-     width: 790px;
-     margin: 16px auto 16px auto;
-     padding: 5px 10px;
-     overflow: hidden;
-     text-align: left;
-     font-size: 8pt;
-     background: #001;
-     border: 4px solid #99f;
+     border-radius: 3px;
+}
+
+.control:hover {
+     background: #229;
+     color: #fff;
+     text-decoration: none;
+}
+
+.control:active {
+     border: 2px inset;
+}
+
+.panel {
+     width: 790px;
+     margin: 16px auto 16px auto;
+     padding: 5px 10px;
+     overflow: hidden;
+     text-align: left;
+     font-size: 8pt;
+     background: #001;
+     border: 1px solid #99f;
      -moz-box-shadow: inset 0px 0px 0px 1px #99f;
-}
-
-.iframed .panel {
-     margin: 16px auto -8px auto !important;
-}
-
-.iframed .panel.iframed {
-     margin: 0 auto -8px auto !important;
-}
-
-.panel .footer {
-
-     padding: 4px;
-}
-
-.toolbox {
-     width: 100%;
-}
-
-.rowItem {
-     width: 750px;
-     float: left;
-     margin: 0px;
-}
-
-.comment {
-     font-style: italic;
-     white-space: nowrap;
-}
-
-.text {
-     height: 24px;
-     width: 150px;
-     padding: 2px 0 0 2px;
-     float: left;
-     margin: 0;
-     font-weight: bold;
-}
-
-.accessKey {
-     text-decoration: underline;
-}
-
-#globalOperationsPanel {
-     background: #001;
-     border: 4px solid #99f;
-     -moz-box-shadow: inset 0px 0px 0px 1px #900;
-     padding: 5px 5px 10px 5px;
-     text-align: right;
-}
-
-#globalOperationsPanel .control {
-     width: 100px !important;
-     margin-top: 3px;
-     float: right;
-}
-
-a:link {
-     color: #bbf;
-     text-decoration: none;
-     font-weight: bold;
-     word-wrap: break-word;
-}
-
-a:visited {
-     color: #aaf;
-     text-decoration: none;
-     font-weight: bold;
-}
-
-a:hover {
-     color: #f60;
-     text-decoration: underline;
-     font-weight: bold;
-}
-
-a:active {
-     color: #f93;
-     text-decoration: underline;
-     font-weight: bold;
-}
+     border-radius: 3px;
+}
+
+.iframed .panel {
+     margin: 16px auto -8px auto !important;
+}
+
+.iframed .panel.iframed {
+     margin: 0 auto -8px auto !important;
+}
+
+.panel .footer {
+
+     padding: 4px;
+}
+
+.toolbox {
+     width: 100%;
+}
+
+.rowItem {
+     width: 750px;
+     float: left;
+     margin: 0px;
+}
+
+.comment {
+     font-style: italic;
+     white-space: nowrap;
+}
+
+.text {
+     height: 24px;
+     width: 150px;
+     padding: 2px 0 0 2px;
+     float: left;
+     margin: 0;
+     font-weight: bold;
+}
+
+.accessKey {
+     text-decoration: underline;
+}
+
+#globalOperationsPanel {
+     background: #001;
+     border: 1px solid #99f;
+     -moz-box-shadow: inset 0px 0px 0px 1px #900;
+     padding: 5px 5px 10px 5px;
+     text-align: right;
+}
+
+#globalOperationsPanel .control {
+     width: 100px !important;
+     margin-top: 3px;
+     float: right;
+}
+
+a:link {
+     color: #bbf;
+     text-decoration: none;
+     font-weight: bold;
+     word-wrap: break-word;
+}
+
+a:visited {
+     color: #aaf;
+     text-decoration: none;
+     font-weight: bold;
+}
+
+a:hover {
+     color: #f60;
+     text-decoration: underline;
+     font-weight: bold;
+}
+
+a:active {
+     color: #f93;
+     text-decoration: underline;
+     font-weight: bold;
+}
diff --git a/installer/resources/themes/snark/light/snark.css b/installer/resources/themes/snark/light/snark.css
index 3c5c9b2d7..c7c53a9a3 100644
--- a/installer/resources/themes/snark/light/snark.css
+++ b/installer/resources/themes/snark/light/snark.css
@@ -1,237 +1,237 @@
 /* I2PSnark theme "Light" by dr|z3d, 2012 */
 /* Cat That Got The Cream Edition */
-/* Thanks to http://www.luxphile.com/2011/01/creative-commons-cat.html for the kitty image */
-
-body {
-     color: #000;
+/* Thanks to http://www.luxphile.com/2011/01/creative-commons-cat.html for the kitty image */
+
+body {
+     color: #000;
      font: 8pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
      background: #fff;
-     background: #fff;
-}
-
-body.iframed {
+     background: #fff;
+}
+
+body.iframed {
      background: transparent url('../../console/dark/images/transparent.gif') !important;
-     margin: 6px 0 0 !important;
-}
-
-.snarkTitle {
-     font-size: 12pt;
-     font-weight: bold;
-     text-align: center;
-}
-
-.snarkRefresh:link,.snarkRefresh:visited {
-     text-decoration: none !important;
-     text-transform: uppercase !important;
-     padding: 4px 16px 5px !important;
-     margin: -5px -8px -5px 0 !important;
-     letter-spacing: 0em;
-     font-weight: bold;
-     font-size: 9pt;
-     color: #559;
-     background: #fff url("../../console/light/images/header.png") repeat-x scroll center center;
-     -moz-border-radius: 0px;
-     -khtml-border-radius: 3px;
+     margin: 6px 0 0 !important;
+}
+
+.snarkTitle {
+     font-size: 12pt;
+     font-weight: bold;
+     text-align: center;
+}
+
+.snarkRefresh:link,.snarkRefresh:visited {
+     text-decoration: none !important;
+     text-transform: uppercase !important;
+     padding: 4px 16px 5px !important;
+     margin: -5px -8px -5px 0 !important;
+     letter-spacing: 0em;
+     font-weight: bold;
+     font-size: 9pt;
+     color: #559;
+     background: #fff url("../../console/light/images/header.png") repeat-x scroll center center;
+     -moz-border-radius: 0px;
+     -khtml-border-radius: 3px;
      border-radius: 0px;
-     border: 1px outset #66f;
-}
-
-.snarkRefresh:hover {
-     text-decoration: none !important;
-     text-transform: uppercase !important;
-     padding: 1px 16px;
-     font-weight: bold;
-     font-size: 9pt;
-     color: #fff;
-     background: #359;
-     -moz-border-radius: 0;
-     -khtml-border-radius: 0;
-     border-radius: 0;
-}
-
-.snarkRefresh:active {
-     text-decoration: none !important;
-     text-transform: uppercase !important;
-     padding: 0 16px;
-     font-weight: bold;
-     font-size: 9pt;
-     color: #fff;
-     background: #00d;
-}
-
-.snarkRefresh:last-child {
-     -moz-border-radius: 0 3px 3px 0px;
-     -khtml-border-radius: 0 3px 3px 0;
-     border-radius: 0 3px 3px 0;
-     border: 1px outset #66f;
-}
-
-.snarkRefresh:first-child {
-     -moz-border-radius: 3px 0 0 3px;
-     -khtml-border-radius: 3px 0 0 3px;
+     border: 1px outset #66f;
+}
+
+.snarkRefresh:hover {
+     text-decoration: none !important;
+     text-transform: uppercase !important;
+     padding: 1px 16px;
+     font-weight: bold;
+     font-size: 9pt;
+     color: #fff;
+     background: #359;
+     -moz-border-radius: 0;
+     -khtml-border-radius: 0;
+     border-radius: 0;
+}
+
+.snarkRefresh:active {
+     text-decoration: none !important;
+     text-transform: uppercase !important;
+     padding: 0 16px;
+     font-weight: bold;
+     font-size: 9pt;
+     color: #fff;
+     background: #00d;
+}
+
+.snarkRefresh:last-child {
+     -moz-border-radius: 0 3px 3px 0px;
+     -khtml-border-radius: 0 3px 3px 0;
+     border-radius: 0 3px 3px 0;
+     border: 1px outset #66f;
+}
+
+.snarkRefresh:first-child {
+     -moz-border-radius: 3px 0 0 3px;
+     -khtml-border-radius: 3px 0 0 3px;
      border-radius: 3px 0 0 3px;
-     border: 1px outset #66f;
+     border: 1px outset #66f;
 }
-
-.snarkMessages {
-     font: normal 8pt "Lucida Console","DejaVu Sans Mono",Courier,mono !important;
-     text-align: left;
-     margin: 0 0 10px 0;
-     padding: 3px 5px 3px 5px;
-     border-spacing: 0px;
-     overflow: auto;
-     color: #44f;
-     max-height: 50px;
-     min-height: 50px;
-     width: auto;
+
+.snarkMessages {
+     font: normal 8pt "Lucida Console","DejaVu Sans Mono",Courier,mono !important;
+     text-align: left;
+     margin: 0 0 10px 0;
+     padding: 3px 5px 3px 5px;
+     border-spacing: 0px;
+     overflow: auto;
+     color: #44f;
+     max-height: 50px;
+     min-height: 50px;
+     width: auto;
      background: #fff url('images/kitty.png') no-repeat scroll right center;
-     border-bottom: 1px solid #66f;
-}
+     border-bottom: 1px solid #66f;
+}
 
 .snarkMessages li {
      list-style: square;
 }
-
-.snarkMessages a:link, .snarkMessages a:visited {
-     color: #69f !important;
-}
-
-.snarkMessages a:hover {
-     color: #f90 !important;
-}
-
-.snarkMessages ul {
-     margin: 0;
-     padding: 0 0 0 16px;
-}
-
-.snarkMessages p {
-     font-style: italic;
-     margin: 0;
-     text-align: right;
-}
-
-.snarkMessages img, .snarkMessages img:hover {
-     float: right;
-     margin: -4px -5px 4px 4px;
+
+.snarkMessages a:link, .snarkMessages a:visited {
+     color: #69f !important;
+}
+
+.snarkMessages a:hover {
+     color: #f90 !important;
+}
+
+.snarkMessages ul {
+     margin: 0;
+     padding: 0 0 0 16px;
+}
+
+.snarkMessages p {
+     font-style: italic;
+     margin: 0;
+     text-align: right;
+}
+
+.snarkMessages img, .snarkMessages img:hover {
+     float: right;
+     margin: -4px -5px 4px 4px;
      opacity: 1;
      border: 1px solid #66f;
      border-right: 0 none;
-     border-top: 0 none;
-}
-
-.logshim {
-     margin-top: -10px !important;
-}
-
-pre {
-     width: 100%;
-     font: 8pt "Lucida Console","DejaVu Sans Mono",Courier,mono !important;
-     padding: 0;
-     text-align: left !important;
-     height: 8px;
-     color: #35f;
-     font-weight: bold !important; 
-}
-
-table {
-     margin: 0px 0px 10px 0px;
-     border: 0px;
-     padding: 0px;
-     border-spacing: 0px;
-     border-collapse: collapse;
-     color: #323;
-     width: 100%;
-     opacity: 1 !important;
-}
-
-tr { 
-     opacity: 1;
-}
-
-thead, tfoot {
-     background: #fff;
-}
-
-thead a, tfoot a {
-} 
-
-thead {
-     border-bottom: 1px solid #101;
-}
-
-th {
-     padding: 3px 2px;
-     font-size: 8pt;
-     border-top: 1px solid #66f;
-     border-bottom: 1px solid #66f;
-     color: #001;
+     border-top: 0 none;
+}
+
+.logshim {
+     margin-top: -10px !important;
+}
+
+pre {
+     width: 100%;
+     font: 8pt "Lucida Console","DejaVu Sans Mono",Courier,mono !important;
+     padding: 0;
+     text-align: left !important;
+     height: 8px;
+     color: #35f;
+     font-weight: bold !important; 
+}
+
+table {
+     margin: 0px 0px 10px 0px;
+     border: 0px;
+     padding: 0px;
+     border-spacing: 0px;
+     border-collapse: collapse;
+     color: #323;
+     width: 100%;
+     opacity: 1 !important;
+}
+
+tr { 
+     opacity: 1;
+}
+
+thead, tfoot {
+     background: #fff;
+}
+
+thead a, tfoot a {
+} 
+
+thead {
+     border-bottom: 1px solid #101;
+}
+
+th {
+     padding: 3px 2px;
+     font-size: 8pt;
+     border-top: 1px solid #66f;
+     border-bottom: 1px solid #66f;
+     color: #001;
       whitespace: nowrap;
-     background: #fff url("../../console/light/images/header.png") repeat-x scroll center center;
-}
-
-th:first-child {
-     text-align: left !important;
-     padding-left: 2px;
-}
-
-tfoot td:first-child {
-     text-align: left !important;
-     padding-left: 0px;
-}
-
-th:first-child img {
-     margin: 1px -2px 3px 1px !important;
-}
-
-th:nth-child(2) img {
-     margin: 1px 7px 3px 2px !important;
-}
-
-tfoot th {
-     padding-bottom: 4px !important;
-}
-
-tfoot img, tfoot:nth-child(2) img, tfoot:nth-child(1) img, tfoot:nth-child(3) img, tfoot:nth-child(4) img {
-     margin: 0px 2px 3px 0px !important;
-     padding-right: 0 !important;
-}
-
-tfoot tr:nth-child(n+1) {
-     text-align: left;
-}
-
-.headerstatus {
-     text-align: left;
-     padding-left: 15px;
-}
-
-.headerpriority {
-     text-align: left;
-     padding-left: 10px;
-}
-
-.ParentDir {
+     background: #fff url("../../console/light/images/header.png") repeat-x scroll center center;
+}
+
+th:first-child {
+     text-align: left !important;
+     padding-left: 2px;
+}
+
+tfoot td:first-child {
+     text-align: left !important;
+     padding-left: 0px;
+}
+
+th:first-child img {
+     margin: 1px -2px 3px 1px !important;
+}
+
+th:nth-child(2) img {
+     margin: 1px 7px 3px 2px !important;
+}
+
+tfoot th {
+     padding-bottom: 4px !important;
+}
+
+tfoot img, tfoot:nth-child(2) img, tfoot:nth-child(1) img, tfoot:nth-child(3) img, tfoot:nth-child(4) img {
+     margin: 0px 2px 3px 0px !important;
+     padding-right: 0 !important;
+}
+
+tfoot tr:nth-child(n+1) {
+     text-align: left;
+}
+
+.headerstatus {
+     text-align: left;
+     padding-left: 15px;
+}
+
+.headerpriority {
+     text-align: left;
+     padding-left: 10px;
+}
+
+.ParentDir {
      background: #fff;
-     font-size: 8pt;
-     border: 0px inset #101 !important;
-     border-left: 0 !important;
-     border-right: 0 !important;
-     text-align: left !important;
-     padding: 4px 0;
-}
-
-.priority {
-     font-size: 7pt;
+     font-size: 8pt;
+     border: 0px inset #101 !important;
+     border-left: 0 !important;
+     border-right: 0 !important;
+     text-align: left !important;
+     padding: 4px 0;
+}
+
+.priority {
+     font-size: 7pt;
      vertical-align: center;
-     min-width: 160px;
-}
+     min-width: 160px;
+}
 
-.SnarkTorrents {
-     margin: 0;
-     border: 0px solid #66f;
-     background: #fff;
-}
+.SnarkTorrents {
+     margin: 0;
+     border: 0px solid #66f;
+     background: #fff;
+}
 
 .SnarkTorrents td {
      line-height: 90%;
@@ -244,184 +244,180 @@ tfoot tr:nth-child(n+1) {
 .SnarkTorrents td:nth-child(3), .SnarkTorrents td:nth-child(4) {
      width: 20px !important;
 }
-
-td {
-     padding: 1px;
-     color: #001 !important;
-      opacity: 1;
-     font-size: 8pt;
-}
-
-.mainsection td {
-     color: #001;
-}
-
-td:first-child {
-     text-align: right;
-     font-size: 8pt;
-}
-
-.center {
-     text-align: center !important;
-}
-
-.snarkTorrentName {
+
+td {
+     padding: 1px;
+     color: #001 !important;
+      opacity: 1;
+     font-size: 8pt;
+}
+
+.mainsection td {
+     color: #001;
+}
+
+td:first-child {
+     text-align: right;
+     font-size: 8pt;
+}
+
+.center {
+     text-align: center !important;
+}
+
+.snarkTorrentName {
      padding: 0;
      line-height: 90%;
-     font-weight: bold !important;
-}
-
-.snarkTorrentAction {
-     text-shadow: 1px 1px #550000;
-     padding: 1px 1px 1px 1px !important;
-     margin: 0 !important;
-     text-align: center;
-     width: 60px; 
-}
-
-.snarkTorrentAction img {
-     margin: 0 2px !important;
-     opacity: 1;
-}
-
-.snarkTorrentAction img:hover {
-     -moz-box-shadow: 0 0 1px 1px #f90;
-     opacity: 1;
-}
-
-.snarkTorrentEven {
-     font-size: 8pt;
+     font-weight: bold !important;
+}
+
+.snarkTorrentAction {
+     text-shadow: 1px 1px #550000;
+     padding: 1px 1px 1px 1px !important;
+     margin: 0 !important;
+     text-align: center;
+     width: 60px; 
+}
+
+.snarkTorrentAction img {
+     margin: 0 2px !important;
+     opacity: 1;
+}
+
+.snarkTorrentAction img:hover {
+     -moz-box-shadow: 0 0 1px 1px #f90;
+     opacity: 1;
+}
+
+.snarkTorrentEven {
+     font-size: 8pt;
      background: #f5f5f5;
-}
-
-.snarkTorrentNoneLoaded {
-     background: #fff;
-     font-size: 8.5pt;
-     font-weight: bold;
-     text-align: center !important;
-     color: #bbb !important;
-}
-
-.snarkTorrentStatus {
+}
+
+.snarkTorrentNoneLoaded {
+     background: #fff;
+     font-size: 8.5pt;
+     font-weight: bold;
+     text-align: center !important;
+     color: #bbb !important;
+}
+
+.snarkTorrentStatus {
      padding: 2px 2px 2px 0;
-     line-height: 90%;
-}
-
-.snarkTorrentStatus:first-child {
-     text-align: left !important;
-     padding-left: 0px;
-     min-width: 48px;
-     font-weight: bold;
-     color: #dd9 !important;
-     font-size: 8pt;
-     padding: 1px !important;
-}
-
-.snarkTorrentStatus:first-child img {
-     margin-right: 10px !important;
-     margin-left: 6px;
-}
-
-.snarkTorrentRateUp, .snarkTorrentRateDown, .snarkTorrentDownloaded, .snarkTorrentUploaded {
-     font-size: 8pt;
+     line-height: 90%;
+}
+
+.snarkTorrentStatus:first-child {
+     text-align: left !important;
+     padding-left: 0px;
+     min-width: 48px;
+     font-weight: bold;
+     color: #dd9 !important;
+     font-size: 8pt;
+     padding: 1px !important;
+}
+
+.snarkTorrentStatus:first-child img {
+     margin-right: 10px !important;
+     margin-left: 6px;
+}
+
+.snarkTorrentRateUp, .snarkTorrentRateDown, .snarkTorrentDownloaded, .snarkTorrentUploaded {
+     font-size: 8pt;
      padding: 0 3px;
-     line-height: 90%;
-}
-
-.snarkTorrentDownloaded {
-     color: #001 !important;
-}
-
-.snarkTorrentUploaded {
-     color: #001 !important;
-}
-
-.snarkTorrentRateUp {
-     color: #001 !important;
-}
-
-.snarkTorrentRateDown {
-     color: #001 !important;
-}
-
-.snarkTorrentOdd {
-     background: #f0f0f0;
-     font-size: 8pt;
-     border: 0px inset #101 !important;
-     border-left: 0 !important;
+     line-height: 90%;
+}
+
+.snarkTorrentDownloaded {
+     color: #001 !important;
+}
+
+.snarkTorrentUploaded {
+     color: #001 !important;
+}
+
+.snarkTorrentRateUp {
+     color: #001 !important;
+}
+
+.snarkTorrentRateDown {
+     color: #001 !important;
+}
+
+.snarkTorrentOdd {
+     background: #f0f0f0;
+     font-size: 8pt;
+     border: 0px inset #101 !important;
+     border-left: 0 !important;
      border-right: 0 !important;
 }
-
-.snarkTorrentOdd td, .snarkTorrentEven td {
-     border-top: 1px dotted #66f !important;
-}
-
-.snarkFileIcon {
-     width: 16px;
-}
-
-.snarkFileName {
-     padding: 4px 0px !important; 
-     text-align: left !important;
-     font-size: 8pt !important;
-}
-
-.snarkFileSize {
-     padding: 4px 2px;
-     font-weight: normal;
-}
-
-.snarkFileStatus {
-     padding: 4px 5px 4px 15px;
-     text-align: center;
-     font-style: italic;
-     font-size: 8pt;
+
+.snarkTorrentOdd td, .snarkTorrentEven td {
+     border-top: 1px dotted #66f !important;
+}
+
+.snarkFileName {
+     padding: 4px 0px !important; 
+     text-align: left !important;
+     font-size: 8pt !important;
+}
+
+.snarkFileSize {
+     padding: 4px 2px;
+     font-weight: normal;
+}
+
+.snarkFileStatus {
+     padding: 4px 5px 4px 15px;
+     text-align: center;
+     font-style: italic;
+     font-size: 8pt;
      text-align: left;
-     min-width: 230px;
-}
-
-.snarkTorrentETA {
-     font-style: italic;
-}
-
-.choked {
-     color: #f00000 !important;
-}
-
-.unchoked {
-     color: #00f000 !important;
-}
-
-.thumb {
-     max-height: 64px;
-     max-width: 96px;
-}
-
-.snarkNewTorrent {
-     font-size: 9pt;
-}
-
-.snarkAddInfo {
-     font-size: 8.5pt;
-     line-height: 130% !important;
-}
-
-.snarkConfigTitle {
-     font-size: 10.5pt;
-     font-weight: bold;
-     padding: 1px 15px 4px 12px;
-     margin: 5px 0 10px 0 !important;
-     letter-spacing: 0.02em;
-     border: 1px solid #66f;
-      -moz-border-radius: 0 0 5px 5px;
-      -khtml-border-radius: 0 0 5px 5px;
-      border-radius: 0 0 5px 5px;
-     border-top: 0;
-     text-shadow: 0px 2px 2px #999;
-     background: #fff url("../../console/light/images/header.png") repeat-x scroll center center;
+     min-width: 230px;
+}
+
+.snarkTorrentETA {
+     font-style: italic;
+}
+
+.choked {
+     color: #f00000 !important;
+}
+
+.unchoked {
+     color: #00f000 !important;
+}
+
+.thumb {
+     max-height: 64px;
+     max-width: 96px;
+}
+
+.snarkNewTorrent {
+     font-size: 9pt;
+}
+
+.snarkAddInfo {
+     font-size: 8.5pt;
+     line-height: 130% !important;
+}
+
+.snarkConfigTitle {
+     font-size: 10.5pt;
+     font-weight: bold;
+     padding: 1px 15px 4px 12px;
+     margin: 5px 0 10px 0 !important;
+     letter-spacing: 0.02em;
+     border: 1px solid #66f;
+     -moz-border-radius: 0 0 5px 5px;
+     -khtml-border-radius: 0 0 5px 5px;
+     border-radius: 0 0 5px 5px;
+     border-top: 0;
+     text-shadow: 0 1px 0 #aaa;
+     background: #fff url("../../console/light/images/header.png") repeat-x scroll center center;
      font-variant: small-caps !important;
-     box-shadow: 0 1px 3px #999;
-}
+     box-shadow: 0 1px 3px #999;
+}
 
 div.newtorrentsection .snarkConfigTitle, div.addtorrentsection .snarkConfigTitle, div.configsectionpanel .snarkConfigTitle {
      padding-top: 0 !important;	
@@ -431,10 +427,10 @@ div.newtorrentsection .snarkConfigTitle, div.addtorrentsection .snarkConfigTitle
      margin-right: -3px;
      padding-bottom: 3px;
 }
-
-.snarkConfig {
-     font-size: 10pt;
-     width: 100%;
+
+.snarkConfig {
+     font-size: 10pt;
+     width: 100%;
 }
 
 table.snarkTorrentInfo, table.snarkDirInfo {
@@ -453,359 +449,359 @@ table.snarkTorrentInfo, table.snarkDirInfo {
      min-width: 0px !important;
 }
 
-.page {
-     color: #310;
+.page {
+     color: #310;
      min-width: 700px !important;
-     margin: 5px 0 0 0;
-     padding: 10px;
-     -moz-border-radius: 4px;
-     -khtml-border-radius: 4px;
-     border-radius: 4px;
-     border: 1px solid #66f;
-     font-size: 9pt !important;
-     line-height: 160% !important;
-     -moz-box-shadow: inset 0px 0px 1px 0px #212;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #002;
-     box-shadow: inset 0px 0px 1px 0px #002;
-     text-align: center;
+     margin: 5px 0 0 0;
+     padding: 10px;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     border: 1px solid #66f;
+     font-size: 9pt !important;
+     line-height: 160% !important;
+     -moz-box-shadow: inset 0px 0px 1px 0px #212;
+     -khtml-box-shadow: inset 0px 0px 1px 0px #002;
+     box-shadow: inset 0px 0px 1px 0px #002;
+     text-align: center;
      opacity: 1;
-     background: #fff;
-}
+     background: #fff;
+}
+
+form {
+     margin-bottom: 0;
+}
+
+p {
+     line-height: 150%;
+}
+
+hr {
+     color: #444;
+     background: #444;
+     height: 1px;
+     border: 0px solid #444;
+     width: 0%;
+     margin: 5px 0 7px 0;
+     text-align: center;
+}
+
+a:link {	
+     color: #359;
+     text-decoration: none;
+     font-weight: bold;
+     word-wrap: break-word;
+}
+
+a:visited {
+     color: #249;
+     text-decoration: none;
+}
+
+a:hover {
+     color: #559;
+}
 
-form {
-     margin-bottom: 0;
+a:active {
+     color: #77b;
 }
-
-p {
-     line-height: 150%;
-}
-
-hr {
-     color: #444;
-     background: #444;
-     height: 1px;
-     border: 0px solid #444;
-     width: 0%;
-     margin: 5px 0 7px 0;
-     text-align: center;
-}
-
-a:link {	
-     color: #359;
-     text-decoration: none;
-     font-weight: bold;
-     word-wrap: break-word;
-}
-
-a:visited {
-     color: #249;
-     text-decoration: none;
-}
-
-a:hover {
-     color: #559;
-}
-
-a:active {
-     color: #77b;
-}
-
-input {
-     font-size: 9pt;
-     font-weight: bold;
-     text-align: left;
-     padding: 3px 4px !important;
-     -moz-border-radius: 4px;
-     -khtml-border-radius: 4px;
-     border-radius: 4px;
-     border: 1px solid #66f;
-     background: #fff;	 
-     color: #559;
+
+input {
+     font-size: 9pt;
+     font-weight: bold;
+     text-align: left;
+     padding: 3px 4px !important;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     border: 1px solid #66f;
+     background: #fff;	 
+     color: #559;
      margin: 2px 4px 2px 0;
      font: bold 8pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
 }
-
-input.r {
-     text-align: right;
+
+input.r {
+     text-align: right;
      background: #fff;
-     border: 1px solid #66f;
-}
-
-input[type=submit] {
-     text-shadow: 0px 0px #410;
-     color: #359;
-     background: #fff;
-     border: 1px outset #191;
+     border: 1px solid #66f;
+}
+
+input[type=submit] {
+     text-shadow: 0px 0px #410;
+     color: #359;
+     background: #fff;
+     border: 1px outset #191;
      padding: 2px;
      font: bold 8pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
-     margin-top: 6px;
-}
-
-input[type=submit]:hover {
-     border: 1px outset #559;
-     background-color: #559;
-     color: #fff;
-}
-
-input[type=submit]:active {
-     background: #f60 !important;
-     color: #fff !important;
-     text-shadow: 0 !important;
-}
-
-input[type=image], thead img {
-     padding: 0 !important;
-     -moz-border-radius: 0px;
-     -khtml-border-radius: 0px;
-     border-radius: 0px;
-     border: medium none;
-     margin: 0 2px;
-     opacity: 1;
-}
-
-input[type=image]:hover, thead img:hover {
-     opacity: 1;
-}
-
-input[type=text]:active, input[type=text]:hover, input.r:hover {
-     background: #fff;
+     margin-top: 6px;
+}
+
+input[type=submit]:hover {
+     border: 1px outset #559;
+     background-color: #559;
+     color: #fff;
+}
+
+input[type=submit]:active {
+     background: #f60 !important;
+     color: #fff !important;
+     text-shadow: 0 !important;
+}
+
+input[type=image], thead img {
+     padding: 0 !important;
+     -moz-border-radius: 0px;
+     -khtml-border-radius: 0px;
+     border-radius: 0px;
+     border: medium none;
+     margin: 0 2px;
+     opacity: 1;
+}
+
+input[type=image]:hover, thead img:hover {
+     opacity: 1;
+}
+
+input[type=text]:active, input[type=text]:hover, input.r:hover {
+     background: #fff;
      color: #009;
      border: 1px solid #66f;
-     box-shadow: none !important;
-}
+     box-shadow: none !important;
+}
 
 input[type=text], input.r {
      min-width: 90px;
      box-shadow: 1px 1px 2px 1px #aaa inset;
 }
-
-input[type=radio] {
-     padding: 2px;
-     margin: 0 3px 0 8px;
-     vertical-align: bottom;
-}
-
+
+input[type=radio] {
+     padding: 2px;
+     margin: 0 3px 0 8px;
+     vertical-align: bottom;
+}
+
 input.default { width: 1px; height: 1px; visibility: hidden; }
-
-select {
-     background: #fff !important;
-     color: #66f;
-     font: 8pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
-     font-weight: bold;
-     padding: 2px 2px 2px 3px;
-     -moz-border-radius: 4px 0 0 4px;
-     -khtml-border-radius: 4px 0 0 4px;
-     border-radius: 4px 0 0 4px;
+
+select {
+     background: #fff !important;
+     color: #22f;
+     font: 8pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
+     font-weight: bold;
+     padding: 2px 2px 2px 3px;
+     -moz-border-radius: 4px 0 0 4px;
+     -khtml-border-radius: 4px 0 0 4px;
+     border-radius: 4px 0 0 4px;
      border: 1px solid #66f;
      margin: 2px 4px 2px 0;
-     min-width: 90px;
-}
-
-select:hover, textarea:hover {
-     background: #fff !important;
-     color: #001 !important;
-}
+     min-width: 90px;
+}
+
+select:hover, textarea:hover {
+     background: #fff !important;
+     color: #001 !important;
+}
 
 textarea:hover {
      color: #001 !important;
      box-shadow: none;
 }
-
-textarea {
-     background: #fff;
-     color: #66f;
-     font-weight: bold;
-     padding: 1px 4px 0px;
-     -moz-border-radius: 4px;
-     -khtml-border-radius: 4px;
-     border-radius: 4px;
+
+textarea {
+     background: #fff;
+     color: #22f;
+     font-weight: bold;
+     padding: 1px 4px 0px;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
      border: 1px solid #66f;
      font-size: 8pt;
-     box-shadow: 1px 1px 2px 1px #aaa inset;
-}
+     box-shadow: 1px 1px 2px 1px #aaa inset;
+}
+
+img {
+     border: none;
+     margin: 0 3px 1px 3px;
+     vertical-align: middle;
+     opacity: 1.0;
+     line-height: 100%;
+}
+
+img:hover {
+     border: none;
+     opacity: 1;
+     line-height: 100%;
+}
+
+.infoz {
+     margin: 0 -1px 0 0 !important;
+     padding: 0 !important;
+     line-height: 100%;
+     float: left;
+}
+
+.infoz img {
+     border: none;
+     opacity: 1 !important;
+}
+
+.infoz img:hover {
+     opacity: 1 !important;
+}
 
-img {
-     border: none;
-     margin: 0 3px 1px 3px;
-     vertical-align: middle;
-     opacity: 1.0;
-     line-height: 100%;
-}
-
-img:hover {
-     border: none;
-     opacity: 1;
-     line-height: 100%;
-}
-
-.infoz {
-     margin: 0 -1px 0 0 !important;
-     padding: 0 !important;
-     line-height: 100%;
-     float: left;
-}
-
-.infoz img {
-     border: none;
-     opacity: 1 !important;
-}
-
-.infoz img:hover {
-     opacity: 1 !important;
-}
-
-div.newtorrentsection td:first-child, div.addtorrentsection td:first-child, div.configsectionpanel td:first-child {
+div.newtorrentsection td:first-child, div.addtorrentsection td:first-child, div.configsectionpanel td:first-child {
      width: auto !important;
 }
 
 div.configsectionpanel td:first-child {
      padding-right: 5px;
 }
-
-div.section,div.mainsection div.section,div.mainsection {
-     margin: 0;
-     padding: 0px;
+
+div.section,div.mainsection div.section,div.mainsection {
+     margin: 0;
+     padding: 0px;
      border: 1px solid #66f;
      border-top: 2px solid #66f;
-     border-bottom: 2px solid #66f;
-     color: #001;
-     word-wrap: break-word;
-     text-align: center;
-     background: #fff;
-     opacity: 1 !important;
-}
-
-div.newtorrentsection {
-     margin: 0 0 10px 0;
-     padding: 0 10px 0px 10px;
-     border: 1px solid #66f;
-     text-align: center;
-     color: #001;
-     -moz-border-radius: 4px;
-     -khtml-border-radius: 4px;
-     border-radius: 4px;
-     -moz-box-shadow: inset 0px 0px 1px 0px #101;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #101;
-     box-shadow: inset 0px 0px 1px 0px #101;
-     word-wrap: break-word;
-     background: #f0f0f0 url('images/snark_create.png') no-repeat scroll right center;
-}
-
-div.addtorrentsection {
-     margin: 10px 0;
-     padding: 0 10px;
-     border: 1px solid #66f;
-     text-align: center;
-     color: #001;
-     -moz-border-radius: 4px;
-     -khtml-border-radius: 4px;
-     border-radius: 4px;
-     -moz-box-shadow: inset 0px 0px 1px 0px #101;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #101;
-     box-shadow: inset 0px 0px 1px 0px #101;
-     word-wrap: break-word;
-     background: #f0f0f0 url('images/snark_add.png') no-repeat scroll right center;
-}
-
-div.configsection {
-     margin: 0;
-     padding: 0 10px 15px 10px;
-     border: 1px solid #66f;
-     color: #001;
-     -moz-border-radius: 4px;
-     -khtml-border-radius: 4px;
-     border-radius: 4px;
-     -moz-box-shadow: inset 0px 0px 1px 0px #101;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #101;
-     box-shadow: inset 0px 0px 1px 0px #101;
-     word-wrap: break-word;
-     text-align: center;
-     background: #f0f0f0;
-     font-weight: bold;
+     border-bottom: 2px solid #66f;
+     color: #001;
+     word-wrap: break-word;
+     text-align: center;
+     background: #fff;
+     opacity: 1 !important;
+}
+
+div.newtorrentsection {
+     margin: 0 0 10px 0;
+     padding: 0 10px 0px 10px;
+     border: 1px solid #66f;
+     text-align: center;
+     color: #001;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     -moz-box-shadow: inset 0px 0px 1px 0px #101;
+     -khtml-box-shadow: inset 0px 0px 1px 0px #101;
+     box-shadow: inset 0px 0px 1px 0px #101;
+     word-wrap: break-word;
+     background: #f0f0f0 url('images/snark_create.png') no-repeat scroll right center;
+}
+
+div.addtorrentsection {
+     margin: 10px 0;
+     padding: 0 10px;
+     border: 1px solid #66f;
+     text-align: center;
+     color: #001;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     -moz-box-shadow: inset 0px 0px 1px 0px #101;
+     -khtml-box-shadow: inset 0px 0px 1px 0px #101;
+     box-shadow: inset 0px 0px 1px 0px #101;
+     word-wrap: break-word;
+     background: #f0f0f0 url('images/snark_add.png') no-repeat scroll right center;
+}
+
+div.configsection {
+     margin: 0;
+     padding: 0 10px 15px 10px;
+     border: 1px solid #66f;
+     color: #001;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     -moz-box-shadow: inset 0px 0px 1px 0px #101;
+     -khtml-box-shadow: inset 0px 0px 1px 0px #101;
+     box-shadow: inset 0px 0px 1px 0px #101;
+     word-wrap: break-word;
+     text-align: center;
+     background: #f0f0f0;
+     font-weight: bold;
 }
 
 div.configsection .snarkConfigTitle {
      padding-top: 0px !important;
-}
-
-div.configsectionpanel {
-     margin: -3px 0 0;
-     padding: 0 10px;
-     border: 1px solid #66f;
-     color: #001;
-     -moz-border-radius: 0 0 4px 4px;
-     -khtml-border-radius: 0 0 4px 4px;
-     border-radius: 0 0 4px 4px;
-     -moz-box-shadow: inset 0px 0px 1px 0px #101;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #101;
-     box-shadow: inset 0px 0px 1px 0px #101;
-     word-wrap: break-word;
-     text-align: center;
-     background: #f0f0f0 url('images/configuration.png') no-repeat scroll right center;
-     font-weight: bold;
-}
-
-.newtorrentsection form, .configsection form, .addtorrentsection form {
-     color: #001 !important;
-}
-
-div.configsection table{
-     color: #ffb;
-     opacity: 1;
-}
-
-div.configsection a {
+}
+
+div.configsectionpanel {
+     margin: -3px 0 0;
+     padding: 0 10px;
+     border: 1px solid #66f;
+     color: #001;
+     -moz-border-radius: 0 0 4px 4px;
+     -khtml-border-radius: 0 0 4px 4px;
+     border-radius: 0 0 4px 4px;
+     -moz-box-shadow: inset 0px 0px 1px 0px #101;
+     -khtml-box-shadow: inset 0px 0px 1px 0px #101;
+     box-shadow: inset 0px 0px 1px 0px #101;
+     word-wrap: break-word;
+     text-align: center;
+     background: #f0f0f0 url('images/configuration.png') no-repeat scroll right center;
+     font-weight: bold;
+}
+
+.newtorrentsection form, .configsection form, .addtorrentsection form {
+     color: #001 !important;
+}
+
+div.configsection table{
+     color: #ffb;
+     opacity: 1;
+}
+
+div.configsection a {
      color: #00a;
-     font-weight: bold;
-}
-
-div.configsection a:hover {
-     color: #00f;
-     text-decoration: none;
-}
-
+     font-weight: bold;
+}
+
+div.configsection a:hover {
+     color: #00f;
+     text-decoration: none;
+}
+
 code {
-     font-size: 8pt;
-     color: #009;
-     padding: 0 2px;
-     font-weight: bold;
-     font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+     font-size: 8pt;
+     color: #009;
+     padding: 0 2px;
+     font-weight: bold;
+     font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono;
 }
-
-.snarknavbar {
-     margin: -10px 0 5px 0 !important;
-     padding: 14px 10px 7px;
+
+.snarknavbar {
+     margin: -10px 0 5px 0 !important;
+     padding: 14px 10px 7px;
 /*
-     border: 1px solid #101;
-     -moz-border-radius: 0 0 8px 8px;
-     -khtml-border-radius: 0 0 8px 8px;
-     border-radius: 0 0 8px 8px;
-     -moz-box-shadow: inset 0px 0px 1px 0px #002;
-     -khtml-box-shadow: inset 0px 0px 1px 0px #002;
-     box-shadow: inset 0px 0px 1px 0px #002;
+     border: 1px solid #101;
+     -moz-border-radius: 0 0 8px 8px;
+     -khtml-border-radius: 0 0 8px 8px;
+     border-radius: 0 0 8px 8px;
+     -moz-box-shadow: inset 0px 0px 1px 0px #002;
+     -khtml-box-shadow: inset 0px 0px 1px 0px #002;
+     box-shadow: inset 0px 0px 1px 0px #002;
      background: #fff url('../../console/dark/images/header.png') repeat-x scroll center center !important;
 */
-     background: none;
-     text-transform: uppercase !important;
-     letter-spacing: 0em !important;
-     font-weight: bold;
-     font-size: 11.5pt;
-     color: #001;
-     min-width: 600px;
-     width: 70%;
-     text-align: center;
+     background: none;
+     text-transform: uppercase !important;
+     letter-spacing: 0em !important;
+     font-weight: bold;
+     font-size: 11.5pt;
+     color: #001;
+     min-width: 600px;
+     width: 70%;
+     text-align: center;
  }
 
 .iframed .snarknavbar {
      margin: -5px 0 8px !important;
-}
-
-.snarknavbar img {
-     border: 0;
-     margin: 1px -8px -1px -2px;
-     padding: 1px 0 0px !important;
-     vertical-align: top;
-}
+}
+
+.snarknavbar img {
+     border: 0;
+     margin: 1px -8px -1px -2px;
+     padding: 1px 0 0px !important;
+     vertical-align: top;
+}
 
 .routerdown {
      color: #001;

From 0ca2d33ee19dbb722b912217b2146902b10ff648 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 7 Aug 2012 04:24:41 +0000
Subject: [PATCH 2/9] New midnight theme for susidns from dr|z3d

---
 .../themes/susidns/midnight/susidns.css       | 321 ++++++++++++++++++
 1 file changed, 321 insertions(+)
 create mode 100644 installer/resources/themes/susidns/midnight/susidns.css

diff --git a/installer/resources/themes/susidns/midnight/susidns.css b/installer/resources/themes/susidns/midnight/susidns.css
new file mode 100644
index 000000000..65a1b7f75
--- /dev/null
+++ b/installer/resources/themes/susidns/midnight/susidns.css
@@ -0,0 +1,321 @@
+/* Susidns Midnight theme by dr|z3d */
+
+body {
+     font-family:"Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
+     background-color: #000;
+     color: #eef;
+}
+
+body.iframed {
+     background: transparent !important;
+     margin: 0;
+}
+
+#logo {
+     display: none;
+}
+
+#navi p {
+     text-align: center;
+     font-weight: bold;
+}
+
+#navi a:link {
+     text-transform: capitalize;
+}
+
+hr {
+     color: #99f;
+     background: #99f;
+     height: 1px;
+     border: 0px solid #99f;
+     width: 100%;
+     margin: 5px 0;
+     text-align: center;
+}
+
+p {
+     color:#eef;
+     margin: 0;
+     font-size: 8pt;
+     text-align: justify;
+}
+
+span.addrhlpr {
+     font-size:8pt;
+}
+
+h3 {
+     color:#eef;
+     font-size:10pt;
+     font-weight:bold;
+     border: 1px solid #99f;
+     padding: 5px;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     background: #001 url("../../console/midnight/images/titles.png") repeat-x scroll center center !important;
+     letter-spacing: 0.08em;
+     padding: 6px;
+     text-shadow: 0 0 2px #001100;
+     text-transform: uppercase;
+}
+
+a {
+     color:#f60;
+     text-decoration:none;
+     font-weight: bold;
+}
+
+a:hover {
+     text-decoration:underline;
+     font-weight: bold;
+}
+
+th {
+
+     color:#ee9;
+     font-size: 9pt;
+     padding:5px 10px;
+     font-size:10pt;
+}
+
+td {
+
+     color:#ee9;
+     line-height:12pt;
+     padding:5px 10px;
+     font-size:8pt;
+     vertical-align:center;
+}
+
+ol, ul {
+     margin: 0 20px 0 10px;
+}
+
+li {
+     color:#ee9;
+     line-height:12pt;
+     margin: 0;
+     font-size:8pt;
+     list-style: square;
+}
+
+tr.list1 {
+     background-color:#001
+}
+
+tr.list0 {
+     background-color:#000;
+}
+
+p.messages {
+     background-color:#000;
+     color:#ee9;
+     border: 1px solid #99f;
+     padding: 5px;
+     margin: 5px 0 10px;
+     border-radius: 4px;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+}
+
+#help {
+     border: 1px solid #99f;
+     padding: 10px 20px;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     margin: 0 0 15px;
+     background: #000;
+}
+
+p.footer {
+     font-size:7pt;
+     text-align: center;
+     display: none;
+}
+
+p.buttons, #buttons {
+     text-align: right;
+     margin: 5px 0 -5px;
+}
+
+.illustrate {
+     margin: 20px 0 15px;
+     padding: 10px;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     border: 1px solid #001;
+     font-size: 10pt;
+     -moz-box-shadow: inset 0px 0px 1px 0px #002;
+     background: #fff;
+}
+
+#book table {
+     width: 100%;
+}
+
+.destinations textarea {
+     width: 100%;
+     padding: 2px;
+}
+
+.page {
+     color:#ee9;
+     margin: 10px 0;
+     padding: 0;
+     font-size: 8pt !important;
+     -moz-box-shadow: inset 0px 0px 1px 0px #002;
+}
+
+.iframed .page {
+     margin: 0;
+}
+
+input[type=submit], input[type=reset] {
+     border: 1px outset #999;
+     background: #ddf;
+     color: #001;
+     margin: 5px;
+     font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
+     padding: 1px 2px;
+     text-decoration: none;
+     min-width: 110px;
+     border-radius: 4px;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     -moz-box-shadow: inset 0px 2px 8px 0px #fff;
+     color: #006;
+}
+
+input[type=submit]:hover, input[type=reset]:hover {
+     background: #000;
+     color: #f60;
+     border: 1px solid #f60;
+     -moz-box-shadow: inset 0 1px 1px 0 #ee9;
+     box-shadow: inset 0 1px 1px 0 #ee9;
+}
+
+/*
+input[type=reset] {
+     border: 1px outset #999;
+     background: #ddf;
+     color: #001;
+     margin: 5px;
+     font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
+     padding: 1px 2px;
+     text-decoration: none;
+     min-width: 110px;
+     border-radius: 4px;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     -moz-box-shadow: inset 0px 2px 8px 0px #fff;
+     color: #006;
+     opacity: 0.9;
+}
+
+input[type=reset]:hover {
+     background: #22a;
+     color: #fff;
+     border: 1px solid #f60;
+     opacity: 1.0;
+     -moz-box-shadow: inset 0px 0px 0px 1px #fff;
+}
+*/
+
+input.accept {
+     background: #ddf url('/themes/console/images/accept.png') no-repeat 2px center;
+     padding: 2px 3px 2px 20px;
+     min-height: 22px;
+}
+
+input.add {
+     background: #ddf url('/themes/console/images/add.png') no-repeat 2px center;
+     padding: 2px 3px 2px 20px;
+     min-height: 22px;
+}
+
+input.cancel {
+     background: #ddf url('/themes/console/images/cancel.png') no-repeat 2px center;
+     padding: 2px 3px 2px 20px;
+     min-height: 22px;
+}
+
+input.delete {
+     background: #ddf url('/themes/console/images/delete.png') no-repeat 2px center;
+     padding: 2px 3px 2px 20px;
+     min-height: 22px;
+}
+
+input.reload {
+     background: #ddf url('/themes/console/images/arrow_refresh.png') no-repeat 2px center;
+     padding: 2px 3px 2px 20px;
+     min-height: 22px;
+}
+
+input.search {
+     background: #ddf url('/themes/console/images/magnifier.png') no-repeat 2px center;
+     padding: 2px 3px 2px 24px;
+     min-height: 22px;
+}
+
+input.search[type="text"] {
+     background: #eef url('/themes/console/images/magnifier.png') no-repeat 2px center;
+}
+
+input {
+     font-size: 9pt;
+     font-weight: bold;
+     text-align: left;
+     padding: 3px 4px !important;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     border: 1px solid #99f;
+     background: #000 none !important;
+     color: #99f;
+     margin: 2px 4px 2px 0;
+     font: bold 8pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
+     min-width: 64px !important;
+}
+
+input[type="text"] {
+     color: #eef;
+}
+
+input[type=submit], input[type=reset] {
+     color: #99f;
+     background: #000;
+     border: 1px outset #119;
+     padding: 2px !important;
+     box-shadow: 0 1px 1px 0 #119 inset;
+     font: bold 8pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
+     text-align: center;
+     min-height: 22px !important;
+}
+
+input[type=submit]:active, input[type=reset]:active {
+     background: #f60 !important;
+     color: #eef !important;
+     border: 1px solid #f60;
+}
+
+textarea {
+     color: #eef;
+     background: #000;
+     border: 1px solid #99f;
+     padding: 2px !important;
+     font: bold 8pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     width: 100%;
+     height: 100px;
+     spell-check: false;
+}
+
+input:focus, textarea:focus {
+     color: #eef;
+}

From 31ea4a7093340ed0da224266e7e465562edc2861 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 7 Aug 2012 04:29:50 +0000
Subject: [PATCH 3/9] Changed universal theming prop key (so not mistaken as a
 theme name by routerconsole)

---
 apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java      | 2 +-
 apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java | 2 +-
 apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java          | 2 +-
 apps/susimail/src/src/i2p/susi/webmail/WebMail.java           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index e3cc8fd93..7fd824a92 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -86,7 +86,7 @@ public class SnarkManager implements Snark.CompleteListener {
     public static final String PROP_STARTUP_DELAY = "i2psnark.startupDelay";
     public static final String PROP_REFRESH_DELAY = "i2psnark.refreshSeconds";
     public static final String RC_PROP_THEME = "routerconsole.theme";
-    public static final String RC_PROP_UNIVERSAL_THEMING = "routerconsole.theme.universal";
+    public static final String RC_PROP_UNIVERSAL_THEMING = "routerconsole.universal.theme";
     public static final String PROP_THEME = "i2psnark.theme";
     public static final String DEFAULT_THEME = "ubergine";
     private static final String PROP_USE_OPENTRACKERS = "i2psnark.useOpentrackers";
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
index ddea8c8cd..15c2b2b2c 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
@@ -13,7 +13,7 @@ public class CSSHelper extends HelperBase {
 
     public CSSHelper() {}
 
-    public static final String PROP_UNIVERSAL_THEMING = "routerconsole.theme.universal";
+    public static final String PROP_UNIVERSAL_THEMING = "routerconsole.universal.theme";
     public static final String PROP_THEME_NAME = "routerconsole.theme";
     public static final String DEFAULT_THEME = "light";
     public static final String BASE_THEME_PATH = "/themes/console/";
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java b/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java
index 36e0a2b38..58950a923 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java
@@ -22,7 +22,7 @@ public class BaseBean
     private static final String DEFAULT_PRIVATE_BOOK = "../privatehosts.txt";
 
     public static final String RC_PROP_THEME_NAME = "routerconsole.theme";
-    public static final String RC_PROP_UNIVERSAL_THEMING = "routerconsole.theme.universal";
+    public static final String RC_PROP_UNIVERSAL_THEMING = "routerconsole.universal.theme";
     public static final String PROP_THEME_NAME = "theme";
     public static final String DEFAULT_THEME = "light";
     public static final String BASE_THEME_PATH = "/themes/susidns/";
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index cfb12c0b6..1d2b71eea 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -169,7 +169,7 @@ public class WebMail extends HttpServlet
 	private static final String CONFIG_BCC_TO_SELF = "composer.bcc.to.self";
 
 	private static final String RC_PROP_THEME = "routerconsole.theme";
-	private static final String RC_PROP_UNIVERSAL_THEMING = "routerconsole.theme.universal";
+	private static final String RC_PROP_UNIVERSAL_THEMING = "routerconsole.universal.theme";
 	private static final String CONFIG_THEME = "theme";
 	private static final String DEFAULT_THEME = "light";
 

From 0a4031cd7b9de1126441add225ffbc7c8ff1f80e Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 7 Aug 2012 06:03:35 +0000
Subject: [PATCH 4/9] Updates to midnight console theme from dr|z3d

---
 .../themes/console/midnight/console.css       | 105 +++--
 .../themes/console/midnight/default.css       |  11 +-
 .../themes/console/midnight/i2ptunnel.css     | 360 +++++++++---------
 3 files changed, 265 insertions(+), 211 deletions(-)

diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css
index 04f546c79..c6ff7047b 100644
--- a/installer/resources/themes/console/midnight/console.css
+++ b/installer/resources/themes/console/midnight/console.css
@@ -46,6 +46,7 @@ div.logo {
      background-color: #00000A;
      -moz-box-shadow: inset 0 0 0 2px #00000A;
      -khtml-box-shadow: inset 0 0 0 2px #00000A;
+     border-radius: 3px;
 }
 
 div.logo hr {
@@ -84,6 +85,7 @@ div.warning {
      background-repeat:no-repeat;
      -moz-box-shadow: inset 0 0 0 1px #f60;
      -khtml-box-shadow: inset 0 0 0 1px #f60;
+     border-radius: 3px 3px 0 0;
 }
 
 div.warning a:link {
@@ -105,24 +107,50 @@ div.warning a:active {
 }
 
 div.warning hr {
-     color: #fb7;
-     background: #fb7;
+     color: #99f;
+     background: #99f;
      height: 1px;
-     border: 0 solid #fb7;
+     border: 0 solid #99f;
      margin: 10px 0;
 }
 
 div.warning h3 {
      border: 0;
-     border-bottom: 1px solid #fb7;
+     border-bottom: 1px solid #99f;
      padding-bottom: 10px;
      padding-left: 0;
-     font-variant: small-caps;
      text-transform: capitalize;
-     font-size: 12.5pt;
+     font-size: 11pt;
      background: none !important;
+     border-radius: 0 !important;
 }
 
+.warning p {
+     padding: 0;     
+}
+
+.warning b {
+     font-size: 8.5pt;
+}
+
+.proxyfooter {
+     border: 1px solid #99f;
+     margin: -16px 25px 20px 260px;
+     border-radius: 0 0 3px 3px;
+     background: #002;  
+}
+
+.proxyfooter p {
+     font-size: 7pt;
+     text-align: right;
+     padding: 0 5px;
+     margin: 3px 3px 5px 3px;
+     line-height: 110%;
+}
+
+.proxyfooter i {
+     font-style: normal !important;     
+}
 /* console error messages */
 
 div.sorry {
@@ -139,6 +167,7 @@ div.sorry {
      background-image: url("../images/errortriangle.png");
      background-position: 15px center;
      background-repeat: no-repeat;
+     border-radius: 0 0 3px 3px;
 }
 
 div.sorry hr {
@@ -201,7 +230,7 @@ div.routersummary h3 {
      font-size: 8.5pt;
      letter-spacing: 0.01em;
      margin: -6px 0 -6px 0;
-     padding: 3px 0;
+     padding: 3px 0 2px;
      background: #002;
      text-transform: uppercase;
      background: #002 url("images/titles.png") repeat-x !important;
@@ -272,7 +301,9 @@ div.routersummary td:first-child {
 .routersummary form {
      margin: 0;
 }
-
+     
+     
+     
 div.newsheadings {
      text-align: right;
      margin: 0 7px 0 -20px;
@@ -528,6 +559,7 @@ div.configure tr {
 
 div.configure li:first-child, div.main li:first-child {
      margin-top: 0;
+     padding-top: 0;
 }
 
 div.configure li:last-child {
@@ -539,12 +571,11 @@ div.configure h2:first-child {
 }
 
 .configure form {
-     margin: 20px 15px;
+     margin: 20px 15px;     
 }
-
 .sidebarconf input[type="image"] {
      margin: 2px;
-     padding: 1px;
+     padding: 1px;     
 }
 
 .sidebarconf th:nth-child(1) {
@@ -591,17 +622,19 @@ div.messages {
      background: #000;
      border: 1px solid #99f;
      border-right: 0;
-     margin: -1px -15px 10px -16px;
+     margin: -6px -15px 10px -16px;
      text-align: center;
      font-size: 9pt;
      font-weight: bold;
      color: #474;
      -moz-box-shadow: inset 0 0 4px 2px #00000A;
+     background: url("../images/info_rhombus.png") no-repeat scroll 18px center #000;
 }
 
 div.messages li, div.messages ul {
      padding: 10px 0 0 5px;
      margin: -10px 0 0 0;
+     list-style: none;
 }
 
 div.main li b{
@@ -611,7 +644,10 @@ div.main li b{
 }
 
 div.error {
-     color: #d00000;
+     color: #d00;
+     background: url("../images/errortriangle.png") no-repeat scroll 5px center #000;
+     padding: 10px 10px 10px 45px;
+     text-align: left;
 }
 
 div.notice {
@@ -660,6 +696,7 @@ h2 {
      background: #000008;
      text-transform: uppercase;
      letter-spacing: 0.07em;
+     
 }
 
 h3 {
@@ -686,11 +723,6 @@ thead, tfoot, th {
      background: #002 url("images/titles.png") repeat-x center center !important;
 }
 
-.proxyfooter{
-     font-size: 7pt;
-     display: none !important;
-}
-
 table {
      border-collapse: collapse;
      border: 1px solid #99f;
@@ -780,20 +812,29 @@ div.ag2 {
 div.app {
      float: left;
      padding: 0;
-     min-width: 80px;
+     min-width: 60px;
      text-align: center !important;
-     border: 1px solid #339;
+     border: 1px solid #55a;
+     border-top: 1px solid #77b;
+     border-left: 1px solid #77b;
      margin: 3px;
      border-radius: 3px;
+     background: -moz-linear-gradient(top, #001, #000);
+}
+
+div.app:hover {
+     border: 1px solid #f60;
+     background: #000;
 }
 
 div.app:last-child {
      margin-bottom: 10px;
 }
 
-div.app a:link {
+div.app a:link, div.app a:link:hover, div.app a:link:visited, div.app a:link:active {
      font-size: 8pt !important;
      text-transform: lowercase;
+     text-decoration: none;
 }
 
 div.appgroup {
@@ -819,7 +860,7 @@ table.search {
 img.app {
      height: 32px;
      width: 32px;
-     padding: 6px;
+     padding: 6px 15px 0;
 }
 
 img.app2p {
@@ -847,20 +888,27 @@ td.app {
 }
 
 .applabel {
-     background: #003;
+     background: #001;
      font-size: 8pt;
      margin: -5px -3px -3px;
      padding: 2px 5px;
      text-align: center;
-     min-width: 80px;
-     border-top: 1px solid #003;
+     min-width: 60px;
+     border-top: 1px solid #000;
      border-radius: 0 0 2px 2px;
+     background: -moz-linear-gradient(top, #000, #001);
 }
 
-.applabel:hover, .appimg {
+.applabel:hover {
+     border-top: 1px solid #000;     
+}
+
+.applabel:hover {
      background: #000;
 }
 
+.appimg {}
+
 /* end home page */
 
 tt {
@@ -1192,6 +1240,11 @@ p img:first-child {
      opacity: 0.7;
 }
 
+/* opera targetted hack */
+x:-o-prefocus, .langbox img {
+     margin-bottom: 4px;
+}
+
 .langbox img:hover {
      opacity: 1;
 }
diff --git a/installer/resources/themes/console/midnight/default.css b/installer/resources/themes/console/midnight/default.css
index 59394ef52..ed4d72924 100644
--- a/installer/resources/themes/console/midnight/default.css
+++ b/installer/resources/themes/console/midnight/default.css
@@ -15,7 +15,7 @@ body {
 
 body.iframed {
      background: transparent url('../dark/images/transparent.gif') !important;
-     padding-top: 5px;
+     padding: 15px 0 0;
 }
 
 div {
@@ -71,7 +71,8 @@ textarea, input, select, button, a {
      float: left;
      margin: 2px 0 5px 0;
      background: #001;
-     color: #eef;
+     color: #eef;
+     border-radius: 3px;
 }
 
 button {
@@ -150,8 +151,8 @@ hr {
 }
 
 .control:hover {
-     background: #229;
-     color: #fff;
+     background: #77f;
+     color: #fff !important;
      text-decoration: none;
 }
 
@@ -222,7 +223,7 @@ hr {
 }
 
 #globalOperationsPanel .control {
-     width: 100px !important;
+     min-width: 100px !important;
      margin-top: 3px;
      float: right;
 }
diff --git a/installer/resources/themes/console/midnight/i2ptunnel.css b/installer/resources/themes/console/midnight/i2ptunnel.css
index 2e46f2cd3..c22a16199 100644
--- a/installer/resources/themes/console/midnight/i2ptunnel.css
+++ b/installer/resources/themes/console/midnight/i2ptunnel.css
@@ -1,180 +1,180 @@
-/* I2P Tunnel Edit Page
-*/
-
-#tunnelEditPage input {
-    width: 458px;
-}
-
-#tunnelEditPage select {
-    width: 308px;
-}
-
-#tunnelEditPage option[selected] {
-    color: green;
-}
-
-#tunnelEditPage #targetField,
-#tunnelEditPage #accessField,
-#tunnelEditPage #optionsField {
-    height: 48px;
-    width: 150px;
-}
-#tunnelEditPage #tunnelOptionsField {
-    height: 96px;
-    width: 150px;
-}
-
-#tunnelEditPage #targetField label,
-#tunnelEditPage #accessField label,
-#tunnelEditPage #tunnelOptionsField label,
-#tunnelEditPage #optionsField label{
-    height: 48px;
-    width: 150px;
-}
-
-#tunnelEditPage #reachField,
-#tunnelEditPage #hostField,
-#tunnelEditPage #depthField,
-#tunnelEditPage #countField,
-#tunnelEditPage #optionsHostField {
-    width: 304px;
-    margin-right: 4px;
-}
-
-#tunnelEditPage #portField,
-#tunnelEditPage #optionsPortField,
-#tunnelEditPage #backupField,
-#tunnelEditPage #varianceField {
-    width: 150px;
-
-}
-
-#tunnelEditPage #reachField label,
-#tunnelEditPage #hostField label,
-#tunnelEditPage #portField label,
-#tunnelEditPage #optionsHostField label,
-#tunnelEditPage #optionsPortField label,
-#tunnelEditPage #depthField label,
-#tunnelEditPage #countField label,
-#tunnelEditPage #backupField label,
-#tunnelEditPage #varianceField label {
-    text-align: left;
-
-}
-
-#tunnelEditPage #otherField label {
-    width: 300px;
-}
-
-#tunnelEditPage #reachableByOther,
-#tunnelEditPage #tunnelDepth,
-#tunnelEditPage #tunnelQuantity,
-#tunnelEditPage #targetHost,
-#tunnelEditPage #clientHost {
-    width: 306px;
-}
-
-#tunnelEditPage #port {
-    width: 80px;
-}
-
-#tunnelEditPage #targetPort,
-#tunnelEditPage #clientPort,
-#tunnelEditPage #tunnelBackupQuantity,
-#tunnelEditPage #tunnelVariance {
-    width: 150px;
-}
-
-#tunnelEditPage #shared,
-#tunnelEditPage #connectDelay,
-#tunnelEditPage #startOnLoad {
-    width: 16px;
-}
-
-#tunnelEditPage label {
-    width: 150px;
-    font-weight: bold;
-    text-align: right;
-    float: left;
-}
-
-/* I2P Tunnel List Page
-*/
-
-#tunnelListPage .rowItem {
-    width: 150px;
-}
-
-#tunnelListPage select {
-    width: 150px;
-}
-
-#tunnelListPage textarea {
-    width: 100%;
-    height: 88px;
-    padding: 0 0 0 4px;
-    color: green;
-    margin-bottom: 7px;
-}
-
-#tunnelListPage .footer .control {
-    margin-left: 2px;
-}
-
-#tunnelListPage .footer label {
-    text-align: right;
-    height: 24px;
-    width: 360px;
-    float: left;
-
-}
-
-/* Use Leary and Langridge content replacement methods (LIR)
-** to embed accessibility information into the document.
-** Should allow the lists to be rendered nicely by
-** screen readers. (and lynx!)
-*/
-
-#tunnelListPage label {
-    height: 0;
-    width: 0;
-    overflow: hidden;
-}
-
-#tunnelListPage .nameHeaderField label,
-#tunnelListPage .portHeaderField label,
-#tunnelListPage .typeHeaderField label,
-#tunnelListPage .interfaceHeaderField label,
-#tunnelListPage .targetHeaderField label,
-#tunnelListPage .previewHeaderField label,
-#tunnelListPage .statusHeaderField label {
-    text-align: left;
-    width: 150px;
-    height: 24px;
-    float: left;
-}
-
-#tunnelListPage .targetField,
-#tunnelListPage .targetField .text,
-#tunnelListPage .targetHeaderField,
-#tunnelListPage .targetHeaderField label {
-    width: 300px;
-}
-
-#tunnelListPage .descriptionField,
-#tunnelListPage .destinationField {
-    width: 750px;
-}
-
-#tunnelListPage .descriptionField .text,
-#tunnelListPage .destinationField .text {
-    width: 450px;
-}
-
-#tunnelListPage .descriptionField label,
-#tunnelListPage .destinationField label {
-    text-align: right;
-    width: 150px;
-    height: 24px;
-    float: left;
-}
+/* I2P Tunnel Edit Page
+*/
+
+#tunnelEditPage input {
+    width: 458px;
+}
+
+#tunnelEditPage select {
+    width: 308px;
+}
+
+#tunnelEditPage option[selected] {
+    color: green;
+}
+
+#tunnelEditPage #targetField,
+#tunnelEditPage #accessField,
+#tunnelEditPage #optionsField {
+    height: 48px;
+    width: 150px;
+}
+#tunnelEditPage #tunnelOptionsField {
+    height: 96px;
+    width: 150px;
+}
+
+#tunnelEditPage #targetField label,
+#tunnelEditPage #accessField label,
+#tunnelEditPage #tunnelOptionsField label,
+#tunnelEditPage #optionsField label{
+    height: 48px;
+    width: 150px;
+}
+
+#tunnelEditPage #reachField,
+#tunnelEditPage #hostField,
+#tunnelEditPage #depthField,
+#tunnelEditPage #countField,
+#tunnelEditPage #optionsHostField {
+    width: 304px;
+    margin-right: 4px;
+}
+
+#tunnelEditPage #portField,
+#tunnelEditPage #optionsPortField,
+#tunnelEditPage #backupField,
+#tunnelEditPage #varianceField {
+    width: 150px;
+
+}
+
+#tunnelEditPage #reachField label,
+#tunnelEditPage #hostField label,
+#tunnelEditPage #portField label,
+#tunnelEditPage #optionsHostField label,
+#tunnelEditPage #optionsPortField label,
+#tunnelEditPage #depthField label,
+#tunnelEditPage #countField label,
+#tunnelEditPage #backupField label,
+#tunnelEditPage #varianceField label {
+    text-align: left;
+
+}
+
+#tunnelEditPage #otherField label {
+    width: 300px;
+}
+
+#tunnelEditPage #reachableByOther,
+#tunnelEditPage #tunnelDepth,
+#tunnelEditPage #tunnelQuantity,
+#tunnelEditPage #targetHost,
+#tunnelEditPage #clientHost {
+    width: 306px;
+}
+
+#tunnelEditPage #port {
+    width: 80px;
+}
+
+#tunnelEditPage #targetPort,
+#tunnelEditPage #clientPort,
+#tunnelEditPage #tunnelBackupQuantity,
+#tunnelEditPage #tunnelVariance {
+    width: 150px;
+}
+
+#tunnelEditPage #shared,
+#tunnelEditPage #connectDelay,
+#tunnelEditPage #startOnLoad {
+    width: 16px;
+}
+
+#tunnelEditPage label {
+    width: 150px;
+    font-weight: bold;
+    text-align: right;
+    float: left;
+}
+
+/* I2P Tunnel List Page
+*/
+
+#tunnelListPage .rowItem {
+    width: 150px;
+}
+
+#tunnelListPage select {
+    width: 150px;
+}
+
+#tunnelListPage textarea {
+    width: 100%;
+    height: 60px;
+    padding: 0 0 0 4px;
+    color: green;
+    margin: 5px 0 10px;
+}
+
+#tunnelListPage .footer .control {
+    margin-left: 2px;
+}
+
+#tunnelListPage .footer label {
+    text-align: right;
+    height: 24px;
+    width: 360px;
+    float: left;
+
+}
+
+/* Use Leary and Langridge content replacement methods (LIR)
+** to embed accessibility information into the document.
+** Should allow the lists to be rendered nicely by
+** screen readers. (and lynx!)
+*/
+
+#tunnelListPage label {
+    height: 0;
+    width: 0;
+    overflow: hidden;
+}
+
+#tunnelListPage .nameHeaderField label,
+#tunnelListPage .portHeaderField label,
+#tunnelListPage .typeHeaderField label,
+#tunnelListPage .interfaceHeaderField label,
+#tunnelListPage .targetHeaderField label,
+#tunnelListPage .previewHeaderField label,
+#tunnelListPage .statusHeaderField label {
+    text-align: left;
+    width: 150px;
+    height: 24px;
+    float: left;
+}
+
+#tunnelListPage .targetField,
+#tunnelListPage .targetField .text,
+#tunnelListPage .targetHeaderField,
+#tunnelListPage .targetHeaderField label {
+    width: 300px;
+}
+
+#tunnelListPage .descriptionField,
+#tunnelListPage .destinationField {
+    width: 750px;
+}
+
+#tunnelListPage .descriptionField .text,
+#tunnelListPage .destinationField .text {
+    width: 450px;
+}
+
+#tunnelListPage .descriptionField label,
+#tunnelListPage .destinationField label {
+    text-align: right;
+    width: 150px;
+    height: 24px;
+    float: left;
+}

From 5ed1ec681f3f13b7b63cb4d4bd6fba20f553b898 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 7 Aug 2012 11:42:22 +0000
Subject: [PATCH 5/9] Updates to classic console theme from dr|z3d

---
 .../themes/console/classic/console.css        | 112 +++++++++++++-----
 1 file changed, 84 insertions(+), 28 deletions(-)

diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index e6e2e7f1a..65ce6f4a4 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -180,6 +180,10 @@ div.routersummary input[type=text] {
      text-align: right !important;
 }
 
+#xhr {
+     margin-top: 15px;     
+}
+
 div.routersummary hr {
      color: #89f;
      background: #89f;
@@ -238,9 +242,15 @@ div.routersummary tr {
      border: 0 !important;
 }
 
+div.routersummary form {
+     margin: 0;     
+}
+
 div.newsheadings {
      text-align: right;
-     margin: 0 0 0 -20px;
+     margin: 0 5px 0 -20px;
+     padding: 0;
+     font-size: 8pt;
 }
 
 div.newsheadings li {
@@ -248,6 +258,11 @@ div.newsheadings li {
      margin: 0 -4px 2px 8px;
 }
 
+div.newsheadings ul {
+     margin: 0 5px -3px 38px;
+     padding: 0;
+}
+
 div.tunnels table {
      margin: 0 -7px !important;
      width: 193px;
@@ -354,7 +369,7 @@ div.main textarea {
 }
 
 div.main h2 {
-     margin-top: 20px;
+     margin-top: 0;
      margin-bottom: 10px !important;
      -moz-border-radius: 0 3px 0 0;
      -khtml-border-radius: 0 3px 0 0;
@@ -370,6 +385,11 @@ div.main h2:first-child, div.main h3:first-child {
      margin-bottom: -5px;
 }
 
+.topness {
+     text-align: right;
+     font-size: 8pt;  
+}
+
 div.wideload h2 {
      margin-bottom: 0px !important;
 }
@@ -396,11 +416,8 @@ div.news {
      text-align: right;
      color: #770;
      min-width: 500px;
-     padding-bottom: 8px;
-     padding-left: 10px;
-     padding-right: 10px;
-     padding: 0 10px 3px 10px;
-     font-size: 7pt;
+     padding: 3px 10px 3px 10px;
+     font-size: 8pt;
 }
 
 /* convert the list entry to our title */
@@ -471,6 +488,10 @@ div.news hr {
      margin: 10px 0 2px 0;
 }
 
+div.news hr:last-child {
+     margin-bottom: 10px !important;
+}
+
 div.confignav {
      padding: 15px 0;
      margin: -16px -16px 0 -16px;
@@ -662,7 +683,7 @@ table {
      border: 1px solid #89f;
      margin: 0 0 5px 0;
      cell-padding: 1px;
-     font-size: 7.5pt;
+     font-size: 8pt;
      background: #fff;
      width: 100%;
 }
@@ -677,7 +698,7 @@ table hr {
 }
 
 table tt {
-     font-size: 7.5pt;
+     font-size: 8pt;
 }
 
 table code {
@@ -722,8 +743,16 @@ h2.app {
 */
 
 h4.app, h4.app2 {
-     margin: 0 10px 2px 10px;
+     margin: 0 10px 5px 10px;
      padding: 10px 0 8px 0;
+     font-size: 12pt;
+     padding: 6px 10px 8px;
+     border: 1px solid #89f;
+     letter-spacing: 0.04em;
+     background: #fff;
+     text-transform: uppercase;
+     text-shadow: 0px 1px 1px #99f;
+     background: url('images/tinytitle.png') center center repeat-x;
 }
 
 h4.app2 {
@@ -732,15 +761,24 @@ h4.app2 {
 }
 
 div.ag2 {
-     margin: 0;
+     margin: 0 -10px -5px;
 }
 
 div.app {
      float: left;
      padding: 2px;
-     height: 90px;
-     width: 112px;
+     min-width: 60px;
      text-align: center !important;
+     border: none;
+     margin: 0 2px 2px;
+}
+
+div.app:last-child {
+     margin-bottom: 10px;
+}
+
+div.app a:link, div.app a:visited, div.app a:hover, div.app a:active {
+     text-decoration: none;
 }
 
 div.appgroup {
@@ -766,44 +804,53 @@ table.search {
 img.app {
      height: 32px;
      width: 32px;
-     padding: 6px;
+     padding: 5px 15px;
 }
 
-img.app2p {
+img.app2 {
      height: 40px;
      padding: 3px 6px 0 6px;
 }
 
-table.app {
+.app table {
      background: none;
      border: 0;
      margin: auto;
      width: auto;
 }
 
-tr.app {
+.app tr {
      background: none;
      border: 0;
      margin: 0;
 }
 
-td.app {
+.app td {
      background: none;
      border: 0;
      margin: 0;
+     padding: 0;
 }
 
 div.applabel {
-     background: url('images/header.png') center center repeat-x;
-     -moz-border-radius: 4px;
-     -khtml-border-radius: 4px;
-     border: 2px #00f;
-     border-radius: 4px;
-     border-width: 1px;
+     background: url('images/tinytitle.png') center center repeat-x;
+     -moz-border-radius: 3px;
+     -khtml-border-radius: 3px;
+     border-radius: 3px;
      font-size: 9pt;
      margin: 0;
-     padding: 3px 6px 4px 6px;
+     padding: 4px;
      text-align: center;
+     min-width: 60px;
+     line-height: 110%;
+     text-transform: lowercase;
+     font-size: 8pt;
+     border: 1px solid #89f;
+     box-shadow: 0 1px 1px #bbb;
+}
+
+div.applabel:hover {
+     box-shadow: none;
 }
 
 /* end home page */
@@ -927,21 +974,31 @@ p {
      text-align: justify;
 }
 
+p img:first-child {
+     display: none;     
+}
+
 .formaction {
      text-align: right;
      margin: -10px -5px;
 }
 
 .langbox {
-     margin: 5px -20px 0px 5px;
+     margin: 5px 5px 0 5px;
      color: #001;
      font-size: 7pt;
      width: 280px;
-     text-align: center;
+     text-align: right;
      float: right;
      valign: middle;
 }
 
+/* opera targetted hack */
+x:-o-prefocus, .langbox img {
+     margin-bottom: 2px;
+     margin-top: 2px;
+}
+
 .langbox img {
      padding: 0 2px; /* Ignored by IE8 */
 }
@@ -989,7 +1046,6 @@ a:hover {
      color: #f60;
      text-decoration: underline;
      font-weight: bold;
-     text-shadow: 0px 0px 1px rgba(255, 96, 0, 0.7);
 }
 
 a:active {

From dfb0b7801d9d58150d25b5df8576cb59574e8875 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 7 Aug 2012 23:03:34 +0000
Subject: [PATCH 6/9] Updates to classic console theme from dr|z3d

---
 .../themes/console/classic/console.css        | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 65ce6f4a4..a5c6f432a 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -369,7 +369,6 @@ div.main textarea {
 }
 
 div.main h2 {
-     margin-top: 0;
      margin-bottom: 10px !important;
      -moz-border-radius: 0 3px 0 0;
      -khtml-border-radius: 0 3px 0 0;
@@ -494,9 +493,9 @@ div.news hr:last-child {
 
 div.confignav {
      padding: 15px 0;
-     margin: -16px -16px 0 -16px;
+     margin: -16px -16px 5px -16px;
      border: 1px solid #89f;
-     font-size: 9.5pt;
+     font-size: 8.5pt;
 }
 
 div.confignav a {
@@ -581,11 +580,11 @@ div.configure h2:first-child {
 }
 
 div.messages {
-     padding: 0px 10px;
+     padding: 10px 10px;
      background: #fff;
      border: 1px solid #89f;
      border-right: 0;
-     margin: -1px -15px 10px -16px;
+     margin: -6px -15px 10px -16px;
      text-align: center;
      font-size: 9pt;
      font-weight: bold;
@@ -593,12 +592,19 @@ div.messages {
 }
 
 div.messages li, div.messages ul {
-     padding: 10px 0 0 5px;
-     margin: -10px 0 0 0;
+     padding: 10px 0 0 5px !important;
+     margin: -10px 0 0 25px !important;
+     list-style: none;
+     text-align: left;
 }
 
 div.error {
      color: #d00000;
+     background-image: url("../images/errortriangle.png");
+     background-position: 10px center;
+     background-repeat: no-repeat;
+     padding: 10px 0;
+     margin-left: -5px;
 }
 
 div.notice {
@@ -888,9 +894,9 @@ hr {
      font-size: 8pt;
      color: #001;
      text-align: center;
-     margin: -5px 0 7px 0;
+     margin: -8px 0 7px 0;
      background: #fff;
-     border: 1px solid #bbf;
+     border: 1px solid #89f !important;
      border-top: 0;
      padding: 4px 0 2px 0;
      background-image: url("images/tinytitle.png") !important;

From 58a545d30c71e995aa137371539250b718129f59 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 7 Aug 2012 23:08:37 +0000
Subject: [PATCH 7/9] Snark: explicitly check if universal theme is "classic",
 and use "light" if so

---
 apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index aa04d597d..25172bea1 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -314,7 +314,11 @@ public class SnarkManager implements Snark.CompleteListener {
                     themeExists = true;
             }
             if (!themeExists) {
-                theme = DEFAULT_THEME;
+                // Since the default is not "light", explicitly check if universal theme is "classic"
+                if (theme.equals("classic")
+                    theme = "light";
+                else
+                    theme = DEFAULT_THEME;
                 _config.setProperty(PROP_THEME, DEFAULT_THEME);
             }
         }

From 2e9fdc6d9fc9047116e720ab3a30c685b5446b6d Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 9 Aug 2012 02:36:39 +0000
Subject: [PATCH 8/9] Updated history.txt

---
 history.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/history.txt b/history.txt
index b2a84d686..e7c9cfdc0 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,14 @@
+2012-08-07 str4d
+ * Console:
+   - Theme updates from dr|z3d
+   - Changed universal theming key so it is not mistaken as a theme
+     name by the routerconsole
+ * i2psnark:
+   - Theme updates from dr|z3d
+   - If universal theming is set and routerconsole theme is classic,
+     use light theme explicitly
+ * susidns: new midnight theme from dr|z3d
+
 2012-08-06 zzz
  * Clone System properties before iterating to avoid
    ConcurrentModificationException (ticket #680)

From a940062255576cf5dc50d5f53249b576293cfd59 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Thu, 9 Aug 2012 11:35:41 +0000
Subject: [PATCH 9/9] add ')' missing from str4d's checkins

---
 apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 25172bea1..5ca311e80 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -315,7 +315,7 @@ public class SnarkManager implements Snark.CompleteListener {
             }
             if (!themeExists) {
                 // Since the default is not "light", explicitly check if universal theme is "classic"
-                if (theme.equals("classic")
+                if (theme.equals("classic"))
                     theme = "light";
                 else
                     theme = DEFAULT_THEME;