diff --git a/ChangeLog b/ChangeLog
index b330198da..974984b01 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ $Source$
     * libraries/auth/cookie.auth.lib.php: use PMA_sendHeaderLocation()
       and new functionality of PMA_generate_common_url()
     * themes/original: revised
+    * themes/darkblue_orange: revised
 
 2005-11-25 Michal Čihař  <michal@cihar.com>
     * Documentation.html, config.footer.inc.php(deleted),
diff --git a/themes/darkblue_orange/css/theme_left.css.php b/themes/darkblue_orange/css/theme_left.css.php
index deac836ef..6604fa1f8 100644
--- a/themes/darkblue_orange/css/theme_left.css.php
+++ b/themes/darkblue_orange/css/theme_left.css.php
@@ -1,3 +1,5 @@
+/******************************************************************************/
+/* general tags */
 body {
     font-family:      Verdana, Arial, Helvetica, sans-serif;
     font-size:        10px;
@@ -7,81 +9,122 @@ body {
     padding: 2px 2px 2px 2px;
 }
 
+a img {
+    border: 0;
+}
+
 /* gecko FIX, font size is not correctly assigned to all child elements */
 body * {
     font-family:      inherit;
     font-size:        inherit;
 }
 
-select{
-    background-color: #ffffff;
-    color:            #000000;
-    width:            150px;
+form {
+    margin:             0;
+    padding:            0;
+    display:            inline;
 }
 
-img, input, select, button {
-    vertical-align: middle;
+select {
+    background-color:   #ffffff;
+    color:              #000000;
+    width:              150px;
 }
 
+/* buttons in some browsers (eg. Konqueror) are block elements,
+   this breaks design */
+button {
+    display:            inline;
+}
+
+
+/******************************************************************************/
+/* classes */
+
+/* leave some space between icons and text */
+.icon {
+    vertical-align:     middle;
+    margin-right:       0.3em;
+    margin-left:        0.3em;
+}
+
+img.lightbulb {
+    cursor:             pointer;
+}
+
+
+/******************************************************************************/
+/* specific elements */
+
 div#pmalogo,
 div#leftframelinks,
 div#databaseList {
-    text-align: center;
-    border-bottom: 0.1em solid #ffffff;
-    margin-bottom: 0.5em;
-    padding-bottom: 0.5em;
+    text-align:         center;
+    border-bottom:      0.05em solid #ffffff;
+    margin-bottom:      0.5em;
+    padding-bottom:     0.5em;
+}
+
+div#leftframelinks .icon {
+    padding:            0;
+    margin:             0;
 }
 
 div#leftframelinks a {
-    margin: 0.1em;
+    margin:             0.1em;
+    padding:            0.2em;
+    border:             0.05em solid #ffffff;
 }
 
 div#leftframelinks a:hover {
-    background-color: #ffffff;
-}
-
-div#databaseList form {
-    display: inline;
+    background-color:   #ffffff;
 }
 
 /* leftdatabaselist */
-div#left_tableList {
-    list-style-type: none;
+div#left_tableList ul {
+    list-style-type:    none;
     list-style-position: outside;
-    margin: 0;
-    padding: 0;
+    margin:             0;
+    padding:            0;
+    font-size:          80%;
+    background-color:   #666699;
+}
+
+div#left_tableList ul ul {
+    font-size:          100%;
 }
 
 div#left_tableList a {
-    color: #ffffff;
-    text-decoration: none;
+    color:              #ffffff;
+    text-decoration:    none;
 }
 
 div#left_tableList a:hover {
-    color: #ffffff;
-    text-decoration: underline;
+    color:              #ffffff;
+    text-decoration:    underline;
 }
 
 div#left_tableList li {
-    margin: 0;
-    padding: 0;
-    white-space: nowrap;
+    margin:             0;
+    padding:            0;
+    white-space:        nowrap;
 }
 
 <?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
 div#left_tableList li:hover {
-    background-color: <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
 }
 <?php } ?>
 
 div#left_tableList img {
-    vertical-align: middle;
+    padding:            0;
+    vertical-align:     middle;
 }
 
 div#left_tableList ul ul {
-    margin-left: 0em;
-    padding-left: 0.1em;
-    border-left: 0.1em solid #ffffff;
-    padding-bottom: 0.1em;
-    border-bottom: 0.1em solid #ffffff;
+    margin-left:        0em;
+    padding-left:       0.1em;
+    border-left:        0.1em solid #ffffff;
+    padding-bottom:     0.1em;
+    border-bottom:      0.1em solid #ffffff;
 }
\ No newline at end of file
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 7b582f68e..b7ecd8505 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -1,209 +1,583 @@
-/************************************************************************************
- * RIGHT FRAME
- ************************************************************************************/
-/* Always enabled stylesheets (right frame) */
+/******************************************************************************/
+/* general tags */
 body {
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #000000;
-<?php
-    if ($GLOBALS['cfg']['RightBgImage'] != '') {
-        echo '    background-image: url(' . $GLOBALS['cfg']['RightBgImage'] . ');' . "\n";
-    }
-    ?>
-    background-color: #ffffff;
-    margin: 5px;
+    font-family:        Verdana, Arial, Helvetica, sans-serif;
+    font-size:          10px;
+    color:              #000000;
+    background-color:   #ffffff;
+    margin:             5px;
 }
 
 /* gecko FIX, font size is not correctly assigned to all child elements */
 body * {
-    font-family:      inherit;
-    font-size:        inherit;
+    font-family:        inherit;
+    font-size:          inherit;
 }
 
-pre, tt, code{
-    font-size:        110%;
+h1 {
+    font-size:          180%;
+    font-weight:        bold;
 }
-a:link, a:visited, a:active{
-    text-decoration:  none;
-    color:            #333399;
+
+h2 {
+    font-size:          130%;
+    font-weight:        bold;
+}
+
+h3 {
+    font-size:          120%;
+    font-weight:        bold;
+}
+
+pre, tt, code {
+    font-size:          110%;
+}
+
+a:link,
+a:visited,
+a:active {
+    text-decoration:    none;
+    color:              #333399;
 
 }
-a:hover{
-    text-decoration:  underline;
-    color:            #cc0000;
+
+a:hover {
+    text-decoration:    underline;
+    color:              #cc0000;
 }
-th{
-    font-weight:         bold;
-    color:               #000000;
-    background-color:    #ff9900;
-    background-image:    url(../themes/darkblue_orange/img/tbl_th.png);
-    background-repeat:   repeat-x;
+
+dfn {
+    font-style:         normal;
+}
+
+dfn:hover {
+    font-style:         normal;
+    cursor:             help;
+}
+
+th {
+    font-weight:        bold;
+    color:              #000000;
+    background-color:   #ff9900;
+    background-image:   url(../themes/darkblue_orange/img/tbl_th.png);
+    background-repeat:  repeat-x;
     background-position: top;
-    height:              18px;
-}
-th a:link, th a:active, th a:visited{
-    color:            #000000;
-    text-decoration:  underline;
+    height:             18px;
 }
 
-th a:hover{
-    color:            #666666;
-    text-decoration:  none;
-}
-.tblcomment{
-    font-weight:      normal;
-    color:            #000099;
-}
-th.td{
-    font-weight: normal;
-    color: transparent;
-    background-color: transparent;
-    background-image: none;
-
-}
-form{
-    padding:          0px 0px 0px 0px;
-    margin:           0px 0px 0px 0px;
-}
-select, textarea{
-    color:            #000000;
-    background-color: #FFFFFF;
-}
-input.textfield{
-    color:            #000000;
-    /*background-color: #FFFFFF;*/
+th a:link,
+th a:active,
+th a:visited {
+    color:              #000000;
+    text-decoration:    underline;
 }
 
-h1{
-    font-size:        180%;
-    font-weight:      bold;
+th a:hover {
+    color:              #666666;
+    text-decoration:    none;
 }
-h2{
-    font-size:        130%;
-    font-weight:      bold;
+
+a img {
+    border:             0;
 }
-h3{
-    font-size:        120%;
-    font-weight:      bold;
+
+hr {
+    color:              #666699;
+    background-color:   #6666cc;
+    border:             0;
+    height:             1px;
 }
-dfn{
-    font-style:       normal;
+
+form {
+    padding:            0;
+    margin:             0;
 }
-dfn:hover{
-    font-style:       normal;
-    cursor:           help;
+
+textarea {
+    overflow:           visible;
+    height:             8em;
 }
 
 fieldset {
-    border:     #666699 solid 1px;
-    padding:    0.5em;
+    margin-top:         1em;
+    border:             #666699 solid 1px;
+    padding:            0.5em;
 }
+
 fieldset fieldset {
-    margin:     0.8em;
+    margin:             0.8em;
 }
-legend {
-    color:       #666699;
-    font-weight: bold;
-    background-color: #ffffff;
-    padding: 2px 2px 2px 2px;
+
+fieldset legend {
+    color:              #666699;
+    font-weight:        bold;
+    background-color:   #ffffff;
+    padding:            2px 2px 2px 2px;
 }
+
+/* buttons in some browsers (eg. Konqueror) are block elements,
+   this breaks design */
+button {
+    display:            inline;
+}
+
+table caption,
+table th,
+table td {
+    padding:            0.1em 0.5em 0.1em 0.5em;
+    margin:             0.1em;
+    vertical-align:     top;
+}
+
+img,
+input,
+select,
+button {
+    vertical-align:     middle;
+}
+
+
+/******************************************************************************/
+/* classes */
+
+fieldset.tblFooters {
+    margin-top:         0;
+    margin-bottom:      0.5em;
+    text-align:         right;
+    float:              none;
+    clear:              both;
+}
+
+fieldset .formelement {
+    float:              left;
+    margin-right:       0.5em;
+    /* IE */
+    white-space:        nowrap;
+}
+
+/* revert for Gecko */
+fieldset div[class=formelement] {
+    white-space:        normal;
+}
+
 button.mult_submit {
-    border: none;
-    background-color: transparent;
+    border:             none;
+    background-color:   transparent;
+}
+
+/* odd 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.even th,
+table tr.even {
+    background-image:   none;
+    background-color:   #D5D5D5;
+    text-align:         left;
+}
+
+/* marked tbale rows */
+table tr.marked th,
+table tr.marked {
+    background-color:   #FFCC99;
+}
+
+/* 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 .value {
+    text-align:         right;
+    white-space:        nowrap;
+}
+/* IE doesnt handles 'pre' right */
+table [class=value] {
+    white-space:        pre;
+}
+
+.value {
+    font-family:        "Courier New", Courier, monospace;
+}
+.value .attention {
+    color:              red;
+    font-weight:        bold;
+}
+.value .allfine {
+    color:              green;
+}
+
+
+img.lightbulb {
+    cursor:             pointer;
 }
 
 .pdflayout {
-    overflow:         hidden;
-    clip:             inherit;
-    background-color: #FFFFFF;
-    display:          none;
-    border:           1px solid #000000;
-    position:         relative;
+    overflow:           hidden;
+    clip:               inherit;
+    background-color:   #FFFFFF;
+    display:            none;
+    border:             1px solid #000000;
+    position:           relative;
 }
 
 .pdflayout_table {
-    background:       #ff9900;
-    color:            #000000;
-    overflow:         hidden;
-    clip:             inherit;
-    z-index:          2;
-    display:          inline;
-    visibility:       inherit;
-    cursor:           move;
-    position:         absolute;
-    font-size:        110%;
-    border:           1px dashed #000000;
+    background:         #ff9900;
+    color:              #000000;
+    overflow:           hidden;
+    clip:               inherit;
+    z-index:            2;
+    display:            inline;
+    visibility:         inherit;
+    cursor:             move;
+    position:           absolute;
+    font-size:          110%;
+    border:             1px dashed #000000;
 }
 
+.print {
+    font-size:          8pt;
+}
+
+/* MySQL Parser */
+.syntax {
+}
+
+.syntax_comment {
+    padding-left:       4pt;
+    padding-right:      4pt;
+}
+
+.syntax_digit {
+}
+
+.syntax_digit_hex {
+}
+
+.syntax_digit_integer {
+}
+
+.syntax_digit_float {
+}
+
+.syntax_punct {
+}
+
+.syntax_alpha {
+}
+
+.syntax_alpha_columnType {
+    text-transform:     uppercase;
+}
+
+.syntax_alpha_columnAttrib {
+    text-transform:     uppercase;
+}
+
+.syntax_alpha_reservedWord {
+    text-transform:     uppercase;
+    font-weight:        bold;
+}
+
+.syntax_alpha_functionName {
+    text-transform:     uppercase;
+}
+
+.syntax_alpha_identifier {
+}
+
+.syntax_alpha_charset {
+}
+
+.syntax_alpha_variable {
+}
+
+.syntax_quote {
+    white-space:        pre;
+}
+
+.syntax_quote_backtick {
+}
+
+/* leave some space between icons and text */
+.icon {
+    vertical-align:     middle;
+    margin-right:       0.3em;
+    margin-left:        0.3em;
+}
+/* no extra space in table cells */
+td .icon {
+    margin: 0;
+}
+
+.selectallarrow {
+    margin-<?php echo $right; ?>: 0.3em;
+    margin-<?php echo $left; ?>: 0.6em;
+}
+
+/* message boxes: warning, error, confirmation */
+.notice {
+    color:              #000000;
+    background-color:   #FFFFDD;
+}
+h1.notice,
+div.notice {
+    margin:             0.5em 0 0.5em 0;
+    border:             0.1em solid #FFD700;
+    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
+    background-image:   url(../themes/darkblue_orange/img/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 } else { ?>
+    padding:            0.5em;
+    <?php } ?>
+}
+.notice h1 {
+    border-bottom:      0.1em solid #FFD700;
+    font-weight:        bold;
+    text-align:         <?php echo $left; ?>;
+    margin:             0 0 0.2em 0;
+}
+
+.warning {
+    color:              #CC0000;
+    background-color:   #FFFFCC;
+}
+p.warning,
+h1.warning,
+div.warning {
+    margin:             0.5em 0 0.5em 0;
+    border:             0.1em solid #CC0000;
+    width:              90%;
+
+    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
+    background-image:   url(../themes/darkblue_orange/img/s_warn.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 } else { ?>
+    padding:            0.5em;
+    <?php } ?>
+}
+.warning h1 {
+    border-bottom:      0.1em solid #cc0000;
+    font-weight:        bold;
+    text-align:         <?php echo $left; ?>;
+    margin:             0 0 0.2em 0;
+}
+
+.error {
+    background-color:   #FFFFCC;
+    color:              #ff0000;
+}
+
+h1.error,
+div.error {
+    margin:             0.5em 0 0.5em 0;
+    border:             0.1em solid #ff0000;
+    width:              90%;
+    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
+    background-image:   url(../themes/darkblue_orange/img/s_error.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 } else { ?>
+    padding:            0.5em;
+    <?php } ?>
+}
+div.error h1 {
+    border-bottom:      0.1em solid #ff0000;
+    font-weight:        bold;
+    text-align:         <?php echo $left; ?>;
+    margin:             0 0 0.2em 0;
+}
+
+.confirmation {
+    background-color:   #FFFFCC;
+}
+fieldset.confirmation {
+    border:             0.1em solid #FF0000;
+}
+fieldset.confirmation legend {
+    border-left:        0.1em solid #FF0000;
+    border-right:       0.1em solid #FF0000;
+    font-weight:        bold;
+    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
+    background-image:   url(../themes/darkblue_orange/img/s_really.png);
+    background-repeat:  no-repeat;
+        <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
+    background-position: 5px 50%;
+    padding:            0.2em 0.2em 0.2em 25px;
+        <?php } else { ?>
+    background-position: 97% 50%;
+    padding:            0.2em 25px 0.2em 0.2em;
+        <?php } ?>
+    <?php } ?>
+}
+/* end messageboxes */
+
+
+.tblcomment {
+    font-weight:        normal;
+    color:              #000099;
+}
+
+.tblHeaders {
+    font-weight:        bold;
+    color:              #ffffff;
+    background-color:   #666699;
+    background-image:   url(../themes/darkblue_orange/img/tbl_header.png);
+    background-repeat:  repeat-x;
+    background-position: top;
+    height:             18px;
+}
+
+.tblFooters {
+    font-weight:        normal;
+    color:              #ffffff;
+    background-color:   #666699;
+    background-image:   url(../themes/darkblue_orange/img/tbl_header.png);
+    background-repeat:  repeat-x;
+    background-position: top;
+}
+
+.tblHeaders a:link,
+.tblHeaders a:active,
+.tblHeaders a:visited,
+.tblFooters a:link,
+.tblFooters a:active,
+.tblFooters a:visited {
+    color:              #ffffcc;
+    text-decoration:    underline;
+}
+
+.tblHeaders a:hover,
+.tblFooters a:hover {
+    text-decoration:    none;
+    color:              #ffffff;
+}
+
+/* forbidden, no privilegs */
+.noPrivileges {
+    color:              #cc0000;
+    font-weight:        bold;
+}
+
+/* disabled text */
+.disabled,
+.disabled a:link,
+.disabled a:active,
+.disabled a:visited {
+    color:              #666666;
+}
+
+.disabled a:hover {
+    color:              #666666;
+    text-decoration:    none;
+}
+
+tr.disabled td,
+td.disabled {
+    background-color:   #cccccc;
+}
+
+
+/******************************************************************************/
+/* specific elements */
 
 /* topmenu */
 ul#topmenu {
-    font-weight: bold;
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
+    font-weight:        bold;
+    list-style-type:    none;
+    margin:             0;
+    padding:            0;
 }
 
 ul#topmenu li {
-    float: left;
-    margin: 0;
-    padding: 0;
-    vertical-align: middle;
+    float:              left;
+    margin:             0;
+    padding:            0;
+    vertical-align:     middle;
 }
 
 #topmenu img {
-    vertical-align: middle;
-    margin-right: 0.1em;
+    vertical-align:     middle;
+    margin-right:       0.1em;
 }
 
 /* default tab styles */
 .tab, .tabcaution, .tabactive {
-    display: block;
-    margin: 0.2em 0.2em 0 0.2em;
-    padding: 0.2em 0.2em 0 0.2em;
-    white-space: nowrap;
+    display:            block;
+    margin:             0.2em 0.2em 0 0.2em;
+    padding:            0.2em 0.2em 0 0.2em;
+    white-space:        nowrap;
 }
 
 /* disabled tabs */
 span.tab {
-    color: #666666;
+    color:              #666666;
 }
 
 /* disabled drop/empty tabs */
 span.tabcaution {
-    color: #ff6666;
+    color:              #ff6666;
 }
 
 /* enabled drop/empty tabs */
 a.tabcaution {
-    color: #FF0000;
+    color:              FF0000;
 }
 a.tabcaution:hover {
     color: #FFFFFF;
-    background-color: #FF0000;
+    background-color:   #FF0000;
 }
 
 <?php if ( $GLOBALS['cfg']['LightTabs'] ) { ?>
 /* active tab */
 a.tabactive {
-    color: black;
+    color:              black;
 }
 <?php } else { ?>
 #topmenu {
-    margin-top: 0.5em;
-    padding: 0.1em 0.3em 0.1em 0.3em;
+    margin-top:         0.5em;
+    padding:            0.1em 0.3em 0.1em 0.3em;
 }
 
 ul#topmenu li {
-    border-bottom: 1pt solid black;
+    border-bottom:      1pt solid black;
 }
 
 /* default tab styles */
 .tab, .tabcaution, .tabactive {
-    background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
-    border: 1pt solid <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
-    border-bottom: 0;
+    background-color:   <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
+    border:             1pt solid <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
+    border-bottom:      0;
     border-radius-topleft: 0.4em;
     border-radius-topright: 0.4em;
     -moz-border-radius-topleft: 0.4em;
@@ -211,314 +585,183 @@ ul#topmenu li {
 }
 
 /* enabled hover/active tabs */
-a.tab:hover, a.tabcaution:hover, .tabactive, .tabactive:hover {
-    margin: 0;
-    padding: 0.2em 0.4em 0.2em 0.4em;
-    text-decoration: none;
+a.tab:hover,
+a.tabcaution:hover,
+.tabactive,
+.tabactive:hover {
+    margin:             0;
+    padding:            0.2em 0.4em 0.2em 0.4em;
+    text-decoration:    none;
 }
 
-a.tab:hover, .tabactive {
-    background-color: <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
+a.tab:hover,
+.tabactive {
+    background-color:   <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
 }
 
 /* disabled drop/empty tabs */
-span.tab, span.tabcaution {
-    cursor: url(themes/darkblue_orange/img/error.ico), url(../themes/darkblue_orange/img/error.ico), default;
+span.tab,
+span.tabcaution {
+    cursor:             url(themes/darkblue_orange/img/error.ico), url(../themes/darkblue_orange/img/error.ico), default;
 }
 <?php } ?>
 /* end topmenu */
 
 
-/* message boxes: warning, error, confirmation */
-.notice {
-    color: #000000;
-    background-color: #FFFFDD;
-}
-h1.notice,
-div.notice {
-    margin: 0.5em 0 0.5em 0;
-    border: 0.1em solid #FFD700;
-    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(../themes/darkblue_orange/img/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 } else {?>
-    padding: 0.5em;
-    <?php }?>
-}
-.notice h1 {
-    border-bottom: 0.1em solid #FFD700;
-    font-weight: bold;
-    text-align: <?php echo $left; ?>;
-    margin: 0 0 0.2em 0;
+#fieldsetexport #exportoptions {
+    float: left;
 }
 
-.warning {
-    color: #CC0000;
-    background-color: #FFFFCC;
-}
-p.warning,
-h1.warning,
-div.warning {
-    margin: 0.5em 0 0.5em 0;
-    border: 0.1em solid #CC0000;
-    width: 90%;
 
-    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(../themes/darkblue_orange/img/s_warn.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 } else {?>
-    padding: 0.5em;
-    <?php }?>
+/* Calendar */
+table.calendar {
+    width:              100%;
 }
-.warning h1 {
-    border-bottom: 0.1em solid #cc0000;
-    font-weight: bold;
-    text-align: <?php echo $left; ?>;
-    margin: 0 0 0.2em 0;
+table.calendar td {
+    text-align:         center;
+}
+table.calendar td a {
+    display:            block;
 }
 
-.error {
-    background-color: #FFFFCC;
-    color: #ff0000;
-}
-p.error,
-h1.error,
-div.error {
-    margin: 0.5em 0 0.5em 0;
-    border: 0.1em solid #ff0000;
-    width: 90%;
-    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(../themes/darkblue_orange/img/s_error.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 } else {?>
-    padding: 0.5em;
-    <?php }?>
-}
-div.error h1 {
-    border-bottom: 0.1em solid #ff0000;
-    font-weight: bold;
-    text-align: <?php echo $left; ?>;
-    margin: 0 0 0.2em 0;
+table.calendar td a:hover {
+    background-color:   #CCFFCC;
 }
 
-.confirmation {
-    background-color: #FFFFCC;
-}
-fieldset.confirmation {
-    border: 0.1em solid #FF0000;
-}
-fieldset.confirmation legend {
-    border-left: 0.1em solid #FF0000;
-    border-right: 0.1em solid #FF0000;
-    font-weight: bold;
-    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(../themes/darkblue_orange/img/s_really.png);
-    background-repeat: no-repeat;
-        <?php if ( $GLOBALS['text_dir'] === 'ltr' ) {?>
-    background-position: 5px 50%;
-    padding: 0.2em 0.2em 0.2em 25px;
-        <?php } else {?>
-    background-position: 98% 50%;
-    padding: 0.2em 25px 0.2em 0.2em;
-        <?php }?>
-    <?php }?>
-}
-/* end messageboxes */
-
-
-.print{font-size:8pt;}
-
-/* MySQL Parser */
-.syntax {}
-.syntax_comment            { padding-left: 4pt; padding-right: 4pt;}
-.syntax_digit              {}
-.syntax_digit_hex          {}
-.syntax_digit_integer      {}
-.syntax_digit_float        {}
-.syntax_punct              {}
-.syntax_alpha              {}
-.syntax_alpha_columnType   {text-transform: uppercase;}
-.syntax_alpha_columnAttrib {text-transform: uppercase;}
-.syntax_alpha_reservedWord {text-transform: uppercase; font-weight: bold;}
-.syntax_alpha_functionName {text-transform: uppercase;}
-.syntax_alpha_identifier   {}
-.syntax_alpha_charset      {}
-.syntax_alpha_variable     {}
-.syntax_quote              {white-space: pre;}
-.syntax_quote_backtick     {}
-
-/* tables */
-.tblHeaders{
-    font-weight:         bold;
-    color:               #ffffff;
-    background-color:    #666699;
-    background-image:    url(../themes/darkblue_orange/img/tbl_header.png);
-    background-repeat:   repeat-x;
-    background-position: top;
-    height:              18px;
-}
-.tblHeaders a:link, .tblHeaders a:visited, .tblHeaders a:active, .tblFooters a:link, tblFooters a:visited, tblFooters a:active{
-    color:            #ffffcc;
-    text-decoration:  underline;
-}
-.tblFooters{
-    font-weight:         normal;
-    color:               #ffffff;
-    background-color:    #666699;
-    background-image:    url(../themes/darkblue_orange/img/tbl_header.png);
-    background-repeat:   repeat-x;
-    background-position: top;
-}
-.tblHeaders a:hover, tblFooters a:hover{
-    text-decoration: none;
-    color:           #ffffff;
+table.calendar th {
+    background-color:   #D3DCE3;
 }
 
-/* forbidden, no privilegs */
-.noPrivileges{
-    color:            #cc0000;
-    font-weight:      bold;
+table.calendar td.selected {
+    background-color:   #FFCC99;
 }
 
-/* Heading for server links*/
+img.calendar {
+    border:             none;
+}
+form.clock {
+    text-align:         center;
+}
+/* end Calendar */
 
-#serverinfo {
-    font-weight: bold;
+
+/* table stats */
+div#tablestatistics {
+    border-bottom: 0.1em solid #669999;
     margin-bottom: 0.5em;
+    padding-bottom: 0.5em;
+}
+
+div#tablestatistics table {
+    float: left;
+    margin-bottom: 0.5em;
+    margin-right: 0.5em;
+}
+
+div#tablestatistics table caption {
+    margin-right: 0.5em;
+}
+/* END table stats */
+
+
+/* server privileges */
+#tableuserrights td,
+#tablespecificuserrights td,
+#tabledatabases td {
+    vertical-align: middle;
+}
+/* END server privileges */
+
+
+
+/* Heading */
+#serverinfo {
+    font-weight:        bold;
+    margin-bottom:      0.5em;
 }
 
 #serverinfo .item {
-    white-space: nowrap;
+    white-space:        nowrap;
 }
 
 #span_table_comment {
-    font-weight: normal;
-    font-style: italic;
-    white-space: nowrap;
+    font-weight:        normal;
+    font-style:         italic;
+    white-space:        nowrap;
 }
 
 #serverinfo img {
-    margin: 0 0.1em 0 0.1em;
-}
-
-hr{
-    color: #666699; background-color: #6666cc; border: 0; height: 1px;
-}
-
-
-img, input, select, button {
-    vertical-align: middle;
-}
-
-/* disabled text */
-.disabled, .disabled a:link, disabled a:active, .disabled a:visited {
-    color:            #666666;
-}
-.disabled a:hover {
-    color:            #666666;
-    text-decoration:  none;
-}
-tr.disabled td, td.disabled {
-    background-color: #cccccc;
+    margin:             0 0.1em 0 0.1em;
 }
 
 /* some styles for IDs: */
-#buttonNo{
-    color:            #CC0000;
-    font-weight:      bold;
-    padding:          0px 10px 0px 10px;
-}
-#buttonYes{
-    color:            #006600;
-    font-weight:      bold;
-    padding:          0px 10px 0px 10px;
-}
-#buttonGo{
-    color:            #006600;
-    font-weight:      bold;
-    padding:          0px 10px 0px 10px;
+#buttonNo {
+    color:              #CC0000;
+    font-weight:        bold;
+    padding:            0 10px 0 10px;
 }
 
-#listTable{
-    width:            260px;
+#buttonYes {
+    color:              #006600;
+    font-weight:        bold;
+    padding:            0 10px 0 10px;
 }
 
-#textSqlquery{
-    width:            450px;
+#buttonGo {
+    color:              #006600;
+    font-weight:        bold;
+    padding:            0 10px 0 10px;
 }
+
+#listTable {
+    width:              260px;
+}
+
+#textSqlquery {
+    width:              450px;
+}
+
 #textSQLDUMP {
-   width: 95%;
-   height: 95%;
-   font-family: "Courier New", Courier, mono;
-   font-size:   110%;
+    width:              95%;
+    height:             95%;
+    font-family:        "Courier New", Courier, mono;
+    font-size:          110%;
 }
 
 #TooltipContainer {
-    position:   absolute;
-    z-index:    99;
-    width:      20em;
-    height:     auto;
-    overflow:   visible;
-    visibility: hidden;
-    background-color: #ffffcc;
-    color:            #006600;
-    border:           0.1em solid #000000;
-    padding:          0.5em;
-}
-
-fieldset {
-    margin-top: 1em;
-}
-
-fieldset.tblFooters {
-    margin-top: 0;
-    margin-bottom: 0.5em;
-    text-align: right;
-    float: none;
-    clear: both;
+    position:           absolute;
+    z-index:            99;
+    width:              20em;
+    height:             auto;
+    overflow:           visible;
+    visibility:         hidden;
+    background-color:   #ffffcc;
+    color:              #006600;
+    border:             0.1em solid #000000;
+    padding:            0.5em;
 }
 
+/* user privileges */
 #fieldset_add_user_login div.item {
-    border-bottom: 1px solid silver;
-    padding-bottom: 0.3em;
-    margin-bottom: 0.3em;
+    border-bottom:      1px solid silver;
+    padding-bottom:     0.3em;
+    margin-bottom:      0.3em;
 }
 
 #fieldset_add_user_login label {
-    float: left;
-    display: block;
-    width: 10em;
-    max-width: 100%;
-    text-align: right;
-    padding-right: 0.5em;
+    float:              left;
+    display:            block;
+    width:              10em;
+    max-width:          100%;
+    text-align:         right;
+    padding-right:      0.5em;
 }
 
 #fieldset_add_user_login span.options #select_pred_username,
 #fieldset_add_user_login span.options #select_pred_hostname,
 #fieldset_add_user_login span.options #select_pred_password {
-    width: 100%;
-    max-width: 100%;
+    width:              100%;
+    max-width:          100%;
 }
 
 #fieldset_add_user_login span.options {
@@ -549,7 +792,7 @@ fieldset.tblFooters {
     float: none;
 }
 
-#fieldset_user_priv div.item label{
+#fieldset_user_priv div.item label {
     white-space: nowrap;
 }
 
@@ -560,3 +803,99 @@ fieldset.tblFooters {
 #fieldset_user_global_rights fieldset {
     float: left;
 }
+/* END user privileges */
+
+
+/* serverstatus */
+div#serverstatus table caption a.top {
+    float: right;
+}
+
+div#serverstatus div#serverstatusqueriesdetails table,
+div#serverstatus table#serverstatustraffic,
+div#serverstatus table#serverstatusconnections {
+    float: left;
+}
+
+#serverstatussection,
+.clearfloat {
+    clear: both;
+}
+div#serverstatussection table {
+    width: 100%;
+    margin-bottom: 1em;
+}
+div#serverstatussection table .name {
+    width: 18em;
+}
+div#serverstatussection table .value {
+    width: 6em;
+}
+
+div#serverstatus table tbody td.descr a,
+div#serverstatus table .tblFooters a {
+    white-space: nowrap;
+}
+div#serverstatus div#statuslinks a:before,
+div#serverstatus div#sectionlinks a:before,
+div#serverstatus table tbody td.descr a:before,
+div#serverstatus table .tblFooters a:before {
+    content: '[';
+}
+div#serverstatus div#statuslinks a:after,
+div#serverstatus div#sectionlinks a:after,
+div#serverstatus table tbody td.descr a:after,
+div#serverstatus table .tblFooters a:after {
+    content: ']';
+}
+/* end serverstatus */
+
+/* querywindow */
+body#bodyquerywindow {
+    margin: 0;
+    padding: 0;
+    background-image: none;
+    background-color: #F5F5F5;
+}
+
+div#querywindowcontainer {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+}
+
+div#querywindowcontainer fieldset {
+    margin-top: 0;
+}
+/* END querywindow */
+
+
+/* querybox */
+
+div#sqlquerycontainer {
+    float: left;
+    width: 69%;
+    /* height: 15em; */
+}
+
+div#tablefieldscontainer {
+    float: right;
+    width: 29%;
+    /* height: 15em; */
+}
+
+div#tablefieldscontainer select {
+    width: 100%;
+    /* height: 12em; */
+}
+
+textarea#sqlquery {
+    width: 100%;
+    /* height: 100%; */
+}
+
+div#queryboxcontainer div#bookmarkoptions {
+    margin-top: 0.5em;
+}
+/* end querybox */
+
diff --git a/themes/darkblue_orange/info.inc.php b/themes/darkblue_orange/info.inc.php
index 6e9ea61ab..ee0b35f43 100644
--- a/themes/darkblue_orange/info.inc.php
+++ b/themes/darkblue_orange/info.inc.php
@@ -4,4 +4,5 @@
 $theme_name = 'Darkblue/orange';
 $theme_version = 2;
 $theme_generation = 2;
+$theme_full_version = '2.7.0.0';
 ?>
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index 2467f8180..81dbbd543 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -1,9 +1,9 @@
 /******************************************************************************/
 /* general tags */
 body {
-    font-family: <?php echo $left_font_family; ?>;
-    background-color: #D0DCE0;
-    color: #000000;
+    font-family:        <?php echo $left_font_family; ?>;
+    background-color:   #D0DCE0;
+    color:              #000000;
 }
 
 a img {
@@ -11,21 +11,20 @@ a img {
 }
 
 form {
-    margin: 0;
-    padding: 0;
-    display: inline;
+    margin:             0;
+    padding:            0;
+    display:            inline;
 }
 
 select {
-    background-color: #ffffff;
-    color: #000000;
+    background-color:   #ffffff;
+    color:              #000000;
 }
 
-
 /* buttons in some browsers (eg. Konqueror) are block elements,
    this breaks design */
 button {
-    display: inline;
+    display:            inline;
 }
 
 
@@ -34,13 +33,13 @@ button {
 
 /* leave some space between icons and text */
 .icon {
-    vertical-align: middle;
-    margin-right: 0.3em;
-    margin-left: 0.3em;
+    vertical-align:     middle;
+    margin-right:       0.3em;
+    margin-left:        0.3em;
 }
 
 img.lightbulb {
-    cursor: pointer;
+    cursor:             pointer;
 }
 
 
@@ -50,72 +49,72 @@ img.lightbulb {
 div#pmalogo,
 div#leftframelinks,
 div#databaseList {
-    text-align: center;
-    border-bottom: 0.05em solid #669999;
-    margin-bottom: 0.5em;
-    padding-bottom: 0.5em;
+    text-align:         center;
+    border-bottom:      0.05em solid #669999;
+    margin-bottom:      0.5em;
+    padding-bottom:     0.5em;
 }
 
 div#leftframelinks .icon {
-    padding: 0;
-    margin: 0;
+    padding:            0;
+    margin:             0;
 }
 
 div#leftframelinks a {
-    margin: 0.1em;
-    padding: 0.2em;
-    border: 0.05em solid #669999;
+    margin:             0.1em;
+    padding:            0.2em;
+    border:             0.05em solid #669999;
 }
 
 div#leftframelinks a:hover {
-    background-color: #669999;
+    background-color:   #669999;
 }
 
 /* leftdatabaselist */
 div#left_tableList ul {
-    list-style-type: none;
+    list-style-type:    none;
     list-style-position: outside;
-    margin: 0;
-    padding: 0;
-    font-size: 80%;
-    background-color: #D0DCE0;
+    margin:             0;
+    padding:            0;
+    font-size:          80%;
+    background-color:   #D0DCE0;
 }
 
 div#left_tableList ul ul {
-    font-size: 100%;
+    font-size:          100%;
 }
 
 div#left_tableList a {
-    color: #333399;
-    text-decoration: none;
+    color:              #333399;
+    text-decoration:    none;
 }
 
 div#left_tableList a:hover {
-    color: #FF0000;
-    text-decoration: underline;
+    color:              #FF0000;
+    text-decoration:    underline;
 }
 
 div#left_tableList li {
-    margin: 0;
-    padding: 0;
-    white-space: nowrap;
+    margin:             0;
+    padding:            0;
+    white-space:        nowrap;
 }
 
 <?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
 div#left_tableList li:hover {
-    background-color: #CCFFCC;
+    background-color:   #CCFFCC;
 }
 <?php } ?>
 
 div#left_tableList img {
-    padding: 0;
-    vertical-align: middle;
+    padding:            0;
+    vertical-align:     middle;
 }
 
 div#left_tableList ul ul {
-    margin-left: 0em;
-    padding-left: 0.1em;
-    border-left: 0.1em solid #669999;
-    padding-bottom: 0.1em;
-    border-bottom: 0.1em solid #669999;
+    margin-left:        0em;
+    padding-left:       0.1em;
+    border-left:        0.1em solid #669999;
+    padding-bottom:     0.1em;
+    border-bottom:      0.1em solid #669999;
 }
\ No newline at end of file
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 2389a7646..9ed4c73d9 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1,113 +1,115 @@
 /******************************************************************************/
 /* general tags */
 body {
-    margin: 0.5em;
-    padding: 0;
-    font-family: <?php echo $right_font_family; ?>;
-    color: #000000;
-    background-image: url(../themes/original/img/vertical_line.png);
-    background-repeat: repeat-y;
-    background-color: #F5F5F5;
+    margin:             0.5em;
+    padding:            0;
+    font-family:        <?php echo $right_font_family; ?>;
+    color:              #000000;
+    background-image:   url(../themes/original/img/vertical_line.png);
+    background-repeat:  repeat-y;
+    background-color:   #F5F5F5;
 }
 
 h1 {
-    font-size: 140%;
-    font-weight: bold;
+    font-size:          140%;
+    font-weight:        bold;
 }
 
 h2 {
-    font-size: 120%;
-    font-weight: bold;
+    font-size:          120%;
+    font-weight:        bold;
 }
 
 h3 {
-    font-weight: bold;
+    font-weight:        bold;
 }
 
 a:link {
-    text-decoration: none;
-    color: #0000FF;
+    text-decoration:    none;
+    color:              #0000FF;
 }
 
 a:visited {
-    text-decoration: none;
-    color: #0000FF;
+    text-decoration:    none;
+    color:              #0000FF;
 }
 
 a:hover {
-    text-decoration: underline;
-    color: #FF0000;
+    text-decoration:    underline;
+    color:              #FF0000;
 }
 
 dfn {
-    font-style: normal;
+    font-style:         normal;
 }
 
 dfn:hover {
-    font-style: normal;
-    cursor: help;
+    font-style:         normal;
+    cursor:             help;
 }
 
 th {
-    font-weight: bold;
-    color: #000000;
-    background-color: #D3DCE3;
+    font-weight:        bold;
+    color:              #000000;
+    background-color:   #D3DCE3;
 }
 
 a img {
-    border: 0;
+    border:             0;
 }
 
 hr {
-    color: #666666;
-    background-color: #666666;
-    border: 0;
-    height: 1px;
+    color:              #666666;
+    background-color:   #666666;
+    border:             0;
+    height:             1px;
 }
 
 form {
-    padding: 0;
-    margin: 0;
-    display: inline;
+    padding:            0;
+    margin:             0;
+    display:            inline;
 }
 
 textarea {
-    overflow: visible;
-    height: 8em;
+    overflow:           visible;
+    height:             8em;
 }
 
 fieldset {
-    margin-top: 1em;
-    border:     #686868 solid 1px;
-    padding:    0.5em;
-    background-color: #E5E5E5;
+    margin-top:         1em;
+    border:             #686868 solid 1px;
+    padding:            0.5em;
+    background-color:   #E5E5E5;
 }
 
 fieldset fieldset {
-    margin:     0.8em;
+    margin:             0.8em;
 }
 
 fieldset legend {
-    background-color: transparent;
+    background-color:   transparent;
 }
 
 /* buttons in some browsers (eg. Konqueror) are block elements,
    this breaks design */
 button {
-    display: inline;
+    display:            inline;
 }
 
 table caption,
 table th,
 table td {
-    padding: 0.1em 0.5em 0.1em 0.5em;
-    margin: 0;
-    margin: 0.1em;
-    vertical-align: top;
+    padding:            0.1em 0.5em 0.1em 0.5em;
+    margin:             0.1em;
+    vertical-align:     top;
 }
 
-img, input, select, button {
-    vertical-align: middle;
+img,
+input,
+select,
+button {
+    vertical-align:     middle;
 }
 
 
@@ -115,47 +117,48 @@ img, input, select, button {
 /* classes */
 
 fieldset.tblFooters {
-    margin-top: 0;
-    margin-bottom: 0.5em;
-    text-align: right;
-    float: none;
-    clear: both;
+    margin-top:         0;
+    margin-bottom:      0.5em;
+    text-align:         right;
+    float:              none;
+    clear:              both;
 }
+
 fieldset .formelement {
-    float: left;
-    margin-right: 0.5em;
+    float:              left;
+    margin-right:       0.5em;
     /* IE */
-    white-space: nowrap;
+    white-space:        nowrap;
 }
+
 /* revert for Gecko */
 fieldset div[class=formelement] {
-    white-space: normal;
+    white-space:        normal;
 }
 
 button.mult_submit {
-    border: none;
-    background-color: transparent;
+    border:             none;
+    background-color:   transparent;
 }
 
-
 /* odd table rows 1,3,5,7,... */
 table tr.odd th,
 table tr.odd {
-    background-color: #E5E5E5;
-    text-align: left;
+    background-color:   #E5E5E5;
+    text-align:         left;
 }
 
 /* even table rows 2,4,6,8,... */
 table tr.even th,
 table tr.even {
-    background-color: #D5D5D5;
-    text-align: left;
+    background-color:   #D5D5D5;
+    text-align:         left;
 }
 
 /* marked tbale rows */
 table tr.marked th,
 table tr.marked {
-    background-color: #FFCC99;
+    background-color:   #FFCC99;
 }
 
 /* hovered table rows */
@@ -165,115 +168,129 @@ table tr.odd:hover th,
 table tr.even:hover th,
 table tr.hover th,
 table tr.hover {
-    background-color: #CCFFCC;
+    background-color:   #CCFFCC;
 }
 
 table .value {
-    text-align: right;
-    white-space: nowrap;
+    text-align:         right;
+    white-space:        nowrap;
 }
 /* IE doesnt handles 'pre' right */
 table [class=value] {
-    white-space: pre;
+    white-space:        pre;
 }
 
 .value {
-    font-family: "Courier New", Courier, monospace;
+    font-family:        "Courier New", Courier, monospace;
 }
 .value .attention {
-    color: red;
-    font-weight: bold;
+    color:              red;
+    font-weight:        bold;
 }
 .value .allfine {
-    color: green;
+    color:              green;
 }
 
 
 img.lightbulb {
-    cursor: pointer;
+    cursor:             pointer;
 }
 
-
 .pdflayout {
-    overflow:         hidden;
-    clip:             inherit;
-    background-color: #FFFFFF;
-    display:          none;
-    border:           1px solid #000000;
-    position:         relative;
+    overflow:           hidden;
+    clip:               inherit;
+    background-color:   #FFFFFF;
+    display:            none;
+    border:             1px solid #000000;
+    position:           relative;
 }
 
 .pdflayout_table {
-    background:       #D3DCE3;
-    color:            #000000;
-    overflow:         hidden;
-    clip:             inherit;
-    z-index:          2;
-    display:          inline;
-    visibility:       inherit;
-    cursor:           move;
-    position:         absolute;
-    font-size:        80%;
-    border:           1px dashed #000000;
+    background:         #D3DCE3;
+    color:              #000000;
+    overflow:           hidden;
+    clip:               inherit;
+    z-index:            2;
+    display:            inline;
+    visibility:         inherit;
+    cursor:             move;
+    position:           absolute;
+    font-size:          80%;
+    border:             1px dashed #000000;
 }
 
 .print {
-    font-family: arial;
-    font-size: 8pt;
+    font-family:        arial;
+    font-size:          8pt;
 }
 
 /* MySQL Parser */
 .syntax {
-    font-family: sans-serif;
-    font-size: 80%;
+    font-family:        sans-serif;
+    font-size:          80%;
 }
+
 .syntax_comment {
-    padding-left: 4pt;
-    padding-right: 4pt;
+    padding-left:       4pt;
+    padding-right:      4pt;
 }
+
 .syntax_digit {
 }
+
 .syntax_digit_hex {
 }
+
 .syntax_digit_integer {
 }
+
 .syntax_digit_float {
 }
+
 .syntax_punct {
 }
+
 .syntax_alpha {
 }
+
 .syntax_alpha_columnType {
-    text-transform: uppercase;
+    text-transform:     uppercase;
 }
+
 .syntax_alpha_columnAttrib {
-    text-transform: uppercase;
+    text-transform:     uppercase;
 }
+
 .syntax_alpha_reservedWord {
-    text-transform: uppercase;
-    font-weight: bold;
+    text-transform:     uppercase;
+    font-weight:        bold;
 }
+
 .syntax_alpha_functionName {
-    text-transform: uppercase;
+    text-transform:     uppercase;
 }
+
 .syntax_alpha_identifier {
 }
+
 .syntax_alpha_charset {
 }
+
 .syntax_alpha_variable {
 }
+
 .syntax_quote {
-    white-space: pre;
+    white-space:        pre;
 }
+
 .syntax_quote_backtick {
 }
 
-
 /* leave some space between icons and text */
 .icon {
-    vertical-align: middle;
-    margin-right: 0.3em;
-    margin-left: 0.3em;
+    vertical-align:     middle;
+    margin-right:       0.3em;
+    margin-left:        0.3em;
 }
 /* no extra space in table cells */
 td .icon {
@@ -287,112 +304,113 @@ td .icon {
 
 /* message boxes: warning, error, confirmation */
 .notice {
-    color: #000000;
-    background-color: #FFFFDD;
+    color:              #000000;
+    background-color:   #FFFFDD;
 }
 h1.notice,
 div.notice {
-    margin: 0.5em 0 0.5em 0;
-    border: 0.1em solid #FFD700;
+    margin:             0.5em 0 0.5em 0;
+    border:             0.1em solid #FFD700;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(../themes/original/img/s_notice.png);
-    background-repeat: no-repeat;
+    background-image:   url(../themes/original/img/s_notice.png);
+    background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
-    padding: 10px 10px 10px 36px;
+    padding:            10px 10px 10px 36px;
         <?php } else { ?>
     background-position: 99% 50%;
-    padding: 10px 5% 10px 10px;
+    padding:            10px 5% 10px 10px;
         <?php } ?>
     <?php } else { ?>
-    padding: 0.5em;
+    padding:            0.5em;
     <?php } ?>
 }
 .notice h1 {
-    border-bottom: 0.1em solid #FFD700;
-    font-weight: bold;
-    text-align: <?php echo $left; ?>;
-    margin: 0 0 0.2em 0;
+    border-bottom:      0.1em solid #FFD700;
+    font-weight:        bold;
+    text-align:         <?php echo $left; ?>;
+    margin:             0 0 0.2em 0;
 }
 
 .warning {
-    color: #CC0000;
-    background-color: #FFFFCC;
+    color:              #CC0000;
+    background-color:   #FFFFCC;
 }
+p.warning,
 h1.warning,
 div.warning {
-    margin: 0.5em 0 0.5em 0;
-    border: 0.1em solid #CC0000;
+    margin:             0.5em 0 0.5em 0;
+    border:             0.1em solid #CC0000;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(../themes/original/img/s_warn.png);
-    background-repeat: no-repeat;
+    background-image:   url(../themes/original/img/s_warn.png);
+    background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
-    padding: 10px 10px 10px 36px;
+    padding:            10px 10px 10px 36px;
         <?php } else { ?>
     background-position: 99% 50%;
-    padding: 10px 5% 10px 10px;
+    padding:            10px 5% 10px 10px;
         <?php } ?>
     <?php } else { ?>
-    padding: 0.5em;
+    padding:            0.5em;
     <?php } ?>
 }
 .warning h1 {
-    border-bottom: 0.1em solid #cc0000;
-    font-weight: bold;
-    text-align: <?php echo $left; ?>;
-    margin: 0 0 0.2em 0;
+    border-bottom:      0.1em solid #cc0000;
+    font-weight:        bold;
+    text-align:         <?php echo $left; ?>;
+    margin:             0 0 0.2em 0;
 }
 
 .error {
-    background-color: #FFFFCC;
-    color: #ff0000;
+    background-color:   #FFFFCC;
+    color:              #ff0000;
 }
+
 h1.error,
 div.error {
-    margin: 0.5em 0 0.5em 0;
-    border: 0.1em solid #ff0000;
+    margin:             0.5em 0 0.5em 0;
+    border:             0.1em solid #ff0000;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(../themes/original/img/s_error.png);
-    background-repeat: no-repeat;
+    background-image:   url(../themes/original/img/s_error.png);
+    background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
-    padding: 10px 10px 10px 36px;
+    padding:            10px 10px 10px 36px;
         <?php } else { ?>
     background-position: 99% 50%;
-    padding: 10px 5% 10px 10px;
+    padding:            10px 5% 10px 10px;
         <?php } ?>
     <?php } else { ?>
-    padding: 0.5em;
+    padding:            0.5em;
     <?php } ?>
 }
 div.error h1 {
-    border-bottom: 0.1em solid #ff0000;
-    font-weight: bold;
-    text-align: <?php echo $left; ?>;
-    margin: 0 0 0.2em 0;
+    border-bottom:      0.1em solid #ff0000;
+    font-weight:        bold;
+    text-align:         <?php echo $left; ?>;
+    margin:             0 0 0.2em 0;
 }
 
-
 .confirmation {
-    background-color: #FFFFCC;
+    background-color:   #FFFFCC;
 }
 fieldset.confirmation {
-    border: 0.1em solid #FF0000;
+    border:             0.1em solid #FF0000;
 }
 fieldset.confirmation legend {
-    border-left: 0.1em solid #FF0000;
-    border-right: 0.1em solid #FF0000;
-    font-weight: bold;
+    border-left:        0.1em solid #FF0000;
+    border-right:       0.1em solid #FF0000;
+    font-weight:        bold;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image: url(../themes/original/img/s_really.png);
-    background-repeat: no-repeat;
+    background-image:   url(../themes/original/img/s_really.png);
+    background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 5px 50%;
-    padding: 0.2em 0.2em 0.2em 25px;
+    padding:            0.2em 0.2em 0.2em 25px;
         <?php } else { ?>
     background-position: 97% 50%;
-    padding: 0.2em 25px 0.2em 0.2em;
+    padding:            0.2em 25px 0.2em 0.2em;
         <?php } ?>
     <?php } ?>
 }
@@ -400,54 +418,58 @@ fieldset.confirmation legend {
 
 
 .tblcomment {
-    font-size: 70%;
-    font-weight: normal;
-    color: #000099;
+    font-size:          70%;
+    font-weight:        normal;
+    color:              #000099;
 }
 
 .tblHeaders {
-    background-color: #D0DCE0;
-    font-weight: bold;
-    color: #000000;
+    background-color:   #D0DCE0;
+    font-weight:        bold;
+    color:              #000000;
 }
+
 .tblFooters {
-    background-color: #D0DCE0;
-    font-weight: normal;
-    color: #000000;
+    font-weight:        normal;
+    color:              #000000;
+    background-color:   #D0DCE0;
 }
+
 .tblHeaders a:link,
 .tblHeaders a:active,
 .tblHeaders a:visited,
 .tblFooters a:link,
 .tblFooters a:active,
 .tblFooters a:visited {
-    color: #0000FF;
+    color:              #0000FF;
 }
+
 .tblHeaders a:hover,
 .tblFooters a:hover {
-    color: #FF0000;
+    color:              #FF0000;
 }
 
 /* forbidden, no privilegs */
-.noPrivileges{
-    color: #FF0000;
-    font-weight: bold;
+.noPrivileges {
+    color:              #FF0000;
+    font-weight:        bold;
 }
 
 /* disabled text */
 .disabled,
 .disabled a:link,
-disabled a:active,
+.disabled a:active,
 .disabled a:visited {
-    font-family: <?php echo $right_font_family; ?>;
-    color:       #666666;
+    color:              #666666;
 }
+
 .disabled a:hover {
-    text-decoration: none;
+    text-decoration:    none;
 }
+
 tr.disabled td,
 td.disabled {
-    background-color: #cccccc;
+    background-color:   #cccccc;
 }
 
 
@@ -456,71 +478,71 @@ td.disabled {
 
 /* topmenu */
 ul#topmenu {
-    font-weight: bold;
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
+    font-weight:        bold;
+    list-style-type:    none;
+    margin:             0;
+    padding:            0;
 }
 
 ul#topmenu li {
-    float: left;
-    margin: 0;
-    padding: 0;
-    vertical-align: middle;
+    float:              left;
+    margin:             0;
+    padding:            0;
+    vertical-align:     middle;
 }
 
 #topmenu img {
-    vertical-align: middle;
-    margin-right: 0.1em;
+    vertical-align:     middle;
+    margin-right:       0.1em;
 }
 
 /* default tab styles */
 .tab, .tabcaution, .tabactive {
-    display: block;
-    margin: 0.2em 0.2em 0 0.2em;
-    padding: 0.2em 0.2em 0 0.2em;
-    white-space: nowrap;
+    display:            block;
+    margin:             0.2em 0.2em 0 0.2em;
+    padding:            0.2em 0.2em 0 0.2em;
+    white-space:        nowrap;
 }
 
 /* disabled tabs */
 span.tab {
-    color: #666666;
+    color:              #666666;
 }
 
 /* disabled drop/empty tabs */
 span.tabcaution {
-    color: #ff6666;
+    color:              #ff6666;
 }
 
 /* enabled drop/empty tabs */
 a.tabcaution {
-    color: #FF0000;
+    color:              #FF0000;
 }
 a.tabcaution:hover {
     color: #FFFFFF;
-    background-color: #FF0000;
+    background-color:   #FF0000;
 }
 
 <?php if ( $GLOBALS['cfg']['LightTabs'] ) { ?>
 /* active tab */
 a.tabactive {
-    color: black;
+    color:              black;
 }
 <?php } else { ?>
 #topmenu {
-    margin-top: 0.5em;
-    padding: 0.1em 0.3em 0.1em 0.3em;
+    margin-top:         0.5em;
+    padding:            0.1em 0.3em 0.1em 0.3em;
 }
 
 ul#topmenu li {
-    border-bottom: 1pt solid black;
+    border-bottom:      1pt solid black;
 }
 
 /* default tab styles */
 .tab, .tabcaution, .tabactive {
-    background-color: #E5E5E5;
-    border: 1pt solid #D5D5D5;
-    border-bottom: 0;
+    background-color:   #E5E5E5;
+    border:             1pt solid #D5D5D5;
+    border-bottom:      0;
     border-radius-topleft: 0.4em;
     border-radius-topright: 0.4em;
     -moz-border-radius-topleft: 0.4em;
@@ -528,19 +550,24 @@ ul#topmenu li {
 }
 
 /* enabled hover/active tabs */
-a.tab:hover, a.tabcaution:hover, .tabactive, .tabactive:hover {
-    margin: 0;
-    padding: 0.2em 0.4em 0.2em 0.4em;
-    text-decoration: none;
+a.tab:hover,
+a.tabcaution:hover,
+.tabactive,
+.tabactive:hover {
+    margin:             0;
+    padding:            0.2em 0.4em 0.2em 0.4em;
+    text-decoration:    none;
 }
 
-a.tab:hover, .tabactive {
-    background-color: #D5D5D5;
+a.tab:hover,
+.tabactive {
+    background-color:   #D5D5D5;
 }
 
 /* disabled drop/empty tabs */
-span.tab, span.tabcaution {
-    cursor: url(themes/original/img/error.ico), url(../themes/original/img/error.ico), default;
+span.tab,
+span.tabcaution {
+    cursor:             url(themes/original/img/error.ico), url(../themes/original/img/error.ico), default;
 }
 <?php } ?>
 /* end topmenu */
@@ -553,32 +580,32 @@ span.tab, span.tabcaution {
 
 /* Calendar */
 table.calendar {
-    width: 100%;
+    width:              100%;
 }
 table.calendar td {
-    text-align: center;
+    text-align:         center;
 }
 table.calendar td a {
-    display: block;
+    display:            block;
 }
 
 table.calendar td a:hover {
-    background-color: #CCFFCC;
+    background-color:   #CCFFCC;
 }
 
 table.calendar th {
-    background-color: #D3DCE3;
+    background-color:   #D3DCE3;
 }
 
 table.calendar td.selected {
-    background-color: #FFCC99;
+    background-color:   #FFCC99;
 }
 
 img.calendar {
-    border: none;
+    border:             none;
 }
 form.clock {
-    text-align: center;
+    text-align:         center;
 }
 /* end Calendar */
 
@@ -611,70 +638,69 @@ div#tablestatistics table caption {
 /* END server privileges */
 
 
+
 /* Heading */
 #serverinfo {
-    font-weight: bold;
-    margin-bottom: 0.5em;
+    font-weight:        bold;
+    margin-bottom:      0.5em;
 }
 
 #serverinfo .item {
-    white-space: nowrap;
+    white-space:        nowrap;
 }
 
 #span_table_comment {
-    font-weight: normal;
-    font-style: italic;
-    white-space: nowrap;
+    font-weight:        normal;
+    font-style:         italic;
+    white-space:        nowrap;
 }
 
 #serverinfo img {
-    margin: 0 0.1em 0 0.2em;
+    margin:             0 0.1em 0 0.2em;
 }
 
 
 #textSQLDUMP {
-    width: 95%;
-    height: 95%;
-    font-family: "Courier New", Courier, mono;
-    font-size:   12px;
+    width:              95%;
+    height:             95%;
+    font-family:        "Courier New", Courier, mono;
+    font-size:          12px;
 }
 
 #TooltipContainer {
-    position:   absolute;
-    z-index:    99;
-    width:      20em;
-    height:     auto;
-    overflow:   visible;
-    visibility: hidden;
-    background-color: #ffffcc;
-    color:            #006600;
-    border:           0.1em solid #000000;
-    padding:          0.5em;
-    font-family:      <?php echo $right_font_family; ?>;
+    position:           absolute;
+    z-index:            99;
+    width:              20em;
+    height:             auto;
+    overflow:           visible;
+    visibility:         hidden;
+    background-color:   #ffffcc;
+    color:              #006600;
+    border:             0.1em solid #000000;
+    padding:            0.5em;
 }
 
-
 /* user privileges */
 #fieldset_add_user_login div.item {
-    border-bottom: 1px solid silver;
-    padding-bottom: 0.3em;
-    margin-bottom: 0.3em;
+    border-bottom:      1px solid silver;
+    padding-bottom:     0.3em;
+    margin-bottom:      0.3em;
 }
 
 #fieldset_add_user_login label {
-    float: left;
-    display: block;
-    width: 10em;
-    max-width: 100%;
-    text-align: right;
-    padding-right: 0.5em;
+    float:              left;
+    display:            block;
+    width:              10em;
+    max-width:          100%;
+    text-align:         right;
+    padding-right:      0.5em;
 }
 
 #fieldset_add_user_login span.options #select_pred_username,
 #fieldset_add_user_login span.options #select_pred_hostname,
 #fieldset_add_user_login span.options #select_pred_password {
-    width: 100%;
-    max-width: 100%;
+    width:              100%;
+    max-width:          100%;
 }
 
 #fieldset_add_user_login span.options {