diff --git a/css/theme_left.css.php b/css/theme_left.css.php
index e2e41de5e..488df06ba 100644
--- a/css/theme_left.css.php
+++ b/css/theme_left.css.php
@@ -41,7 +41,7 @@ a:link,
 a:visited,
 a:active {
     text-decoration:    none;
-    color:              #0000FF;
+    color:              <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor'];?>;
 }
 
 ul {
@@ -169,12 +169,7 @@ div#leftframelinks a img.icon {
     margin:             0;
     padding:            0.2em;
     border:             0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
-    background:         <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
-}
-
-div#leftframelinks a:hover img {
     background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
 }
 
 /* serverlist */
@@ -275,14 +270,11 @@ div#left_tableList ul ul {
 }
 
 #NavFilter input {
-    border: 1px solid #999;
     padding: 2px 0;
     margin: 3px 0;
 }
 
 #clear_fast_filter {
-    background: white;
-    color: black;
     cursor: pointer;
     padding: 0;
     margin: 6px 5px 0 -23px;
diff --git a/css/theme_right.css.php b/css/theme_right.css.php
index 038ffcdf2..71503a506 100644
--- a/css/theme_right.css.php
+++ b/css/theme_right.css.php
@@ -30,7 +30,8 @@ body {
     padding:            0;
     line-height: 		20px;
     margin:             0;
-    color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
+    color: #333;
+    /*color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;*/
     background:         <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
 }
 
@@ -63,7 +64,7 @@ a:active {
 
 a:hover {
     text-decoration:    underline;
-    color:              #FF0000;
+    color:              <?php echo $GLOBALS['cfg']['TableLinkColor'];?>;
 }
 
 dfn {
@@ -76,7 +77,7 @@ dfn:hover {
 }
 
 th {
-    font-weight:        bold;
+    font-weight:        normal;
     color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
     background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
 }
@@ -800,7 +801,7 @@ ul#topmenu ul .tabactive {
 ul#topmenu a.tab:hover,
 ul#topmenu .tabactive {
     background-color:   <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
-    padding: 5px;
+    /*padding: 5px;*/
 }
 
 ul#topmenu2 a.tab:hover,
@@ -890,10 +891,9 @@ div#tablestatistics table caption {
 /* Heading */
 #serverinfo {
     font-weight:        bold;
-    
     color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
     padding: 5px;
-    background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
+    background: <?php echo $GLOBALS['cfg']['HeaderBackground']; ?>;
     border: 1px solid #999;
 }
 
@@ -1317,19 +1317,16 @@ code.sql, div.sqlvalidate {
 }
 
 .group {
-    border: 0.3em solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
+    border: 0.3em solid <?php echo $GLOBALS['cfg']['HeaderBackground']; ?>;
     margin-bottom:      1em;
     margin-right:      1em;
-    /* Az */
-    /*background: <?php echo $GLOBALS['cfg']['TblContentBackground']; ?>;
-    padding: 5px;*/
 }
 
 .group h2 {
-    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['HeaderBackground']; ?>;
     padding:            0.1em 0.3em;
     margin-top:         0;
-    color: 				<?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    color: 				<?php echo $GLOBALS['cfg']['HeaderColor']; ?>;
 }
 
 .group ul {
@@ -1825,17 +1822,32 @@ fieldset .disabled-field td {
 
 /* Misc */
 #serverinfo a {
-	color: #FFFFFF;	
+	color: <?php echo $GLOBALS['cfg']['TableHeaderlinkColor']; ?>;	
 } 
 
+#serverinfo a:hover {
+	color: <?php echo $GLOBALS['cfg']['TblContentBackground']; ?>;
+	text-decoration: none;
+}
+
+table.data thead a {
+	color: <?php echo $GLOBALS['cfg']['HeaderColor'];?>;
+	font-weight: normal;
+}
+
+table.data a {
+	color: <?php echo $GLOBALS['cfg']['TableLinkColor'];?>;
+}
+
 th a {
 	color: <?php echo $GLOBALS['cfg']['TableHeaderlinkColor']; ?>;	
 }
 
-#serverinfo a:hover {
-	color: <?php echo $GLOBALS['cfg']['TableHeaderlinkColor']; ?>;
+th label, .name, tr.odd th, tr.even th {
+	color: <?php echo $GLOBALS['cfg']['LabelColor'];?>;	
 }
 
-th label, .name, tr.odd th, tr.even th {
-	color: #333;	
+
+.ui-widget-header {
+	background: red;	
 }
diff --git a/img/b_inline_edit.png b/img/b_inline_edit.png
index 98977eb05..054ddfce6 100644
Binary files a/img/b_inline_edit.png and b/img/b_inline_edit.png differ
diff --git a/layout.inc.php b/layout.inc.php
index f18835c84..9ca612316 100644
--- a/layout.inc.php
+++ b/layout.inc.php
@@ -7,6 +7,25 @@
  * @package phpMyAdmin-theme
  * @subpackage Original
  */
+ 
+ 
+/**
+ * Basic color 
+ * Define color here
+ */ 
+ 
+$color['one'] 	= '#D0E7F4'; 
+$color['two'] 	= '#4284B5';
+$color['three'] = '#F8FAFC';
+$color['four'] 	= '#0000FF';
+$color['five'] 	= '#000000';
+$color['six'] 	= '#FFFFFF';
+$color['seven'] = '#999999';
+$color['eight'] = '#3D7BC9';
+$color['nine'] 	= '#FEFEFE';
+$color['ten'] 	= '#333333';
+
+
 
 /**
  * navi frame
@@ -15,36 +34,35 @@
 $GLOBALS['cfg']['NaviWidth']                = 225;
 
 // foreground (text) color for the navi frame
-$GLOBALS['cfg']['NaviColor']                = '#000000';
+$GLOBALS['cfg']['NaviColor']                = $color['five'];
 
 // background for the navi frame
-$GLOBALS['cfg']['NaviBackground']           = '#D0E7F4';
+$GLOBALS['cfg']['NaviBackground']           = $color['one'];
 
 // foreground (text) color of the pointer in navi frame
-$GLOBALS['cfg']['NaviPointerColor']         = '#F5F5F5';
+$GLOBALS['cfg']['NaviPointerColor']         = $color['nine'];
 // background of the pointer in navi frame
-$GLOBALS['cfg']['NaviPointerBackground']    = '#9999CC';
+$GLOBALS['cfg']['NaviPointerBackground']    = $color['two'];
 // text color of the selected database name (when showing the table list)
-$GLOBALS['cfg']['NaviDatabaseNameColor']    = '#0000FF';
+$GLOBALS['cfg']['NaviDatabaseNameColor']    = $color['four'];
 
 /**
  * main frame
  */
 // foreground (text) color for the main frame
-$GLOBALS['cfg']['MainColor']                = '#000000';
+$GLOBALS['cfg']['MainColor']                = $color['five'];
 
 // background for the main frame
-$GLOBALS['cfg']['MainBackground']           = '#F8FAFC';
-//$GLOBALS['cfg']['MainBackground']       = '#F5F5F5 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y';
+$GLOBALS['cfg']['MainBackground']           = $color['three'];
 
 // foreground (text) color of the pointer in browse mode
-$GLOBALS['cfg']['BrowsePointerColor']       = '#000000';
+$GLOBALS['cfg']['BrowsePointerColor']       = $color['five'];
 
 // 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';
+$GLOBALS['cfg']['BrowseMarkerColor']        = $color['five'];
 
 // background of the marker (visually marks row by clicking on it) in browse mode
 $GLOBALS['cfg']['BrowseMarkerBackground']   = '#FFCC99';
@@ -69,13 +87,13 @@ $GLOBALS['cfg']['FontFamilyFixed']      = 'monospace';
 // border
 $GLOBALS['cfg']['Border']               = 0;
 // table header and footer color
-$GLOBALS['cfg']['ThBackground']         = '#4284B5';
+$GLOBALS['cfg']['ThBackground']         = $color['two'];
 // table content color
-$GLOBALS['cfg']['TblContentBackground'] = '#FFFFFF';
+$GLOBALS['cfg']['TblContentBackground'] = $color['six'];
 // table header and footer background
-$GLOBALS['cfg']['ThColor']              = '#FEFEFE';
+$GLOBALS['cfg']['ThColor']              = $color['nine'];
 // table data row background
-$GLOBALS['cfg']['BgOne']                = '#D0E7F4';
+$GLOBALS['cfg']['BgOne']                = $color['one'];
 // table data row background, alternate
 $GLOBALS['cfg']['BgTwo']                = '#F5FAFC';
 
@@ -83,12 +101,22 @@ $GLOBALS['cfg']['BgTwo']                = '#F5FAFC';
 /**
  * misc
  */
+// div header 
+$GLOBALS['cfg']['HeaderBackground']     = $color['two']; 
+$GLOBALS['cfg']['HeaderColor']     		= $color['nine']; 
+  
 // link color
 $GLOBALS['cfg']['linkColor']            = '#21759B'; 
-// tableheader link color
-$GLOBALS['cfg']['TableHeaderlinkColor'] = 'aqua';
 
-$GLOBALS['cfg']['TopMenuBgColor']       = '#D0E7F4'; 
+// label color
+$GLOBALS['cfg']['LabelColor']           = $color['ten'];
+
+// tableheader link color
+$GLOBALS['cfg']['TableHeaderlinkColor'] = '#F5FAFC';
+
+$GLOBALS['cfg']['TableLinkColor'] 		= $color['eight'];
+
+$GLOBALS['cfg']['TopMenuBgColor']       = $color['one']; 
 
 // LightTabs
 //$GLOBALS['cfg']['LightTabs']            = '#333';