diff --git a/e107_themes/_blank/admin_template.php b/e107_themes/_blank/admin_template.php
index c66c8d589..a4328761a 100644
--- a/e107_themes/_blank/admin_template.php
+++ b/e107_themes/_blank/admin_template.php
@@ -9,13 +9,13 @@
  * Admin template - _blank theme
  *
  * $Source: /cvs_backup/e107_0.8/e107_themes/_blank/admin_template.php,v $
- * $Revision: 1.15 $
- * $Date: 2009-07-17 23:23:36 $
- * $Author: e107coders $
+ * $Revision: 1.16 $
+ * $Date: 2009-07-18 15:04:01 $
+ * $Author: marj_nl_fr $
  *
 */
 
-if (!defined('e107_INIT')) { exit; }
+if (!defined('e107_INIT')) { exit(); }
 
 define("ADLINK_COLS",5);
 
@@ -23,7 +23,7 @@ define("ADLINK_COLS",5);
 
 
 
-include_lan(THEME."languages/".e_LANGUAGE.".php");
+include_lan(e_THEME."_blank/languages/".e_LANGUAGE.".php");
 
 //{FS_ADMIN_ALT_NAV}
 $ADMIN_HEADER = "
diff --git a/e107_themes/_blank/admin_theme.php b/e107_themes/_blank/admin_theme.php
index f8731c1aa..61842bed5 100644
--- a/e107_themes/_blank/admin_theme.php
+++ b/e107_themes/_blank/admin_theme.php
@@ -1,5 +1,6 @@
 <?php
-include_lan(THEME."languages/".e_LANGUAGE.".php");
+if ( ! defined('e107_INIT')) { exit(); }
+include_lan(e_THEME."_blank/languages/".e_LANGUAGE.".php");
 
 $THEME_CORE_JSLIB = array(
 	'jslib/core/decorate.js' => 'all',
diff --git a/e107_themes/_blank/theme.php b/e107_themes/_blank/theme.php
index 7da0bd4b1..f67a78161 100644
--- a/e107_themes/_blank/theme.php
+++ b/e107_themes/_blank/theme.php
@@ -1,5 +1,6 @@
 <?php
-include_lan(THEME."languages/".e_LANGUAGE.".php");
+if ( ! defined('e107_INIT')) { exit(); }
+include_lan(e_THEME."_blank/languages/".e_LANGUAGE.".php");
 
 $THEME_CORE_JSLIB = array(
 	'jslib/core/decorate.js' => 'all',
diff --git a/e107_themes/jayya/forum/forum_icons_template.php b/e107_themes/jayya/forum/forum_icons_template.php
index b047f4df7..5e050b119 100644
--- a/e107_themes/jayya/forum/forum_icons_template.php
+++ b/e107_themes/jayya/forum/forum_icons_template.php
@@ -11,16 +11,15 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/jayya/forum/forum_icons_template.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2007-06-06 19:31:43 $
-|     $Author: e107steved $
+|     $Revision: 1.5 $
+|     $Date: 2009-07-18 15:04:02 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 	
 if (!defined('e107_INIT')) { exit; }
 
-@include_once(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_viewforum.php');
-@include_once(e_PLUGIN.'forum/languages/English/lan_forum_viewforum.php');
+include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_viewforum.php');
 
 define("IMAGE_e", "<img src='".img_path('e.png')."' alt='' title='' style='border:0' />");
 define("IMAGE_new", "<img src='".img_path('new.png')."' alt='".LAN_199."' title='".LAN_199."' style='border:0' />");
diff --git a/e107_themes/khatru/theme.php b/e107_themes/khatru/theme.php
index ad62228eb..61f2dc740 100644
--- a/e107_themes/khatru/theme.php
+++ b/e107_themes/khatru/theme.php
@@ -14,8 +14,7 @@
 if (!defined('e107_INIT')) { exit; }
 
 // [multilanguage]
-@include_once(THEME."languages/".e_LANGUAGE.".php");
-@include_once(THEME."languages/English.php");
+include_lan(e_THEME."khatru/languages/".e_LANGUAGE.".php");
 
 // [theme]
 $themename = "khatru";
diff --git a/e107_themes/vekna_blue/theme.php b/e107_themes/vekna_blue/theme.php
index c5be7d064..80d91b1dc 100644
--- a/e107_themes/vekna_blue/theme.php
+++ b/e107_themes/vekna_blue/theme.php
@@ -15,8 +15,7 @@
 if (!defined('e107_INIT')) { exit; }
 
 // [multilanguage]
-@include_once(e_THEME."vekna_blue/languages/".e_LANGUAGE.".php");
-@include_once(e_THEME."vekna_blue/languages/English.php");
+include_lan(e_THEME."vekna_blue/languages/".e_LANGUAGE.".php");
 
 // [theme]
 $themename = "vekna blue";