diff --git a/other/converter/TBDevYSE_pre6/root/convert.php b/other/converter/TBDevYSE_pre6/root/convert.php
index 330cd133a..27d047626 100644
--- a/other/converter/TBDevYSE_pre6/root/convert.php
+++ b/other/converter/TBDevYSE_pre6/root/convert.php
@@ -1,6 +1,6 @@
 <?php
 
-define ('IN_PHPBB', true);
+define ('IN_FORUM', true);
 define ('IN_SERVICE', true);
 define ('BB_ROOT', './');
 require (BB_ROOT .'common.php');
diff --git a/other/converter/TBDevYSE_pre6/root/recover.php b/other/converter/TBDevYSE_pre6/root/recover.php
index ef5ff2e74..c6dccd39d 100644
--- a/other/converter/TBDevYSE_pre6/root/recover.php
+++ b/other/converter/TBDevYSE_pre6/root/recover.php
@@ -1,6 +1,6 @@
 <?php
 	
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('IN_SERVICE', true);
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/other/recover/recover.php b/other/recover/recover.php
index c8d14fab5..2af559ef3 100644
--- a/other/recover/recover.php
+++ b/other/recover/recover.php
@@ -1,6 +1,6 @@
 <?php
 	
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('IN_SERVICE', true);
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/upload/admin/pagestart.php b/upload/admin/pagestart.php
index 30a7014e8..dd9b2bfad 100644
--- a/upload/admin/pagestart.php
+++ b/upload/admin/pagestart.php
@@ -1,7 +1,7 @@
 <?php
 
 define('BB_ROOT', './../');
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('IN_ADMIN', true);
 
 require(BB_ROOT .'common.php');
diff --git a/upload/admin/xs_include.php b/upload/admin/xs_include.php
index 28b6bac3b..159f1c280 100644
--- a/upload/admin/xs_include.php
+++ b/upload/admin/xs_include.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB') || !defined('IN_XS')) die(basename(__FILE__));
+if (!defined('IN_FORUM') || !defined('IN_XS')) die(basename(__FILE__));
 if(defined('XS_INCLUDED')) return;
 
 define('XS_INCLUDED', true);
diff --git a/upload/attach_mod/attachment_mod.php b/upload/attach_mod/attachment_mod.php
index 76497f0e5..0cfb2f8af 100644
--- a/upload/attach_mod/attachment_mod.php
+++ b/upload/attach_mod/attachment_mod.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB'))
+if (!defined('IN_FORUM'))
 {
 	die('Hacking attempt');
 	exit;
diff --git a/upload/attach_mod/displaying.php b/upload/attach_mod/displaying.php
index 6be4ebb17..c8db7dfe2 100644
--- a/upload/attach_mod/displaying.php
+++ b/upload/attach_mod/displaying.php
@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;
diff --git a/upload/attach_mod/displaying_torrent.php b/upload/attach_mod/displaying_torrent.php
index 781828ce2..55307d9ec 100644
--- a/upload/attach_mod/displaying_torrent.php
+++ b/upload/attach_mod/displaying_torrent.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 
 global $bb_cfg, $t_data, $poster_id, $is_auth, $dl_link_css, $dl_status_css, $lang, $images;
 
diff --git a/upload/attach_mod/includes/functions_thumbs.php b/upload/attach_mod/includes/functions_thumbs.php
index 42f6aad8c..6af6ea4ed 100644
--- a/upload/attach_mod/includes/functions_thumbs.php
+++ b/upload/attach_mod/includes/functions_thumbs.php
@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;
diff --git a/upload/attach_mod/posting_attachments.php b/upload/attach_mod/posting_attachments.php
index 353d6ccc6..b8bf2299c 100644
--- a/upload/attach_mod/posting_attachments.php
+++ b/upload/attach_mod/posting_attachments.php
@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;
diff --git a/upload/callseed.php b/upload/callseed.php
index d3503db43..87cfec2b4 100644
--- a/upload/callseed.php
+++ b/upload/callseed.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'callseed');
 define('BB_ROOT', './');
 require(BB_ROOT . 'common.php');
diff --git a/upload/common.php b/upload/common.php
index d9ebf1b04..98d06dd92 100644
--- a/upload/common.php
+++ b/upload/common.php
@@ -7,7 +7,7 @@ define('TIMENOW',   time());
 if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) die();
 
 if (!defined('BB_ROOT')) define('BB_ROOT', './');
-if (!defined('IN_PHPBB') && !defined('IN_TRACKER')) define('IN_PHPBB', true);
+if (!defined('IN_FORUM') && !defined('IN_TRACKER')) define('IN_FORUM', true);
 
 // Get initial config
 require(BB_ROOT .'config.php');
@@ -2247,7 +2247,7 @@ function log_request ($file = '', $prepend_str = false, $add_post = true)
 }
 
 // Board init
-if (defined('IN_PHPBB'))
+if (defined('IN_FORUM'))
 {
 	require(INC_DIR .'init_bb.php');
 }
diff --git a/upload/config.php b/upload/config.php
index 8279c9a30..23172b625 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 pre-stable';
-$bb_cfg['tp_release_date'] = '26-07-2013';
-$bb_cfg['tp_release_state'] = 'R514';
+$bb_cfg['tp_release_date'] = '27-07-2013';
+$bb_cfg['tp_release_state'] = 'R515';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/develop/show_source.php b/upload/develop/show_source.php
index 498bd4c9f..ed2a44c91 100644
--- a/upload/develop/show_source.php
+++ b/upload/develop/show_source.php
@@ -3,7 +3,7 @@
 // Comment the following line to enable
 die('Please REMOVE THIS FILE from your production environment!<br /><br />'. basename(__FILE__));
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_ROOT', './../');
 
 require('./dbg_config.php');
diff --git a/upload/dl_list.php b/upload/dl_list.php
index 1a271e40a..d880596d9 100644
--- a/upload/dl_list.php
+++ b/upload/dl_list.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'dl_list');
 define('IN_SERVICE', true);
 define('BB_ROOT', './');
diff --git a/upload/donate.php b/upload/donate.php
index 48a6738e0..d166d93cf 100644
--- a/upload/donate.php
+++ b/upload/donate.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'donate');
 define('BB_ROOT', './');
 require(BB_ROOT ."common.php");
diff --git a/upload/download.php b/upload/download.php
index b93a4fd38..b8697c551 100644
--- a/upload/download.php
+++ b/upload/download.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'download');
 define('IN_SERVICE', true);
 define('NO_GZIP', true);
diff --git a/upload/faq.php b/upload/faq.php
index 5f91d932e..0c4741e21 100644
--- a/upload/faq.php
+++ b/upload/faq.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'faq');
 define('BB_ROOT', './');
 require(BB_ROOT ."common.php");
diff --git a/upload/gallery.php b/upload/gallery.php
index 3b3b6efd6..581c5e4ef 100644
--- a/upload/gallery.php
+++ b/upload/gallery.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'gallery');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
@@ -13,7 +13,9 @@ if (!$bb_cfg['gallery_enabled']) bb_die($lang['GALLERY_DISABLED']);
 require(LANG_ROOT_DIR ."lang_{$userdata['user_lang']}/lang_gallery.php");
 
 if(bf($userdata['user_opt'], 'user_opt', 'allow_gallery'))
-{
	bb_die($lang['USE_GALLERY_OFF']);
}
+{
+	bb_die($lang['USE_GALLERY_OFF']);
+}
 
 $go = isset($_GET['go']) ? $_GET['go'] : '';
 $max_size = $bb_cfg['pic_max_size']*1024*1024;
diff --git a/upload/groupcp.php b/upload/groupcp.php
index 6414c3c40..ed6a55fb9 100644
--- a/upload/groupcp.php
+++ b/upload/groupcp.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'groupcp');
 define('BB_ROOT', './');
 require(BB_ROOT ."common.php");
@@ -176,7 +176,9 @@ if (!$group_id)
 	else
 	{
 		if(IS_ADMIN)
-		{
			redirect('admin/admin_groups.php');
		}
+		{
+			redirect('admin/admin_groups.php');
+		}
 		else bb_die($lang['NO_GROUPS_EXIST']);
 	}
 }
diff --git a/upload/includes/topic_templates/audiobooks.php b/upload/includes/topic_templates/audiobooks.php
index c05549ca1..744cc7982 100644
--- a/upload/includes/topic_templates/audiobooks.php
+++ b/upload/includes/topic_templates/audiobooks.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';
diff --git a/upload/includes/topic_templates/books.php b/upload/includes/topic_templates/books.php
index 7f4ed7863..c00662b0e 100644
--- a/upload/includes/topic_templates/books.php
+++ b/upload/includes/topic_templates/books.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';
diff --git a/upload/includes/topic_templates/games.php b/upload/includes/topic_templates/games.php
index 09f507b8b..12c9852d3 100644
--- a/upload/includes/topic_templates/games.php
+++ b/upload/includes/topic_templates/games.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';
diff --git a/upload/includes/topic_templates/music.php b/upload/includes/topic_templates/music.php
index 59409e994..f23d5ecf8 100644
--- a/upload/includes/topic_templates/music.php
+++ b/upload/includes/topic_templates/music.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';
diff --git a/upload/includes/topic_templates/progs.php b/upload/includes/topic_templates/progs.php
index 2ccf89c44..94b7408b6 100644
--- a/upload/includes/topic_templates/progs.php
+++ b/upload/includes/topic_templates/progs.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';
diff --git a/upload/includes/topic_templates/sport.php b/upload/includes/topic_templates/sport.php
index 5b6725154..f4761c635 100644
--- a/upload/includes/topic_templates/sport.php
+++ b/upload/includes/topic_templates/sport.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';
diff --git a/upload/includes/topic_templates/tpl_selects.php b/upload/includes/topic_templates/tpl_selects.php
index 72fca6ae4..14153051f 100644
--- a/upload/includes/topic_templates/tpl_selects.php
+++ b/upload/includes/topic_templates/tpl_selects.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 
 $selects = array(
 	'SEL_VIDEO_QUALITY' => array(
diff --git a/upload/includes/topic_templates/video.php b/upload/includes/topic_templates/video.php
index 117dc08a5..41d5dc9fe 100644
--- a/upload/includes/topic_templates/video.php
+++ b/upload/includes/topic_templates/video.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';
diff --git a/upload/includes/ucp/usercp_activate.php b/upload/includes/ucp/usercp_activate.php
index b6b353bc2..2c7c60f12 100644
--- a/upload/includes/ucp/usercp_activate.php
+++ b/upload/includes/ucp/usercp_activate.php
@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;
diff --git a/upload/includes/ucp/usercp_attachcp.php b/upload/includes/ucp/usercp_attachcp.php
index a5ab5b7d8..d0102ab69 100644
--- a/upload/includes/ucp/usercp_attachcp.php
+++ b/upload/includes/ucp/usercp_attachcp.php
@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die("Hacking attempt");
 	exit;
diff --git a/upload/includes/ucp/usercp_avatar.php b/upload/includes/ucp/usercp_avatar.php
index e4e8ab6ed..7a4d4bc12 100644
--- a/upload/includes/ucp/usercp_avatar.php
+++ b/upload/includes/ucp/usercp_avatar.php
@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;
diff --git a/upload/includes/ucp/usercp_email.php b/upload/includes/ucp/usercp_email.php
index f78bebd4c..f550835d1 100644
--- a/upload/includes/ucp/usercp_email.php
+++ b/upload/includes/ucp/usercp_email.php
@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die("Hacking attempt");
 	exit;
diff --git a/upload/includes/ucp/usercp_sendpasswd.php b/upload/includes/ucp/usercp_sendpasswd.php
index 300318547..46ccb4679 100644
--- a/upload/includes/ucp/usercp_sendpasswd.php
+++ b/upload/includes/ucp/usercp_sendpasswd.php
@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;
diff --git a/upload/index.php b/upload/index.php
index 4656082b4..fb11d1613 100644
--- a/upload/index.php
+++ b/upload/index.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'index');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/upload/login.php b/upload/login.php
index 8d9c68bd7..8a64d5236 100644
--- a/upload/login.php
+++ b/upload/login.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'login');
 define('IN_LOGIN', true);
 define('BB_ROOT', './');
diff --git a/upload/memberlist.php b/upload/memberlist.php
index 0c05e572b..dafc2ed8c 100644
--- a/upload/memberlist.php
+++ b/upload/memberlist.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'memberlist');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/upload/misc.php b/upload/misc.php
index 8883d1659..ed9fd9d01 100644
--- a/upload/misc.php
+++ b/upload/misc.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'misc');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/upload/modcp.php b/upload/modcp.php
index 868f564a3..abdeee307 100644
--- a/upload/modcp.php
+++ b/upload/modcp.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'modcp');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/upload/posting.php b/upload/posting.php
index 513a5bae6..c8dbc3245 100644
--- a/upload/posting.php
+++ b/upload/posting.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'posting');
 define('BB_ROOT', './');
 require(BB_ROOT ."common.php");
diff --git a/upload/privmsg.php b/upload/privmsg.php
index e2aac84a2..4b458b811 100644
--- a/upload/privmsg.php
+++ b/upload/privmsg.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'pm');
 define('IN_PM',     true);
 define('BB_ROOT', './');
diff --git a/upload/profile.php b/upload/profile.php
index e27640078..1931741d6 100644
--- a/upload/profile.php
+++ b/upload/profile.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('IN_PROFILE', true);
 define('BB_SCRIPT', 'profile');
 define('BB_ROOT', './');
diff --git a/upload/report.php b/upload/report.php
index 06f91ceca..5499b7ea7 100644
--- a/upload/report.php
+++ b/upload/report.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'report');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/upload/templates/limit_load_exit.php b/upload/templates/limit_load_exit.php
index a47a52e37..687ba48d4 100644
--- a/upload/templates/limit_load_exit.php
+++ b/upload/templates/limit_load_exit.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB'))	die(basename(__FILE__));
+if (!defined('IN_FORUM'))	die(basename(__FILE__));
 
 global $DBS;
 
diff --git a/upload/viewforum.php b/upload/viewforum.php
index 2b0ce0d96..5a266f620 100644
--- a/upload/viewforum.php
+++ b/upload/viewforum.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'forum');
 define('BB_ROOT', './');
 require(BB_ROOT . "common.php");
diff --git a/upload/viewonline.php b/upload/viewonline.php
index b45884ce4..505e9a8c3 100644
--- a/upload/viewonline.php
+++ b/upload/viewonline.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'online');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/upload/viewtopic.php b/upload/viewtopic.php
index 229f1ce4e..6eb6c9333 100644
--- a/upload/viewtopic.php
+++ b/upload/viewtopic.php
@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'topic');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');