diff --git a/e107_plugins/calendar_menu/languages/English.php b/e107_plugins/calendar_menu/languages/English.php
index d11da328c..58b2ad4b8 100644
--- a/e107_plugins/calendar_menu/languages/English.php
+++ b/e107_plugins/calendar_menu/languages/English.php
@@ -1,26 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ?Steve Dun.an 2001-2002
-|     http://e107.org
-|     jali.@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2008-08-25 10:46:46 $
-|     $Author: e107steved $
-|
-+----------------------------------------------------------------------------+
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * These messages are for the 'user' pages of the event calendar (including event entry/editing)
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English.php,v $
+ * $Revision: 1.9 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
+ */
 
-These messages are for the 'user' pages of the event calendar (including event entry/editing)
-*/
-	
-	
 define('EC_ADLAN_1', "Event Calendar");
 define('EC_ADLAN_2', "Configure Event Calendar");
 define('EC_LAN_TODAY', "today");
@@ -268,5 +261,3 @@ define("NT_LAN_EC_8", "Event Calendar - Event modified");
 // Prefs - language defines can be used in various places where text is set through the admin screens
 define('EC_MAILOUT_SUBJECT', "Advice of calendar event");	// Use shortcode EC_MAIL_SUBJECT
 
-
-?>
\ No newline at end of file
diff --git a/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php b/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php
index bb0e978fa..8ecef33af 100644
--- a/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php
+++ b/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php
@@ -1,25 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ?Steve Dun.an 2001-2002
-|     http://e107.org
-|     jali.@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2008-12-07 21:41:04 $
-|     $Author: e107steved $
-|
-+----------------------------------------------------------------------------+
-
-Messages for admin pages of event calendar
-*/
-	
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * Messages for admin pages of event calendar
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
+ */
 	
 define('EC_ADLAN_1', "Event Calendar");
 
@@ -375,16 +368,7 @@ define('EC_ADLAN_A217', 'year/month');
 define('EC_ADLAN_A218', 'Update Settings');
 define('EC_ADLAN_A219', 'Icon:');
 define('EC_ADLAN_A220', 'Choose');
-define('EC_ADLAN_A221', '');
-define('EC_ADLAN_A222', '');
-define('EC_ADLAN_A223', '');
-define('EC_ADLAN_A224', '');
-define('EC_ADLAN_A225', '');
-define('EC_ADLAN_A226', '');
-define('EC_ADLAN_A227', '');
-define('EC_ADLAN_A228', '');
-define('EC_ADLAN_A229', '');
-define('EC_ADLAN_A230', '');
+
 
 /*
 // Notify
@@ -397,6 +381,3 @@ define("NT_LAN_EC_6", "Event Calendar - Event added");
 define("NT_LAN_EC_7", "New event posted");
 define("NT_LAN_EC_8", "Event Calendar - Event modified");
 */
-
-
-?>
\ No newline at end of file
diff --git a/e107_plugins/calendar_menu/languages/English_install.php b/e107_plugins/calendar_menu/languages/English_install.php
index 8615a5ea9..27892767c 100644
--- a/e107_plugins/calendar_menu/languages/English_install.php
+++ b/e107_plugins/calendar_menu/languages/English_install.php
@@ -1,24 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ?Steve Dun.an 2001-2002
-|     http://e107.org
-|     jali.@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English_install.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2008-08-11 21:24:42 $
-|     $Author: e107steved $
-|
-+----------------------------------------------------------------------------+
-
-These constants are used solely during install/uninstall - in some cases to set defaults into the database
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * These constants are used solely during install/uninstall - in some cases to set defaults into the database
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English_install.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
+ */
 
 // Install
 define('EC_ADINST_LAN_01', "Forthcoming event:\n\n{EC_MAIL_CATEGORY}\n\n{EC_MAIL_TITLE} on {EC_MAIL_HEADING_DATE}{EC_MAIL_TIME_START}\n\n
@@ -31,8 +25,3 @@ define('EC_ADINST_LAN_05', 'Configure Event Calendar');
 define('EC_ADINST_LAN_06', 'Default category entered');
 define('EC_ADINST_LAN_07', 'Error adding default category');
 define('EC_ADINST_LAN_08', 'Default category already in DB');
-define('EC_ADINST_LAN_09', '');
-define('EC_ADINST_LAN_10', '');
-define('EC_ADINST_LAN_11', '');
-
-?>
diff --git a/e107_plugins/calendar_menu/languages/English_log.php b/e107_plugins/calendar_menu/languages/English_log.php
index 377b1fe45..4307535b8 100644
--- a/e107_plugins/calendar_menu/languages/English_log.php
+++ b/e107_plugins/calendar_menu/languages/English_log.php
@@ -1,23 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ?Steve Dun.an 2001-2002
-|     http://e107.org
-|     jali.@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English_log.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2008-11-20 21:43:57 $
-|     $Author: e107steved $
-|
-+----------------------------------------------------------------------------+
-*/
-// Event calendar - messages for admin log titles	
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * Event calendar - messages for admin log titles
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English_log.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
+ */
 
 define('LAN_AL_EC_ADM_01', 'Event Calendar - add event');
 define('LAN_AL_EC_ADM_02', 'Event Calendar - edit event');
@@ -30,6 +25,3 @@ define('LAN_AL_EC_ADM_08', 'Event Calendar - Category added');
 define('LAN_AL_EC_ADM_09', 'Event Calendar - Category edited');
 define('LAN_AL_EC_ADM_10', 'Event Calendar - Category deleted');
 define('LAN_AL_EC_ADM_11', 'Event Calendar - Old events deleted');
-
-
-?>
diff --git a/e107_plugins/download/e_rss.php b/e107_plugins/download/e_rss.php
index d92b41354..43324bdac 100644
--- a/e107_plugins/download/e_rss.php
+++ b/e107_plugins/download/e_rss.php
@@ -1,20 +1,19 @@
 <?php
 /*
- + ----------------------------------------------------------------------------+
- |     e107 website system
- |
- |     Copyright (c) e107 Inc. 2001-2009
- |     http://e107.org
- |
- |     Released under the terms and conditions of the
- |     GNU General Public License (http://gnu.org).
- |
- |     $Source: /cvs_backup/e107_0.8/e107_plugins/download/e_rss.php,v $
- |     $Revision: 1.1 $
- |     $Date: 2009-09-18 19:07:09 $
- |     $Author: e107coders $
- +----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/download/e_rss.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 //##### create feed for admin, return array $eplug_rss_feed --------------------------------
@@ -92,5 +91,3 @@ if (!defined('e107_INIT')) { exit; }
 //##### ------------------------------------------------------------------------------------
 
 $eplug_rss_data[] = $rss;
-
-?>
\ No newline at end of file
diff --git a/e107_plugins/download/handlers/adminDownload_class.php b/e107_plugins/download/handlers/adminDownload_class.php
index 22092adf1..93b41ea6f 100644
--- a/e107_plugins/download/handlers/adminDownload_class.php
+++ b/e107_plugins/download/handlers/adminDownload_class.php
@@ -1,20 +1,19 @@
 <?php
 /*
- + ----------------------------------------------------------------------------+
- |     e107 website system
- |
- |     Copyright (c) e107 Inc. 2001-2009
- |     http://e107.org
- |
- |     Released under the terms and conditions of the
- |     GNU General Public License (http://gnu.org).
- |
- |     $Source: /cvs_backup/e107_0.8/e107_plugins/download/handlers/adminDownload_class.php,v $
- |     $Revision: 1.24 $
- |     $Date: 2009-11-12 21:46:13 $
- |     $Author: bugrain $
- +----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/download/handlers/adminDownload_class.php,v $
+ * $Revision: 1.25 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!e107::isInstalled('download')) { exit(); }
 
 require_once(e_PLUGIN.'download/handlers/download_class.php');
diff --git a/e107_plugins/download/handlers/category_class.php b/e107_plugins/download/handlers/category_class.php
index 3cc9259f4..accddf50c 100644
--- a/e107_plugins/download/handlers/category_class.php
+++ b/e107_plugins/download/handlers/category_class.php
@@ -1,20 +1,18 @@
 <?php
 /*
- + ----------------------------------------------------------------------------+
- |     e107 website system
- |
- |     Copyright (c) e107 Inc. 2001-2009
- |     http://e107.org
- |
- |     Released under the terms and conditions of the
- |     GNU General Public License (http://gnu.org).
- |
- |     $Source: /cvs_backup/e107_0.8/e107_plugins/download/handlers/category_class.php,v $
- |     $Revision: 1.3 $
- |     $Date: 2009-09-18 19:07:09 $
- |     $Author: e107coders $
- +----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/download/handlers/category_class.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!e107::isInstalled('download')) { exit(); }
 
diff --git a/e107_plugins/download/handlers/download_class.php b/e107_plugins/download/handlers/download_class.php
index fb88277df..ad4876ad1 100644
--- a/e107_plugins/download/handlers/download_class.php
+++ b/e107_plugins/download/handlers/download_class.php
@@ -1,20 +1,18 @@
 <?php
 /*
- + ----------------------------------------------------------------------------+
- |     e107 website system
- |
- |     Copyright (c) e107 Inc. 2001-2009
- |     http://e107.org
- |
- |     Released under the terms and conditions of the
- |     GNU General Public License (http://gnu.org).
- |
- |     $Source: /cvs_backup/e107_0.8/e107_plugins/download/handlers/download_class.php,v $
- |     $Revision: 1.4 $
- |     $Date: 2009-09-18 19:07:09 $
- |     $Author: e107coders $
- +----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/download/handlers/download_class.php,v $
+ * $Revision: 1.5 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
+ */
 
 if (!e107::isInstalled('download')) { exit(); }
 
diff --git a/e107_plugins/facebook/facebook_function.php b/e107_plugins/facebook/facebook_function.php
index 2c989c82f..63357e1fe 100644
--- a/e107_plugins/facebook/facebook_function.php
+++ b/e107_plugins/facebook/facebook_function.php
@@ -1,19 +1,17 @@
 <?php
 /*
- + ----------------------------------------------------------------------------+
- |     e107 website system
- |
- |     Copyright (c) e107 Inc. 2001-2009
- |     http://e107.org
- |
- |     Released under the terms and conditions of the
- |     GNU General Public License (http://gnu.org).
- |
- |     $Source: /cvs_backup/e107_0.8/e107_plugins/facebook/facebook_function.php,v $
- |     $Revision: 1.12 $
- |     $Date: 2009-11-17 14:31:43 $
- |     $Author: marj_nl_fr $
- +----------------------------------------------------------------------------+
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/facebook/facebook_function.php,v $
+ * $Revision: 1.13 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
  */
 
 if (!defined('e107_INIT'))
diff --git a/e107_plugins/import/languages/English_admin_import.php b/e107_plugins/import/languages/English_admin_import.php
index 6f38f3b10..e3da96d69 100644
--- a/e107_plugins/import/languages/English_admin_import.php
+++ b/e107_plugins/import/languages/English_admin_import.php
@@ -1,20 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     Copyright (c) e107 Inc. 2001-2009
-|     http://e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/import/languages/English_admin_import.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2009-07-20 15:24:34 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/languages/English_admin_import.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 define('LAN_CONTINUE','Continue');
@@ -67,18 +66,3 @@ define('LAN_CONVERT_45','Cannot read import code file');
 define('LAN_CONVERT_46','Error: --ERRNUM-- while writing to --DB-- database, line ');
 define('LAN_CONVERT_47','Block --BLOCK-- import completed. --LINES-- read, --USERS-- added, --ERRORS-- errors');
 define('LAN_CONVERT_48','Forum posts');
-define('LAN_CONVERT_49','');
-define('LAN_CONVERT_50','');
-define('LAN_CONVERT_51','');
-define('LAN_CONVERT_52','');
-define('LAN_CONVERT_53','');
-define('LAN_CONVERT_54','');
-define('LAN_CONVERT_55','');
-define('LAN_CONVERT_56','');
-define('LAN_CONVERT_57','');
-define('LAN_CONVERT_58','');
-define('LAN_CONVERT_59','');
-define('LAN_CONVERT_60','');
-
-
-?>
\ No newline at end of file
diff --git a/e107_plugins/rss_menu/admin_prefs.php b/e107_plugins/rss_menu/admin_prefs.php
index 2c5bbf3a1..ada1b0eda 100644
--- a/e107_plugins/rss_menu/admin_prefs.php
+++ b/e107_plugins/rss_menu/admin_prefs.php
@@ -1,20 +1,19 @@
 <?php
 /*
- + ----------------------------------------------------------------------------+
- |     e107 website system
- |
- |     Copyright (c) e107 Inc. 2001-2009
- |     http://e107.org
- |
- |     Released under the terms and conditions of the
- |     GNU General Public License (http://gnu.org).
- |
- |     $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/admin_prefs.php,v $
- |     $Revision: 1.7 $
- |     $Date: 2009-09-18 19:05:49 $
- |     $Author: e107coders $
- +----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/admin_prefs.php,v $
+ * $Revision: 1.8 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
+ */
+
 /*
 Notes:
 - array_flip method deprecated for delete item detection.
diff --git a/e107_themes/khatru/theme.php b/e107_themes/khatru/theme.php
index 61f2dc740..c4de2ae70 100644
--- a/e107_themes/khatru/theme.php
+++ b/e107_themes/khatru/theme.php
@@ -1,16 +1,19 @@
 <?php
 /*
-+---------------------------------------------------------------+
-|	e107 website system
-|
-|	?Steve Dunstan 2001-2005
-|	http://e107.org
-|	jalist@e107.org
-|
-|	Released under the terms and conditions of the
-|	GNU General Public License (http://gnu.org).
-+---------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_themes/khatru/theme.php,v $
+ * $Revision: 1.7 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 // [multilanguage]
@@ -233,4 +236,3 @@ $COMMENTSTYLE = "
 </table>
 <br />";
 
-?>
\ No newline at end of file
diff --git a/e107_themes/templates/admin_icons_template.php b/e107_themes/templates/admin_icons_template.php
index 9738b56b2..ecdaa3af6 100644
--- a/e107_themes/templates/admin_icons_template.php
+++ b/e107_themes/templates/admin_icons_template.php
@@ -2,16 +2,16 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2001-2010 e107 Inc (e107.org)
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  * Administration Icons, should handle all icons in the future (somehow)
  *
  * $Source: /cvs_backup/e107_0.8/e107_themes/templates/admin_icons_template.php,v $
- * $Revision: 1.1 $
- * $Date: 2009-11-12 16:45:35 $
- * $Author: secretr $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-18 02:03:35 $
+ * $Author: marj_nl_fr $
 */
 
 	define("ADMIN_TRUE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/true_16.png' alt='' />");