diff --git a/crimson_gray/css/theme_left.css.php b/crimson_gray/css/theme_left.css.php
index 5ed70e703..a68dc221d 100644
--- a/crimson_gray/css/theme_left.css.php
+++ b/crimson_gray/css/theme_left.css.php
@@ -29,13 +29,18 @@ a img {
     border: 0;
 }
 
+ul {
+	margin:0;
+}	
+
 form {
     margin:             0;
     padding:            0;
     display:            inline;
 }
 
-select {
+select#select_server,
+select#lightm_db {
     width:              100%;
 }
 
@@ -56,10 +61,18 @@ button {
     margin-left:        0.3em;
 }
 
+.navi_dbName {
+    font-weight:    bold;
+    color:          <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor']; ?>;
+}
 
 /******************************************************************************/
 /* specific elements */
 
+div#pmalogo {
+    background-color: #D0DCE0<?php //better echo $GLOBALS['cfg']['logoBGC']; ?>;
+    padding:.3em;
+}
 div#pmalogo,
 div#leftframelinks,
 div#databaseList {
@@ -73,11 +86,15 @@ ul#databaseList {
     border-bottom:      0.05em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     margin-bottom:      0.5em;
     padding-bottom:     0.5em;
-    padding-left: 	1.5em;
+    padding-<?php echo $left; ?>:     1.5em;
 }
 
 ul#databaseList a {
     display: block;
+}
+
+div#navidbpageselector a,
+ul#databaseList a {
     background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
     color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
 }
@@ -124,6 +141,10 @@ div#leftframelinks a:hover {
 }
 
 /* leftdatabaselist */
+div#left_tableList {
+    border-bottom:      0.05em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+}
+
 div#left_tableList ul {
     list-style-type:    none;
     list-style-position: outside;
@@ -164,7 +185,7 @@ div#left_tableList > ul li.marked {
 }
 <?php } ?>
 
-<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
+<?php if ($GLOBALS['cfg']['LeftPointerEnable']) { ?>
 div#left_tableList > ul li:hover > a,
 div#left_tableList > ul li:hover {
     background:         <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
@@ -178,9 +199,19 @@ div#left_tableList img {
 }
 
 div#left_tableList ul ul {
-    margin-left:        0;
-    padding-left:       0.1em;
-    border-left:        0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    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']; ?>;
 }
+
+/* for the servers list in navi panel */
+#serverinfo .item {
+    white-space:        nowrap;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+}
+#serverinfo a:hover {
+    background:         <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
+}
diff --git a/crimson_gray/css/theme_right.css.php b/crimson_gray/css/theme_right.css.php
index 0b8d1d411..2cc2dedfb 100644
--- a/crimson_gray/css/theme_right.css.php
+++ b/crimson_gray/css/theme_right.css.php
@@ -7,10 +7,11 @@
  * @package phpMyAdmin-theme
  * @subpackage Crimson-Gray
  */
-    // unplanned execution path
-    if (!defined('PMA_MINIMUM_COMMON')) {
-        exit();
-    }
+
+// unplanned execution path
+if (!defined('PMA_MINIMUM_COMMON')) {
+    exit();
+}
 ?>
 /******************************************************************************/
 /* general tags */
@@ -105,6 +106,8 @@ fieldset fieldset {
 
 fieldset legend {
     background-color:   transparent;
+    font-weight:        bold;
+    color:              #444444;
 }
 
 /* buttons in some browsers (eg. Konqueror) are block elements,
@@ -135,6 +138,8 @@ button {
 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;
@@ -351,10 +356,10 @@ h1.notice,
 div.notice {
     margin:             0.5em 0 0.5em 0;
     border:             0.1em solid #FFD700;
-    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
+    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
     background-repeat:  no-repeat;
-        <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
     background-position: 10px 50%;
     padding:            10px 10px 10px 36px;
         <?php } else { ?>
@@ -381,10 +386,10 @@ h1.warning,
 div.warning {
     margin:             0.5em 0 0.5em 0;
     border:             0.1em solid #CC0000;
-    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
+    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
     background-repeat:  no-repeat;
-        <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
     background-position: 10px 50%;
     padding:            10px 10px 10px 36px;
         <?php } else { ?>
@@ -411,10 +416,10 @@ h1.error,
 div.error {
     margin:             0.5em 0 0.5em 0;
     border:             0.1em solid #ff0000;
-    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
+    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
     background-repeat:  no-repeat;
-        <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
     background-position: 10px 50%;
     padding:            10px 10px 10px 36px;
         <?php } else { ?>
@@ -442,10 +447,10 @@ fieldset.confirmation legend {
     border-left:        0.1em solid #FF0000;
     border-right:       0.1em solid #FF0000;
     font-weight:        bold;
-    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
+    <?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' ) { ?>
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
     background-position: 5px 50%;
     padding:            0.2em 0.2em 0.2em 25px;
         <?php } else { ?>
@@ -535,7 +540,7 @@ body.loginform div.container {
 
 form.login label {
     float: <?php echo $left; ?>;
-    width: 10em;
+    width: 11.5em;
     font-weight: bolder;
 }
 
@@ -590,7 +595,7 @@ a.tabcaution:hover {
     background-color:   #AA0000;
 }
 
-<?php if ( $GLOBALS['cfg']['LightTabs'] ) { ?>
+<?php if ($GLOBALS['cfg']['LightTabs']) { ?>
 /* active tab */
 a.tabactive {
     color:              black;
@@ -626,7 +631,12 @@ a.tabcaution:hover,
 
 a.tab:hover,
 .tabactive {
-    background-color:   <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    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 */
@@ -943,7 +953,8 @@ li#li_select_theme{
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
 }
 
-li#li_server_info{
+li#li_server_info,
+li#li_server_version{
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
 }
 
@@ -995,7 +1006,8 @@ li#li_log_out {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
 }
 
-li#li_pma_docs {
+li#li_pma_docs,
+li#li_pma_wiki {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_docs.png);
 }
 
diff --git a/crimson_gray/img/b_info.png b/crimson_gray/img/b_info.png
index 09be19382..9c4301919 100644
Binary files a/crimson_gray/img/b_info.png and b/crimson_gray/img/b_info.png differ
diff --git a/crimson_gray/img/s_loggoff.png b/crimson_gray/img/s_loggoff.png
index b4b4dcaff..210387d21 100644
Binary files a/crimson_gray/img/s_loggoff.png and b/crimson_gray/img/s_loggoff.png differ
diff --git a/crimson_gray/layout.inc.php b/crimson_gray/layout.inc.php
index c55311bde..559b26e22 100644
--- a/crimson_gray/layout.inc.php
+++ b/crimson_gray/layout.inc.php
@@ -25,6 +25,8 @@ $GLOBALS['cfg']['NaviBackground']           = '#8B8F94';
 $GLOBALS['cfg']['NaviPointerColor']         = '#000000';
 // background of the pointer in navi frame
 $GLOBALS['cfg']['NaviPointerBackground']    = '#C0C0C0';
+// text color of the selected database name (when showing the table list)
+$GLOBALS['cfg']['NaviDatabaseNameColor']    = '#AA0000';
 
 /**
  * main frame
diff --git a/crimson_gray/screen.png b/crimson_gray/screen.png
index 3570651e6..c5bd376e3 100644
Binary files a/crimson_gray/screen.png and b/crimson_gray/screen.png differ