diff --git a/paradice/css/theme_left.css.php b/paradice/css/theme_left.css.php
index 1ca3cb206..79fee10d6 100644
--- a/paradice/css/theme_left.css.php
+++ b/paradice/css/theme_left.css.php
@@ -1,42 +1,39 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * navigation css file from theme
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Paradice
- */
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/**     
+ * navigation css file from theme   
+ *      
+ * @version $Id$    
+ * @package phpMyAdmin-theme    
+ * @subpackage Paradice     
+*/
 
-    // unplanned execution path
-    if (!defined('PMA_MINIMUM_COMMON')) {
-        exit();
-    }
-?> 
+// unplanned execution path
+if (!defined('PMA_MINIMUM_COMMON')) {
+    exit();
+}
+?>
 /******************************************************************************/
 /* general tags */
+
 body {
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        12px;
-    background-color: #3674CF;
-    color:            #ffffff;
-    margin: 0;
-    padding: 2px 2px 2px 2px;
-	background-image: 		url(themes/paradice/img/leftBgnd.jpg);
-	background-position: 	left top;
-	background-repeat: 		repeat-y;
+<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
+<?php } ?>
+	font-size:			0.8em;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    margin:             0;
+    padding:            0.2em 0.2em 0.2em 0.2em;
+	background-image: 	url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>leftBgnd.png);
+	background-position:left top;
+	background-repeat: 	repeat-y;
 }
 
 a img {
     border: 0;
 }
 
-/* gecko FIX, font size is not correctly assigned to all child elements */
-body * {
-    font-family:      inherit;
-    font-size:        inherit;
-}
-
 form {
     margin:             0;
     padding:            0;
@@ -46,8 +43,7 @@ form {
 select {
     background-color:   #ffffff;
     color:              #000000;
-    width:              150px;
-	font-size:			10px;
+    width:              100%;
 }
 
 /* buttons in some browsers (eg. Konqueror) are block elements,
@@ -67,10 +63,6 @@ button {
     margin-left:        0.3em;
 }
 
-img.lightbulb {
-    cursor:             pointer;
-}
-
 
 /******************************************************************************/
 /* specific elements */
@@ -79,36 +71,75 @@ div#pmalogo,
 div#leftframelinks,
 div#databaseList {
     text-align:         center;
-    border-bottom:      0.05em solid #ffffff;
+    border-bottom:      0.05em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     margin-bottom:      0.5em;
     padding-bottom:     0.5em;
 }
 
-div#leftframelinks img {
-    vertical-align: middle;
+ul#databaseList {
+    border-bottom:      0.05em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    margin-bottom:      0.5em;
+    padding-bottom:     0.5em;
+    padding-left: 	1.5em;
+}
+
+ul#databaseList a {
+    display: block;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+}
+
+ul#databaseList a:hover {
+    background:         <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
+    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 {
-    margin:             0.1em;
+div#leftframelinks a img.icon {
+    margin:             0;
     padding:            0.2em;
     border:             0;
 }
 
 div#leftframelinks a:hover {
-	background-color: #3674CF;
-    color: #FFFFFF;	
+    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
+}
+
+/* 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;
+    margin: 0;
+    padding: 0;
+}
+
+#body_leftFrame #list_server li {
+    margin: 0;
+    padding: 0;
+    font-size:          80%;
 }
 
 /* leftdatabaselist */
+div#left_tableList {
+	background-color:	none;
+}
 div#left_tableList ul {
     list-style-type:    none;
     list-style-position: outside;
     margin:             0;
     padding:            0;
-    font-size:          10px;
-    background-color:   #3674CF;
+    font-size:          80%;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
 }
 
 div#left_tableList ul ul {
@@ -116,13 +147,15 @@ div#left_tableList ul ul {
 }
 
 div#left_tableList a {
-    color:              #ffffff;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     text-decoration:    none;
 }
 
 div#left_tableList a:hover {
-    color:              #ffffcc;
-    text-decoration: 	none;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    text-decoration:    underline;
 }
 
 div#left_tableList li {
@@ -131,9 +164,20 @@ div#left_tableList li {
     white-space:        nowrap;
 }
 
+<?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']['NaviPointerBackground']; ?>;
+    color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
+}
+<?php } ?>
+
 <?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
-div#left_tableList li:hover {
-    background-color: #2563BE;
+div#left_tableList > ul li:hover > a,
+div#left_tableList > ul li:hover {
+    background:         <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
 }
 <?php } ?>
 
@@ -143,9 +187,9 @@ div#left_tableList img {
 }
 
 div#left_tableList ul ul {
-    margin-left:        0em;
+    margin-left:        0;
     padding-left:       0.1em;
-    border-left:        0.1em solid #ffffff;
+    border-left:        0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     padding-bottom:     0.1em;
-    border-bottom:      0.1em solid #ffffff;
+    border-bottom:      0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
 }
diff --git a/paradice/css/theme_print.css.php b/paradice/css/theme_print.css.php
index dbb888017..e67c6a14a 100644
--- a/paradice/css/theme_print.css.php
+++ b/paradice/css/theme_print.css.php
@@ -1,51 +1,38 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * print css file from theme
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Paradice
- */
-?>
+<?php 	 
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/** 	 
+ * print css file from theme 	 
+ * 	 
+ * @version $Id$ 	 
+ * @package phpMyAdmin-theme 	 
+ * @subpackage Paradice 	 
+ */ 	 
 /* For printview */
-body{
-    font-family:       Verdana, Arial, Helvetica, sans-serif;
-    font-size:         10px;
+body, table, th, td {
     color:             #000000;
     background-color:  #ffffff;
 }
-h1{
-    font-family:       Verdana, Arial, Helvetica, sans-serif;
-    font-size:         16px;
-    font-weight:       bold;
-    color:             #000000;
+
+img {
+    border: 0;
 }
-table{
-    border-width:      1px;
+
+table, th, td {
+    border-width:      0.1em;
     border-color:      #000000;
     border-style:      solid;
+}
+
+table {
     border-collapse:   collapse;
     border-spacing:    0;
 }
-th{
-    font-family:       Verdana, Arial, Helvetica, sans-serif;
-    font-size:         10px;
-    font-weight:       bold;
-    color:             #000000;
-    background-color:  #e5e5e5;
-    border-width:      1px;
-    border-color:      #000000;
-    border-style:      solid;
-    padding:           2px;
+
+th, td {
+    padding:           0.2em;
+}
+
+th {
+    font-weight:       bold;
+    background-color:  #e5e5e5;
 }
-td{
-    font-family:       Verdana, Arial, Helvetica, sans-serif;
-    font-size:         10px;
-    color:             #000000;
-    background-color:  #ffffff;
-    border-width:      1px;
-    border-color:      #000000;
-    border-style:      solid;
-    padding:           2px;
-}
\ No newline at end of file
diff --git a/paradice/css/theme_right.css.php b/paradice/css/theme_right.css.php
index 0f1b98a57..0537298af 100644
--- a/paradice/css/theme_right.css.php
+++ b/paradice/css/theme_right.css.php
@@ -1,75 +1,65 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * main css file from theme
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Paradice
- */
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/** 	 
+  * main css file from theme 	 
+  * 	 
+  * @version $Id$ 	 
+  * @package phpMyAdmin-theme 	 
+  * @subpackage Paradice 	 
+  */
     // unplanned execution path
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
     }
-?> 
+?>
 /******************************************************************************/
 /* general tags */
 html {
-	margin: 0px;
-	padding: 0px;
+	margin: 0;
+	padding: 0;
 }
 
 body {
-    font-family:        Verdana, Arial, Helvetica, sans-serif;
-    font-size:          10px;
-    color:            	 #142F56;
-	background-image:	 url(themes/paradice/img/rightBgnd.jpg);
-	background-repeat: 	 no-repeat;
-	background-position: right bottom;
-    background-color:   #ffffff;
-    margin:             5px;
-	padding: 			0px;
+    padding:            0;
+    margin:             0.5em;
+<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
+<?php } ?>
+    color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
+    font-size:          0.8em;
 }
 
-/* gecko FIX, font size is not correctly assigned to all child elements */
-body * {
-    font-family:        inherit;
-    font-size:          inherit;
+<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
+textarea, tt, pre, code {
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
 }
+<?php } ?>
 
 h1 {
-    font-size:        	 18px;
-    font-weight:      	 bold;
+    font-size:          140%;
+    font-weight:        bold;
 }
 
 h2 {
-    font-size:        	 13px;
-    font-weight:      	 bold;
+    font-size:          120%;
+    font-weight:        bold;
 }
 
 h3 {
-    font-size:        	 12px;
-    font-weight:      	 bold;
-}
-
-pre, tt, code{
-    font-size:        	 11px;
+    font-weight:        bold;
 }
 
 a:link,
 a:visited,
 a:active {
-    font-size:        	 11px;
-    text-decoration:  	 none;
-    color:            	 #1F457E;
-
+    text-decoration:    none;
+    color:              #1F457E;
 }
 
 a:hover {
-    font-size:        	 11px;
-    text-decoration:  	 underline;
-    color:            	 #8897AE;
+    text-decoration:    underline;
+    color:              #8897AE;
 }
 
 dfn {
@@ -82,14 +72,12 @@ dfn:hover {
 }
 
 th {
-    font-size:          11px;
     font-weight:        bold;
-    color:              #000000;
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
     background-color:   #ff9900;
-    background-image:   url(themes/paradice/img/tbl_th.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_th.png);
     background-repeat:  repeat-x;
     background-position: top;
-    height:             18px;
 }
 
 th a:link,
@@ -109,32 +97,26 @@ a img {
 }
 
 hr {
-    color: #79A2DF;
-	background-color: #6666cc;
-	border: 0;
+    color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['MainColor']; ?>;
+    border:             0;
     height:             1px;
 }
 
 form {
-    font-size:        	 10px;
-    padding:          	 0px 0px 0px 0px;
-    margin:           	 0px 0px 0px 0px;
+    padding:            0;
+    margin:             0;
+    display:            inline;
 }
 
 th.td{
     font-weight: 		 normal;
     color: 				 transparent;
     background-color: 	 transparent;
-    background-image: 	 url(themes/paradice/img/tbl_th.png);
-
-}
-
-td{
-    font-size:        	 10px;
+    background-image: 	 url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_th.png);
 }
 
 select, textarea, input {
-    font-size:        	 10px;
 	border: 			 1px solid #3674CF;
 }
 
@@ -144,31 +126,26 @@ select, textarea{
 }
 
 input.textfield{
-    font-size:        	 10px;
     color:            	 #000000;
     background-color: 	 #FFFFFF;
 }
 
 a.h1:link, a.h1:active, a.h1:visited{
-    font-size:        	 18px;
     font-weight:      	 bold;
     color:            	 #000000;
 }
 
 a.h1:hover{
-    font-size:        	 18px;
     font-weight:      	 bold;
     color:            	 #666666;
 }
 
 a.h2:link, a.h2:active, a.h2:visited{
-    font-size:        	 13px;
     font-weight:      	 bold;
     color:            	 #000000;
 }
 
 a.h2:hover{
-    font-size:        	 13px;
     font-weight:      	 bold;
     color:            	 #666666;
 }
@@ -183,10 +160,15 @@ a.drop:hover{
     text-decoration:  	 none;
 }
 
+textarea {
+    overflow:           visible;
+}
+
 fieldset {
     margin-top:         1em;
-    border:     		 #79A2DF solid 1px;
-    padding:    		 0.5em;
+    border:             <?php echo $GLOBALS['cfg']['ThBackground']; ?> solid 1px;
+    padding:            0.5em;
+    background:         <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
 }
 
 fieldset fieldset {
@@ -194,11 +176,10 @@ fieldset fieldset {
 }
 
 fieldset legend {
-    color:       		#79A2DF;
+    color:       		<?php echo $GLOBALS['cfg']['ThBackground']; ?>;
     font-weight: 		bold;
-    background-color: 	#ffffff;
-    padding:            2px 2px 2px 2px;
-	size:        		11px;
+    background-color: 	<?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    padding:            2px;
 }
 
 /* buttons in some browsers (eg. Konqueror) are block elements,
@@ -229,14 +210,14 @@ button {
 fieldset.tblFooters {
     margin-top:         0;
     margin-bottom:      0.5em;
-    text-align:         right;
+    text-align:         <?php echo $right; ?>;
     float:              none;
     clear:              both;
 }
 
 fieldset .formelement {
-    float:              left;
-    margin-right:       0.5em;
+    float:              <?php echo $left; ?>;
+    margin-<?php echo $right; ?>:       0.5em;
     /* IE */
     white-space:        nowrap;
 }
@@ -251,50 +232,78 @@ button.mult_submit {
     background-color:   transparent;
 }
 
+/* odd items 1,3,5,7,... */
+table tr.odd th,
+.odd {
+    background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+}
+
+/* even items 2,4,6,8,... */
+table tr.even th,
+.even {
+    background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+}
+
 /* odd table rows 1,3,5,7,... */
 table tr.odd th,
-table tr.odd {
-    background-image:   none;
-    background-color:   #E5E5E5;
-    text-align:         left;
-}
-
-/* even table rows 2,4,6,8,... */
+table tr.odd,
 table tr.even th,
 table tr.even {
-    background-image:   none;
-    background-color:   #D5D5D5;
-    text-align:         left;
+    text-align:         <?php echo $left; ?>;
 }
 
-/* marked tbale rows */
+<?php if ($GLOBALS['cfg']['BrowseMarkerEnable']) { ?>
+/* marked table rows */
 table tr.marked th,
 table tr.marked {
-    background-color:   #FFCC99;
+    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,
-table tr.even:hover,
 table tr.odd:hover th,
 table tr.even:hover th,
-table tr.hover th,
-table tr.hover {
-    background-color:   #CCFFCC;
+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:         right;
-    white-space:        nowrap;
+    text-align:         <?php echo $right; ?>;
+    white-space:        normal;
 }
 /* IE doesnt handles 'pre' right */
 table [class=value] {
-    white-space:        pre;
+    white-space:        normal;
 }
 
+
+<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
 .value {
-    font-family:        "Courier New", Courier, monospace;
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
 }
+<?php } ?>
 .value .attention {
     color:              red;
     font-weight:        bold;
@@ -318,7 +327,7 @@ img.lightbulb {
 }
 
 .pdflayout_table {
-    background:         #ff9900;
+    background:         #D3DCE3;
     color:              #000000;
     overflow:           hidden;
     clip:               inherit;
@@ -327,17 +336,15 @@ img.lightbulb {
     visibility:         inherit;
     cursor:             move;
     position:           absolute;
-    font-size:          110%;
+    font-size:          80%;
     border:             1px dashed #000000;
 }
 
-.print {
-    font-size:          8pt;
-}
-
 /* MySQL Parser */
 .syntax {
-font-size: 10px;}
+    font-size:          100%;
+	font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
+}
 
 .syntax_comment {
     padding-left:       4pt;
@@ -419,9 +426,9 @@ td .icon {
 h1.notice,
 div.notice {
     margin:             0.5em 0 0.5em 0;
-    border:             0.1em solid #FFD700;
+    border:             1px solid #FFD700;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(themes/paradice/img/s_notice.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -435,7 +442,7 @@ div.notice {
     <?php } ?>
 }
 .notice h1 {
-    border-bottom:      0.1em solid #FFD700;
+    border-bottom:      1px solid #FFD700;
     font-weight:        bold;
     text-align:         <?php echo $left; ?>;
     margin:             0 0 0.2em 0;
@@ -449,11 +456,9 @@ p.warning,
 h1.warning,
 div.warning {
     margin:             0.5em 0 0.5em 0;
-    border:             0.1em solid #CC0000;
-    width:              90%;
-
+    border:             1px solid #CC0000;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(themes/paradice/img/s_warn.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -467,7 +472,7 @@ div.warning {
     <?php } ?>
 }
 .warning h1 {
-    border-bottom:      0.1em solid #cc0000;
+    border-bottom:      1px solid #cc0000;
     font-weight:        bold;
     text-align:         <?php echo $left; ?>;
     margin:             0 0 0.2em 0;
@@ -481,10 +486,9 @@ div.warning {
 h1.error,
 div.error {
     margin:             0.5em 0 0.5em 0;
-    border:             0.1em solid #ff0000;
-    width:              90%;
+    border:             1px solid #ff0000;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-	background-image:   url(themes/paradice/img/s_error.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -498,7 +502,7 @@ div.error {
     <?php } ?>
 }
 div.error h1 {
-    border-bottom:      0.1em solid #ff0000;
+    border-bottom:      1px solid #ff0000;
     font-weight:        bold;
     text-align:         <?php echo $left; ?>;
     margin:             0 0 0.2em 0;
@@ -508,14 +512,14 @@ div.error h1 {
     background-color:   #FFFFCC;
 }
 fieldset.confirmation {
-    border:             0.1em solid #FF0000;
+    border:             1px solid #FF0000;
 }
 fieldset.confirmation legend {
-    border-left:        0.1em solid #FF0000;
-    border-right:       0.1em solid #FF0000;
+    border-left:        1px solid #FF0000;
+    border-right:       1px solid #FF0000;
     font-weight:        bold;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(themes/paradice/img/s_error.png);
+    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%;
@@ -528,31 +532,33 @@ fieldset.confirmation legend {
 }
 /* end messageboxes */
 
+.data caption {
+	color:				#FFFFFF;
+}
 
-.tblcomment{
-    font-family:      	 Verdana, Arial, Helvetica, sans-serif;
-    font-size:         	 10px;
-    font-weight:      	 normal;
-    color:            	 #000099;
+.tblcomment {
+	font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
+    font-size:          70%;
+    font-weight:        normal;
+    color:              #000099;
 }
 
 .tblHeaders {
+	background-color:	<?php echo $GLOBALS['cfg']['ThBackground']; ?>;
     font-weight:        bold;
-    color:              #ffffff;
-    background-color:    #79A2DF;
-    background-image:    url(themes/paradice/img/tbl_header.png);
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header.png);
     background-repeat:  repeat-x;
-    background-position: top;
-    height:             18px;
+    background-position:top;
 }
 
 .tblFooters {
     font-weight:        normal;
-    color:              #ffffff;
-    background-color:    #79A2DF;
-    background-image:    url(themes/paradice/img/tbl_header.png);
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
+	background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header.png);
     background-repeat:  repeat-x;
-    background-position: top;
+    background-position:top;
 }
 
 .tblHeaders a:link,
@@ -561,19 +567,19 @@ fieldset.confirmation legend {
 .tblFooters a:link,
 .tblFooters a:active,
 .tblFooters a:visited {
-    color:              #ffffcc;
-    text-decoration:    underline;
+    color:              #FFFFCC;
+	text-decoration:    underline;
 }
 
 .tblHeaders a:hover,
 .tblFooters a:hover {
     text-decoration:    none;
-    color:              #ffffff;
+    color:              #FFFFFF;
 }
 
 /* forbidden, no privilegs */
 .noPrivileges {
-    color:              #cc0000;
+    color:              #CC0000;
     font-weight:        bold;
 }
 
@@ -595,6 +601,31 @@ 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 */
@@ -605,203 +636,164 @@ ul#topmenu {
     list-style-type:    none;
     margin:             0;
     padding:            0;
-    background-color:    #79A2DF;
-	background-image:    url(themes/paradice/img/tbl_header.png);
-    background-repeat:   repeat-x;
-    background-position: top;
-	height: 			 28px;
+    border:				0;
 }
 
 ul#topmenu li {
-    float:              left;
+    float:              <?php echo $left; ?>;
     margin:             0;
     padding:            0;
     vertical-align:     middle;
-	height: 			 24px;
+	border-bottom: 		0;
 }
 
 #topmenu img {
     vertical-align:     middle;
-    margin-right:       0.1em;
+    margin-<?php echo $right; ?>:       0.1em;
 }
 
 /* default tab styles */
 .tab, .tabcaution, .tabactive {
-	color:               #000000;
-	font-family:         Verdana, Arial, Helvetica, sans-serif;
-	padding:			 0;
+    display:            block;
+    margin:             0;
+    padding:            0;
     white-space:        nowrap;
 }
 
 /* disabled tabs */
 span.tab {
-	font-family:         Verdana, Arial, Helvetica, sans-serif;
-	font-size:           11px;
-	font-weight:         bold;
-	color:               #FFFFFF;
-	padding: 			 4px 8px 8px 8px;
-	margin: 			-1px 0px 0px -1px;
-	background-image:    url(themes/paradice/img/tbl_header_disabled.png);
+    color:               #FFFFFF;
+	background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header_disabled.png);
 	background-repeat:   repeat-x;
     background-position: top;
 }
 
-span.tab:hover {
-	background-image:    url(themes/paradice/img/tbl_header_disabled.png);
-	font-family:         Verdana, Arial, Helvetica, sans-serif;
-	font-size:           11px;
-	font-weight:         bold;
-	color:               #FFFFFF;
-	padding: 			 4px 8px 8px 8px;
-	margin: 			-1px 0px 0px -1px;
-	background-image:    url(themes/paradice/img/tbl_header2.png);
-	background-repeat:   repeat-x;
-    background-position: top;
-    text-decoration:		none;
-}
-
 /* disabled drop/empty tabs */
 span.tabcaution {
-    color:              #ff6666;
+    color:               #FFFFFF;
+	background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header2.png);
+	background-repeat:   repeat-x;
+    background-position: top;
+	text-decoration:	 none;
 }
 
 /* enabled drop/empty tabs */
 a.tabcaution {
-    color:              FF0000;
+    color:              #FF0000;
 }
 a.tabcaution:hover {
-    color: #FFFFFF;
+    color: 				#FFFFFF;
     background-color:   #FF0000;
 }
 
 <?php if ( $GLOBALS['cfg']['LightTabs'] ) { ?>
 /* active tab */
-ul#topmenu li a.tabactive {
+a.tabactive {
     color:              black;
-	padding: 			 4px 8px 8px 8px;
 }
 <?php } else { ?>
 #topmenu {
-    padding: 0px;
-    padding-top:		 4px;
+    margin-top:         0.5em;
+    padding:            0.1em 0.3em 0.1em 0.3em;
 }
 
 ul#topmenu li {
-    border-bottom: 0;
+    border-bottom:      0;
 }
 
 /* default tab styles */
 .tab, .tabcaution, .tabactive {
-    background-color:	 #E5E5E5;
-    border: 			 0px 1px 0px 0px;
+    background-color:   <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    border: 			 0 1px 0 0;
 	border-style:		 solid;
-	border-color: 		 #FFFFFF;
-	background-image:    url(themes/paradice/img/tbl_header2.png);
+    border-color: 		 #FFFFFF;
+	background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header2.png);
     background-repeat:   repeat-x;
     background-position: top;
-	/* overwrite default button look */
+    border-bottom:      0;
+    /* overwrite default button look */
 	border-radius-topleft: 0px;
     border-radius-topright: 0px;
-    -moz-border-radius-topleft: 0px;
-    -moz-border-radius-topright: 0px;
+    height:				21px;
 }
 
 ul#topmenu li a.tab {
-    font-family:         Verdana, Arial, Helvetica, sans-serif;
-    font-size:           11px;
-    font-weight:         bold;
 	color:               #FFFFFF;
 }
 
 ul#topmenu li a.tab:hover {
-    font-family:         Verdana, Arial, Helvetica, sans-serif;
-    font-size:           11px;
-    font-weight:         bold;
 	color:               #FFFFFF;
+	text-decoration:		none;
 }
 
 ul#topmenu li:hover {
-	background-image:    url(themes/paradice/img/tbl_header2.png);
-	text-decoration: 	 underline;
-	font-family:         Verdana, Arial, Helvetica, sans-serif;
-    font-size:           11px;
-    font-weight:         bold;
+	background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header2.png);
+	text-decoration:	 none;
 	color:               #FFFFFF;
 }
 
 /* enabled drop/empty tabs */
 ul#topmenu li a.tabcaution {
-    font-family:         Verdana, Arial, Helvetica, sans-serif;
-    font-size:           11px;
-    font-weight:         bold;
     color:               #FFFFFF;
     background-color:    #cc0000;
-    background-image:    url(themes/paradice/img/tbl_error.png);
+    background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_error.png);
     background-repeat:   repeat-x;
     background-position: top;
-    padding: 			 4px 8px 8px 8px;
+    padding: 			 4px 8px 4px 8px;
     border: 			 0;
     border-right: 		 1px solid #FFFFFF;
-	margin-right: 		 0;
-	margin: 			 0;
-	margin-left: 		 0px;
 }
 ul#topmenu li a.tabcaution:hover {
-	background-image:    url(themes/paradice/img/tbl_error2.png);
-	padding: 			 4px 8px 8px 8px;
+	background-image:    url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_error2.png);
+	text-decoration:		none;
 }
 
 /* enabled hover/active tabs */
 a.tabactive {
-    font-family:         Verdana, Arial, Helvetica, sans-serif;
-    font-weight:         bold;
     color:               #000000;
-    background-image:    url(themes/paradice/img/tbl_headerActive.png);
+    background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_headerActive.png);
     background-repeat:   repeat-x;
     background-position: top;
     background-color:    #ffffff;
-    padding: 		 	 4px 8px 8px 8px; /* top left bottom right - I just can't memorize this ;) */
+    padding: 		 	 4px 8px 4px 8px;
 	border: 			 0;
     border-right: 		 1px solid #FFFFFF;
 	border-left: 		 1px solid #FFFFFF;
-    margin-left: 		 -3px;
 	color:               #000000;
 }
 
 a.tabactive:hover {
-	background-image:    url(themes/paradice/img/tbl_header.png);
-	padding: 		 	 4px 8px 8px 8px; /* top left bottom right - I just can't memorize this ;) */
-    margin-left: 		 -3px;
+	background-image:    url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header.png);
+	padding: 		 	 4px 8px 4px 8px;
 	color:				 #FFFFFF;
+	text-decoration:		none;
 }
 
 a.tab:link, a.tab:active,a.tab:hover, a.tab:visited {
-    padding: 			 4px 8px 8px 8px; /* top left bottom right - I just can't memorize this ;) */
+    padding: 			 4px 8px 4px 8px;
 	border: 			 0;
     border-right: 		 1px solid #FFFFFF;
-	margin: 			 0;
-	margin-left: 		 0px;
     color:               #FFFFFF;
+    text-decoration:		none;
 }
 
 a.tab:hover,
 .tabactive {
-	background-image:    url(themes/paradice/img/tbl_header.png);
+    background-color:   <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    background-image:	url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header.png);
+    text-decoration:		none;
 }
 
 /* disabled drop/empty tabs */
-span.tab, span.tabcaution {
-        cursor:             url(themes/darkblue_orange/img/error.ico), default;
+span.tab,
+a.warning,
+span.tabcaution {
+    cursor:             url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
 }
 <?php } ?>
 /* end topmenu */
 
 
-#fieldsetexport #exportoptions {
-    float: left;
-}
-
-
 /* Calendar */
 table.calendar {
     width:              100%;
@@ -842,13 +834,13 @@ div#tablestatistics {
 }
 
 div#tablestatistics table {
-    float: left;
+    float: <?php echo $left; ?>;
     margin-bottom: 0.5em;
-    margin-right: 0.5em;
+    margin-<?php echo $right; ?>: 0.5em;
 }
 
 div#tablestatistics table caption {
-    margin-right: 0.5em;
+    margin-<?php echo $right; ?>: 0.5em;
 }
 /* END table stats */
 
@@ -865,20 +857,12 @@ div#tablestatistics table caption {
 
 /* Heading */
 #serverinfo {
-    font-family:    	 Verdana, Arial, Helvetica, sans-serif;
-    font-size:      	 12px;
-    font-weight:    	 normal;
-    padding: 			 0px 0px 10px 0px;
-    margin: 			 0px;
-    white-space:    	 nowrap;
-    vertical-align: 	 middle;
+    font-weight:        bold;
+    margin-bottom:      0.5em;
 }
 
 #serverinfo .item {
     white-space:        nowrap;
-    font-size:      	 12px;
-    font-weight:    	 bolder;
-	color:				 #142F56;
 }
 
 #span_table_comment {
@@ -888,75 +872,44 @@ div#tablestatistics table caption {
 }
 
 #serverinfo img {
-    margin:             0 0.1em 0 0.1em;
+    margin:             0 0.1em 0 0.2em;
 }
 
-/* some styles for IDs: */
-#buttonNo {
-    color:              #CC0000;
-    font-weight:        bold;
-    padding:            0 10px 0 10px;
-    font-size:        	 10px;
-}
-
-#buttonYes {
-    color:              #006600;
-    font-weight:        bold;
-    padding:            0 10px 0 10px;
-    font-size:        	10px;
-}
-
-#buttonGo {
-    color:              #006600;
-    font-weight:        bold;
-    padding:            0 10px 0 10px;
-	font-size:        	10px;
-}
-
-#listTable {
-    width:              260px;
-}
-
-#textSqlquery {
-    width:              450px;
-}
 
 #textSQLDUMP {
     width:              95%;
     height:             95%;
     font-family:        "Courier New", Courier, mono;
-   font-size:   		 11px;
+    font-size:          110%;
 }
 
 #TooltipContainer {
     position:           absolute;
     z-index:            99;
-    width:      	  	 250px;
-    height:     	  	 50px;
-    overflow:   	  	 auto;
-    visibility: 	  	 hidden;
+    width:              20em;
+    height:             auto;
+    overflow:           visible;
+    visibility:         hidden;
     background-color:   #ffffcc;
     color:              #006600;
-    border:           	 1px solid #000000;
-    padding:          	 5px;
-    font-family: 	  	 Verdana, Arial, Helvetica, sans-serif;
-    font-size:   	  	 10px;
+    border:             0.1em solid #000000;
+    padding:            0.5em;
 }
 
 /* user privileges */
 #fieldset_add_user_login div.item {
-    border-bottom: 		1px solid #79A2DF;
+    border-bottom:      1px solid <?php echo $GLOBALS['cfg']['ThBackground']?>;
     padding-bottom:     0.3em;
     margin-bottom:      0.3em;
 }
 
 #fieldset_add_user_login label {
-    float:              left;
+    float:              <?php echo $left; ?>;
     display:            block;
     width:              10em;
     max-width:          100%;
-    text-align:         right;
-    padding-right:      0.5em;
+    text-align:         <?php echo $right; ?>;
+    padding-<?php echo $right; ?>:      0.5em;
 }
 
 #fieldset_add_user_login span.options #select_pred_username,
@@ -967,16 +920,16 @@ div#tablestatistics table caption {
 }
 
 #fieldset_add_user_login span.options {
-    float: left;
+    float: <?php echo $left; ?>;
     display: block;
     width: 12em;
     max-width: 100%;
-    padding-right: 0.5em;
+    padding-<?php echo $right; ?>: 0.5em;
 }
 
 #fieldset_add_user_login input {
     width: 12em;
-    clear: right;
+    clear: <?php echo $right; ?>;
     max-width: 100%;
 }
 
@@ -985,8 +938,8 @@ div#tablestatistics table caption {
 }
 
 #fieldset_user_priv div.item {
-    float: left;
-    width: 8em;
+    float: <?php echo $left; ?>;
+    width: 9em;
     max-width: 100%;
 }
 
@@ -1003,20 +956,20 @@ div#tablestatistics table caption {
 }
 
 #fieldset_user_global_rights fieldset {
-    float: left;
+    float: <?php echo $left; ?>;
 }
 /* END user privileges */
 
 
 /* serverstatus */
 div#serverstatus table caption a.top {
-    float: right;
+    float: <?php echo $right; ?>;
 }
 
 div#serverstatus div#serverstatusqueriesdetails table,
 div#serverstatus table#serverstatustraffic,
 div#serverstatus table#serverstatusconnections {
-    float: left;
+    float: <?php echo $left; ?>;
 }
 
 #serverstatussection,
@@ -1075,13 +1028,13 @@ div#querywindowcontainer fieldset {
 /* querybox */
 
 div#sqlquerycontainer {
-    float: left;
+    float: <?php echo $left; ?>;
     width: 69%;
     /* height: 15em; */
 }
 
 div#tablefieldscontainer {
-    float: right;
+    float: <?php echo $right; ?>;
     width: 29%;
     /* height: 15em; */
 }
@@ -1101,3 +1054,283 @@ div#queryboxcontainer div#bookmarkoptions {
 }
 /* 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;
+    border-bottom: 1px solid <?php echo $GLOBALS['cfg']['ThBackground']?>;
+}
+#selflink {
+    margin-top: 1em;
+    margin-bottom: 1em;
+	padding-top 10px;
+    width: 100%;
+    border-top: 0;
+    text-align: right;
+	vertical-align: bottom;
+}
+div#tablestatistics {
+    border-bottom: 0;
+}
+#queryfieldscontainer {
+	border: 0;
+}
+#mysqlmaininformation h1, #pmamaininformation h1 {
+	background-image: 	url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbl_header.png);
+	background-position:left top;
+	background-repeat: 	repeat-x;
+	color: 				#FFFFFF;
+	text-align: 		center;
+	padding: 			1px;
+	margin: 			0;
+}
+
+#mysqlmaininformation,
+#pmamaininformation {
+    float: <?php echo $left; ?>;
+    width: 49%;
+    border:     		1px solid <?php echo $GLOBALS['cfg']['ThBackground']?>;
+	background-color:	#FBFBFF;
+	margin-top:			5px;
+	margin-left:		5px;
+	margin-bottom: 		1em;
+}
+
+#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;
+}
+
+
+#li_select_lang form select {
+	width: 180px;
+}
+
+li#li_server_info,
+li#li_mysql_proto,
+li#li_user_info,
+li#li_used_php_extension,
+li#li_mysql_client_version {
+	color: #888888;
+}
+#mysqlmaininformation {
+	background-image: 	url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>mysql_info.jpg);
+	background-position:right bottom;
+	background-repeat: 	no-repeat;
+}
+#pmamaininformation {
+	background-image: 	url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pma_info.jpg);
+	background-position:right bottom;
+	background-repeat: 	no-repeat;
+}
+div.formelementrow {
+	border: 0;
+}
+/* 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{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_ltr.png);
+    font-size:			80%;
+}
+
+li#li_user_info{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_ltr.png);
+	font-size:			80%;
+	margin-bottom: 2em;
+}
+
+li#li_mysql_proto{
+	list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_ltr.png);
+	font-size:			80%;
+}
+
+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 {
+    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);
+}
+
+li#li_used_php_extension {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_ltr.png);
+	font-size: 80%;
+	margin-bottom: 2em;
+}
+
+li#li_mysql_client_version {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_ltr.png);
+    font-size: 80%;
+}
+
+li#li_select_fontsize {
+	list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.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 {
+    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; ?>;
+}
diff --git a/paradice/img/arrow_ltr.png b/paradice/img/arrow_ltr.png
new file mode 100644
index 000000000..a504d1f6e
Binary files /dev/null and b/paradice/img/arrow_ltr.png differ
diff --git a/paradice/img/arrow_rtl.png b/paradice/img/arrow_rtl.png
new file mode 100644
index 000000000..98a19126d
Binary files /dev/null and b/paradice/img/arrow_rtl.png differ
diff --git a/paradice/img/b_sbrowse.png b/paradice/img/b_sbrowse.png
index e1821f727..0d3280f44 100644
Binary files a/paradice/img/b_sbrowse.png and b/paradice/img/b_sbrowse.png differ
diff --git a/paradice/img/error.ico b/paradice/img/error.ico
new file mode 100644
index 000000000..f63f14f8a
Binary files /dev/null and b/paradice/img/error.ico differ
diff --git a/paradice/img/leftBgnd.png b/paradice/img/leftBgnd.png
new file mode 100644
index 000000000..18f257f6e
Binary files /dev/null and b/paradice/img/leftBgnd.png differ
diff --git a/paradice/img/mysql_info.jpg b/paradice/img/mysql_info.jpg
new file mode 100644
index 000000000..45bb37fbf
Binary files /dev/null and b/paradice/img/mysql_info.jpg differ
diff --git a/paradice/img/navi_header.png b/paradice/img/navi_header.png
new file mode 100644
index 000000000..bb4598eec
Binary files /dev/null and b/paradice/img/navi_header.png differ
diff --git a/paradice/img/pma_info.jpg b/paradice/img/pma_info.jpg
new file mode 100644
index 000000000..01a6a7ef4
Binary files /dev/null and b/paradice/img/pma_info.jpg differ
diff --git a/paradice/info.inc.php b/paradice/info.inc.php
index 3493d63e1..afa2408b1 100644
--- a/paradice/info.inc.php
+++ b/paradice/info.inc.php
@@ -1,18 +1,17 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Theme information
- * 
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Paradice
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/** 	 
+ * Theme information 	 
+ * 	 
+ * 	 
+ * @version $Id$ 	 
+ * @package phpMyAdmin-theme 	 
+ * @subpackage Paradice 	 
  */
-
+ 
 /**
  *
  */
 $theme_name = 'Paradice';
-$theme_version = 2;
-$theme_generation = 2;
+$theme_full_version = '2.10';
 ?>
diff --git a/paradice/layout.inc.php b/paradice/layout.inc.php
index 7a8324d73..c1943a72e 100644
--- a/paradice/layout.inc.php
+++ b/paradice/layout.inc.php
@@ -1,37 +1,92 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Paradice
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/** 	 
+ * 	 
+ * @version $Id$ 	 
+ * @package phpMyAdmin-theme 	 
+ * @subpackage Paradice 	 
  */
 
 /**
- *
+ * navi frame
  */
-$cfg['LeftWidth']           = 180;          						// left frame width
-/* colors */
-$cfg['LeftBgColor']         = '#3674CF';    						// background color for the left frame
-$cfg['RightBgColor']        = '#FFFFFF';    						// background color for the right frame
-$cfg['RightBgImage']        = 'themes/paradice/img/rightBgnd.jpg';  // path to a background image for the right frame
-                                            						// (leave blank for no background image)
-$cfg['LeftPointerColor']    = '#9999CC';    						// color of the pointer in left frame
-$cfg['Border']              = 0;            						// border width on tables
-$cfg['ThBgcolor']           = '#79A2DF';    						// table header row colour
-$cfg['BgcolorOne']          = '#EEEEEE';    						// table data row colour
-$cfg['BgcolorTwo']          = '#E5E5E5';    						// table data row colour, alternate
-$cfg['BrowsePointerColor']  = '#CCCCFF';    						// color of the pointer in browse mode
-$cfg['BrowseMarkerColor']   = '#FFCC99';    						// color of the marker (visually marks row
-                                            						// by clicking on it) in browse mode
+// navi frame width
+$GLOBALS['cfg']['NaviWidth']                = 164;
 
-$cfg['QueryWindowWidth']    = 550;          						// Width of Query window
-$cfg['QueryWindowHeight']   = 310;          						// Height of Query window
+// foreground (text) color for the navi frame
+$GLOBALS['cfg']['NaviColor']                = '#FFFFFF';
+
+// background for the navi frame
+$GLOBALS['cfg']['NaviBackground']           = '#3674CF';
+
+// foreground (text) color of the pointer in navi frame
+$GLOBALS['cfg']['NaviPointerColor']         = '#000000';
+// background of the pointer in navi frame
+$GLOBALS['cfg']['NaviPointerBackground']    = '#5796EF';
+
+/**
+ * main frame
+ */
+// foreground (text) color for the main frame
+$GLOBALS['cfg']['MainColor']                = '#142F56';
+
+// background for the main frame
+$GLOBALS['cfg']['MainBackground']           = '#FFFFFF';
+//$GLOBALS['cfg']['MainBackground']       = '#F5F5F5 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y';
+
+// foreground (text) color of the pointer in browse mode
+$GLOBALS['cfg']['BrowsePointerColor']       = '#FFFFFF';
+
+// background of the pointer in browse mode
+$GLOBALS['cfg']['BrowsePointerBackground']  = '#5287D6';
+
+// 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']   = '#FBAE36';
+
+/**
+ * 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']           = 'Verdana, Arial, Helvetica, sans-serif';
+/**
+ * fixed width font family, used in textarea
+ */
+$GLOBALS['cfg']['FontFamilyFixed']      = '"Courier New", Courier, monospace';
+
+/**
+ * tables
+ */
+// border
+$GLOBALS['cfg']['Border']               = 0;
+// table header and footer color
+$GLOBALS['cfg']['ThBackground']         = '#79A2DF';
+// table header and footer background
+$GLOBALS['cfg']['ThColor']              = '#000000';
+// table data row background
+$GLOBALS['cfg']['BgOne']                = '#EEEEEE';
+// table data row background, alternate
+$GLOBALS['cfg']['BgTwo']                = '#E5E5E5';
+
+/**
+ * query window
+ */
+// Width of Query window
+$GLOBALS['cfg']['QueryWindowWidth']     = 600;
+// Height of Query window
+$GLOBALS['cfg']['QueryWindowHeight']    = 400;
 
 /**
  * SQL Parser Settings
+ * Syntax colouring data
  */
-$cfg['SQP']['fmtColor']     = array(        						// Syntax colouring data
+$GLOBALS['cfg']['SQP']['fmtColor']      = array(
     'comment'            => '#808000',
     'comment_mysql'      => '',
     'comment_ansi'       => '',
diff --git a/paradice/screen.png b/paradice/screen.png
index 327b6d3e5..258cb67a3 100644
Binary files a/paradice/screen.png and b/paradice/screen.png differ
diff --git a/very_small/css/theme_left.css.php b/very_small/css/theme_left.css.php
index 2b7771217..0614496a5 100644
--- a/very_small/css/theme_left.css.php
+++ b/very_small/css/theme_left.css.php
@@ -1,12 +1,12 @@
-<?php
+<?php $pma_http_url = ''; ?>
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * navigation css file from theme
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Very_small
- */
+ * 	 
+ * @version $Id$ 	 
+ * @package phpMyAdmin-theme 	 
+ * @subpackage Very_small 	 
+ */ 	 
 ?>
 
 #body_leftFrame {
@@ -32,7 +32,7 @@
 }
 body {
     background-color:    #d9e4f4;
-    background-image:    url('themes/arctic_ocean/img/wbg_left.jpg');
+    background-image:    url('<?php echo ( (isset($pma_http_url) && !empty($pma_http_url)) ? $pma_http_url : '../' ); ?>themes/arctic_ocean/img/wbg_left.jpg');
     background-repeat:   repeat-y;
     background-position: 0px 0px;
 }
@@ -44,7 +44,7 @@ body, input, textarea, select, th, td, .item, .tblItem {
     width:                100%;
 }
 #body_queryFrame div {
-                white-space:         nowrap;
+				white-space:         nowrap;
 }
 input, select, textarea {
     color:               #000000;
@@ -86,7 +86,7 @@ img {
 }
 
 td.heada, span.heada {
-    background-image:    url(themes/arctic_ocean/img/b_sdb.png);
+    background-image:    url(<?php echo ( (isset($pma_http_url) && !empty($pma_http_url)) ? $pma_http_url : '../' ); ?>themes/arctic_ocean/img/b_sdb.png);
     background-position: 2px center;
     background-repeat:   no-repeat;
     font-weight: bold;
@@ -98,7 +98,7 @@ span.heada, span.heada a:link, span.heada a:active, span.heada a:visited, span.h
 td.heada, span.heada {
     text-align:          left;
     padding-left:        12px;
-                white-space:         nowrap;
+				white-space:         nowrap;
 }
 
 bdo {
diff --git a/very_small/css/theme_print.css.php b/very_small/css/theme_print.css.php
index 610533907..097d64935 100644
--- a/very_small/css/theme_print.css.php
+++ b/very_small/css/theme_print.css.php
@@ -1,12 +1,12 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * print css file from theme
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Very_small
- */
+<?php $pma_http_url = ''; ?>
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/** 	 
+ * print css file from theme 	 
+ * 	 
+ * @version $Id$ 	 
+ * @package phpMyAdmin-theme 	 
+ * @subpackage Very_small 	 
+ */ 	 
 ?>
 /* For printview */
 body {
@@ -99,9 +99,9 @@ input[type=button], input[type=submit], input[type=reset] {
 }
 
 .serverinfo div {
-    background-image:    url(themes/arctic_ocean/img/item_ltr.png);
+    background-image:    url(<?php echo ( (isset($pma_http_url) && !empty($pma_http_url)) ? $pma_http_url : '../' ); ?>themes/arctic_ocean/img/item_ltr.png);
     background-repeat:   no-repeat;
     background-position: 50% 50%;
     width:               20px;
     height:              16px;
-}
\ No newline at end of file
+}
diff --git a/very_small/css/theme_right.css.php b/very_small/css/theme_right.css.php
index 89211f658..ad4b35891 100644
--- a/very_small/css/theme_right.css.php
+++ b/very_small/css/theme_right.css.php
@@ -1,12 +1,12 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * main css file from theme
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Very_small
- */
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/** 	 
+ * main css file from theme 	 
+ * 	 
+ * @version $Id$ 	 
+ * @package phpMyAdmin-theme 	 
+ * @subpackage Very_small 	 
+ */ 	 
 ?>
 
 #mainFrameset, #leftFrameset, frameset, frame {
@@ -37,7 +37,7 @@ body {
     background-color:    #ffffff;
     margin:              0;
     padding:          14px 0px 0px 0px;
-    background-image:    url(themes/arctic_ocean/img/wbg_right.jpg);
+    background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>wbg_right.jpg);
     background-position: 100% 100%;
     background-repeat:   no-repeat;
     background-attachment: fixed;
@@ -106,12 +106,12 @@ img {
 }
 img[class=icon]{
     margin:              0 0 0 0;
-    padding:              0 0 0 0;
-    height:13px;
+	padding:              0 0 0 0;
+	height:13px;
 }
 /* tables */
 table,td,th{
-    padding: 0px;
+	padding: 0px;
     margin:  0px;
 }
 table {
@@ -133,7 +133,7 @@ th, .tblFooters {
     border-top:          1px solid #cccccc;
     border-bottom:       1px solid #333333;
     white-space:         nowrap;
-    background-image:    url(themes/arctic_ocean/img/tbg_th1.png);
+    background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbg_th1.png);
     background-repeat:   repeat-x;
     background-position: 0 0;
 }
@@ -146,7 +146,7 @@ th, .tblFooters {
 .tblHeaders, tr.tblHeaders td, tr.tblHeaders th {
     color:               #585880;
     background-color:    #b4cae9;
-    background-image:    url(themes/arctic_ocean/img/tbg_th0.png);
+    background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbg_th0.png);
 }
 .tblcomment {
     font-size:           10px;
@@ -172,7 +172,7 @@ th.td {
     background-image:    none;
     border-top:          1px none #cccccc;
     border-bottom:       1px solid #333333;
-    padding: 0px;
+	padding: 0px;
     margin:  0px;
 }
 
@@ -182,7 +182,7 @@ table tr.even th,
 table tr.marked th {
     background-image:    none;
     border:              none;
-    padding: 0px;
+	padding: 0px;
     margin:  0px;
 }
 
@@ -228,10 +228,10 @@ input[type=text], input[type=file], input[type=password], input.textfield {
 }
 input.inpcheck {
     width:10px;
-    height:10px;
+	height:10px;
 }
 input[type=checkbox] {
-    width:10px;
+	width:10px;
     height:10px;
 }
 
@@ -269,7 +269,7 @@ div.notice {
     margin: 0.5em 0 0.5em 0;
     border: 0.1em solid #FFD700;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(themes/arctic_ocean/img/s_notice.png);
+    background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
     background-repeat: no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) {?>
     background-position: 10px 50%;
@@ -298,7 +298,7 @@ div.warning {
     margin: 0.5em 0 0.5em 0;
     border: 0.1em solid #CC0000;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(themes/arctic_ocean/img/s_warn.png);
+    background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
     background-repeat: no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) {?>
     background-position: 10px 50%;
@@ -327,7 +327,7 @@ div.error {
     margin: 0.5em 0 0.5em 0;
     border: 0.1em solid #ff0000;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(themes/arctic_ocean/img/s_error.png);
+    background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
     background-repeat: no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) {?>
     background-position: 10px 50%;
@@ -359,7 +359,7 @@ fieldset.confirmation legend {
     border-right: 0.1em solid #FF0000;
     font-weight: bold;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(themes/arctic_ocean/img/s_really.png);
+    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%;
@@ -512,7 +512,7 @@ fieldset.confirmation legend {
         margin:              0px 1px 0px 1px;
     }
     .serverinfo div {
-        background-image:    url(themes/arctic_ocean/img/item_ltr.png);
+        background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_ltr.png);
         background-repeat:   no-repeat;
         background-position: 50% 50%;
         width:               16px;
@@ -578,7 +578,7 @@ fieldset.confirmation legend {
     .nav {
         color:               #000000;
         background-color:    #b4cae9;
-        background-image:    url(themes/arctic_ocean/img/tbg_nav0.png);
+        background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbg_nav0.png);
         background-repeat:   repeat-x;
         background-position: center;
         height:              24px;
@@ -613,18 +613,18 @@ fieldset.confirmation legend {
    }
     .navNormal {
         background-color:    #b4cae9;
-        background-image:    url(themes/arctic_ocean/img/tbg_nav0.png);
+        background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbg_nav0.png);
     }
     .navActive {
         background-color:    #ffffff;
-        background-image:    url(themes/arctic_ocean/img/tbg_nav2.png);
+        background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbg_nav2.png);
         border:              none;
         margin:              0px;
         padding:             0px;
     }
     .navDrop {
         background-color:    #e9c7b4;
-        background-image:    url(themes/arctic_ocean/img/tbg_nav3.png);
+        background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbg_nav3.png);
     }
     .navActive a:link, .navActive a:active, .navActive a:visited {
         color:               #585880;
@@ -647,7 +647,7 @@ fieldset.confirmation legend {
     .navSpacer {
         width:               1px;
         background-color:    #333333;
-        background-image:    url(themes/arctic_ocean/img/tbg_nav1.png);
+        background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbg_nav1.png);
         background-repeat:   no-repeat;
         background-position: center top;
     }
@@ -660,7 +660,7 @@ fieldset.confirmation legend {
     ul#topmenu {
         list-style-type: none;
         background-color:    #ffffff;
-        background-image:    url(themes/arctic_ocean/img/tbg_nav0.png);
+        background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbg_nav0.png);
         background-repeat:   repeat-x;
         background-position: center bottom;
         border:              none;
@@ -678,7 +678,7 @@ fieldset.confirmation legend {
         width:               100%;
         _width:               expression(eval(document.body.offsetWidth-18));
     }
-
+    
     ul#topmenu li {
         float:               left;
         margin:              0;
@@ -686,7 +686,7 @@ fieldset.confirmation legend {
         vertical-align:      middle;
         border:              none;
     }
-
+    
     /* default tab styles */
     span.tab, span.tab:hover,
     span.tabcaution, span.tabcaution:hover,
@@ -717,18 +717,18 @@ fieldset.confirmation legend {
     }
     a.tab:hover  {
         color:               #ffffff;
-        background-image:    url(themes/arctic_ocean/img/tbg_nav4.png);
+        background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbg_nav4.png);
         background-position: center bottom;
     }
     a.tabactive:link,  a.tabactive:active,  a.tabactive:visited,  a.tabactive:hover  {
-        background-image:    url(themes/arctic_ocean/img/tbg_nav2.png);
+        background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbg_nav2.png);
         background-color:    #ffffff;
         border-left:         1px solid #333333;
         border-right:        1px solid #333333;
         border-bottom:       1px solid #ffffff;
     }
     a.tabcaution:hover {
-        background-image:    url(themes/arctic_ocean/img/tbg_nav3.png);
+        background-image:    url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tbg_nav3.png);
         background-position: center bottom;
     }
     a.tabcaution:link, a.tabcaution:active, a.tabcaution:visited, a.tabcaution:hover, span.tabcaution  {
@@ -798,3 +798,174 @@ tr.disabled, td.disabled, .disabled td {
    font-family:          "Courier New", Courier, mono;
    font-size:            11px;
 }
+
+
+/********************/
+/* NEW in PMA 2.9   */
+/********************/
+
+<?php if ($GLOBALS['cfg']['BrowseMarkerColor']) { ?>
+/* marked items */
+.marked a,
+.marked {
+    background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
+    color:      black;
+}
+<?php } ?>
+
+/* odd items 1,3,5,7,... */
+.odd {
+    background: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
+}
+
+/* even items 2,4,6,8,... */
+.even {
+    background: <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
+}
+
+/* hovered items */
+.odd:hover,
+.even:hover,
+.hover {
+    background: <?php echo $GLOBALS['cfg']['BrowseHoverBackground']; ?>;
+    color: black;
+}
+
+/**
+ * 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']; ?>;
+}
+
+label.desc {
+    width: 30em;
+    float: <?php echo $left; ?>;
+}
+
+body.loginform {
+    text-align: center;
+}
+
+body.loginform div.container {
+    text-align: <?php echo $left; ?>;
+    width: 30em;
+    margin: 0 auto;
+}
+
+#body_leftFrame #list_server {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
+    list-style-position: inside;
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+
+#body_leftFrame #list_server li {
+    margin: 0;
+    padding: 0;
+    font-size:          80%;
+}
+
+<?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_mysql_proto{
+    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,
+li#li_mysql_client_version,
+li#li_used_php_extension{
+    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 {
+    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'] */ ?>
diff --git a/very_small/info.inc.php b/very_small/info.inc.php
index be6c1d31e..7fc4afe64 100644
--- a/very_small/info.inc.php
+++ b/very_small/info.inc.php
@@ -1,18 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Theme information
- * 
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Very_small
- */
+/** 	 
+ * Theme information 	 
+ * 	 
+ * @version $Id$ 	 
+ * @package phpMyAdmin-theme 	 
+ * @subpackage Very_small 	 
+ */ 	 
 
-/**
- *
+/** 	 
+ * 	 
  */
 $theme_name = 'Very small';
-$theme_version = 2;
+$theme_version = 3;
 $theme_generation = 2;
 ?>
diff --git a/very_small/layout.inc.php b/very_small/layout.inc.php
index 863fcd853..d582adbce 100644
--- a/very_small/layout.inc.php
+++ b/very_small/layout.inc.php
@@ -1,14 +1,14 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Very_small
- */
-
-/**
- *
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/** 	 
+ * 	 
+ * @version $Id$ 	 
+ * @package phpMyAdmin-theme 	 
+ * @subpackage Very_small 	 
+ */ 	 
+ 
+/** 	 
+ * 	 
  */
 $cfg['LeftWidth']           = 170;          						// left frame width
 /* colors */
@@ -24,6 +24,8 @@ $cfg['BgcolorTwo']          = '#dbe7f9';    						// table data row colour, alte
 $cfg['BrowsePointerColor']  = '#b4cae9';    						// color of the pointer in browse mode
 $cfg['BrowseMarkerColor']   = '#e9c7b4';    						// color of the marker (visually marks row
                                             						// by clicking on it) in browse mode
+$cfg['BrowseMarkerBackground'] = '#b4cae9';						// background color of a marked item
+$cfg['BrowseHoverBackground']  = '#e9c7b4';						// background color of a hovered item
 
 $cfg['QueryWindowWidth']    = 550;          						// Width of Query window
 $cfg['QueryWindowHeight']   = 310;          						// Height of Query window
diff --git a/very_small/readme.txt b/very_small/readme.txt
index ca30ee84b..cf95d9a7c 100644
--- a/very_small/readme.txt
+++ b/very_small/readme.txt
@@ -3,6 +3,13 @@
 ----------------------------------------------------------------------
 
 CHANGE LOG:
+    - 2007-04-22:
+      > Supporting phpMyAdmin Version 2.10.1-rc1
+      > Fixed the text of selected (marked) and hovered lines (they weren't visible)
+      > Fixed the startup page icons
+      > Fixed the "Open new window" missing icon (it is from the "Original" theme)
+      > The theme does not depend on the Arctic Ocean
+      > Removed the $pma_http_url = ''; parameter because it is not neccessary any more
     - 2005-09-12;
       > Supporting phpMyAdmin Version 2.6.4 and higher
     - 2005-09-11:
@@ -13,23 +20,7 @@ CHANGE LOG:
 1. INSTALLATION
 ----------------------------------------------------------------------
    Simply unzip the files.
-   (sample: [whatever]/phpMyAdmin/themes/)
-
-   One each .css you'll find in first line <?php $pma_http_url = ''; ?>.
-   Here you can (if required) the url to the 'artic_ocean' theme.
-   This may fix some problems with relative urls.
-
-   Then make sure, that all images are in the directory
-   - [whatever]/phpMyAdmin/themes/arctic_ocean/img/
-
-   and all *.css.php files are in the directory
-   - [whatever]/phpMyAdmin/themes/arctic_ocean/css/.
-
-   The two *.inc.php files must stored in the directory
-   - [whatever]/phpMyAdmin/themes/arctic_ocean/.
-			
-  Note:
-    [whatever] is any path to your phpMyAdmin-Installation.
+   (sample: /phpMyAdmin/themes/)
 
 1b. OPTIONAL
 -----------------------------------------------------------------------
@@ -72,12 +63,9 @@ CHANGE LOG:
    - phpMyAdmin Version 2.6.2 or higher
    - full CSS2 compatible browser
      (I've tested with Firefox 1.02, Microsoft(R) 
-      InternetExplorer 6.0, and Opera 7.54)
+      InternetExplorer 6.0, and Opera 7.54 and Opera 9.20)
    - Your browser should support Javascript
      and png-images.
-   - In phpMyAdmin Version 2.6.4 there's
-     a new navigation behavior included.
-     The navigation panel has a fixed position now.
 
 ----------------------------------------------------------------------