diff --git a/aqua/css/theme_left.css.php b/aqua/css/theme_left.css.php
index 21bdadec75..4f5578a3c7 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 8d652c5f3c..c2b01df9c6 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 79b822002d..9d62d16063 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 259458eebe..fb64edeb3e 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 a0e5f454c2..28e8467d38 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 21bdadec75..a0678ee928 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 8d652c5f3c..5bba3c4678 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 079fe9133d..197f29cb66 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 916df7642d..8c71f37a14 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 c74cdbcf37..838ac5176e 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 043a283523..33f45f99e2 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 b54b291011..b1dcf9cef2 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 9036a232e6..95325d0ae8 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 021e3b5afc..6a5c1f3f79 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 55d87faf22..58cd325a3c 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 b06bf0e221..a00dc69cfa 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 8d652c5f3c..357d3f662b 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 27e307fc4d..3d2dbeff9c 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 8997c2c691..b4f2315c33 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 35fff21cbb..014c08e52d 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 a80cf2dc6f..38d7ec69a1 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 dc2367bfbc..d8ac70f219 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 01fda6aca5..823a5296e3 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 d895ee2cd1..69283f254c 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 beb10cd802..f4bc7a4b06 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 e5d4985794..3c49f29ec8 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 8d652c5f3c..7a070a1bc2 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 9ab0110c26..53827672ac 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 0237c1c1bb..b0a877101f 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 23427a1d22..0f48e18ae8 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 f4c556a991..6abdcb96a8 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 5ba5929cfa..5a1cc7c7b5 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 8ea8f6bc21..a026eebbb9 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 441f8ada71..8bff994bd2 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 0ad9477440..51d3ad2b41 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 6440dd6ff0..92ce20aaf2 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 8d652c5f3c..bfaf887c71 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 d523dc27a7..35f6735bcc 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 e1542f4906..1947be1768 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 4cae30ba20..7be3fe6ff3 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 9ccf41ae81..25149abec3 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 6c61db3d2a..3643344501 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 69f36862d0..dc39561690 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 20f18d9f60..58211012d6 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 4482ec03f8..fa44930226 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 8d652c5f3c..b25da1d397 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 6da65663b7..1d4885d11e 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 6c95a1c2e1..18c5f9c705 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 ddb2cc8354..6e3c2bd742 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 3b4770382d..c8af36d2f4 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 0b385e6db9..eedfbfb15e 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 ed0ca8968f..0f520a823a 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 0fa6d6ccb2..1ea2aa550a 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 dbafad11bc..b09e62285d 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 6692c9de58..1ca3cb2068 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 8d652c5f3c..dbb8880173 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 a7d5dabb02..0f1b98a57c 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 31a8644430..3493d63e15 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 2d748f961d..7a8324d734 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 90da3762e2..e9e95e75d6 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 b54b291011..d20328d6c1 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 ddb6f96678..4064b296b4 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 c4f364efeb..3f5f92c0a7 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 55d87faf22..b89dc27431 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 3ae17a53e6..03b2d4da71 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 8d652c5f3c..7dbd164acb 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 0a41014dc6..a248fdd250 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 5a6d7b69e8..f4efac4c10 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 6403dafcb7..7158b2973f 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 cec891e626..c24806e329 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 ca0c7799bd..62d9da1205 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 6afe2f8af5..f5d95ace26 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 7cbd43745b..0c2902cdb4 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 7b979443a0..9333325fb6 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 31f4b2abed..407fe7127c 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 dc2367bfbc..5f2a4e8ef9 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 417ad87752..dd8c304631 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 4de2e90b92..c974747123 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 88954ad59f..f858137f00 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 d8df6d1b82..9ba4884cc9 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 e594350a8a..3b3c0ddcad 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 0066a5f7b4..073517a522 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 9a234e9041..35b64d5857 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 6931423a0b..1b0cd5fe8e 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 212b504218..4121594d5b 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 dc2367bfbc..35465fe557 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 d80ddc4ef7..76e21e8b40 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 84550935c9..3dc28f31aa 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 016b6c05c5..b7dd290336 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 daf6e87801..ed30c49c2c 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 dc2367bfbc..4e805b3baa 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 52af188f0d..7c76bbce88 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 76d7125d72..d22b68469e 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 a9324d2214..d77505145b 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