diff --git a/aqua/css/theme_left.css.php b/aqua/css/theme_left.css.php
index 21bdadec7..4f5578a3c 100644
--- a/aqua/css/theme_left.css.php
+++ b/aqua/css/theme_left.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Aqua
+ */
+
     // unplanned execution path
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
diff --git a/aqua/css/theme_print.css.php b/aqua/css/theme_print.css.php
index 8d652c5f3..c2b01df9c 100644
--- a/aqua/css/theme_print.css.php
+++ b/aqua/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Aqua
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/aqua/css/theme_right.css.php b/aqua/css/theme_right.css.php
index 79b822002..9d62d1606 100644
--- a/aqua/css/theme_right.css.php
+++ b/aqua/css/theme_right.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Aqua
+ */
+
     // unplanned execution path
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
diff --git a/aqua/info.inc.php b/aqua/info.inc.php
index 259458eeb..fb64edeb3 100644
--- a/aqua/info.inc.php
+++ b/aqua/info.inc.php
@@ -1,6 +1,17 @@
 <?php
-/* $Id$ */
-/* Theme information */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Aqua
+ */
+
+/**
+ *
+ */
 $theme_name = 'Aqua';
 $theme_full_version = '2.8';
 ?>
diff --git a/aqua/layout.inc.php b/aqua/layout.inc.php
index a0e5f454c..28e8467d3 100644
--- a/aqua/layout.inc.php
+++ b/aqua/layout.inc.php
@@ -1,7 +1,12 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * configures general layout
  * for detailed layout configuration please refer to the css files
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Aqua
  */
 
 /**
diff --git a/aqua_brushed/css/theme_left.css.php b/aqua_brushed/css/theme_left.css.php
index 21bdadec7..a0678ee92 100644
--- a/aqua_brushed/css/theme_left.css.php
+++ b/aqua_brushed/css/theme_left.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Aqua Brushed
+ */
+
     // unplanned execution path
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
diff --git a/aqua_brushed/css/theme_print.css.php b/aqua_brushed/css/theme_print.css.php
index 8d652c5f3..5bba3c467 100644
--- a/aqua_brushed/css/theme_print.css.php
+++ b/aqua_brushed/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Aqua Brushed
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/aqua_brushed/css/theme_right.css.php b/aqua_brushed/css/theme_right.css.php
index 079fe9133..197f29cb6 100644
--- a/aqua_brushed/css/theme_right.css.php
+++ b/aqua_brushed/css/theme_right.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Aqua Brushed
+ */
+
     // unplanned execution path
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
diff --git a/aqua_brushed/info.inc.php b/aqua_brushed/info.inc.php
index 916df7642..8c71f37a1 100644
--- a/aqua_brushed/info.inc.php
+++ b/aqua_brushed/info.inc.php
@@ -1,7 +1,18 @@
 <?php
-/* $Id$ */
-/* made By Luigi Saraullo <webluigi@gmail.com>*/
-/* Theme information */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
+ * made By Luigi Saraullo <webluigi@gmail.com>
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Aqua Brushed
+ */
+
+/**
+ *
+ */
 $theme_name = 'Aqua Brushed';
 $theme_full_version = '2.8';
 ?>
diff --git a/aqua_brushed/layout.inc.php b/aqua_brushed/layout.inc.php
index c74cdbcf3..838ac5176 100644
--- a/aqua_brushed/layout.inc.php
+++ b/aqua_brushed/layout.inc.php
@@ -1,7 +1,12 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * configures general layout
  * for detailed layout configuration please refer to the css files
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Aqua Brushed
  */
 
 /**
diff --git a/arctic_ocean/css/theme_left.css.php b/arctic_ocean/css/theme_left.css.php
index 043a28352..33f45f99e 100644
--- a/arctic_ocean/css/theme_left.css.php
+++ b/arctic_ocean/css/theme_left.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Arctic Ocean
+ */
+
     // unplanned execution path
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
diff --git a/arctic_ocean/css/theme_print.css.php b/arctic_ocean/css/theme_print.css.php
index b54b29101..b1dcf9cef 100644
--- a/arctic_ocean/css/theme_print.css.php
+++ b/arctic_ocean/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Arctic Ocean
+ */
+?>
 /* For printview */
 body {
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/arctic_ocean/css/theme_right.css.php b/arctic_ocean/css/theme_right.css.php
index 9036a232e..95325d0ae 100644
--- a/arctic_ocean/css/theme_right.css.php
+++ b/arctic_ocean/css/theme_right.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Arctic Ocean
+ */
+
     // unplanned execution path
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
diff --git a/arctic_ocean/info.inc.php b/arctic_ocean/info.inc.php
index 021e3b5af..6a5c1f3f7 100644
--- a/arctic_ocean/info.inc.php
+++ b/arctic_ocean/info.inc.php
@@ -1,5 +1,17 @@
 <?php
-/* Theme information */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Arctic Ocean
+ */
+
+/**
+ *
+ */
 $theme_name = 'Arctic Ocean';
 $theme_version = 2;
 $theme_generation = 2;
diff --git a/arctic_ocean/layout.inc.php b/arctic_ocean/layout.inc.php
index 55d87faf2..58cd325a3 100644
--- a/arctic_ocean/layout.inc.php
+++ b/arctic_ocean/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Arctic Ocean
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 170;          						// left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#d9e4f4';    						// background color for the left frame
diff --git a/cactica_blues/css/theme_left.css.php b/cactica_blues/css/theme_left.css.php
index b06bf0e22..a00dc69cf 100644
--- a/cactica_blues/css/theme_left.css.php
+++ b/cactica_blues/css/theme_left.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Cactica Blues
+ */
+?>
 /************************************************************************************
  * LEFT FRAME
  ************************************************************************************/
diff --git a/cactica_blues/css/theme_print.css.php b/cactica_blues/css/theme_print.css.php
index 8d652c5f3..357d3f662 100644
--- a/cactica_blues/css/theme_print.css.php
+++ b/cactica_blues/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Cactic Blues
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/cactica_blues/css/theme_right.css.php b/cactica_blues/css/theme_right.css.php
index 27e307fc4..3d2dbeff9 100644
--- a/cactica_blues/css/theme_right.css.php
+++ b/cactica_blues/css/theme_right.css.php
@@ -1,7 +1,14 @@
-/************************************************************************************
- * RIGHT FRAME
- ************************************************************************************/
-/* Always enabled stylesheets (right frame) */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Cactica Blues
+ */
+?>
+
 body{
     font-family:      Verdana, Arial, Helvetica, sans-serif;
     font-size:        10px;
diff --git a/cactica_blues/info.inc.php b/cactica_blues/info.inc.php
index 8997c2c69..b4f2315c3 100644
--- a/cactica_blues/info.inc.php
+++ b/cactica_blues/info.inc.php
@@ -1,11 +1,22 @@
 <?php
-/* $Id$ */
-/* Theme modified by Tony Casparro, Cactica Technologies */
-/* www.cactica.com */
-/*
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
+ * Theme modified by Tony Casparro, Cactica Technologies
+ * www.cactica.com
+ *
  * updated 2005-01-25 by Michael Keck (mkkeck@users.sourceforge.net)
  * for 2.6.1 and higher
-*/
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Cactica Blues
+ */
+
+/**
+ *
+ */
 $theme_name = 'CacticaBlues';
 $theme_version = 1;
 $theme_generation = 2;
diff --git a/cactica_blues/layout.inc.php b/cactica_blues/layout.inc.php
index 35fff21cb..014c08e52 100644
--- a/cactica_blues/layout.inc.php
+++ b/cactica_blues/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Cactica Blues
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 180;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#666699';    // background color for the left frame
diff --git a/darkblue_gray/css/theme_left.css.php b/darkblue_gray/css/theme_left.css.php
index a80cf2dc6..38d7ec69a 100644
--- a/darkblue_gray/css/theme_left.css.php
+++ b/darkblue_gray/css/theme_left.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Darkblue Grey
+ */
+?>
 /************************************************************************************
  * LEFT FRAME
  ************************************************************************************/
diff --git a/darkblue_gray/css/theme_print.css.php b/darkblue_gray/css/theme_print.css.php
index dc2367bfb..d8ac70f21 100644
--- a/darkblue_gray/css/theme_print.css.php
+++ b/darkblue_gray/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Darkblue Grey
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/darkblue_gray/css/theme_right.css.php b/darkblue_gray/css/theme_right.css.php
index 01fda6aca..823a5296e 100644
--- a/darkblue_gray/css/theme_right.css.php
+++ b/darkblue_gray/css/theme_right.css.php
@@ -1,7 +1,14 @@
-/************************************************************************************
- * RIGHT FRAME
- ************************************************************************************/
-/* Always enabled stylesheets (right frame) */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Darkblue Grey
+ */
+?>
+
 body{
     font-family:      Verdana, Arial, Helvetica, sans-serif;
     font-size:        10px;
diff --git a/darkblue_gray/info.inc.php b/darkblue_gray/info.inc.php
index d895ee2cd..69283f254 100644
--- a/darkblue_gray/info.inc.php
+++ b/darkblue_gray/info.inc.php
@@ -1,9 +1,19 @@
 <?php
-/* Theme information */
-/*
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
  * updated 2005-01-25 by Michael Keck (mkkeck@users.sourceforge.net)
  * for 2.6.1 and higher
-*/
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Darkblue Grey
+ */
+
+/**
+ *
+ */
 $theme_name = 'Darkblue/gray';
 $theme_version = 1;
 $theme_generation = 2;
diff --git a/darkblue_gray/layout.inc.php b/darkblue_gray/layout.inc.php
index beb10cd80..f4bc7a4b0 100644
--- a/darkblue_gray/layout.inc.php
+++ b/darkblue_gray/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Darkblue Gray
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 180;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#666666';    // background color for the left frame
diff --git a/garvblue/css/theme_left.css.php b/garvblue/css/theme_left.css.php
index e5d498579..3c49f29ec 100644
--- a/garvblue/css/theme_left.css.php
+++ b/garvblue/css/theme_left.css.php
@@ -1,9 +1,17 @@
-/************************************************************************************
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
  * Lightweight CSS for garvBlue theme. Even though some styles may not apply to every
  * state of the left frame, it's easier to drop all those IF-structures and do it the
  * human-readable way.
- ************************************************************************************/
-
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage garvBlue
+ */
+?>
 .parent {
     text-decoration:  none;
     display:          block;
diff --git a/garvblue/css/theme_print.css.php b/garvblue/css/theme_print.css.php
index 8d652c5f3..7a070a1bc 100644
--- a/garvblue/css/theme_print.css.php
+++ b/garvblue/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Garvblue
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/garvblue/css/theme_right.css.php b/garvblue/css/theme_right.css.php
index 9ab0110c2..53827672a 100644
--- a/garvblue/css/theme_right.css.php
+++ b/garvblue/css/theme_right.css.php
@@ -1,4 +1,13 @@
-/* Always enabled stylesheets (right frame) */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage garvBlue
+ */
+?>
 
 #leftFrameset, #mainFrameset,
 framset, frame {
diff --git a/garvblue/info.inc.php b/garvblue/info.inc.php
index 0237c1c1b..b0a877101 100644
--- a/garvblue/info.inc.php
+++ b/garvblue/info.inc.php
@@ -1,10 +1,20 @@
 <?php
-/* $Id$ */
-/* Theme information */
-/* Done By Garvin Hicking, http://www.supergarv.de/
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
+ * Done By Garvin Hicking, http://www.supergarv.de/
  * updated 2005-01-25 by Michael Keck (mkkeck@users.sourceforge.net)
  * for 2.6.1 and higher
-*/
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage garvBlue
+ */
+
+/**
+ *
+ */
 $theme_name = 'garvBlue';
 $theme_version = 2;
 $theme_generation = 1;
diff --git a/garvblue/layout.inc.php b/garvblue/layout.inc.php
index 23427a1d2..0f48e18ae 100644
--- a/garvblue/layout.inc.php
+++ b/garvblue/layout.inc.php
@@ -1,6 +1,16 @@
 <?php
-// Done By Garvin Hicking, http://www.supergarv.de/
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Done By Garvin Hicking, http://www.supergarv.de/
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage garvBlue
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 200;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#E8EAF1';    // background color for the left frame
diff --git a/graphivore/css/theme_left.css.php b/graphivore/css/theme_left.css.php
index f4c556a99..6abdcb96a 100644
--- a/graphivore/css/theme_left.css.php
+++ b/graphivore/css/theme_left.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Graphivore
+ */
+?>
 /************************************************************************************
  * LEFT FRAME
  ************************************************************************************/
diff --git a/graphivore/css/theme_print.css.php b/graphivore/css/theme_print.css.php
index 5ba5929cf..5a1cc7c7b 100644
--- a/graphivore/css/theme_print.css.php
+++ b/graphivore/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Graphivore
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/graphivore/css/theme_right.css.php b/graphivore/css/theme_right.css.php
index 8ea8f6bc2..a026eebbb 100644
--- a/graphivore/css/theme_right.css.php
+++ b/graphivore/css/theme_right.css.php
@@ -1,7 +1,14 @@
-/************************************************************************************
- * RIGHT FRAME
- ************************************************************************************/
-/* Always enabled stylesheets (right frame) */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Graphivore
+ */
+?>
+
 body{
     font-family:      Verdana, Arial, Helvetica, sans-serif;
     font-size:        10px;
diff --git a/graphivore/info.inc.php b/graphivore/info.inc.php
index 441f8ada7..8bff994bd 100644
--- a/graphivore/info.inc.php
+++ b/graphivore/info.inc.php
@@ -1,10 +1,19 @@
 <?php
-/* $Id$ */
-/* Theme information */
-/*
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
  * created 2005-09-15 by Yves De Troeyer (ydt@ydtconcept.org)
  * for 2.6.1 and higher
-*/
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Graphivore
+ */
+
+/**
+ *
+ */
 $theme_name = 'Graphivore';
 $theme_version = 1;
 $theme_generation = 2;
diff --git a/graphivore/layout.inc.php b/graphivore/layout.inc.php
index 0ad947744..51d3ad2b4 100644
--- a/graphivore/layout.inc.php
+++ b/graphivore/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Graphivore
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 200;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#AB9C72';    // background color for the left frame
diff --git a/green_orange/css/theme_left.css.php b/green_orange/css/theme_left.css.php
index 6440dd6ff..92ce20aaf 100644
--- a/green_orange/css/theme_left.css.php
+++ b/green_orange/css/theme_left.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Green Orange
+ */
+?>
 /************************************************************************************
  * LEFT FRAME
  ************************************************************************************/
diff --git a/green_orange/css/theme_print.css.php b/green_orange/css/theme_print.css.php
index 8d652c5f3..bfaf887c7 100644
--- a/green_orange/css/theme_print.css.php
+++ b/green_orange/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Green Orange
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/green_orange/css/theme_right.css.php b/green_orange/css/theme_right.css.php
index d523dc27a..35f6735bc 100644
--- a/green_orange/css/theme_right.css.php
+++ b/green_orange/css/theme_right.css.php
@@ -1,7 +1,14 @@
-/************************************************************************************
- * RIGHT FRAME
- ************************************************************************************/
-/* Always enabled stylesheets (right frame) */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Green Orange
+ */
+?>
+
 body{
     font-family:      Verdana, Arial, Helvetica, sans-serif;
     font-size:        10px;
diff --git a/green_orange/info.inc.php b/green_orange/info.inc.php
index e1542f490..1947be176 100644
--- a/green_orange/info.inc.php
+++ b/green_orange/info.inc.php
@@ -1,10 +1,19 @@
 <?php
-/* $Id$ */
-/* Theme information */
-/*
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
  * updated 2005-01-25 by Michael Keck (mkkeck@users.sourceforge.net)
  * for 2.6.1 and higher
-*/
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Green Orange
+ */
+
+/**
+ *
+ */
 $theme_name = 'Green/Orange';
 $theme_version = 1;
 $theme_generation = 2;
diff --git a/green_orange/layout.inc.php b/green_orange/layout.inc.php
index 4cae30ba2..7be3fe6ff 100644
--- a/green_orange/layout.inc.php
+++ b/green_orange/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Green Orange
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 180;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#31736B';    // background color for the left frame
diff --git a/grid/css/theme_left.css.php b/grid/css/theme_left.css.php
index 9ccf41ae8..25149abec 100644
--- a/grid/css/theme_left.css.php
+++ b/grid/css/theme_left.css.php
@@ -1,4 +1,12 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @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();
diff --git a/grid/css/theme_right.css.php b/grid/css/theme_right.css.php
index 6c61db3d2..364334450 100644
--- a/grid/css/theme_right.css.php
+++ b/grid/css/theme_right.css.php
@@ -1,5 +1,14 @@
 <?php
-/* theme_right.css.php 2006-12-29 IE6 sql window fix 2do:pma28 hover th?*/
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *theme_right.css.php 2006-12-29 IE6 sql window fix 2do:pma28 hover th?
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Grid
+ */
+
 // unplanned execution path
 if(!defined('PMA_MINIMUM_COMMON')) exit();
 
diff --git a/grid/info.inc.php b/grid/info.inc.php
index 69f36862d..dc3956169 100644
--- a/grid/info.inc.php
+++ b/grid/info.inc.php
@@ -1,6 +1,5 @@
 <?php
-/* info.inc.php 2006/06/19 cybot_tm | 2007/02/11 windkiel */
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * 2007-02-11 working with version 2.8 .. 2.1x.x ...
  * differs from theme "original" (2.9) in:
@@ -14,9 +13,14 @@
  * comments, suggestions, bugreports are welcome:
  * http://sourceforge.net/users/windkiel/
  *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Grid
  */
 
-/* Theme information */
+/**
+ *
+ */
 $theme_name = 'Grid';
 $theme_version = 2;
 $theme_full_version = '2.9';
diff --git a/grid/layout.inc.php b/grid/layout.inc.php
index 20f18d9f6..58211012d 100644
--- a/grid/layout.inc.php
+++ b/grid/layout.inc.php
@@ -1,5 +1,8 @@
 <?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
@@ -9,10 +12,10 @@
  * comments, suggestions, bugreports are welcome:
  * http://sourceforge.net/users/windkiel/
  * no '' allowed, except for Font.. ..Link.. ..Marke...(frame reload may be needed after changes)
- */
-
-/**
- * Navi frame (called "Left frame" in older versions)
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Grid
  */
 
 // for this theme almost all settings (except "SPQ") can be done in config.inc.php :
diff --git a/openphpnuke/css/theme_left.css.php b/openphpnuke/css/theme_left.css.php
index 4482ec03f..fa4493022 100644
--- a/openphpnuke/css/theme_left.css.php
+++ b/openphpnuke/css/theme_left.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage OpenPHPNuke
+ */
+
     if (isset($num_dbs) && $num_dbs == '0') {
     ?>
 /* No layer effects neccessary */
diff --git a/openphpnuke/css/theme_print.css.php b/openphpnuke/css/theme_print.css.php
index 8d652c5f3..b25da1d39 100644
--- a/openphpnuke/css/theme_print.css.php
+++ b/openphpnuke/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage OpenPHPNuke
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/openphpnuke/css/theme_right.css.php b/openphpnuke/css/theme_right.css.php
index 6da65663b..1d4885d11 100644
--- a/openphpnuke/css/theme_right.css.php
+++ b/openphpnuke/css/theme_right.css.php
@@ -1,3 +1,14 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage OpenPHPNuke
+ */
+?>
+
 body {font:<?php echo $font_size; ?> Arial,Verdana,Helvetica,sans-serif; color:#000000; background:#FFFFFF url(themes/openphpnuke/img/vertical_line.png) repeat-y;}
 
 pre, tt					{font-size:<?php echo $font_size; ?>;}
diff --git a/openphpnuke/info.inc.php b/openphpnuke/info.inc.php
index 6c95a1c2e..18c5f9c70 100644
--- a/openphpnuke/info.inc.php
+++ b/openphpnuke/info.inc.php
@@ -1,10 +1,19 @@
 <?php
-/* $Id$ */
-/* Theme information */
-/*
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
  * 2005-04-13 by DigitalPixel @ www.openphpnuke.info
  * for 2.6.0 or higher
-*/
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage OpenPHPNuke
+ */
+
+/**
+ *
+ */
 $theme_name = 'OpenPHPNuke';
 $theme_version = 2;
 $theme_generation = 1;
diff --git a/openphpnuke/layout.inc.php b/openphpnuke/layout.inc.php
index ddb2cc835..6e3c2bd74 100644
--- a/openphpnuke/layout.inc.php
+++ b/openphpnuke/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage OpenPHPNuke
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 250;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#1CC2F8';    // background color for the left frame
diff --git a/original_small/css/theme_left.css.php b/original_small/css/theme_left.css.php
index 3b4770382..c8af36d2f 100644
--- a/original_small/css/theme_left.css.php
+++ b/original_small/css/theme_left.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Original Small
+ */
+
 // unplanned execution path
 if (!defined('PMA_MINIMUM_COMMON')) {
     exit();
diff --git a/original_small/css/theme_print.css.php b/original_small/css/theme_print.css.php
index 0b385e6db..eedfbfb15 100644
--- a/original_small/css/theme_print.css.php
+++ b/original_small/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Original Small
+ */
+?>
 /* For printview */
 body, table, th, td {
     color:             #000000;
diff --git a/original_small/css/theme_right.css.php b/original_small/css/theme_right.css.php
index ed0ca8968..0f520a823 100644
--- a/original_small/css/theme_right.css.php
+++ b/original_small/css/theme_right.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Original Small
+ */
+
     // unplanned execution path
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
diff --git a/original_small/info.inc.php b/original_small/info.inc.php
index 0fa6d6ccb..1ea2aa550 100644
--- a/original_small/info.inc.php
+++ b/original_small/info.inc.php
@@ -1,6 +1,17 @@
 <?php
-/* $Id$ */
-/* Theme information */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Original Small
+ */
+
+/**
+ *
+ */
 $theme_name = 'Original small';
 $theme_full_version = '2.9';
 ?>
diff --git a/original_small/layout.inc.php b/original_small/layout.inc.php
index dbafad11b..b09e62285 100644
--- a/original_small/layout.inc.php
+++ b/original_small/layout.inc.php
@@ -1,7 +1,12 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * configures general layout
  * for detailed layout configuration please refer to the css files
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Original Small
  */
 
 /**
diff --git a/paradice/css/theme_left.css.php b/paradice/css/theme_left.css.php
index 6692c9de5..1ca3cb206 100644
--- a/paradice/css/theme_left.css.php
+++ b/paradice/css/theme_left.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Paradice
+ */
+
     // unplanned execution path
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
diff --git a/paradice/css/theme_print.css.php b/paradice/css/theme_print.css.php
index 8d652c5f3..dbb888017 100644
--- a/paradice/css/theme_print.css.php
+++ b/paradice/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Paradice
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/paradice/css/theme_right.css.php b/paradice/css/theme_right.css.php
index a7d5dabb0..0f1b98a57 100644
--- a/paradice/css/theme_right.css.php
+++ b/paradice/css/theme_right.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Paradice
+ */
+
     // unplanned execution path
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
diff --git a/paradice/info.inc.php b/paradice/info.inc.php
index 31a864443..3493d63e1 100644
--- a/paradice/info.inc.php
+++ b/paradice/info.inc.php
@@ -1,5 +1,17 @@
 <?php
-/* Theme information */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Paradice
+ */
+
+/**
+ *
+ */
 $theme_name = 'Paradice';
 $theme_version = 2;
 $theme_generation = 2;
diff --git a/paradice/layout.inc.php b/paradice/layout.inc.php
index 2d748f961..7a8324d73 100644
--- a/paradice/layout.inc.php
+++ b/paradice/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Paradice
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 180;          						// left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#3674CF';    						// background color for the left frame
diff --git a/very_small/css/theme_left.css.php b/very_small/css/theme_left.css.php
index 90da3762e..e9e95e75d 100644
--- a/very_small/css/theme_left.css.php
+++ b/very_small/css/theme_left.css.php
@@ -1,6 +1,13 @@
-/************************************************************************************
- * LEFT FRAME
- ************************************************************************************/
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Very Small
+ */
+?>
 
 #body_leftFrame {
     padding-top:           0px;
diff --git a/very_small/css/theme_print.css.php b/very_small/css/theme_print.css.php
index b54b29101..d20328d6c 100644
--- a/very_small/css/theme_print.css.php
+++ b/very_small/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Very Small
+ */
+?>
 /* For printview */
 body {
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/very_small/css/theme_right.css.php b/very_small/css/theme_right.css.php
index ddb6f9667..4064b296b 100644
--- a/very_small/css/theme_right.css.php
+++ b/very_small/css/theme_right.css.php
@@ -1,4 +1,13 @@
-/* STYLE FOR THE RIGHT (MAIN) FRAME */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Very Small
+ */
+?>
 
 #mainFrameset, #leftFrameset, frameset, frame {
     margin:              0 !important;
diff --git a/very_small/info.inc.php b/very_small/info.inc.php
index c4f364efe..3f5f92c0a 100644
--- a/very_small/info.inc.php
+++ b/very_small/info.inc.php
@@ -1,5 +1,17 @@
 <?php
-/* Theme information */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Very Small
+ */
+
+/**
+ *
+ */
 $theme_name = 'Very small';
 $theme_version = 2;
 $theme_generation = 2;
diff --git a/very_small/layout.inc.php b/very_small/layout.inc.php
index 55d87faf2..b89dc2743 100644
--- a/very_small/layout.inc.php
+++ b/very_small/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Very Small
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 170;          						// left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#d9e4f4';    						// background color for the left frame
diff --git a/xampp/css/theme_left.css.php b/xampp/css/theme_left.css.php
index 3ae17a53e..03b2d4da7 100644
--- a/xampp/css/theme_left.css.php
+++ b/xampp/css/theme_left.css.php
@@ -1,15 +1,15 @@
-/************************************************************************************
- * LEFT FRAME
- ************************************************************************************/
-
-    /**
-     * Add styles for positioned layers
-    **/
-/*
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XAMPP
+ */
+
     if (isset($num_dbs) && $num_dbs == '0') {
 ?>
-*/
 /* No layer effects neccessary */
 div{
     font-family:      Verdana, Arial, Helvetica, sans-serif;
diff --git a/xampp/css/theme_print.css.php b/xampp/css/theme_print.css.php
index 8d652c5f3..7dbd164ac 100644
--- a/xampp/css/theme_print.css.php
+++ b/xampp/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XAMPP
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/xampp/css/theme_right.css.php b/xampp/css/theme_right.css.php
index 0a41014dc..a248fdd25 100644
--- a/xampp/css/theme_right.css.php
+++ b/xampp/css/theme_right.css.php
@@ -1,7 +1,14 @@
-/************************************************************************************
- * RIGHT FRAME
- ************************************************************************************/
-/* Always enabled stylesheets (right frame) */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XAMPP
+ */
+?>
+
 body{
     font-family:      Verdana, Arial, Helvetica, sans-serif;
     font-size:        10px;
diff --git a/xampp/info.inc.php b/xampp/info.inc.php
index 5a6d7b69e..f4efac4c1 100644
--- a/xampp/info.inc.php
+++ b/xampp/info.inc.php
@@ -1,9 +1,19 @@
 <?php
-/* Theme information */
-/*
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ *
  * 2005-01-25 by Michael Keck (mkkeck@users.sourceforge.net)
  * for 2.6.1 and higher
-*/
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XAMPP
+ */
+
+/**
+ *
+ */
 $theme_name = 'XAMPP (Apachefriends.org)';
 $theme_version = 2;
 $theme_generation = 1;
diff --git a/xampp/layout.inc.php b/xampp/layout.inc.php
index 6403dafcb..7158b2973 100644
--- a/xampp/layout.inc.php
+++ b/xampp/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XAMPP
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 180;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#fb7922';    // background color for the left frame
diff --git a/xp_basic/css/theme_left.css.php b/xp_basic/css/theme_left.css.php
index cec891e62..c24806e32 100644
--- a/xp_basic/css/theme_left.css.php
+++ b/xp_basic/css/theme_left.css.php
@@ -1,4 +1,13 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Basic
+ */
+
     if (isset($num_dbs) && $num_dbs == '0') {
     ?>
 /* No layer effects neccessary */
diff --git a/xp_basic/css/theme_print.css.php b/xp_basic/css/theme_print.css.php
index ca0c7799b..62d9da120 100644
--- a/xp_basic/css/theme_print.css.php
+++ b/xp_basic/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Basic
+ */
+?>
 /* For printview */
 body{
     font-family:       Tahoma, Verdana, Arial, Helvetica, sans-serif;
diff --git a/xp_basic/css/theme_right.css.php b/xp_basic/css/theme_right.css.php
index 6afe2f8af..f5d95ace2 100644
--- a/xp_basic/css/theme_right.css.php
+++ b/xp_basic/css/theme_right.css.php
@@ -1,4 +1,14 @@
-/* Always enabled stylesheets (right frame) */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Basic
+ */
+?>
+
 body {
     font-family: <?php echo $right_font_family; ?>;
     font-size: <?php echo $font_size; ?>;
diff --git a/xp_basic/info.inc.php b/xp_basic/info.inc.php
index 7cbd43745..0c2902cdb 100644
--- a/xp_basic/info.inc.php
+++ b/xp_basic/info.inc.php
@@ -1,8 +1,19 @@
 <?php
-/* Theme information */
-/* Theme by Vladan Zirojevic (zira@volomp.com)
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
+ * Theme by Vladan Zirojevic (zira@volomp.com)
  * Updated by Michael Keck (mkkeck@users.sourceforge.net)
  * for 2.6.1 and higher
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Basic
+ */
+
+/**
+ *
  */
 $theme_name = 'WinXP (basic)';
 $theme_version = 1;
diff --git a/xp_basic/layout.inc.php b/xp_basic/layout.inc.php
index 7b979443a..9333325fb 100644
--- a/xp_basic/layout.inc.php
+++ b/xp_basic/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Basic
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 260;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#6375D6';    // background color for the left frame
diff --git a/xp_blue/css/theme_left.css.php b/xp_blue/css/theme_left.css.php
index 31f4b2abe..407fe7127 100644
--- a/xp_blue/css/theme_left.css.php
+++ b/xp_blue/css/theme_left.css.php
@@ -1,15 +1,15 @@
-/************************************************************************************
- * LEFT FRAME
- ************************************************************************************/
-
-    /**
-     * Add styles for positioned layers
-    **/
-/*
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Blue
+ */
+
     if (isset($num_dbs) && $num_dbs == '0') {
 ?>
-*/
 /* No layer effects neccessary */
 div{
     font-family:      Arial, Helvetica, Verdana, sans-serif;
diff --git a/xp_blue/css/theme_print.css.php b/xp_blue/css/theme_print.css.php
index dc2367bfb..5f2a4e8ef 100644
--- a/xp_blue/css/theme_print.css.php
+++ b/xp_blue/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Blue
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/xp_blue/css/theme_right.css.php b/xp_blue/css/theme_right.css.php
index 417ad8775..dd8c30463 100644
--- a/xp_blue/css/theme_right.css.php
+++ b/xp_blue/css/theme_right.css.php
@@ -1,7 +1,14 @@
-/************************************************************************************
- * RIGHT FRAME
- ************************************************************************************/
-/* Always enabled stylesheets (right frame) */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Blue
+ */
+?>
+
 body{
     font-family:      Arial, Helvetica, Verdana, sans-serif;
     font-size:        12px;
diff --git a/xp_blue/info.inc.php b/xp_blue/info.inc.php
index 4de2e90b9..c97474712 100644
--- a/xp_blue/info.inc.php
+++ b/xp_blue/info.inc.php
@@ -1,9 +1,19 @@
 <?php
-/* Theme information */
-/*
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
  * 2005-01-25 by Michael Keck (mkkeck@users.sourceforge.net)
  * for 2.6.1 and higher
-*/
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Blue
+ */
+
+/**
+ *
+ */
 $theme_name = 'WinXP (blue)';
 $theme_version = 2;
 $theme_generation = 1;
diff --git a/xp_blue/layout.inc.php b/xp_blue/layout.inc.php
index 88954ad59..f858137f0 100644
--- a/xp_blue/layout.inc.php
+++ b/xp_blue/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Blue
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 180;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#6375D6';    // background color for the left frame
diff --git a/xp_dirty/css/theme_left.css.php b/xp_dirty/css/theme_left.css.php
index d8df6d1b8..9ba4884cc 100644
--- a/xp_dirty/css/theme_left.css.php
+++ b/xp_dirty/css/theme_left.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Dirty
+ */
+?>
 body, input, select {
     font-family: <?php echo $left_font_family; ?>;
     font-size: <?php echo $font_size; ?>;
diff --git a/xp_dirty/css/theme_print.css.php b/xp_dirty/css/theme_print.css.php
index e594350a8..3b3c0ddca 100644
--- a/xp_dirty/css/theme_print.css.php
+++ b/xp_dirty/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Dirty
+ */
+?>
 /* For printview */
 body{
     font-family:       Tahoma, Verdana, Arial, Hevetica, sans-serif;
diff --git a/xp_dirty/css/theme_right.css.php b/xp_dirty/css/theme_right.css.php
index 0066a5f7b..073517a52 100644
--- a/xp_dirty/css/theme_right.css.php
+++ b/xp_dirty/css/theme_right.css.php
@@ -1,4 +1,14 @@
-/* Always enabled stylesheets (right frame) */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Dirty
+ */
+?>
+
 body {
     font-family: <?php echo $right_font_family; ?>;
     font-size: <?php echo $font_size; ?>;
diff --git a/xp_dirty/info.inc.php b/xp_dirty/info.inc.php
index 9a234e904..35b64d585 100644
--- a/xp_dirty/info.inc.php
+++ b/xp_dirty/info.inc.php
@@ -1,8 +1,20 @@
 <?php
-/* Theme information */
-/* Theme by [OTD]Spockman(spockman@otd-clan.org) */
-/* Based on WinXP Theme */
-/* for 2.6.0 to 2.7.0 */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
+ * Theme by [OTD]Spockman(spockman@otd-clan.org)
+ * Based on WinXP Theme
+ * for 2.6.0 to 2.7.0
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Dirty
+ */
+
+/**
+ *
+ */
 $theme_name = 'WinXP Dirty';
 $theme_version = 2;
 $theme_generation = 2;
diff --git a/xp_dirty/layout.inc.php b/xp_dirty/layout.inc.php
index 6931423a0..1b0cd5fe8 100644
--- a/xp_dirty/layout.inc.php
+++ b/xp_dirty/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Dirty
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 185;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#666633';    // background color for the left frame
diff --git a/xp_green/css/theme_left.css.php b/xp_green/css/theme_left.css.php
index 212b50421..4121594d5 100644
--- a/xp_green/css/theme_left.css.php
+++ b/xp_green/css/theme_left.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Green
+ */
+?>
 /************************************************************************************
  * LEFT FRAME
  ************************************************************************************/
diff --git a/xp_green/css/theme_print.css.php b/xp_green/css/theme_print.css.php
index dc2367bfb..35465fe55 100644
--- a/xp_green/css/theme_print.css.php
+++ b/xp_green/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Green
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/xp_green/css/theme_right.css.php b/xp_green/css/theme_right.css.php
index d80ddc4ef..76e21e8b4 100644
--- a/xp_green/css/theme_right.css.php
+++ b/xp_green/css/theme_right.css.php
@@ -1,7 +1,14 @@
-/************************************************************************************
- * RIGHT FRAME
- ************************************************************************************/
-/* Always enabled stylesheets (right frame) */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Green
+ */
+?>
+
 body{
     font-family:      Arial, Helvetica, Verdana, sans-serif;
     font-size:        12px;
diff --git a/xp_green/info.inc.php b/xp_green/info.inc.php
index 84550935c..3dc28f31a 100644
--- a/xp_green/info.inc.php
+++ b/xp_green/info.inc.php
@@ -1,9 +1,19 @@
 <?php
-/* Theme information */
-/*
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
  * 2005-01-25 by Michael Keck (mkkeck@users.sourceforge.net)
  * for 2.6.1 and higher
-*/
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Green
+ */
+
+/**
+ *
+ */
 $theme_name = 'WinXP (green)';
 $theme_version = 2;
 $theme_generation = 1;
diff --git a/xp_green/layout.inc.php b/xp_green/layout.inc.php
index 016b6c05c..b7dd29033 100644
--- a/xp_green/layout.inc.php
+++ b/xp_green/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Green
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 180;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#cbd8ac';    // background color for the left frame
diff --git a/xp_silver/css/theme_left.css.php b/xp_silver/css/theme_left.css.php
index daf6e8780..ed30c49c2 100644
--- a/xp_silver/css/theme_left.css.php
+++ b/xp_silver/css/theme_left.css.php
@@ -1,15 +1,15 @@
-/************************************************************************************
- * LEFT FRAME
- ************************************************************************************/
-
-    /**
-     * Add styles for positioned layers
-    **/
-/*
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Silver
+ */
+
     if (isset($num_dbs) && $num_dbs == '0') {
 ?>
-*/
 /* No layer effects neccessary */
 div{
     font-family:      Arial, Helvetica, Verdana, sans-serif;
diff --git a/xp_silver/css/theme_print.css.php b/xp_silver/css/theme_print.css.php
index dc2367bfb..4e805b3ba 100644
--- a/xp_silver/css/theme_print.css.php
+++ b/xp_silver/css/theme_print.css.php
@@ -1,3 +1,13 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * print css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Silver
+ */
+?>
 /* For printview */
 body{
     font-family:       Verdana, Arial, Helvetica, sans-serif;
diff --git a/xp_silver/css/theme_right.css.php b/xp_silver/css/theme_right.css.php
index 52af188f0..7c76bbce8 100644
--- a/xp_silver/css/theme_right.css.php
+++ b/xp_silver/css/theme_right.css.php
@@ -1,7 +1,14 @@
-/************************************************************************************
- * RIGHT FRAME
- ************************************************************************************/
-/* Always enabled stylesheets (right frame) */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * main css file from theme
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Silver
+ */
+?>
+
 body{
     font-family:      Arial, Helvetica, Verdana, sans-serif;
     font-size:        12px;
diff --git a/xp_silver/info.inc.php b/xp_silver/info.inc.php
index 76d7125d7..d22b68469 100644
--- a/xp_silver/info.inc.php
+++ b/xp_silver/info.inc.php
@@ -1,9 +1,19 @@
 <?php
-/* Theme information */
-/*
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ * 
  * 2005-01-25 by Michael Keck (mkkeck@users.sourceforge.net)
  * for 2.6.1 and higher
-*/
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Silver
+ */
+
+/**
+ *
+ */
 $theme_name = 'WinXP (silver)';
 $theme_version = 2;
 $theme_generation = 1;
diff --git a/xp_silver/layout.inc.php b/xp_silver/layout.inc.php
index a9324d221..d77505145 100644
--- a/xp_silver/layout.inc.php
+++ b/xp_silver/layout.inc.php
@@ -1,5 +1,15 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage XP Silver
+ */
 
+/**
+ *
+ */
 $cfg['LeftWidth']           = 180;          // left frame width
 /* colors */
 $cfg['LeftBgColor']         = '#c2c6d3';    // background color for the left frame