diff --git a/hillside/css/theme_left.css.php b/hillside/css/theme_left.css.php
index 8fa7a9672..15efdd530 100644
--- a/hillside/css/theme_left.css.php
+++ b/hillside/css/theme_left.css.php
@@ -1,160 +1,226 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * navigation css file from theme
+ * navigation css file
  *
  * @version $Id$
  * @package phpMyAdmin-theme
- * @subpackage Hillside
+ * @subpackage hillside 
  */
 
 // unplanned execution path
 if (!defined('PMA_MINIMUM_COMMON')) {
     exit();
 }
-?> 
+?>
+/******************************************************************************/
+/* general tags */
 html {
-    height:100%;
-    border-right:1px solid #AAA;
-}
-html,body{padding-top:0;margin:0;}
-body, input, select {
-    font-family:    Tahoma, Arial, Helvetica, Verdana, sans-serif;
-    font-size:         11px;
-    color: #333333;
+    font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
 }
 
-body#body_leftFrame {
-    color: #000000;
-    height:100%;
-    overflow:auto;
+input, select, textarea {
+    font-size: 1em;
 }
+
 body {
-    background: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?> url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>island_light.png) top left repeat-x;
-	background-color: #65a603;
-	background-attachment: fixed;
+<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
+<?php } ?>
+    background:         <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    margin:             0;
+    padding:            0.2em 0.2em 0.2em 0.2em;
 }
 
-select {
-    background-color: #ffffff;
-    color: #000000;
+a img {
+    border: 0;
+}
+
+a:link,
+a:visited,
+a:active {
+    text-decoration:    none;
+    color:              #0000FF;
+}
+
+ul {
+    margin:0;
+}
+
+form {
+    margin:             0;
+    padding:            0;
+    display:            inline;
+}
+
+select#select_server,
+select#lightm_db {
+    width:              100%;
+}
+
+/* buttons in some browsers (eg. Konqueror) are block elements,
+   this breaks design */
+button {
+    display:            inline;
 }
 
 
+/******************************************************************************/
+/* classes */
+
+/* leave some space between icons and text */
+.icon {
+    vertical-align:     middle;
+    margin-right:       0.3em;
+    margin-left:        0.3em;
+}
+
+.navi_dbName {
+    font-weight:    bold;
+    color:          <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor']; ?>;
+}
+
+/******************************************************************************/
+/* specific elements */
+
+#body_leftFrame {
+	background-image:	url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/island_light.png);
+}
+
+div#pmalogo {
+    <?php //better echo $GLOBALS['cfg']['logoBGC']; ?>
+    padding:.3em;
+}
+div#pmalogo,
 div#leftframelinks,
 div#databaseList {
-    text-align: center;
-    border-bottom: 0.05em solid #FFF;
-    margin-bottom: 0.5em;
-    padding-bottom: 0.5em;
-    color: #000000;
-
-}
-div#pmalogo{
-	background:#FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_background.png) top left repeat-x;
-	padding:0;
-	margin:0;
-	border-bottom:0px;
-}
-div#leftframelinks img {
-    vertical-align: middle;
+    text-align:         center;
+    margin-bottom:      0.5em;
+    padding-bottom:     0.5em;
 }
 
-div#leftframelinks a {
-    margin: 0.5em;
-    padding: 0.2em;
-    border: 0.05em solid #FFF;
-    color: #000000;
+ul#databaseList {
+    margin-bottom:      0.5em;
+    padding-bottom:     0.5em;
+    padding-<?php echo $left; ?>:     1.5em;
+}
+
+ul#databaseList a {
+    display: block;
+}
+
+div#navidbpageselector a,
+ul#databaseList a {
+    background-image:url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/transparent.png);
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+}
+
+ul#databaseList a:hover {
+    background-image:url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/transparent60.png);
+    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
+}
+
+ul#databaseList li.selected a {
+    background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
+    color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
+}
+
+div#leftframelinks .icon {
+    padding:            0;
+    margin:             0;
+}
+
+div#leftframelinks a img.icon {
+    margin:             0;
+    padding:            0.2em;
+    border:             0.05em solid <?php echo $GLOBALS['cfg']['NaviBorderColor']; ?>;
 }
 
 div#leftframelinks a:hover {
-    background-color: transparent;
-    color:#FFF;
+    background-image:url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/transparent.png);
+    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
 }
 
-div#databaseList form {
-    display: inline;
-}
-
-/* leftdatabaselist */
-div#left_tableList {
+/* serverlist */
+#body_leftFrame #list_server {
+    list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_host.png);
+    list-style-position: inside;
     list-style-type: none;
-    list-style-position: outside;
     margin: 0;
     padding: 0;
-    font-size: <?php echo $font_smaller; ?>;
-    color:#FFF;
 }
-div#left_tableList p a.item, form#left label{
-	font-weight:bold;
-	color:#000;
-	font-size:110%;
-	text-align:left;
+
+#body_leftFrame #list_server li {
+    margin: 0;
+    padding: 0;
+    font-size:          80%;
 }
+
+div#left_tableList ul {
+    list-style-type:    none;
+    list-style-position: outside;
+    margin:             0;
+    padding:            0;
+    font-size:          80%;
+    background-image:url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/transparent.png);
+}
+
+div#left_tableList ul ul {
+    font-size:          100%;
+}
+
 div#left_tableList a {
-    color: #FFF;
-    text-decoration: none;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    text-decoration:    none;
 }
 
 div#left_tableList a:hover {
-    color: #FFF;
-    background-color: transparent;
-    text-decoration:none;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    text-decoration:    underline;
 }
 
 div#left_tableList li {
-    margin: 0;
-    padding: 0;
-    white-space: nowrap;
-    line-height:1.5;
+    margin:             0;
+    padding:            0;
+    white-space:        nowrap;
 }
 
-<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
-div#left_tableList li:hover {
-	background:#FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent.png) top left repeat-x;
-    background-color: transparent;
-	color:#FFF;
+<?php if ($GLOBALS['cfg']['BrowseMarkerColor']) { ?>
+/* marked items */
+div#left_tableList > ul li.marked > a,
+div#left_tableList > ul li.marked {
+    background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
+    color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
+}
+<?php } ?>
+
+<?php if ($GLOBALS['cfg']['LeftPointerEnable']) { ?>
+div#left_tableList > ul li:hover {
+    background-image:url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/transparent60.png);
+    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
 }
 <?php } ?>
 
 div#left_tableList img {
-    vertical-align: middle;
+    padding:            0;
+    vertical-align:     middle;
 }
-div#left_tableList p {color:#333;padding:10px;}
+
 div#left_tableList ul ul {
-    margin-left: 0em;
-    padding-left: 0.1em;
-    border-left: 0.1em solid #669999;
-    padding-bottom: 0.1em;
-    border-bottom: 0.1em solid #669999;
-    background-color:#FEFEFE;
+    margin-<?php echo $left; ?>:        0;
+    padding-<?php echo $left; ?>:       0.1em;
+    border-<?php echo $left; ?>:        0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    padding-bottom:     0.1em;
+    border-bottom:      0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
 }
 
-/** Thanks Vince ;) - vincekruger@gmail.com**/
-ul#databaseList{
-list-style:none;
-
+/* for the servers list in navi panel */
+#serverinfo .item {
+    white-space:        nowrap;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
 }
-ul#databaseList li{
-	line-height:1.5em;
-	font-weight:bold;
-
-}
-ul#databaseList li a{
-	font-weight:normal;
-	text-decoration:none;
-	color:#333;
-}
-ul#databaseList li a:hover, ul#databaseList li a:active, ul#databaseList li a:focus{
-font-weight:bold;
-}
-ul#databaseList li ul{
-padding-left:10px;
-margin-left:0px;
-
-	list-style:none;
-	padding-bottom:1em;
-}
-ul#databaseList li ul li a{
-	border-left:1px solid #333;
+#serverinfo a:hover {
+    background:         <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
 }
diff --git a/hillside/css/theme_print.css.php b/hillside/css/theme_print.css.php
index 178b93c81..b39f5cf80 100644
--- a/hillside/css/theme_print.css.php
+++ b/hillside/css/theme_print.css.php
@@ -1,51 +1,39 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * print css file from theme
+ * print css file from theme Original
  *
  * @version $Id$
  * @package phpMyAdmin-theme
- * @subpackage Hillside
+ * @subpackage Original
  */
 ?>
 /* For printview */
-body{
-    font-family:       Tahoma, Verdana, Arial, Hevetica, sans-serif;
-    font-size:         10px;
-    color:             #FFFFFF;
+body, table, th, td {
+    color:             #000000;
     background-color:  #ffffff;
 }
-h1{
-    font-family:       Tahoma, Verdana, Arial, Hevetica, sans-serif;
-    font-size:         16px;
-    font-weight:       bold;
-    color:             #FFFFFF;
+
+img {
+    border: 0;
 }
-table{
-    border-width:      1px;
-    border-color:      #FFFFFF;
+
+table, th, td {
+    border-width:      0.1em;
+    border-color:      #000000;
     border-style:      solid;
+}
+
+table {
     border-collapse:   collapse;
     border-spacing:    0;
 }
-th{
-    font-family:       Tahoma, Verdana, Arial, Hevetica, sans-serif;
-    font-size:         10px;
+
+th, td {
+    padding:           0.2em;
+}
+
+th {
     font-weight:       bold;
-    color:             #FFFFFF;
     background-color:  #e5e5e5;
-    border-width:      1px;
-    border-color:      #FFFFFF;
-    border-style:      solid;
-    padding:           2px;
-}
-td{
-    font-family:       Tahoma, Verdana, Arial, Hevetica, sans-serif;
-    font-size:         10px;
-    color:             #FFFFFF;
-    background-color:  #ffffff;
-    border-width:      1px;
-    border-color:      #FFFFFF;
-    border-style:      solid;
-    padding:           2px;
 }
diff --git a/hillside/css/theme_right.css.php b/hillside/css/theme_right.css.php
index 7f2f3f26e..b29679d9f 100644
--- a/hillside/css/theme_right.css.php
+++ b/hillside/css/theme_right.css.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * main css file from theme
+ * main css file
  *
  * @version $Id$
  * @package phpMyAdmin-theme
- * @subpackage Hillside
+ * @subpackage hillside
  */
 
 // unplanned execution path
@@ -13,472 +13,1168 @@ if (!defined('PMA_MINIMUM_COMMON')) {
     exit();
 }
 ?>
-/* Always enabled stylesheets (right frame) */
+/******************************************************************************/
+/* general tags */
 html {
-    height:100%;
-    border-left:1px solid #AAA;
+    font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;
 }
-html, body {
-margin:0;
-padding:0;
+
+input, select, textarea {
+    font-size: 1em;
 }
 
 body {
-    font-family:    Tahoma, Arial, Helvetica, Verdana, sans-serif;
-    font-size:         11px;
-    color: #000000;
-         background: <?php echo $GLOBALS['cfg']['RightBgColor']; ?> url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>island_light.png) top left repeat-x;
-
-	background-attachment: fixed;
+<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
+<?php } ?>
+    padding:            0;
+    margin:             0.5em;
+    color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
+    background:         <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
 }
 
-#maincontainer
-{
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png);
-    background-repeat: no-repeat;
-    background-position: bottom right;
-    height:550px;
-    border: 0px;
+<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
+textarea, tt, pre, code {
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
 }
-#selflink
-{
-	border: 0px;
+<?php } ?>
+h1 {
+    font-size:          140%;
+    font-weight:        bold;
 }
 
-pre, tt         {font-size: <?php echo $font_size; ?>}
-td              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
-form            {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; padding: 0px; margin: 10px;}
-input           {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
-input.textfield {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
-select          {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
-textarea        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
-h1              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold}
-h2              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold}
-h3              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold}
-a:link          {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000FF}
-a:visited       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000FF}
-a:hover         {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: underline; color: #FF0000}
-a.nav:link      {font-family: <?php echo $right_font_family; ?>; color: #000000}
-a.nav:visited   {font-family: <?php echo $right_font_family; ?>; color: #000000}
-a.nav:hover     {font-family: <?php echo $right_font_family; ?>; color: #FF0000}
-a.h1:link       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
-a.h1:active     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
-a.h1:visited    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
-a.h1:hover      {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #FF0000}
-a.h2:link       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
-a.h2:active     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
-a.h2:visited    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
-a.h2:hover      {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #FF0000}
-a.drop:link     {font-family: <?php echo $right_font_family; ?>; color: #ff0000}
-a.drop:visited  {font-family: <?php echo $right_font_family; ?>; color: #ff0000}
-a.drop:hover    {font-family: <?php echo $right_font_family; ?>; color: #ffffff; background-color:#ff0000; text-decoration: none}
-dfn             {font-style: normal}
-dfn:hover       {font-style: normal; cursor: help}
-.nav            {font-family: <?php echo $right_font_family; ?>; color: #000000}
-.warning        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #FF0000}
-.tblcomment     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_smallest; ?>; font-weight: normal; color: #000099; }
-td.topline      {font-size: 1px}
-td.tab          {
-    border-top: 1px solid #999;
-    border-right: 1px solid #666;
-    border-left: 1px solid #999;
-    border-bottom: none;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
+h2 {
+    font-size:          120%;
+    font-weight:        bold;
 }
-h1{
-text-transform:capitalize;
-letter-spacing:-2px;
-font-family:"trebuchet MS";
-font-weight:normal;
+
+h3 {
+    font-weight:        bold;
 }
-#mysqlmaininformation h1, #pmamaininformation h1{
-margin-top:40px;
-padding-left:10px;
+
+a:link,
+a:visited,
+a:active {
+    text-decoration:    none;
+    color:              #ffffff;
 }
-fieldset        {
-    border:     #686868 solid 1px;
-    padding:    0.5em;
-    background-color:transparent;
+
+a:hover {
+    text-decoration:    underline;
+    color:              #000000;
     background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent.png);
 }
+
+dfn {
+    font-style:         normal;
+}
+
+dfn:hover {
+    font-style:         normal;
+    cursor:             help;
+}
+
+th {
+    font-weight:        bold;
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
+}
+
+a img {
+    border:             0;
+}
+
+hr {
+    color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['MainColor']; ?>;
+    border:             0;
+    height:             1px;
+}
+
+form {
+    padding:            0;
+    margin:             0;
+    display:            inline;
+}
+
+textarea {
+    overflow:           visible;
+    height:             <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
+}
+
+fieldset {
+    margin-top:         1em;
+    border:             <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;
+    padding:            0.5em;
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent.png);
+}
+
 fieldset fieldset {
-    margin:     0.8em;
+    margin:             0.8em;
 }
+
 fieldset legend {
-    border:     #686868 solid 1px;
-    padding:3px;
-    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent.png);
+    font-weight:        bold;
+    color:              #ffffff;
+    background-color:   <?php echo 'OPERA' != PMA_USR_BROWSER_AGENT ? 'transparent' : $GLOBALS['cfg']['BgOne']; ?>;
+}
+
+/* buttons in some browsers (eg. Konqueror) are block elements,
+   this breaks design */
+button {
+    display:            inline;
+}
+
+table caption,
+table th,
+table td {
+    padding:            0.1em 0.5em 0.1em 0.5em;
+    margin:             0.1em;
+    vertical-align:     top;
+}
+
+img,
+input,
+select,
+button {
+    vertical-align:     middle;
+}
+
+
+/******************************************************************************/
+/* classes */
+div.tools {
+    border: 1px solid #000000;
+    padding: 0.2em;
+}
+
+div.tools,
+fieldset.tblFooters {
+    margin-top:         0;
+    margin-bottom:      0.5em;
+    /* avoid a thick line since this should be used under another fieldset */
+    border-top:         0;
+    text-align:         <?php echo $right; ?>;
+    float:              none;
+    clear:              both;
+}
+
+fieldset .formelement {
+    float:              <?php echo $left; ?>;
+    margin-<?php echo $right; ?>:       0.5em;
+    /* IE */
+    white-space:        nowrap;
+}
+
+/* revert for Gecko */
+fieldset div[class=formelement] {
+    white-space:        normal;
 }
 
 button.mult_submit {
-    border: none;
-    background-color: transparent;
+    border:             none;
+    background-color:   transparent;
+}
+
+/* odd items 1,3,5,7,... */
+table tr.odd th,
+.odd {
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent.png);
+}
+
+/* even items 2,4,6,8,... */
+table tr.even th,
+.even {
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent60.png);
+}
+
+/* odd table rows 1,3,5,7,... */
+table tr.odd th,
+table tr.odd,
+table tr.even th,
+table tr.even {
+    text-align:         <?php echo $left; ?>;
+}
+
+<?php if ($GLOBALS['cfg']['BrowseMarkerEnable']) { ?>
+/* marked table rows */
+table tr.marked th,
+table tr.marked {
+    background:   <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
+    color:   <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
+}
+<?php } ?>
+
+<?php if ($GLOBALS['cfg']['BrowsePointerEnable']) { ?>
+/* hovered items */
+.odd:hover,
+.even:hover,
+.hover {
+    background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
+    color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
+}
+
+/* hovered table rows */
+table tr.odd:hover th,
+table tr.even:hover th,
+table tr.hover th {
+    background:   <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
+    color:   <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
+}
+<?php } ?>
+
+/**
+ * marks table rows/cells if the db field is in a where condition
+ */
+tr.condition th,
+tr.condition td,
+td.condition,
+th.condition {
+    border: 1px solid <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
+}
+
+table .value {
+    text-align:         <?php echo $right; ?>;
+    white-space:        normal;
+}
+/* IE doesnt handles 'pre' right */
+table [class=value] {
+    white-space:        normal;
+}
+
+
+<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
+.value {
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
+}
+<?php } ?>
+.value .attention {
+    color:              red;
+    font-weight:        bold;
+}
+.value .allfine {
+    color:              green;
+}
+
+
+img.lightbulb {
+    cursor:             pointer;
 }
 
 .pdflayout {
-    overflow:         hidden;
-    clip:             inherit;
-    background-color: #FFFFFF;
-    display:          none;
-    border:           1px solid #000000;
-    position:         relative;
+    overflow:           hidden;
+    clip:               inherit;
+    background-color:   #FFFFFF;
+    display:            none;
+    border:             1px solid #000000;
+    position:           relative;
 }
 
 .pdflayout_table {
-    background:       <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>;
-    color:            #000000;
-    overflow:         hidden;
-    clip:             inherit;
-    z-index:          2;
-    display:          inline;
-    visibility:       inherit;
-    cursor:           move;
-    position:         absolute;
-    font-size:        <?php echo $font_smaller; ?>;
-    border:           1px dashed #000000;
+    background:         #D3DCE3;
+    color:              #000000;
+    overflow:           hidden;
+    clip:               inherit;
+    z-index:            2;
+    display:            inline;
+    visibility:         inherit;
+    cursor:             move;
+    position:           absolute;
+    font-size:          80%;
+    border:             1px dashed #000000;
 }
 
-.print{font-family:arial;font-size:8pt;}
-
 /* MySQL Parser */
-.syntax {font-family: sans-serif; font-size: <?php echo $font_smaller; ?>;}
-.syntax_comment            { padding-left: 4pt; padding-right: 4pt;}
-.syntax_digit              {}
-.syntax_digit_hex          {}
-.syntax_digit_integer      {}
-.syntax_digit_float        {}
-.syntax_punct              {}
-.syntax_alpha              {}
-.syntax_alpha_columnType   {text-transform: uppercase;}
-.syntax_alpha_columnAttrib {text-transform: uppercase;}
-.syntax_alpha_reservedWord {text-transform: uppercase; font-weight: bold;}
-.syntax_alpha_functionName {text-transform: uppercase;}
-.syntax_alpha_identifier   {}
-.syntax_alpha_charset      {}
-.syntax_alpha_variable     {}
-.syntax_quote              {white-space: pre;}
-.syntax_quote_backtick     {}
-
-hr{ color: #666666; background-color: #666666; border: 0; height: 1px; }
-
-/* new styles for navigation */
-
-.nav {
-    font-family: <?php echo $right_font_family; ?>;
-    color: #000000;
-    border-top: none;
-    border-right: none;
-    border-left: none;
-    border-bottom: 1px solid #666;
-}
-.navSpacer {
-    width:            5px;
-    height:           16px;
-}
-.navNormal, .navDrop, .navActive {
-    font-family:      <?php echo $right_font_family; ?>;
-    font-size:        <?php echo $font_size; ?>;
-    font-weight:      bold;
-    border-top: 1px solid #999;
-    border-right: 1px solid #666;
-    border-left: 1px solid #999;
-    border-bottom: none;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    padding: 2px 5px 2px 5px;
-}
-.navNormal {
-    color:            #000000;
-    background-color: #FEFEFE;
-}
-.navActive{
-    font-family:      <?php echo $right_font_family; ?>;
-    font-size:        <?php echo $font_size; ?>;
-    font-weight:      bold;
-    color:            #000000;
-    background-color: #EAE6D0;
-}
-.navDrop{
-    color: #000000;
-    background-color: #E5E5E5;
-}
-.navNormal a:link, .navNormal a:active, .navNormal a:visited, .navActive a:link, .navActive a:active, .navActive a:visited{
-    color: #0000FF;
+.syntax {
+    font-size:          80%;
 }
 
-.navDrop a:link, .navDrop a:active, .navDrop a:visited{
-    color: #FF0000;
-}
-.navDrop a:hover{
-    color: #FFFFFF;
-    background-color: #FF0000;
-}
-.navNormal a:hover, .navActive a:hover{
-    color: #FF0000;
+.syntax_comment {
+    padding-left:       4pt;
+    padding-right:      4pt;
 }
 
-/* Warning showing div with right border and optional icon */
+.syntax_digit {
+}
 
-div.errorhead {
-    font-weight: bold;
-    color: #ffffff;
-    text-align: left;
-    <?php if ($cfg['ErrorIconic'] && isset($js_isDOM) && $js_isDOM != '0') { ?>
-    background-image: url(themes/silkline/img/s_error.png);
-    background-repeat: no-repeat;
-    background-position: 5px 50%;
-    padding: 0px 0px 0px 25px;
+.syntax_digit_hex {
+}
+
+.syntax_digit_integer {
+}
+
+.syntax_digit_float {
+}
+
+.syntax_punct {
+}
+
+.syntax_alpha {
+}
+
+.syntax_alpha_columnType {
+    text-transform:     uppercase;
+}
+
+.syntax_alpha_columnAttrib {
+    text-transform:     uppercase;
+}
+
+.syntax_alpha_reservedWord {
+    text-transform:     uppercase;
+    font-weight:        bold;
+}
+
+.syntax_alpha_functionName {
+    text-transform:     uppercase;
+}
+
+.syntax_alpha_identifier {
+}
+
+.syntax_alpha_charset {
+}
+
+.syntax_alpha_variable {
+}
+
+.syntax_quote {
+    white-space:        pre;
+}
+
+.syntax_quote_backtick {
+}
+
+/* leave some space between icons and text */
+.icon {
+    vertical-align:     middle;
+    margin-right:       0.3em;
+    margin-left:        0.3em;
+}
+/* no extra space in table cells */
+td .icon {
+    margin: 0;
+}
+
+.selectallarrow {
+    margin-<?php echo $right; ?>: 0.3em;
+    margin-<?php echo $left; ?>: 0.6em;
+}
+
+/* message boxes: warning, error, confirmation */
+.success h1,
+.notice h1,
+.warning h1,
+div.error h1 {
+    border-bottom:      2px solid;
+    font-weight:        bold;
+    text-align:         <?php echo $left; ?>;
+    margin:             0 0 0.2em 0;
+}
+
+div.success,
+div.notice,
+div.warning,
+div.error {
+    margin:             0.3em 0 0 0;
+    border:             2px solid;
+    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
+    background-repeat:  no-repeat;
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
+    background-position: 10px 50%;
+    padding:            0.1em 0.1em 0.1em 36px;
+        <?php } else { ?>
+    background-position: 99% 50%;
+    padding:            10px 5% 10px 10px;
+        <?php } ?>
+    <?php } else { ?>
+    padding:            0.3em;
     <?php } ?>
-    margin: 0px;
 }
 
-/* tables */
-th              {
-	font-family: <?php echo $right_font_family; ?>;
-	font-size: <?php echo $font_size; ?>;
-	font-weight: normal;
-	color: #FFF;
-	background-color: transparent;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparentdark.png);
+.success {
+    color:              #000000;
+    background-color:   #f0fff0;
 }
-th a:link {
-	color:#FFF;
-	text-decoration:underline;
+h1.success,
+div.success {
+    border-color:       #00FF00;
+    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
+    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_success.png);
+    <?php } ?>
 }
-th a:hover {
-	color:#bdbdbd;
+.success h1 {
+    border-color:       #00FF00;
 }
-.tblError {
-    border: 1px solid #FF0000;
-    background-color: #FFFFCC;
+
+.notice {
+    color:              #000000;
+    background-color:   #FFFFDD;
 }
-.tblWarn, div.tblWarn {
-    border: 1px solid #FF0000;
-    background-color: #FFFFFF;
+h1.notice,
+div.notice {
+    border-color:       #FFD700;
+    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
+    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
+    <?php } ?>
 }
-div.tblWarn {
-    padding: 5px 5px 5px 5px;
-    margin:  0px 0px 5px 0px;
-    width:   100%;
+.notice h1 {
+    border-color:       #FFD700;
 }
+
+.warning {
+    color:              #CC0000;
+	background-image:	url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparentdark.png);
+}
+p.warning,
+h1.warning,
+div.warning {
+    border-color:       #CC0000;
+    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
+    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
+    <?php } ?>
+}
+.warning h1 {
+    border-color:       #cc0000;
+}
+
+.error {
+    background-color:   #FFFFCC;
+    color:              #ff0000;
+}
+
+h1.error,
+div.error {
+    border-color:       #ff0000;
+    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
+    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
+    <?php } ?>
+}
+div.error h1 {
+    border-color:       #ff0000;
+}
+
+.confirmation {
+    background-color:   #FFFFCC;
+}
+fieldset.confirmation {
+    border:             0.1em solid #FF0000;
+}
+fieldset.confirmation legend {
+    border-left:        0.1em solid #FF0000;
+    border-right:       0.1em solid #FF0000;
+    font-weight:        bold;
+    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
+    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_really.png);
+    background-repeat:  no-repeat;
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
+    background-position: 5px 50%;
+    padding:            0.2em 0.2em 0.2em 25px;
+        <?php } else { ?>
+    background-position: 97% 50%;
+    padding:            0.2em 25px 0.2em 0.2em;
+        <?php } ?>
+    <?php } ?>
+}
+/* end messageboxes */
+
+
+.tblcomment {
+    font-size:          70%;
+    font-weight:        normal;
+    color:              #000099;
+}
+
 .tblHeaders {
-    background-color: <?php echo $cfg['LeftBgColor']; ?>;
-    font-weight: bold;
-    color: #FFFFFF;
+    font-weight:        bold;
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
 }
+
+div.tools,
 .tblFooters {
-    background-color: <?php echo $cfg['LeftBgColor']; ?>;
-    font-weight: normal;
-    color: #000000;
+    font-weight:        normal;
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent60.png);
 }
-.tblHeaders a:link, .tblHeaders a:active, .tblHeaders a:visited, .tblFooters a:link, .tblFooters a:active, .tblFooters a:visited {
-	color:#FFF;
-	text-decoration:underline;
+
+.tblHeaders a:link,
+.tblHeaders a:active,
+.tblHeaders a:visited,
+div.tools a:link,
+div.tools a:visited,
+div.tools a:active,
+.tblFooters a:link,
+.tblFooters a:active,
+.tblFooters a:visited {
+    color:              #0000FF;
 }
-.tblHeaders a:hover, .tblFooters a:hover { color: #bdbdbd; }
-.tblHeadError {
-    background-color: #FF0000;
-    font-weight: bold;
-    color: #FFFFFF;
-}
-.tblHeadWarn {
-    background-color: #FFCC00;
-    font-weight: bold;
-    color: #000000;
+
+.tblHeaders a:hover,
+div.tools a:hover,
+.tblFooters a:hover {
+    color:              #FF0000;
 }
+
 /* forbidden, no privilegs */
-.noPrivileges{
-    color: #FF0000;
-    font-weight: bold;
+.noPrivileges {
+    color:              #FF0000;
+    font-weight:        bold;
 }
 
+/* disabled text */
+.disabled,
+.disabled a:link,
+.disabled a:active,
+.disabled a:visited {
+    color:              #666666;
+}
+
+.disabled a:hover {
+    color:              #666666;
+    text-decoration:    none;
+}
+
+tr.disabled td,
+td.disabled {
+    background-color:   #cccccc;
+}
+
+/**
+ * login form
+ */
+body.loginform h1,
+body.loginform a.logo {
+    display: block;
+    text-align: center;
+}
+
+body.loginform {
+    text-align: center;
+}
+
+body.loginform div.container {
+    text-align: <?php echo $left; ?>;
+    width: 30em;
+    margin: 0 auto;
+}
+
+form.login label {
+    float: <?php echo $left; ?>;
+    width: 10em;
+    font-weight: bolder;
+}
+
+
+/******************************************************************************/
+/* specific elements */
+
+/* topmenu */
+ul#topmenu {
+    font-weight:        bold;
+    list-style-type:    none;
+    margin:             0;
+    padding:            0;
+}
+
+ul#topmenu li {
+    float:              <?php echo $left; ?>;
+    margin:             0;
+    padding:            0;
+    vertical-align:     middle;
+}
+
+#topmenu img {
+    vertical-align:     middle;
+    margin-<?php echo $right; ?>:       0.1em;
+}
+
+/* default tab styles */
+.tab, .tabcaution, .tabactive {
+    display:            block;
+    margin:             0.2em 0.2em 0 0.2em;
+    padding:            0.2em 0.2em 0 0.2em;
+    white-space:        nowrap;
+}
+
+/* disabled tabs */
+span.tab {
+    color:              #666666;
+}
+
+/* disabled drop/empty tabs */
+span.tabcaution {
+    color:              #ff6666;
+}
+
+/* enabled drop/empty tabs */
+a.tabcaution {
+    color:              #FF0000;
+}
+a.tabcaution:hover {
+    color: #FFFFFF;
+    background-color:   #FF0000;
+}
+
+<?php if ($GLOBALS['cfg']['LightTabs']) { ?>
+/* active tab */
+a.tabactive {
+    color:              black;
+}
+<?php } else { ?>
+#topmenu {
+    margin-top:         0.5em;
+    padding:            0.1em 0.3em 0.1em 0.3em;
+}
+
+ul#topmenu li {
+    border-bottom:      1pt solid black;
+}
+
+/* default tab styles */
+.tab, .tabcaution, .tabactive {
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent.png);
+    border:             1pt solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    border-bottom:      0;
+    border-top-left-radius: 0.4em;
+    border-top-right-radius: 0.4em;
+}
+
+/* enabled hover/active tabs */
+a.tab:hover,
+a.tabcaution:hover,
+.tabactive,
+.tabactive:hover {
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent60.png);
+    margin:             0;
+    padding:            0.2em 0.4em 0.2em 0.4em;
+    text-decoration:    none;
+}
+
+a.tab:hover,
+.tabactive {
+    background-color:   <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
+}
+
+/* to be able to cancel the bottom border, use <li class="active"> */
+ul#topmenu li.active {
+     border-bottom:      1pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
+}
+
+/* disabled drop/empty tabs */
+span.tab,
+a.warning,
+span.tabcaution {
+    cursor:             url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
+}
+<?php } ?>
+/* end topmenu */
+
+
+/* Calendar */
+table.calendar {
+    width:              100%;
+}
+table.calendar td {
+    text-align:         center;
+}
+table.calendar td a {
+    display:            block;
+}
+
+table.calendar td a:hover {
+    background-color:   #CCFFCC;
+}
+
+table.calendar th {
+    background-color:   #D3DCE3;
+}
+
+table.calendar td.selected {
+    background-color:   #FFCC99;
+}
+
+img.calendar {
+    border:             none;
+}
+form.clock {
+    text-align:         center;
+}
+/* end Calendar */
+
+
+/* table stats */
+div#tablestatistics {
+    border-bottom: 0.1em solid #669999;
+    margin-bottom: 0.5em;
+    padding-bottom: 0.5em;
+}
+
+div#tablestatistics table {
+    float: <?php echo $left; ?>;
+    margin-bottom: 0.5em;
+    margin-<?php echo $right; ?>: 0.5em;
+}
+
+div#tablestatistics table caption {
+    margin-<?php echo $right; ?>: 0.5em;
+}
+/* END table stats */
+
+
+/* server privileges */
+#tableuserrights td,
+#tablespecificuserrights td,
+#tabledatabases td {
+    vertical-align: middle;
+}
+/* END server privileges */
+
+
+
 /* Heading */
-
 #serverinfo {
-    font-family: <?php echo $right_font_family; ?>;
-    font-size: <?php echo $font_size; ?>;
-    font-weight: normal;
-    white-space: nowrap;
-    vertical-align: middle;
-    padding:23px 10px 10px 10px;
-    border:1px solid #aaa;
-    border:0;
-    background-color:transparent;
-    color:#fff;
-    margin:0;
-    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent.png);
-}
-#serverinfo a {
-	color:#fff;
+    font-weight:        bold;
+    margin-bottom:      0.5em;
 }
 
-img, input, select, button {
-    vertical-align: middle;
+#serverinfo .item {
+    white-space:        nowrap;
 }
 
-<?php if (isset($js_isDOM) && $js_isDOM != '0') { ?>
-html body div#serverinfo a.item, #serverinfo a.item:active, #serverinfo a.item:visited {
-    font-family: <?php echo $right_font_family; ?>;
-    font-size: <?php echo $font_size; ?>;
-    font-weight: normal;
-    color:#111111;
+#span_table_comment {
+    font-weight:        normal;
+    font-style:         italic;
+    white-space:        nowrap;
 }
-#serverinfo a.item img{
-    vertical-align: middle;
-    margin: 0px 1px 0px 2px;
-}
-#serverinfo div{
-    background-image:    url(themes/silkline/img/item_ltr.png);
-    background-repeat:   no-repeat;
-    background-position: 50% 50%;
-    width: 20px;
-    height: 16px;
+
+#serverinfo img {
+    margin:             0 0.1em 0 0.2em;
 }
+
+
 #textSQLDUMP {
-    width: 95%;
-    height: 95%;
-    font-family: "Courier New", Courier, mono;
-    font-size:   12px;
-}
-<?php } // end of isDom ?>
-/* disabled text */
-.disabled, .disabled a:link, disabled a:active, .disabled a:visited {
-    font-family: <?php echo $right_font_family; ?>;
-    font-size:   <?php echo $font_size; ?>;
-    color:       #666666;
-}
-.disabled a:hover {
-    text-decoration: none;
-}
-td.disabled {
-    background-color: #cccccc;
+    width:              95%;
+    height:             95%;
+    font-family:        "Courier New", Courier, mono;
+    font-size:          110%;
 }
 
 #TooltipContainer {
-    position:   absolute;
-    z-index:    99;
-    width:      250px;
-    height:     50px;
-    overflow:   auto;
-    visibility: hidden;
-    background-color: transparent;
-    color:            #000000;
-    border:           1px solid #000000;
-    padding:          5px;
-    font-family:      <?php echo $right_font_family; ?>;
-    font-size:        <?php echo $font_size; ?>;
+    position:           absolute;
+    z-index:            99;
+    width:              20em;
+    height:             auto;
+    overflow:           visible;
+    visibility:         hidden;
+    background-color:   #ffffcc;
+    color:              #006600;
+    border:             0.1em solid #000000;
+    padding:            0.5em;
 }
 
- /* disabled text */
- .disabled, .disabled a:link, disabled a:active, .disabled a:visited {
-     font-family: <?php echo $right_font_family; ?>;
-     font-size:   <?php echo $font_size; ?>;
-     color:       #666666;
- }
- .disabled a:hover {
-     text-decoration: none;
- }
- tr.disabled td, td.disabled {
-     background-color: #cccccc;
- }
+/* user privileges */
+#fieldset_add_user_login div.item {
+    border-bottom:      1px solid silver;
+    padding-bottom:     0.3em;
+    margin-bottom:      0.3em;
+}
 
-#TooltipContainer {
-     position:   absolute;
-     z-index:    99;
-     width:      250px;
-     height:     50px;
-     overflow:   auto;
-     visibility: hidden;
-     background-color: #ffffcc;
-     color:            #000000;
-     border:           1px solid #000000;
-     padding:          5px;
-     font-family:      <?php echo $right_font_family; ?>;
-     font-size:        <?php echo $font_size; ?>;
- }
+#fieldset_add_user_login label {
+    float:              <?php echo $left; ?>;
+    display:            block;
+    width:              10em;
+    max-width:          100%;
+    text-align:         <?php echo $right; ?>;
+    padding-<?php echo $right; ?>:      0.5em;
+}
 
- #topmenucontainer {
-	border-top-width:0;
-	border-bottom:1px solid #AAA;
-	background-color:transparent;
+#fieldset_add_user_login span.options #select_pred_username,
+#fieldset_add_user_login span.options #select_pred_hostname,
+#fieldset_add_user_login span.options #select_pred_password {
+    width:              100%;
+    max-width:          100%;
+}
+
+#fieldset_add_user_login span.options {
+    float: <?php echo $left; ?>;
+    display: block;
+    width: 12em;
+    max-width: 100%;
+    padding-<?php echo $right; ?>: 0.5em;
+}
+
+#fieldset_add_user_login input {
+    width: 12em;
+    clear: <?php echo $right; ?>;
+    max-width: 100%;
+}
+
+#fieldset_add_user_login span.options input {
+    width: auto;
+}
+
+#fieldset_user_priv div.item {
+    float: <?php echo $left; ?>;
+    width: 9em;
+    max-width: 100%;
+}
+
+#fieldset_user_priv div.item div.item {
+    float: none;
+}
+
+#fieldset_user_priv div.item label {
+    white-space: nowrap;
+}
+
+#fieldset_user_priv div.item select {
+    width: 100%;
+}
+
+#fieldset_user_global_rights fieldset {
+    float: <?php echo $left; ?>;
+}
+/* END user privileges */
+
+
+/* serverstatus */
+div#serverstatus table caption a.top {
+    float: <?php echo $right; ?>;
+}
+
+div#serverstatus div#serverstatusqueriesdetails table,
+div#serverstatus table#serverstatustraffic,
+div#serverstatus table#serverstatusconnections {
+    float: <?php echo $left; ?>;
+}
+
+#serverstatussection,
+.clearfloat {
+    clear: both;
+}
+div#serverstatussection table {
+    width: 100%;
+    margin-bottom: 1em;
+}
+div#serverstatussection table .name {
+    width: 18em;
+}
+div#serverstatussection table .value {
+    width: 6em;
+}
+
+div#serverstatus table tbody td.descr a,
+div#serverstatus table .tblFooters a {
+    white-space: nowrap;
+}
+div#serverstatus div#statuslinks a:before,
+div#serverstatus div#sectionlinks a:before,
+div#serverstatus table tbody td.descr a:before,
+div#serverstatus table .tblFooters a:before {
+    content: '[';
+}
+div#serverstatus div#statuslinks a:after,
+div#serverstatus div#sectionlinks a:after,
+div#serverstatus table tbody td.descr a:after,
+div#serverstatus table .tblFooters a:after {
+    content: ']';
+}
+/* end serverstatus */
+
+/* querywindow */
+body#bodyquerywindow {
+    margin: 0;
+    padding: 0;
+	background-image:	url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>island_light.png);
+}
+
+div#querywindowcontainer {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+}
+
+div#querywindowcontainer fieldset {
+    margin-top: 0;
+}
+/* END querywindow */
+
+
+/* querybox */
+
+div#sqlquerycontainer {
+    float: <?php echo $left; ?>;
+    width: 69%;
+    /* height: 15em; */
+}
+
+div#tablefieldscontainer {
+    float: <?php echo $right; ?>;
+    width: 29%;
+    /* height: 15em; */
+}
+
+div#tablefieldscontainer select {
+    width: 100%;
+    /* height: 12em; */
+}
+
+textarea#sqlquery {
+    width: 100%;
+    /* height: 100%; */
+}
+
+div#queryboxcontainer div#bookmarkoptions {
+    margin-top: 0.5em;
+}
+/* end querybox */
+
+/* main page */
+#maincontainer {
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png);
+    background-position: <?php echo $right; ?> bottom;
+    background-repeat: no-repeat;
+}
+
+#mysqlmaininformation,
+#pmamaininformation {
+    float: <?php echo $left; ?>;
+    width: 49%;
+}
+
+#maincontainer ul {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_<?php echo $GLOBALS['text_dir']; ?>.png);
+    vertical-align: middle;
+}
+
+#maincontainer li {
+    margin-bottom:  0.3em;
+}
+/* END main page */
+
+
+<?php if ($GLOBALS['cfg']['MainPageIconic']) { ?>
+/* iconic view for ul items */
+li#li_create_database {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_newdb.png);
+}
+
+li#li_select_lang {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
+}
+
+li#li_select_mysql_collation,
+li#li_select_mysql_charset {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
+}
+
+li#li_select_theme{
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
+}
+
+li#li_server_info,
+li#li_server_version{
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
+}
+
+li#li_user_info{
+    /* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png); */
+}
+
+li#li_mysql_status{
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_status.png);
+}
+
+li#li_mysql_variables{
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_vars.png);
+}
+
+li#li_mysql_processes{
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_process.png);
+}
+
+li#li_mysql_collations{
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
+}
+
+li#li_mysql_engines{
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_engine.png);
+}
+
+li#li_mysql_binlogs {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_tbl.png);
+}
+
+li#li_mysql_databases {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_db.png);
+}
+
+li#li_export {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_export.png);
+}
+
+li#li_import {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_import.png);
+}
+
+li#li_change_password {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_passwd.png);
+}
+
+li#li_log_out {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
+}
+
+li#li_pma_docs,
+li#li_pma_wiki {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_docs.png);
+}
+
+li#li_phpinfo {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>php_sym.png);
+}
+
+li#li_pma_homepage {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_home.png);
+}
+
+li#li_mysql_privilegs{
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png);
+}
+
+li#li_switch_dbstats {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_dbstatistics.png);
+}
+
+li#li_flush_privileges {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
+}
+/* END iconic view for ul items */
+<?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
+
+
+#body_browse_foreigners {
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    margin:             0.5em 0.5em 0 0.5em;
+}
+
+#bodyquerywindow {
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+}
+
+#bodythemes {
+    width: 500px;
+    margin: auto;
+    text-align: center;
+}
+
+#bodythemes img {
+    border: 0.1em solid black;
+}
+
+#bodythemes a:hover img {
+    border: 0.1em solid red;
+}
+
+#fieldset_select_fields {
+    float: <?php echo $left; ?>;
+}
+
+#selflink {
+    clear: both;
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+    width: 100%;
+    border-top: 0.1em solid silver;
+    text-align: <?php echo $right; ?>;
+}
+
+#table_innodb_bufferpool_usage,
+#table_innodb_bufferpool_activity {
+    float: <?php echo $left; ?>;
+}
+
+#div_mysql_charset_collations table {
+    float: <?php echo $left; ?>;
+}
+
+#div_table_order {
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#div_table_rename {
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#div_table_copy,
+#div_partition_maintenance,
+#div_referential_integrity,
+#div_table_maintenance {
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#div_table_options {
+    clear: both;
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#qbe_div_table_list {
+    float: <?php echo $left; ?>;
+}
+
+#qbe_div_sql_query {
+    float: <?php echo $left; ?>;
+}
+
+label.desc {
+    width: 30em;
+    float: <?php echo $left; ?>;
+}
+
+code.sql {
+    display:            block;
+    padding:            0.3em;
+    margin-top:         0;
+    margin-bottom:      0;
+    border:             <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;
+    border-top:         0;
+    border-bottom:      0;
+    max-height:         10em;
+    overflow:           auto;
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent60.png);
+}
+
+#main_pane_left {
+    width:              60%;
+    float:              <?php echo $left; ?>;
+    padding-top:        1em;
+}
+
+#main_pane_right {
+    margin-<?php echo $left; ?>: 60%;
+    padding-top: 1em;
+    padding-<?php echo $left; ?>: 1em;
+}
+
+.group {
     background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent.png);
- }
-#topmenu{
-margin:0;
-padding:0;
-}
-#topmenucontainer ul#topmenu li{
-padding-right:3px;
-border-bottom:0px;
-}
-#topmenu li .tab, #topmenu li .tabcaution, #topmenu li a.tabactive{
-margin:0;
-font: 9px Arial;
-padding:3px 6px 1px;
-background-color:#ffc5b6;
-background-color:#ffffd7;
-color:#000;
-border:1px solid #AAA;
-border-bottom:0px;
-font-weight:normal;
-text-transform:uppercase;
-
-}
-#topmenu li a.tabactive, #topmenu li a.tab:hover{
-background-color:#FFEB8F;
-color:#0000FF;
-border:1px solid #AAA;
-border-bottom:0px;
+    margin-bottom:      1em;
 }
 
-#topmenu li a.tabcaution{
-background-color:#FFFF00;
-color:#000;
+.group h2 {
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent60.png);
+    padding:            0.1em 0.3em;
+    margin-top:         0;
 }
-html frameset#mainframeset{
-border:5px solid red;
-background-color:#FF0000;
-}
-#topmenu li a.tabcaution:hover{
-background-color:#FFDD00;
-color:#000;
-}
-table.calendar td.selected,table tr.marked th,
-table tr.marked,table tr.odd:hover,
-table tr.even:hover,
-table tr.odd:hover th,
-table tr.even:hover th,
-table tr.hover th,
-table tr.hover,.marked a,
-.marked,.odd:hover,
-.even:hover,
-.hover  {
-color:#000;
-}
-#calendar_data{
-background-color:#CECECE;
-}
-#calendar_data table.calendar{
-border-collapse:collapse;
-border:0px solid #CECECE;
-}
-#calendar_data table.calendar td{
-background-color:#EEE;
-border:1px solid #CCC;
-}
-#calendar_data table.calendar th{
-padding:5px 0 3px;
-background-color:#FFF;
-font-size:120%;
-color:#333;
-}
-#clock_data {
-margin:auto;
-text-align:center;
-}
-#clock_data button{
-font-size:120%;
-color:#000;
-font-weight:bold;
+
+#li_select_server {
+    padding-bottom:     0.3em;
+    border-bottom:      0.3em solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
+    margin-bottom:      0.3em;
 }
diff --git a/hillside/img/bd_drop.png b/hillside/img/bd_drop.png
new file mode 100644
index 000000000..15c70d676
Binary files /dev/null and b/hillside/img/bd_drop.png differ
diff --git a/hillside/img/bd_insrow.png b/hillside/img/bd_insrow.png
new file mode 100644
index 000000000..d3c9b7b0b
Binary files /dev/null and b/hillside/img/bd_insrow.png differ
diff --git a/hillside/img/error.ico b/hillside/img/error.ico
new file mode 100644
index 000000000..41d26d638
Binary files /dev/null and b/hillside/img/error.ico differ
diff --git a/hillside/img/logo_left.png b/hillside/img/logo_left.png
index c4d540592..6d9dcccae 100644
Binary files a/hillside/img/logo_left.png and b/hillside/img/logo_left.png differ
diff --git a/hillside/img/logo_right.png b/hillside/img/logo_right.png
index 3bc0aa383..9df915b98 100644
Binary files a/hillside/img/logo_right.png and b/hillside/img/logo_right.png differ
diff --git a/hillside/img/s_success.png b/hillside/img/s_success.png
new file mode 100644
index 000000000..2f86f0ae6
Binary files /dev/null and b/hillside/img/s_success.png differ
diff --git a/hillside/img/transparentdark.png b/hillside/img/transparentdark.png
index f80965bc4..b2af304b2 100644
Binary files a/hillside/img/transparentdark.png and b/hillside/img/transparentdark.png differ
diff --git a/hillside/info.inc.php b/hillside/info.inc.php
index dc97f569a..e4e319495 100644
--- a/hillside/info.inc.php
+++ b/hillside/info.inc.php
@@ -2,20 +2,15 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Theme information
- * 
  *
  * @version $Id$
  * @package phpMyAdmin-theme
- * @subpackage Hillside
+ * @subpackage hillside
  */
 
 /**
- * This theme is based on Pixeline, but it uses the famous Silk-icons.
- * Made by Douwe Ikkuh (http://www.douweikkuh.nl)
- * Fixed (remade) for PMA 2.11 by Lukáš Chmela (http://82.114.202.3/)
+ *
  */
-
 $theme_name = 'Hillside';
-$theme_version = 1;
-$theme_generation = 1;
+$theme_full_version = '1.0';
 ?>
diff --git a/hillside/layout.inc.php b/hillside/layout.inc.php
index 1aba3066f..4121b0f12 100644
--- a/hillside/layout.inc.php
+++ b/hillside/layout.inc.php
@@ -6,33 +6,92 @@
  *
  * @version $Id$
  * @package phpMyAdmin-theme
- * @subpackage Hillside
+ * @subpackage Original
  */
 
 /**
  * navi frame
  */
+// navi frame width
+$GLOBALS['cfg']['NaviWidth']                = 200;
+
+// foreground (text) color for the navi frame
+$GLOBALS['cfg']['NaviColor']                = '#000000';
+$GLOBALS['cfg']['NaviBorderColor']          = '#94b3f2';
+
+// background for the navi frame
+$GLOBALS['cfg']['NaviBackground']           = '#D0DCE0';
+
+// foreground (text) color of the pointer in navi frame
+$GLOBALS['cfg']['NaviPointerColor']         = '#000000';
+// background of the pointer in navi frame
+$GLOBALS['cfg']['NaviPointerBackground']    = '#9999CC';
+// text color of the selected database name (when showing the table list)
+$GLOBALS['cfg']['NaviDatabaseNameColor']    = '#ffa113';
+
+/**
+ * main frame
+ */
+// foreground (text) color for the main frame
+$GLOBALS['cfg']['MainColor']                = '#000000';
+
+// background for the main frame
+//$GLOBALS['cfg']['MainBackground']           = '#F5F5F5';
+$GLOBALS['cfg']['MainBackground']       = '#65a603 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'island_light.png) top left repeat-x';
+
+// foreground (text) color of the pointer in browse mode
+$GLOBALS['cfg']['BrowsePointerColor']       = '#000000';
+
+// background of the pointer in browse mode
+$GLOBALS['cfg']['BrowsePointerBackground']  = '#CCFFCC';
+
+// foreground (text) color of the marker (visually marks row by clicking on it) in browse mode
+$GLOBALS['cfg']['BrowseMarkerColor']        = '#000000';
+
+// background of the marker (visually marks row by clicking on it) in browse mode
+$GLOBALS['cfg']['BrowseMarkerBackground']   = '#FFCC99';
+
+/**
+ * fonts
+ */
+/**
+ * the font family as a valid css font family value,
+ * if not set the browser default will be used
+ * (depending on browser, DTD and system settings)
+ */
+$GLOBALS['cfg']['FontFamily']           = '"Tahoma", "Lucida Grande", Verdana, sans-serif';
+/**
+ * fixed width font family, used in textarea
+ */
+$GLOBALS['cfg']['FontFamilyFixed']      = 'monospace';
+
+/**
+ * tables
+ */
+// border
+$GLOBALS['cfg']['Border']               = 0;
+// table header and footer color
+$GLOBALS['cfg']['ThBackground']         = '#D3DCE3';
+// table header and footer background
+$GLOBALS['cfg']['ThColor']              = '#000000';
+// table data row background
+$GLOBALS['cfg']['BgOne']                = '#E5E5E5';
+// table data row background, alternate
+$GLOBALS['cfg']['BgTwo']                = '#D5D5D5';
+
+/**
+ * query window
+ */
+// Width of Query window
+$GLOBALS['cfg']['QueryWindowWidth']     = 600;
+// Height of Query window
+$GLOBALS['cfg']['QueryWindowHeight']    = 400;
 
-$cfg['LeftWidth']           = 250;          // left frame width
-/* colors */
-$cfg['LeftBgColor']         = '';    // background color for the left frame
-$cfg['RightBgColor']        = '#65a603';    // background color for the right frame
-$cfg['RightBgImage']        = '';           // path to a background image for the right frame
-                                            // (leave blank for no background image)
-$cfg['LeftPointerColor']    = '#525252';    // color of the pointer in left frame
-$cfg['Border']              = 0;            // border width on tables
-$cfg['ThBgcolor']           = '#DEDEDE';    // table header row colour
-$cfg['BgcolorOne']          = '#F3F3F3';    // table data row colour
-$cfg['BgcolorTwo']          = '#FFFFFF';    // table data row colour, alternate
-$cfg['BrowsePointerColor']  = '#ffffd7';    // color of the pointer in browse mode
-$cfg['BrowseMarkerColor']   = '#ffffd7';    // color of the marker (visually marks row
-                                            // by clicking on it) in browse mode
-$right_font_family = 'Tahoma, Arial, Helvetica, Verdana, sans-serif';
-$font_size = '11px';
 /**
  * SQL Parser Settings
+ * Syntax colouring data
  */
-$cfg['SQP']['fmtColor']     = array(        // Syntax colouring data
+$GLOBALS['cfg']['SQP']['fmtColor']      = array(
     'comment'            => '#808000',
     'comment_mysql'      => '',
     'comment_ansi'       => '',