diff --git a/e107_plugins/content/content.php b/e107_plugins/content/content.php
index ffe52ebd8..a1b5839dc 100644
--- a/e107_plugins/content/content.php
+++ b/e107_plugins/content/content.php
@@ -1,20 +1,26 @@
 <?php
 /*
- * 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/content/content.php,v $
- * $Revision$
- * $Date$
- * $Author$
- */
+* e107 website system
+*
+* Copyright (C) 2008-2011 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* Content management main file
+*
+* $URL$
+* $Id$
+*
+*/
+
+require_once('../../class2.php');
+$e107 = e107::getInstance();
+if (!$e107->isInstalled('content')) 
+{
+	header('Location: '.e_BASE.'index.php');
+	exit;
+}
 
-require_once("../../class2.php");
 $plugindir = e_PLUGIN."content/";
 require_once($plugindir."content_shortcodes.php");
 require_once(e_HANDLER."emailprint_class.php");
diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php
index 44d2122ca..caf9f86cf 100644
--- a/e107_plugins/forum/forum.php
+++ b/e107_plugins/forum/forum.php
@@ -2,7 +2,7 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2010 e107 Inc (e107.org)
+ * Copyright (C) 2008-2011 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
@@ -16,6 +16,12 @@ if(!defined('e107_INIT'))
 {
 	require_once('../../class2.php');
 }
+$e107 = e107::getInstance();
+if (!$e107->isInstalled('forum')) 
+{
+	header('Location: '.e_BASE.'index.php');
+	exit;
+}
 
 include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum.php');
 
diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php
index a06c919f4..8e08316de 100644
--- a/e107_plugins/forum/forum_viewforum.php
+++ b/e107_plugins/forum/forum_viewforum.php
@@ -2,7 +2,7 @@
 /*
 * e107 website system
 *
-* Copyright (C) 2008-2009 e107 Inc (e107.org)
+* Copyright (C) 2008-2011 e107 Inc (e107.org)
 * Released under the terms and conditions of the
 * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
 *
@@ -14,6 +14,12 @@
 */
 
 require_once('../../class2.php');
+$e107 = e107::getInstance();
+if (!$e107->isInstalled('forum')) 
+{
+	header('Location: '.e_BASE.'index.php');
+	exit;
+}
 include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_viewforum.php');
 
 if (isset($_POST['fjsubmit']))
diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php
index 79623bbe1..aea7605f7 100644
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -2,7 +2,7 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2011 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
@@ -14,6 +14,12 @@
 */
 
 require_once ('../../class2.php');
+$e107 = e107::getInstance();
+if (!$e107->isInstalled('forum')) 
+{
+	header('Location: '.e_BASE.'index.php');
+	exit;
+}
 
 if (isset($_POST['fjsubmit']))
 {
diff --git a/e107_plugins/poll/poll.php b/e107_plugins/poll/poll.php
index fb08c4fac..a180ef973 100644
--- a/e107_plugins/poll/poll.php
+++ b/e107_plugins/poll/poll.php
@@ -2,28 +2,26 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2011 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
+ * Poll plugin main page display
  *
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll.php,v $
- * $Revision$
- * $Date$
- * $Author$
+ * $URL$
+ * $Id$
  */
 
-require_once("../../class2.php");
+require_once('../../class2.php');
 if (!plugInstalled('poll')) 
 {
-	header("Location: ".e_BASE."index.php");
+	header('Location: '.e_BASE.'index.php');
 	exit;
 }
 
 require_once(HEADERF);
 
-require_once(e_PLUGIN."poll/poll_menu.php");
+require(e_PLUGIN.'poll/poll_menu.php');
 
 
 require_once(FOOTERF);
diff --git a/e107_plugins/rss_menu/rss.php b/e107_plugins/rss_menu/rss.php
index 2b5847f78..9af721b11 100644
--- a/e107_plugins/rss_menu/rss.php
+++ b/e107_plugins/rss_menu/rss.php
@@ -1,18 +1,17 @@
 <?php
 /*
- * 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/rss.php,v $
- * $Revision$
- * $Date$
- * $Author$
- */
+* e107 website system
+*
+* Copyright (C) 2008-2011 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* RSS Feed management
+*
+* $URL$
+* $Id$
+*
+*/
 
 /*
 Query string: content_type.rss_type.[topic id]