diff --git a/grid/css/theme_left.css.php b/grid/css/theme_left.css.php
index 25149abec3..0d22b134c2 100644
--- a/grid/css/theme_left.css.php
+++ b/grid/css/theme_left.css.php
@@ -1,4 +1,4 @@
-<?php
+<?php 
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * navigation css file from theme
@@ -7,103 +7,97 @@
  * @package phpMyAdmin-theme
  * @subpackage Grid
  */
-// 2do: hover background in Gecko not fitting the img size , has anybody a hint?
-// illegal execution path
-if (!defined('PMA_MINIMUM_COMMON')) exit();
 
-$parts = explode('.', PMA_VERSION );// f.e. 2.11.0-dev
-$last  = explode('-', $parts[2]);   // 2.8.2.4«last part ignored
-$iPmaVersion = 10000 * $parts[0] + 100 * $parts[1] + $last[0];// max 99 ?
-// new  pma 2.11 style image paths:
-if($iPmaVersion < 21100) {
-// old style (causing problems with some MS products) :
-	$GridImgPath = '../' . $_SESSION['PMA_Theme']->getImgPath();
-} else {
-	$GridImgPath = $_SESSION['PMA_Theme']->getImgPath();
+if (!defined('PMA_MINIMUM_COMMON')) exit(); // illegal execution path
+
+$GridImgPath = version_compare(PMA_VERSION,'2.11','lt') ? '../' : ''; 
+$GridImgPath .= $_SESSION['PMA_Theme']->getImgPath();
+
+if(version_compare(PMA_VERSION,'2.9','lt')) {
+	echo 'html,table{font-size:', $GLOBALS['cfg']['FontSize'], '}';
 }
 
-if($iPmaVersion < 20900) {
-	echo 'html,
-table{font-size:', $GLOBALS['cfg']['FontSize'],'}
-';
+// Whether to activate the Navi marker (bug pma < 2.11)
+if (empty($GLOBALS['cfg']['LeftMarkerEnable'])) {
+	$GLOBALS['cfg']['LeftMarkerEnable'] = $GLOBALS['cfg']['LeftPointerEnable'];
 }
-/** general **/
-echo '/*theme "Grid-2.9d" Navi 20070211 windkiel pma 2.8..2.1x*/
-*{margin:0;padding:0}';//1st: general reset and corrected later, if needed (f.e. hr)
+
+if (!$GLOBALS['cfg']['LeftMarkerEnable'] ) { // init in config.default
+	$GLOBALS['cfg']['NaviMarkedBackground'] = $GLOBALS['cfg']['NaviBackground'];
+}
+
+/** (left) navigation.php **/
 echo '
-body{background:', $GLOBALS['cfg']['NaviBackground'],
-	';color:', $GLOBALS['cfg']['NaviColor'],
-	';padding:.2em';
+*{margin:0;padding:0}'; //general reset and defined later if needed (f.e. hr)
+
+//           top left
+echo '
+body{margin:.2em .3em;background:', $GLOBALS['cfg']['NaviBackground'],
+	';color:', $GLOBALS['cfg']['NaviColor'];
+//	';padding:.2em';
+
 if (!empty($GLOBALS['cfg']['FontFamily'])) {
 	echo ';font-family:', $GLOBALS['cfg']['FontFamily'];
 }
 echo '}
-hr{margin:5px 0 5px}
+hr{margin:.5em 0 .3em;color:', $GLOBALS['cfg']['NaviColor'],
+	';background:', $GLOBALS['cfg']['NaviColor'], ';border:0;height:1px}
 a img{border:0}
 form{display:inline}
 select{width:100%}
 button{display:inline}'; // buttons in some browsers (eg. Konqueror) are block elements,this breaks design
 
 /* * * * classes * * * * * * * * * * * * * */
-/*
-specific elements div#pmalogo{background:', $GLOBALS['cfg']['NaviLinkBackground'], '}
-div#pmalogo,
-*/
+// specific elements div#pmalogo{background:', $GLOBALS['cfg']['NaviLinkBackground'], '} div#pmalogo,
 
-/* leave some space between icons and text: */ echo '
+/* leave some space between icons and text:
+ * ??? div#databaseList a{text-decoration:underline}
+*/
+echo '
 .icon{vertical-align:middle;margin:0 .1em 0 .1em}
-div#leftframelinks{padding-top:5px;text-align:center}
-div#leftframelinks a img.icon{padding:.1em;border:0}
+div#leftframelinks{text-align:center}
+div#leftframelinks a img.icon{padding:.2em;border:0}
 div#leftframelinks,
-div#databaseList{margin-bottom:.5em;padding-bottom:.5em;border-bottom:1px solid ', $GLOBALS['cfg']['NaviColor'], '}
-div#pmalogo{text-align:center;';
-if($iPmaVersion > 20900) {
-	echo 'background:', $GLOBALS['cfg']['NaviLinkBackground'];
-} else {
-	echo 'border-bottom:1px solid ', $GLOBALS['cfg']['NaviColor'];
-}
-echo "}\n";
-if( ($GLOBALS['cfg']['LeftDisplayServers'])&&($GLOBALS['cfg']['LeftFrameLight']) ){
+div#databaseList{margin-bottom:.3em;padding-bottom:.3em;border-bottom:1px solid ', $GLOBALS['cfg']['NaviColor'], '}
+div#pmalogo{text-align:center;';//padding:.7em;
+echo ($iPmaVersion > 20900) ? 'background:' . $GLOBALS['cfg']['NaviBackground'] :
+	'border-bottom:1px solid ' . $GLOBALS['cfg']['NaviColor'];
+echo '}
+';
+
+if( $GLOBALS['cfg']['LeftDisplayServers'] && $GLOBALS['cfg']['LeftFrameLight'] ){
 	echo 'div#databaseList{text-align:left}
-'; // looks nicer if LeftDisplayServers==true
+'; // looks nicer if LeftDisplayServers==true - 2do: r2l char sets
 };
 
-if($GLOBALS['cfg']['LeftPointerEnable']){
-	echo 'div#leftframelinks a:hover{background:', $GLOBALS['cfg']['NaviPointerBackground'],
-';color:', $GLOBALS['cfg']['NaviPointerColor'], '}
-';
-}
-/*1px solid echo $GLOBALS['cfg']['NaviColor']; top links */
-
-/* serverlist */ ?>
-#body_leftFrame #list_server{list-style-image: url("<?php
- echo $GridImgPath; ?>s_host.png");list-style-position: inside;list-style-type:none}
-#body_leftFrame #list_server li{font-size:<?php echo $GLOBALS['cfg']['NaviFontPercentage']; ?>}
-<?php /* leftdatabaselist */ ?>
-div#left_tableList ul{list-style-type:none;list-style-position:outside;font-size:<?php
- echo $GLOBALS['cfg']['NaviFontPercentage']; ?>;background:<?php echo $GLOBALS['cfg']['NaviBackground']; ?>}
+/***** serverlist *****/
+echo '
+#body_leftFrame #list_server{list-style-image:url("', $GridImgPath,'s_host.png");',
+	'list-style-position: inside;list-style-type:none}
+#body_leftFrame #list_server li{font-size:', $GLOBALS['cfg']['NaviFontPercentage'], '}
+div#left_tableList ul{list-style-type:none;line-height:110%;list-style-position:outside;font-size:',
+	$GLOBALS['cfg']['NaviFontPercentage'], ';background:', $GLOBALS['cfg']['NaviBackground'], '}
 div#left_tableList ul ul{font-size:100%}
-div#left_tableList a{text-decoration:none;color:<?php echo $GLOBALS['cfg']['NaviLinkColor']; ?>}
-<?php
-// echo 	background:	',$GLOBALS['cfg']['NaviLinkBackground'];
-// makes marking impossibel
-?>
+div#left_tableList a{text-decoration:none;color:', $GLOBALS['cfg']['NaviLinkColor'], '}
 a,
-div#left_tableList a{padding:0 2px 0 2px}
-<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ){ ?>
-a:hover,
-div#left_tableList a:hover{background:<?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;color:<?php
- echo $GLOBALS['cfg']['NaviPointerColor']; ?>;text-decoration:underline}
-<?php } else{ ?>
-div#left_tableList a:hover{text-decoration:underline}
-<?php } ?>
-<?php
-if( ($GLOBALS['cfg']['LeftMarkerEnable'] ) && ($GLOBALS['cfg']['NaviMarkedColor']) ){
-	echo 'div#left_tableList ul li.marked{background:', $GLOBALS['cfg']['NaviMarkedBackground'], ';color:', $GLOBALS['cfg']['NaviMarkedColor'], '}
+div#left_tableList a{padding:.2em}
 ';
-}/* end marked items */
-?>
+
+echo ( $GLOBALS['cfg']['LeftPointerEnable'] )
+? 'a:hover,
+div#left_tableList a:hover{background:' . $GLOBALS['cfg']['NaviPointerBackground'] .
+	';color:' . $GLOBALS['cfg']['NaviPointerColor'] .
+	';text-decoration:underline}'
+:	'div#left_tableList a:hover{text-decoration:underline}';
+
+if ( $GLOBALS['cfg']['LeftMarkerEnable'] && $GLOBALS['cfg']['NaviMarkedColor'] ) {
+	echo '
+div#left_tableList ul li.marked{background:', $GLOBALS['cfg']['NaviMarkedBackground'],
+	';color:', $GLOBALS['cfg']['NaviMarkedColor'], '}';
+}
+
+echo '
 div#left_tableList img{vertical-align:middle}
-div#left_tableList ul ul{padding-left:1px;border-left:1px solid <?php
- echo $GLOBALS['cfg']['NaviColor']; /* ab__cd */ ?>;padding-bottom:1px;border-bottom:1px solid <?php
- echo $GLOBALS['cfg']['NaviColor']; /*2do ltr rtl*/ ?>}
+div#left_tableList ul ul{padding:.2em;border-left:1px solid ', $GLOBALS['cfg']['NaviColor'], // __ table sep.
+	';border-bottom:1px solid ', $GLOBALS['cfg']['NaviColor'], '}';
+?>
diff --git a/grid/css/theme_right.css.php b/grid/css/theme_right.css.php
index 3643344501..f2214e2a8d 100644
--- a/grid/css/theme_right.css.php
+++ b/grid/css/theme_right.css.php
@@ -12,26 +12,19 @@
 // unplanned execution path
 if(!defined('PMA_MINIMUM_COMMON')) exit();
 
-$parts = explode('.', PMA_VERSION );// f.e. 2.11.0-dev
-$last  = explode('-', $parts[2]);   // 2.8.2.4«last part ignored
-$iPmaVersion = 10000 * $parts[0] + 100 * $parts[1] + $last[0];
-// new  pma 2.11 style image paths:
-if($iPmaVersion < 21100) {
-// old style (causing problems with some MS products) :
-	$GridImgPath = '../' . $_SESSION['PMA_Theme']->getImgPath();
-} else {
-	$GridImgPath = $_SESSION['PMA_Theme']->getImgPath();
-}
-echo'
-/** general tags "Grid-2.9d" right 20070211 windkiel pma 2.8 .. 2.1x */';
+$GridImgPath = version_compare(PMA_VERSION,'2.11','lt') ? '../' : ''; 
+$GridImgPath .= $_SESSION['PMA_Theme']->getImgPath();
 
-if($iPmaVersion < 20900) {
-	echo '
-html,
+if(version_compare(PMA_VERSION,'2.9','lt')) {
+	//needed for pma2.8 only (if E_NOTICE=1 , but no effect) :
+	$GLOBALS['cfg']['BgcolorOne'] = '#f7f7f7';
+	$GLOBALS['cfg']['BgcolorTwo'] = '#fff';
+	echo 'html,
 table{font-size:', $GLOBALS['cfg']['FontSize'],'}
 td,
 th{color:', $GLOBALS['cfg']['MainColor'], '}';
 }
+
 $listImgUrl = 'list-style-image:url("'. $GridImgPath; //.....xxx.png")
 echo'
 body{padding:0;margin:.4em;color:', $GLOBALS['cfg']['MainColor'],';background:', $GLOBALS['cfg']['MainBackgroundColor'];
@@ -47,11 +40,11 @@ pre,
 code{font-family:', $GLOBALS['cfg']['FontFamilyFixed'], '}
 ';
 ?>
-input{padding:0 .3em;font-size:100%}
+input{padding:0 .2em;font-size:100%}
 h1{font-size:140%;font-weight:bold;margin:0 .8em 0 .8em}
 h2{font-size:120%;font-weight:bold}
 h3{font-weight:bold}
-a{padding:.1em .1em}
+a{padding:1px}
 a:link,
 a:visited,
 a:active{text-decoration:none;color:<?php echo $GLOBALS['cfg']['MainLinkColor']; ?>}
@@ -65,9 +58,8 @@ th{font-weight:bold;color:<?php echo $GLOBALS['cfg']['ThColor']; ?>;background:<
 a img{border:0}
 hr{color:<?php echo $GLOBALS['cfg']['MainColor']; ?>;background:<?php
  echo $GLOBALS['cfg']['MainColor']; ?>;border:0;height:1px}
-form{padding:0;margin:0;display:inline}
-textarea{overflow:visible;<?php if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 6') > 0) echo 'height:8em;'; ?>
-}
+form{padding:0;margin:1px;display:inline}
+textarea{overflow:visible;height:<?php echo ceil($GLOBALS['cfg']['TextareaRows']*1.2); //thx Mario Rohkrämer (ligh1l) Gag_H ?>em}
 fieldset{margin:1em 0 1px 1px;border:<?php
  echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;padding:.5em;background:<?php echo $GLOBALS['cfg']['BgOne']; ?>}
 fieldset fieldset{margin:.8em}
@@ -79,7 +71,7 @@ button{display:inline}
 table{margin:1px;border-collapse:collapse}
 table caption,
 table th,
-table td{padding:0 2px 0 2px;vertical-align:top;<?php if ($GLOBALS['cfg']['Border']){
+table td{padding:0 .2em 0 .2em;vertical-align:top;<?php if ($GLOBALS['cfg']['Border']){
 echo 'border:', $GLOBALS['cfg']['Border'], ' solid ', $GLOBALS['cfg']['MainGridColor'];
 //effects also page navigation table :(
 }
@@ -174,8 +166,8 @@ h1.notice,
 div.notice{margin:.5em 0 .5em 0;border:1px solid #FFD700;<?php if ( $GLOBALS['cfg']['ErrorIconic'] ){ ?>
 background-image:url("<?php echo $GridImgPath; ?>s_notice.png");
 background-repeat:no-repeat;
-<?php if ( $GLOBALS['text_dir'] === 'ltr' ){ ?>background-position:10px 50%;padding:10px 10px 10px 36px;<?php
-} else { ?>background-position:99% 50%;padding:10px 5% 10px 10px;<?php
+<?php if ( $GLOBALS['text_dir'] === 'ltr' ){ ?>background-position:1em 50%;padding:1em 1em 1em 3.6em;<?php
+} else { ?>background-position:99% 50%;padding:1em 5% 1em 1em;<?php
 } ?>
 <?php } else { ?>padding:.5em;<?php } ?>}
 .notice h1{border-bottom:1px solid #FFD700;font-weight:bold;text-align:<?php echo $left; ?>;margin:0 0 .2em 0}
@@ -185,9 +177,9 @@ h1.warning,
 div.warning{margin:.5em 0 .5em 0;border:1px solid #c00;
 <?php if ( $GLOBALS['cfg']['ErrorIconic'] ){ ?>
 background-image:url("<?php echo $GridImgPath; ?>s_warn.png");background-repeat:no-repeat;
-<?php  if ( $GLOBALS['text_dir'] === 'ltr' ){ ?>background-position:10px 50%;padding:10px 10px 10px 36px;
+<?php  if ( $GLOBALS['text_dir'] === 'ltr' ){ ?>background-position:1em 50%;padding:1em 1em 1em 3.6em;
 <?php } else{ ?>
-background-position:99% 50%;padding:10px 5% 10px 10px;
+background-position:99% 50%;padding:1em 5% 1em 1em;
 <?php } ?>
 <?php } else{ ?>
 padding:.5em;
@@ -200,9 +192,9 @@ div.error{margin:.5em 0 .5em 0;border:1px solid #f00;
 <?php if ( $GLOBALS['cfg']['ErrorIconic'] ){ ?>
 background-image:url("<?php echo $GridImgPath; ?>s_error.png");background-repeat:no-repeat;
 <?php if ( $GLOBALS['text_dir'] === 'ltr' ){ ?>
-background-position:10px 50%;padding:10px 10px 10px 36px;
+background-position:1em 50%;padding:1em 1em 1em 3.6em;
 <?php } else{ ?>
-background-position:99% 50%;padding:10px 5% 10px 10px;<?php
+background-position:99% 50%;padding:1em 5% 1em 1em;<?php
 } ?>
 <?php } else{ ?>
 padding:.5em;
@@ -214,9 +206,9 @@ fieldset.confirmation legend{border-left:1px solid #f00;border-right:1px solid #
 <?php if ( $GLOBALS['cfg']['ErrorIconic'] ){ ?>
 background-image:url("<?php echo $GridImgPath; ?>s_really.png");background-repeat:no-repeat;
 <?php if ( $GLOBALS['text_dir'] === 'ltr' ){ ?>
-background-position:5px 50%;padding:.2em .2em .2em 25px;
+background-position:.5em 50%;padding:.2em .2em .2em 2.5em;
 <?php } else{ ?>
-background-position:97% 50%;padding:.2em 25px .2em .2em;
+background-position:97% 50%;padding:.2em 2.5em .2em .2em;
 <?php } ?>
 <?php } /* end messageboxes */ ?>}
 .tblcomment{font-size:90%;font-weight:normal;color:#009}
@@ -273,12 +265,7 @@ echo /* default tab styles */ $GLOBALS['cfg']['BgTwo']; ?>;border-bottom:0;<?php
 if (strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') > 0){ /*FF..*/
 echo '-moz-border-radius-topleft:.6em;-moz-border-radius-topright:.6em';
 }
-/**
-MSIE:
-Sebastian removed the wrong lines from "original" :(
-neither border-radius-topleft nor border-top-left-radius is css compliant
-http://blogs.msdn.com/ie/archive/2005/06/23/431980.aspx
-**/
+/** MSIE 6: http://blogs.msdn.com/ie/archive/2005/06/23/431980.aspx **/
 ?>}
 a.tab:hover,
 a.tabcaution:hover,
@@ -367,8 +354,9 @@ div#serverstatus table tbody td.descr a:after,
 div#serverstatus table .tblFooters a:after{content:']'}
 <?php /* end serverstatus */
 
-/* querywindow */ ?>
-body#bodyquerywindow{margin:0;padding:0;background-image:none;background:#F5F5F5}
+/* querywindow  -image:none;??-color: */ ?>
+body#bodyquerywindow{margin:0;padding:0;background:<?php
+	echo $GLOBALS['cfg']['MainBackgroundColor']; ?>}
 div#querywindowcontainer{margin:0;padding:0;width:100%}
 div#querywindowcontainer fieldset{margin-top:0}
 <?php /* END querywindow */
@@ -427,7 +415,7 @@ li#li_user_info{
 
 #body_browse_foreigners{background:<?php echo $GLOBALS['cfg']['NaviBackground']; ?>;margin:.5em .5em 0 .5em}
 #bodyquerywindow{background:<?php echo $GLOBALS['cfg']['NaviBackground'], "}
-#bodythemes{width:500px;margin:auto;text-align:center}
+#bodythemes{width:50em;margin:auto;text-align:center}
 #bodythemes img{border:1px solid black}
 #bodythemes a:hover img{border:1px solid red}
 #fieldset_select_fields{float:$left}
diff --git a/grid/info.inc.php b/grid/info.inc.php
index dc39561690..a48d30ef13 100644
--- a/grid/info.inc.php
+++ b/grid/info.inc.php
@@ -1,8 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
+/* info.inc.php 2007/04/26 windkiel */
+
 /**
- * 2007-02-11 working with version 2.8 .. 2.1x.x ...
- * differs from theme "original" (2.9) in:
+ * 2007-05 "Grid 2.9e working with version 2.8 .. 2.1x.y ...
+ * the previous version had some refresh issues after switching from original
+ * (all browser windows had to be closed to force a new session)
+ * main differences to theme "original" in:
  *
  * smaller table margins/paddings
  * border-rounding only working in Geckos like Firefox 1 .. 2 ( -moz...),
@@ -18,10 +22,8 @@
  * @subpackage Grid
  */
 
-/**
- *
- */
+/* Theme information */
 $theme_name = 'Grid';
 $theme_version = 2;
 $theme_full_version = '2.9';
-?>
\ No newline at end of file
+?>
diff --git a/grid/layout.inc.php b/grid/layout.inc.php
index 58211012d6..e6e41593e0 100644
--- a/grid/layout.inc.php
+++ b/grid/layout.inc.php
@@ -1,93 +1,104 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Navi frame (called "Left frame" in older versions)
- * 
- * derived from theme "original" pma 2.9
- * 20070211: error.ico cursor for non Opera browsers, vertical line IE only, pma 2.8 td{color:black} necessary!
- * 20070208 bug 1653769 fixed: BrowsePointerEnable, BrowseMarkerEnable
- * by windkiel (started 2006-08-19)
- * works with pma 2.8+
+ * by windkiel (started 2006-08-19) derived from theme "original"
+ * 2007-04-26: grid2.9.e  layout choosable in config.inc.php see bottom
+ * you can switch to an alternate Color/Font set simply by putting the line
+ * $cfg['customGrid'] = 'tan';
+ * into your pma/config.inc.php or if you like the settings of the original theme:
+ * $cfg['customGrid'] = 'originalColors';
+ * you can add any number of different settings in the themes/grid/layout.inc.php,
+ * take the 'test' section as an example.
+ * some bugfixes like textarea height (thx Mario Rohkrämer) ...
+ * the previous version had some refresh issues after switching from original
+ * (all browser windows had to be closed to force a new session)
+
+ * 2007-02-11: grid2.9.d error.ico cursor for non Opera browsers,
+ * vertical line IE only, for pma 2.8 td{color:black} is necessary!
+
+ * 2007-02-08 bug 1653769 fixed: BrowsePointerEnable, BrowseMarkerEnable
+
  * for detailed layout configuration please refer to the css files
  * comments, suggestions, bugreports are welcome:
- * http://sourceforge.net/users/windkiel/
- * no '' allowed, except for Font.. ..Link.. ..Marke...(frame reload may be needed after changes)
+ * https://sourceforge.net/tracker/index.php?func=detail&aid=1656956&group_id=23067&atid=689412
+ *
+ * CSS doesn't like empty values, except for Font.. ..Link.. ..Marke...
+ *(a forced frame reload may be needed after changes, esp. for some Opera versions)
  *
  * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Grid
  */
 
-// for this theme almost all settings (except "SPQ") can be done in config.inc.php :
-// like "$cfg['LeftMarkerEnable'] = false;"
-
-// Whether to activate the Navi marker. Similar settings see libraries/config.default.php
-if(!isset($GLOBALS['cfg']['LeftMarkerEnable']))
-	$GLOBALS['cfg']['LeftMarkerEnable'] = $GLOBALS['cfg']['LeftPointerEnable'];
-
-// Navi (left) frame width for index.php :
-if(!isset($GLOBALS['cfg']['NaviWidth'])) $GLOBALS['cfg']['NaviWidth'] = 180; 
-
-// backward compatibility :
-if('2.8' == substr(PMA_VERSION,0,3)) $GLOBALS['cfg']['LeftWidth'] = $GLOBALS['cfg']['NaviWidth']; 
-
-// foreground (text) color for the navi frame
-if(!isset($GLOBALS['cfg']['NaviColor'])) $GLOBALS['cfg']['NaviColor'] = '#000';
-
-// background for the navi frame
-if(!isset($GLOBALS['cfg']['NaviBackground'])) $GLOBALS['cfg']['NaviBackground'] = '#D3DCE6';#dee
-
-// link color
-if(!isset($GLOBALS['cfg']['NaviLinkColor'])) $GLOBALS['cfg']['NaviLinkColor'] = '#00a';
-
-// link background-color
-if(!isset($GLOBALS['cfg']['NaviLinkBackground'])) $GLOBALS['cfg']['NaviLinkBackground'] = 'white';
-
-// foreground (text) color of the pointer in navi frame
-if(!isset($GLOBALS['cfg']['NaviPointerColor'])) $GLOBALS['cfg']['NaviPointerColor']	= '#00f';
-// background of the pointer in navi frame
-
-if(!isset($GLOBALS['cfg']['NaviPointerBackground'])) $GLOBALS['cfg']['NaviPointerBackground'] = 'white';
-
-// color of the marked (visually marks selected) item
-if(!isset($GLOBALS['cfg']['NaviMarkedColor'])) $GLOBALS['cfg']['NaviMarkedColor'] = $GLOBALS['cfg']['NaviColor'];
-
-// background of the marked item
-if( $GLOBALS['cfg']['LeftMarkerEnable'] ) {
-	$GLOBALS['cfg']['NaviMarkedBackground'] = '#fc9';
-} else {
-	$GLOBALS['cfg']['NaviMarkedBackground'] = $GLOBALS['cfg']['NaviBackground'];
-}
-
-// "zoom" factor for list items
-if(!isset($GLOBALS['cfg']['NaviFontPercentage'])) $GLOBALS['cfg']['NaviFontPercentage'] = '90%';
 
 /**
- * main frame
+ * ~~~~~~~~~~~~~ NAVIGATION frame (called "Left frame" in older versions) ~~~~~~~~~~
  */
-// foreground (text) color for the main frame
-if(!isset($GLOBALS['cfg']['MainColor'])) $GLOBALS['cfg']['MainColor'] = '#000';
 
-// BackgroundColor for the main frame, other solution than in original!
-if(!isset($GLOBALS['cfg']['MainBackgroundColor'])) $GLOBALS['cfg']['MainBackgroundColor'] = '#d0d0d0';
+// navi/left frame width for index.php :
+$GLOBALS['cfg']['NaviWidth'] = 200;
+
+// backward compatibility :
+if('2.8' == substr(PMA_VERSION,0,3))
+    $GLOBALS['cfg']['LeftWidth']
+  = $GLOBALS['cfg']['NaviWidth'];
+
+// foreground (text) color for the navi frame
+$GLOBALS['cfg']['NaviColor'] = '#000';
+
+// background
+$GLOBALS['cfg']['NaviBackground'] = '#e7e7e7';
 
 // link color
-if(!isset($GLOBALS['cfg']['MainLinkColor'])) $GLOBALS['cfg']['MainLinkColor'] = '#00d';
+$GLOBALS['cfg']['NaviLinkColor'] = '#00a';
+
+// link background-color
+$GLOBALS['cfg']['NaviLinkBackground'] = 'white';
+
+// foreground (text) color of the navi pointer
+$GLOBALS['cfg']['NaviPointerColor']    = '#00f';
+
+// background of the navi pointer
+$GLOBALS['cfg']['NaviPointerBackground'] = 'white';
+
+// color of the marked (visually marks selected) item
+$GLOBALS['cfg']['NaviMarkedColor'] = $GLOBALS['cfg']['NaviColor'];
+
+// background of the marked item
+$GLOBALS['cfg']['NaviMarkedBackground'] = '#fafaaa';
+
+// "zoom" factor for list items
+$GLOBALS['cfg']['NaviFontPercentage'] = '90%';
+
+/**
+ * ~~~~~~~~~~~~~~~~~           MAIN frame           ~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+// BackgroundColor for the main frame, different solution than in ´original´!
+$GLOBALS['cfg']['MainBackgroundColor']	= '#efefef';
+
+//at least 1 bit difference from $GLOBALS['cfg']['MainBackground'] to show the grid!(?)
+$GLOBALS['cfg']['MainGridColor']		= '#efefee';
+
+// foreground (text) color for the main frame
+$GLOBALS['cfg']['MainColor'] = '#000';
+
+// link color
+$GLOBALS['cfg']['MainLinkColor'] = '#00d';
 
 // link BGcolor
-if(!isset($GLOBALS['cfg']['MainLinkBackground'])) $GLOBALS['cfg']['MainLinkBackground'] = '#fff';
+$GLOBALS['cfg']['MainLinkBackground'] = '#fff';
 
 // foreground (text) color of the pointer in browse mode
-if(!isset($GLOBALS['cfg']['BrowsePointerColor'])) $GLOBALS['cfg']['BrowsePointerColor'] = '#000';
+$GLOBALS['cfg']['BrowsePointerColor'] = '#000';
 
 // background of the pointer in browse mode
-if(!isset($GLOBALS['cfg']['BrowsePointerBackground'])) $GLOBALS['cfg']['BrowsePointerBackground'] = '#cfc';
+$GLOBALS['cfg']['BrowsePointerBackground'] = '#cfc';
 
 // foreground (text) color of the marker (visually marks row by clicking on it) in browse mode
-if(!isset($GLOBALS['cfg']['BrowseMarkerColor'])) $GLOBALS['cfg']['BrowseMarkerColor'] = '#000';
+$GLOBALS['cfg']['BrowseMarkerColor'] = '#000';
 
 // background of the marker (visually marks row by clicking on it) in browse mode
-if(!isset($GLOBALS['cfg']['BrowseMarkerBackground'])) $GLOBALS['cfg']['BrowseMarkerBackground'] = '#fc9';
+$GLOBALS['cfg']['BrowseMarkerBackground'] = '#ffb'; #fc9';
 
 /**
  * fonts
@@ -98,11 +109,11 @@ if(!isset($GLOBALS['cfg']['BrowseMarkerBackground'])) $GLOBALS['cfg']['BrowseMar
  * if not set the browser default will be used
  * (depending on browser, DTD and system settings)
  */
-if(!isset($GLOBALS['cfg']['FontFamily'])) $GLOBALS['cfg']['FontFamily'] = 'sans-serif'; //was:Arial
+$GLOBALS['cfg']['FontFamily'] = 'sans-serif'; //was:Arial
 /**
  * fixed width font family, used in textarea
  */
-if(!isset($GLOBALS['cfg']['FontFamilyFixed'])) $GLOBALS['cfg']['FontFamilyFixed'] = 'monospace';
+$GLOBALS['cfg']['FontFamilyFixed'] = 'monospace';
 
 /**
  * font size as a valid css font size value,
@@ -112,61 +123,54 @@ if(!isset($GLOBALS['cfg']['FontFamilyFixed'])) $GLOBALS['cfg']['FontFamilyFixed'
  */
 
 // for pma <2.9 :
-if(!isset($GLOBALS['cfg']['FontSize'])) $GLOBALS['cfg']['FontSize'] = '90%';
+$GLOBALS['cfg']['FontSize'] = '90%';
 
 /**
  * tables
  */
 
 // border strenght ( e.g. .05em(min!)|1px|3pt| 0 but NOT 1)
-if(!isset($GLOBALS['cfg']['Border'])) $GLOBALS['cfg']['Border'] = '1px';
+$GLOBALS['cfg']['Border'] = '.1em';
 
-//at least 1 bit difference from $GLOBALS['cfg']['MainBackground'] to show the grid!
-if(!isset($GLOBALS['cfg']['MainGridColor'])) $GLOBALS['cfg']['MainGridColor'] = '#d0d0d1';
-
-// table header and footer color
-if(!isset($GLOBALS['cfg']['ThBackground'])) $GLOBALS['cfg']['ThBackground'] = $GLOBALS['cfg']['NaviBackground'];#dee
+// table header,footer and "OK box" color
+$GLOBALS['cfg']['ThBackground'] = '#ddd';
 
 // table header and footer background
-if(!isset($GLOBALS['cfg']['ThColor'])) $GLOBALS['cfg']['ThColor'] = '#000';
+$GLOBALS['cfg']['ThColor'] = '#000';
 
 // table data row background
-if(!isset($GLOBALS['cfg']['BgOne'])) $GLOBALS['cfg']['BgOne'] = '#f8f8fa';
+$GLOBALS['cfg']['BgOne'] = '#f5f5f5';
 
 // table data row background, alternate
-if(!isset($GLOBALS['cfg']['BgTwo'])) $GLOBALS['cfg']['BgTwo'] = '#fff';
+$GLOBALS['cfg']['BgTwo'] = '#fff';
 
 // table outer border color
-//if(!isset($GLOBALS['cfg']['TblBorderColor'])) $GLOBALS['cfg']['TblBorderColor'] = 'blue';
-
-//needed for pma2.8 only (if E_NOTICE=1 , but no effect) :
-if(!isset($GLOBALS['cfg']['BgcolorOne'])) $GLOBALS['cfg']['BgcolorOne'] = '#f7f7f7';
-if(!isset($GLOBALS['cfg']['BgcolorTwo'])) $GLOBALS['cfg']['BgcolorTwo'] = '#fff';
+$GLOBALS['cfg']['TblBorderColor'] = 'blue';
 
 /**
  * query window
  */
 // Width of Query window
-if(!isset($GLOBALS['cfg']['QueryWindowWidth'])) $GLOBALS['cfg']['QueryWindowWidth'] = 600;
+$GLOBALS['cfg']['QueryWindowWidth'] = 600;
 
 // Height of Query window
-if(!isset($GLOBALS['cfg']['QueryWindowHeight'])) $GLOBALS['cfg']['QueryWindowHeight'] = 300;
+$GLOBALS['cfg']['QueryWindowHeight'] = 300;
 
 /**
  * SQL Parser Settings
  * Syntax colouring data
  */
 $GLOBALS['cfg']['SQP']['fmtColor']      = array(
-    'comment'            => '#808000',
+    'comment'        => '#808000',
     'comment_mysql'      => '',
     'comment_ansi'       => '',
-    'comment_c'          => '',
-    'digit'              => '',
-    'digit_hex'          => 'teal',
+    'comment_c'      => '',
+    'digit'          => '',
+    'digit_hex'      => 'teal',
     'digit_integer'      => 'teal',
-    'digit_float'        => 'aqua',
-    'punct'              => 'fuchsia',
-    'alpha'              => '',
+    'digit_float'    => 'aqua',
+    'punct'          => 'fuchsia',
+    'alpha'          => '',
     'alpha_columnType'   => '#F90',
     'alpha_columnAttrib' => 'blue',
     'alpha_reservedWord' => '#909',
@@ -174,9 +178,74 @@ $GLOBALS['cfg']['SQP']['fmtColor']      = array(
     'alpha_identifier'   => 'black',
     'alpha_charset'      => '#6495ed',
     'alpha_variable'     => '#800000',
-    'quote'              => '#008000',
+    'quote'          => '#008000',
     'quote_double'       => '',
     'quote_single'       => '',
     'quote_backtick'     => ''
 );
-?>
\ No newline at end of file
+
+// Settings from .../phpmyadmin/config.inc.php
+// See libraries/config.default.php for similar settings
+
+// ~~~~~~~ alternate COLOR/FONT SETS choosable in config.inc.php ~~~~~~~~~~~
+// (default settings from above are simply overridden)
+if (isset($GLOBALS['cfg']['customGrid']))
+{
+  if('old' == $GLOBALS['cfg']['customGrid'])
+  {
+    $GLOBALS['cfg']['NaviBackground']        = '#efefef';
+    $GLOBALS['cfg']['MainBackgroundColor']   = '#ddd';
+    $GLOBALS['cfg']['BrowseMarkerBackground']= '#ee9';
+    $GLOBALS['cfg']['TblBorderColor']        = '#ddddde';
+  }
+  elseif('originalColors' == $GLOBALS['cfg']['customGrid'])
+  {
+    $GLOBALS['cfg']['NaviBackground']           = '#D0DCE0';
+    $GLOBALS['cfg']['NaviPointerColor']         = '#000';
+    $GLOBALS['cfg']['NaviPointerBackground']    = '#99C';
+    $GLOBALS['cfg']['NaviMarkedColor']     = '#000';
+    $GLOBALS['cfg']['NaviMarkedBackground']= '#99c';
+    $GLOBALS['cfg']['MainColor']                = '#000';
+    $GLOBALS['cfg']['MainBackgroundColor']      = '#F5F5F5';//'MainBackground'
+    $GLOBALS['cfg']['BrowsePointerColor']       = '#000';
+    $GLOBALS['cfg']['BrowsePointerBackground']  = '#CFC';
+    $GLOBALS['cfg']['BrowseMarkerColor']        = '#000';
+    $GLOBALS['cfg']['BrowseMarkerBackground']   = '#FC9';
+    $GLOBALS['cfg']['FontFamily']           = 'sans-serif';
+    $GLOBALS['cfg']['FontFamilyFixed']      = 'monospace';
+    $GLOBALS['cfg']['Border']               = 0;
+    $GLOBALS['cfg']['ThBackground']         = '#D3DCE3';
+    $GLOBALS['cfg']['ThColor']              = '#000';
+    $GLOBALS['cfg']['BgOne']                = '#E5E5E5';
+    $GLOBALS['cfg']['BgTwo']                = '#D5D5D5';
+    $GLOBALS['cfg']['QueryWindowWidth']     = 600;
+    $GLOBALS['cfg']['QueryWindowHeight']    = 400;
+  }
+  elseif('tan' == $GLOBALS['cfg']['customGrid'])
+  {
+    $GLOBALS['cfg']['FontFamily']          = 'verdana,sans-serif';
+    $GLOBALS['cfg']['NaviBackground']      = '#dfc7a0';//white looks ugly,'#e7e7e7';// like IE6 scrollbar Am.:gray Br.:grey
+    $GLOBALS['cfg']['NaviLinkColor']       = '#00a';
+    $GLOBALS['cfg']['NaviLinkBackground']  = '#fff';
+    $GLOBALS['cfg']['NaviPointerColor']      = '#00f';
+    $GLOBALS['cfg']['NaviPointerBackground'] = '#fff'; //'#d9f5ff'; //~cyan/tuerkis
+    $GLOBALS['cfg']['NaviMarkedColor']     = '#000';
+    $GLOBALS['cfg']['NaviMarkedBackground']= '#ff9';
+    $GLOBALS['cfg']['NaviFontPercentage']  = '90%';
+
+    $GLOBALS['cfg']['MainBackgroundColor'] = '#edb'; //~tan
+    $GLOBALS['cfg']['MainGridColor']       = '#eeddbc';
+    $GLOBALS['cfg']['MainLinkColor']       = '#00c';
+    $GLOBALS['cfg']['MainLinkBackground']  = '#fff';
+
+    $GLOBALS['cfg']['BrowsePointerColor']      = '#000';
+    $GLOBALS['cfg']['BrowsePointerBackground'] = '#cfc';
+    $GLOBALS['cfg']['BrowseMarkerColor']       = '#000';
+    $GLOBALS['cfg']['BrowseMarkerBackground']  = '#ffb';
+    $GLOBALS['cfg']['ThBackground']    = '#dca'; // ff9 too yellowish
+    $GLOBALS['cfg']['ThColor']         = '#000';
+    $GLOBALS['cfg']['BgOne']           = '#fffcfa';#fffaf5 a bit too reddish
+    $GLOBALS['cfg']['BgTwo']           = '#fff';
+  }
+}
+?>