diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index 5cd64b0456..fc13337247 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -271,7 +271,7 @@ div#left_tableList ul ul {
 
 #fast_filter {
     width: 100%;
-    padding:2px 0px;
-    margin:0;
-    border:0;
+    padding: 2px 0;
+    margin: 0;
+    border: 0;
 }
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 3a7eeb598f..6ab3b1f802 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1196,7 +1196,7 @@ div.liveChart {
 }
 
 #addChartDialog input[type="text"] {
-    margin:0px;
+    margin: 0;
     padding:3px;
 }
 
@@ -1592,7 +1592,7 @@ div.upload_progress_bar_outer
 div.upload_progress_bar_inner
 {
     background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-    width: 0px;
+    width: 0;
     height: 12px;
     margin: 1px;
 }
@@ -1613,7 +1613,7 @@ table#serverconnection_trg_local  {
   *  Ajax notification styling
   */
  .ajax_notification {
-    top: 0px;           /** The notification needs to be shown on the top of the page */
+    top: 0;           /** The notification needs to be shown on the top of the page */
     position: fixed;
     margin-top: 0;
     margin-right: auto;
@@ -1684,13 +1684,13 @@ table#serverconnection_trg_local  {
 }
 
 .format_specific_options h3 {
-    margin: 10px 0px 0px 10px;
-    border: 0px;
+    margin: 10px 0 0 10px;
+    border: 0;
 }
 
 .format_specific_options {
     border: 1px solid #999999;
-    margin: 7px 0px;
+    margin: 7px 0;
     padding: 3px;
 }
 
@@ -1706,7 +1706,7 @@ select#db_select, select#table_select {
 }
 
 .export_sub_options {
-    margin: 20px 0px 0px 30px;
+    margin: 20px 0 0 30px;
 }
 
 .export_sub_options h4 {
@@ -1730,7 +1730,7 @@ select#db_select, select#table_select {
  */
 
 .importoptions #import_notification {
-    margin: 10px 0px;
+    margin: 10px 0;
     font-style: italic;
 }
 
@@ -1739,7 +1739,7 @@ input#input_import_file {
 }
 
 .formelementrow {
-    margin: 5px 0px 5px 0px;
+    margin: 5px 0 5px 0;
 }
 
 /**
@@ -1824,12 +1824,12 @@ a.close_enum_editor {
 }
 
 #enum_editor #values, #enum_editor_no_js #values {
-    margin: 15px 0px;
+    margin: 15px 0;
     width: 100%;
 }
 
 #enum_editor #values input, #enum_editor_no_js #values input {
-    margin: 5px 0px;
+    margin: 5px 0;
     float: top;
     width: 100%;
 }
diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php
index d862015417..e6b586c08b 100644
--- a/themes/pmahomme/css/theme_left.css.php
+++ b/themes/pmahomme/css/theme_left.css.php
@@ -161,15 +161,15 @@ div#navidbpageselector select{
 }
 
 ul#databaseList ul {
-    margin:0px;
-    padding:0px;
+    margin: 0;
+    padding: 0;
 }
 
 ul#databaseList li {
     list-style: none;
     text-indent: 20px;
-    margin: 0px;
-    padding: 0px;
+    margin: 0;
+    padding: 0;
 }
 
 ul#databaseList a:hover {
@@ -190,7 +190,7 @@ div#reloadlink a img,
 div#leftframelinks a img.icon {
     margin:        0.3em;
     margin-top:    0.7em;
-    border:        0px;
+    border:        0;
 }
 
 div#leftframelinks a:hover img {
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 6da96cfd23..589fa54c68 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -60,7 +60,7 @@ h1 {
 h2 {
     font-size:          2em;
     font-weight:        normal;
-    text-shadow:        0px 1px 0px #fff;
+    text-shadow:        0 1px 0 #fff;
     padding:            10px 0 10px 3px;
     color:              #777;
 }
@@ -204,7 +204,7 @@ input[type=submit]{
     -webkit-border-radius: 12px;
     -moz-border-radius: 12px;
 
-    text-shadow: 0px 1px 0px #fff;
+    text-shadow: 0 1px 0 #fff;
 
     background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc);
     background-size: 100% 100%;
@@ -966,11 +966,11 @@ form.login label {
 
 /* topmenu */
 #topmenu a {
-    text-shadow:0px 1px 0px #fff;
+    text-shadow: 0 1px 0 #fff;
 }
 
 #topmenu .error {
-    background:#eee;border:0px !important;color:#aaa;
+    background:#eee;border: 0 !important;color:#aaa;
 }
 
 ul#topmenu, ul#topmenu2, ul.tabs {
@@ -1010,8 +1010,8 @@ ul#topmenu li, ul#topmenu2 li {
 
 ul#topmenu a, ul#topmenu span {
     display:            block;
-    margin:             0px;
-    padding:            0px;
+    margin:             0;
+    padding:            0;
     white-space:        nowrap;
 }
 
@@ -1056,7 +1056,7 @@ ul#topmenu ul li {
 
 ul#topmenu2 a {
     display:            block;
-    margin:             7px 6px 7px 0px;
+    margin:             7px 6px 7px 0;
     padding:            4px 10px;
     white-space:        nowrap;
     border:1px solid #ddd;
@@ -1150,7 +1150,7 @@ ul#topmenu2 a.tabactive {
 /* to be able to cancel the bottom border, use <li class="active"> */
 ul#topmenu > li.active {
     /* border-bottom:      0pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>; */
-    border-right:0px;
+    border-right: 0;
 }
 
 /* disabled tabs */
@@ -1412,8 +1412,8 @@ div.liveChart {
 }
 
 #addChartDialog input[type="text"] {
-    margin:0px;
-    padding:3px;
+    margin: 0;
+    padding: 3px;
 }
 
 div#chartVariableSettings {
@@ -1517,7 +1517,7 @@ table#serverVariables td {
 
 
 p.notice {
-    margin:             1.5em 0px;
+    margin:             1.5em 0;
     border:             1px solid #000;
     <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-repeat:  no-repeat;
@@ -1534,9 +1534,9 @@ p.notice {
     -moz-border-radius:5px;
     -webkit-border-radius:5px;
     border-radius:5px;
-    -moz-box-shadow: 0px 1px 2px #fff inset;
-    -webkit-box-shadow: 0px 1px 2px #fff inset;
-    box-shadow:0px 1px 2px #fff; inset;
+    -moz-box-shadow: 0 1px 2px #fff inset;
+    -webkit-box-shadow: 0 1px 2px #fff inset;
+    box-shadow: 0 1px 2px #fff; inset;
     background:#555;
     color:#d4fb6a;
 }
@@ -1604,14 +1604,14 @@ div#profilingchart {
     border-radius:5px;
     -webkit-border-radius:5px;
     -moz-border-radius:5px;
-    box-shadow:0px 1px 1px #fff inset;
-    -webkit-box-shadow:0px 1px 1px #fff inset;
-    -moz-box-shadow:0px 1px 1px #fff inset;
+    box-shadow: 0 1px 1px #fff inset;
+    -webkit-box-shadow: 0 1px 1px #fff inset;
+    -moz-box-shadow: 0 1px 1px #fff inset;
 }
 #sectionlinks a, .buttonlinks a, a.button {
     font-size:0.88em;
     font-weight:bold;
-    text-shadow: 0px 1px 0px #fff;
+    text-shadow: 0 1px 0 #fff;
     line-height:35px;
     margin-left:7px;
     border: 1px solid #aaa;
@@ -1627,7 +1627,7 @@ div#profilingchart {
     /*
     -webkit-box-shadow: 1px 1px 2px rgba(0,0,0,.5);
     -moz-box-shadow: 1px 1px 2px rgba(0,0,0,.5);
-    text-shadow: #fff 0px 1px 0px;
+    text-shadow: #fff 0 1px 0;
     */
     background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc);
     background-size: 100% 100%;
@@ -1954,7 +1954,7 @@ div.upload_progress_bar_outer
 div.upload_progress_bar_inner
 {
     background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-    width: 0px;
+    width: 0;
     height: 12px;
     margin: 1px;
 }
@@ -1977,7 +1977,7 @@ input[type=text].invalid_value,
   *  Ajax notification styling
   */
  .ajax_notification {
-    top: 0px;           /** The notification needs to be shown on the top of the page */
+    top: 0;           /** The notification needs to be shown on the top of the page */
     position: fixed;
     margin-top: 0;
     margin-right: auto;
@@ -2003,9 +2003,9 @@ input[type=text].invalid_value,
     border-radius:5px;
     -moz-border-radius:5px;
     -webkit-border-radius:5px;
-    box-shadow: 0px 5px 90px #888;
-    -moz-box-shadow: 0px 5px 90px #888;
-    -webkit-box-shadow: 0px 5px 90px #888;
+    box-shadow: 0 5px 90px #888;
+    -moz-box-shadow: 0 5px 90px #888;
+    -webkit-box-shadow: 0 5px 90px #888;
 }
 
 #loading_parent {
@@ -2057,7 +2057,7 @@ input[type=text].invalid_value,
     -webkit-border-radius: 12px;
     -moz-border-radius: 12px;
 
-    text-shadow: 0px 1px 0px #fff;
+    text-shadow: 0 1px 0 #fff;
 
     background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc);
     background-size: 100% 100%;
@@ -2077,13 +2077,13 @@ input[type=text].invalid_value,
 }
 
 .format_specific_options h3 {
-    margin: 10px 0px 0px 10px;
-    border: 0px;
+    margin: 10px 0 0 10px;
+    border: 0;
 }
 
 .format_specific_options {
     border: 1px solid #999999;
-    margin: 7px 0px;
+    margin: 7px 0;
     padding: 3px;
 }
 
@@ -2099,7 +2099,7 @@ select#db_select, select#table_select {
 }
 
 .export_sub_options {
-    margin: 20px 0px 0px 30px;
+    margin: 20px 0 0 30px;
 }
 
 .export_sub_options h4 {
@@ -2123,7 +2123,7 @@ select#db_select, select#table_select {
  */
 
 .importoptions #import_notification {
-    margin: 10px 0px;
+    margin: 10px 0;
     font-style: italic;
 }
 
@@ -2132,7 +2132,7 @@ input#input_import_file {
 }
 
 .formelementrow {
-    margin: 5px 0px 5px 0px;
+    margin: 5px 0 5px 0;
 }
 
 /**
@@ -2217,12 +2217,12 @@ a.close_enum_editor {
 }
 
 #enum_editor #values, #enum_editor_no_js #values {
-    margin: 15px 0px;
+    margin: 15px 0;
     width: 100%;
 }
 
 #enum_editor #values input, #enum_editor_no_js #values input {
-    margin: 5px 0px;
+    margin: 5px 0;
     float: top;
     width: 100%;
 }
@@ -2244,7 +2244,7 @@ a.close_enum_editor {
     background:#fff;
     line-height:24px;
     border:1px solid #aaa;
-    -moz-box-shadow:0px 3px 3px #ddd;
+    -moz-box-shadow: 0 3px 3px #ddd;
 }
 .structure_actions_dropdown span{display:block;}
 .structure_actions_dropdown span:hover{background:#ddd;}
@@ -2319,7 +2319,7 @@ iframe.IE_hack {
     margin:    0;
     padding:   0.5em;
     background: #fff;
-    border-top:0px;
+    border-top: 0;
 }
 
 .config-form fieldset .errors { /* form error list */
@@ -2552,7 +2552,7 @@ fieldset .disabled-field td {
 .toggleButton .toggleOn {
     color: white;
     padding: 0 1em;
-    text-shadow: 0px 0px 0.2em #000;
+    text-shadow: 0 0 0.2em #000;
 }
 .toggleButton .toggleOff {
     padding: 0 1em;