diff --git a/upload/admin/admin_attach_cp.php b/upload/admin/admin_attach_cp.php
index a285d4fc6..5ec630366 100644
--- a/upload/admin/admin_attach_cp.php
+++ b/upload/admin/admin_attach_cp.php
@@ -1,17 +1,15 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Attachments']['Control_Panel'] = basename(__FILE__);
+	$module['ATTACHMENTS']['CONTROL_PANEL'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 $total_attachments = 0;
 
-if ( ($attach_config['upload_dir'][0] == '/') || ( ($attach_config['upload_dir'][0] != '/') && ($attach_config['upload_dir'][1] == ':') ) )
+if (($attach_config['upload_dir'][0] == '/') || (($attach_config['upload_dir'][0] != '/') && ($attach_config['upload_dir'][1] == ':')))
 {
 	$upload_dir = $attach_config['upload_dir'];
 }
diff --git a/upload/admin/admin_attachments.php b/upload/admin/admin_attachments.php
index adf1bd92a..3d0d93356 100644
--- a/upload/admin/admin_attachments.php
+++ b/upload/admin/admin_attachments.php
@@ -1,20 +1,18 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
 	$filename = basename(__FILE__);
-	$module['Attachments']['Manage'] = $filename . '?mode=manage';
-	$module['Attachments']['Special_categories'] = $filename . '?mode=cats';
-	$module['Attachments']['Quota_limits'] = $filename . '?mode=quota';
+	$module['ATTACHMENTS']['MANAGE'] = $filename . '?mode=manage';
+	$module['ATTACHMENTS']['SPECIAL_CATEGORIES'] = $filename . '?mode=cats';
+	$module['ATTACHMENTS']['QUOTA_LIMITS'] = $filename . '?mode=quota';
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 $error = false;
 
-if ( ($attach_config['upload_dir'][0] == '/') || ( ($attach_config['upload_dir'][0] != '/') && ($attach_config['upload_dir'][1] == ':') ) )
+if (($attach_config['upload_dir'][0] == '/') || (($attach_config['upload_dir'][0] != '/') && ($attach_config['upload_dir'][1] == ':')))
 {
 	$upload_dir = $attach_config['upload_dir'];
 }
diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php
index 32761b3d4..ad875d269 100644
--- a/upload/admin/admin_board.php
+++ b/upload/admin/admin_board.php
@@ -1,14 +1,12 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['General']['Configuration'] = basename(__FILE__) .'?mode=config';
-	$module['Mods']['Configuration'] = basename(__FILE__) .'?mode=config_mods';
+	$module['GENERAL']['CONFIGURATION'] = basename(__FILE__) .'?mode=config';
+	$module['MODS']['CONFIGURATION'] = basename(__FILE__) .'?mode=config_mods';
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 require(INC_DIR .'functions_selects.php');
 
@@ -24,13 +22,13 @@ $return_links = array(
 // Pull all config data
 //
 $sql = "SELECT * FROM " . BB_CONFIG;
-if(!$result = DB()->sql_query($sql))
+if (!$result = DB()->sql_query($sql))
 {
 	bb_die('Could not query config information in admin_board');
 }
 else
 {
-	while( $row = DB()->sql_fetchrow($result) )
+	while ($row = DB()->sql_fetchrow($result))
 	{
 		$config_name = $row['config_name'];
 		$config_value = $row['config_value'];
@@ -51,7 +49,7 @@ else
 	}
 }
 
-switch($mode)
+switch ($mode)
 {
 	case 'config_mods':
 		$template->assign_vars(array(
diff --git a/upload/admin/admin_bt_forum_cfg.php b/upload/admin/admin_bt_forum_cfg.php
index 3aab8b5b9..ba06b1382 100644
--- a/upload/admin/admin_bt_forum_cfg.php
+++ b/upload/admin/admin_bt_forum_cfg.php
@@ -1,13 +1,11 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['TorrentPier']['Forum_Config'] = basename(__FILE__);
+	$module['TP']['FORUM_CONFIG'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 $max_forum_name_len = 30;
 $max_forum_rows     = 25;
diff --git a/upload/admin/admin_bt_tracker_cfg.php b/upload/admin/admin_bt_tracker_cfg.php
index 34ac6bae1..15aa17714 100644
--- a/upload/admin/admin_bt_tracker_cfg.php
+++ b/upload/admin/admin_bt_tracker_cfg.php
@@ -1,16 +1,13 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	if(IS_SUPER_ADMIN){
-	$module['TorrentPier']['Tracker_Config'] = basename(__FILE__);}
+	if (IS_SUPER_ADMIN) $module['TP']['TRACKER_CONFIG'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
-if(!IS_SUPER_ADMIN) bb_die($lang['NOT_ADMIN']);
+if (!IS_SUPER_ADMIN) bb_die($lang['NOT_ADMIN']);
 
 require(INC_DIR .'functions_admin_torrent.php');
 
diff --git a/upload/admin/admin_cron.php b/upload/admin/admin_cron.php
index 0bed68c94..fc168e67f 100644
--- a/upload/admin/admin_cron.php
+++ b/upload/admin/admin_cron.php
@@ -1,12 +1,8 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	if (IS_SUPER_ADMIN)
-	{
-		$module['TorrentPier']['Cron'] = basename(__FILE__) . '?mode=list';
-	}
+	if (IS_SUPER_ADMIN) $module['TP']['CRON'] = basename(__FILE__) . '?mode=list';
 	return;
 }
 
@@ -24,7 +20,6 @@ if ($mode == 'run' && !$job_id)
 	redirect('admin/'.basename(__FILE__) . '?mode=list');
 }
 else require('./pagestart.php');
-// ACP Header - END
 
 if (!IS_SUPER_ADMIN) bb_die($lang['NOT_ADMIN']);
 
@@ -52,7 +47,7 @@ $template->assign_vars(array(
 	'CRON_CHECK_INTERVAL' => $new['cron_check_interval'],
 ));
 
-switch($mode)
+switch ($mode)
 {
 	case 'list':
 		$sql = DB()->fetch_rowset("SELECT * FROM ". BB_CRON ." ORDER BY cron_id");
@@ -60,7 +55,7 @@ switch($mode)
 		foreach ($sql as $i => $row)
 		{
 			$template->assign_block_vars('list', array(
-				'ROW_CLASS'	  => !($i % 2) ? 'row2' : 'row1',
+				'ROW_CLASS'   => !($i % 2) ? 'row2' : 'row1',
 				'JOB_ID'      => $i + 1,
 				'CRON_ID'     => $row['cron_id'],
 				'CRON_ACTIVE' => $row['cron_active'] ? '<img src="../images/icon_run.gif" alt="'. $lang['YES'] .'" />' : '<img src="../images/icon_delete.gif" alt="'. $lang['NO'] .'" />',
@@ -212,7 +207,7 @@ if ($submit)
 	}
 	else if (validate_cron_post($_POST) == 1)
 	{
-		if($_POST['mode'] == 'edit')
+		if ($_POST['mode'] == 'edit')
 		{
 			update_cron_job($_POST);
 		}
diff --git a/upload/admin/admin_disallow.php b/upload/admin/admin_disallow.php
index fa75c2c0c..6fe2ef3b9 100644
--- a/upload/admin/admin_disallow.php
+++ b/upload/admin/admin_disallow.php
@@ -1,17 +1,15 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Users']['Disallow'] = basename(__FILE__);
+	$module['USERS']['DISALLOW'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 $message = '';
 
-if( isset($_POST['add_name']) )
+if (isset($_POST['add_name']))
 {
 	include(INC_DIR .'functions_validate.php');
 
@@ -75,13 +73,13 @@ $disallowed = DB()->sql_fetchrowset($result);
 //
 $disallow_select = '<select name="disallowed_id">';
 
-if( count($disallowed) <= 0 )
+if (count($disallowed) <= 0)
 {
 	$disallow_select .= '<option value="">' . $lang['NO_DISALLOWED'] . '</option>';
 }
 else
 {
-	for( $i = 0; $i < count($disallowed); $i++ )
+	for ($i = 0; $i < count($disallowed); $i++)
 	{
 		$disallow_select .= '<option value="' . $disallowed[$i]['disallow_id'] . '">' . $disallowed[$i]['disallow_username'] . '</option>';
 	}
diff --git a/upload/admin/admin_extensions.php b/upload/admin/admin_extensions.php
index 85c4804c6..d36b997c7 100644
--- a/upload/admin/admin_extensions.php
+++ b/upload/admin/admin_extensions.php
@@ -1,23 +1,20 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
 	$filename = basename(__FILE__);
-	$module['Attachments']['Extension_control'] = $filename .'?mode=extensions';
-	$module['Attachments']['Extension_group_manage'] = $filename .'?mode=groups';
+	$module['ATTACHMENTS']['EXTENSION_CONTROL'] = $filename .'?mode=extensions';
+	$module['ATTACHMENTS']['EXTENSION_GROUP_MANAGE'] = $filename .'?mode=groups';
 	return;
 }
+require('./pagestart.php');
 
 function update_attach_extensions () {
-  $GLOBALS['datastore']->update('attach_extensions');
+	$GLOBALS['datastore']->update('attach_extensions');
 }
 register_shutdown_function('update_attach_extensions');
 
-require('./pagestart.php');
-// ACP Header - END
-
-if ( ($attach_config['upload_dir'][0] == '/') || ( ($attach_config['upload_dir'][0] != '/') && ($attach_config['upload_dir'][1] == ':') ) )
+if (($attach_config['upload_dir'][0] == '/') || (($attach_config['upload_dir'][0] != '/') && ($attach_config['upload_dir'][1] == ':')))
 {
 	$upload_dir = $attach_config['upload_dir'];
 }
diff --git a/upload/admin/admin_forum_prune.php b/upload/admin/admin_forum_prune.php
index 65eb9f302..86e8968e3 100644
--- a/upload/admin/admin_forum_prune.php
+++ b/upload/admin/admin_forum_prune.php
@@ -1,16 +1,13 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Forums']['Prune'] = basename(__FILE__);
+	$module['FORUMS']['PRUNE'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 $all_forums = -1;
-
 $pruned_total = 0;
 $prune_performed = false;
 
diff --git a/upload/admin/admin_forumauth.php b/upload/admin/admin_forumauth.php
index 013944f35..f4798d3dc 100644
--- a/upload/admin/admin_forumauth.php
+++ b/upload/admin/admin_forumauth.php
@@ -1,13 +1,11 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Forums']['Permissions'] = basename(__FILE__);
+	$module['FORUMS']['PERMISSIONS'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 $forum_auth_fields = array(
 	'auth_view',
diff --git a/upload/admin/admin_forumauth_list.php b/upload/admin/admin_forumauth_list.php
index 456704278..b8c8a7188 100644
--- a/upload/admin/admin_forumauth_list.php
+++ b/upload/admin/admin_forumauth_list.php
@@ -1,13 +1,11 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Forums']['Permissions_List'] = basename(__FILE__);
+	$module['FORUMS']['PERMISSIONS_LIST'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 //  View  Read  Post  Reply  Edit  Delete  Sticky  Announce  Vote  Poll  PostAttach  Download
 $simple_auth_ary = array(
diff --git a/upload/admin/admin_forums.php b/upload/admin/admin_forums.php
index c3264607f..ce017520f 100644
--- a/upload/admin/admin_forums.php
+++ b/upload/admin/admin_forums.php
@@ -1,13 +1,11 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Forums']['Manage'] = basename(__FILE__);
+	$module['FORUMS']['MANAGE'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 require(INC_DIR .'functions_group.php');
 
diff --git a/upload/admin/admin_groups.php b/upload/admin/admin_groups.php
index 30b819a04..7e0d6f365 100644
--- a/upload/admin/admin_groups.php
+++ b/upload/admin/admin_groups.php
@@ -1,13 +1,11 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Groups']['Manage'] = basename(__FILE__);
+	$module['GROUPS']['MANAGE'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 require(INC_DIR .'functions_group.php');
 
diff --git a/upload/admin/admin_log.php b/upload/admin/admin_log.php
index 4dcb6f772..2e53c4099 100644
--- a/upload/admin/admin_log.php
+++ b/upload/admin/admin_log.php
@@ -1,13 +1,11 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Users']['Actions_log'] = basename(__FILE__);
+	$module['USERS']['ACTIONS_LOG'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 $datastore->enqueue(array(
 	'moderators',
diff --git a/upload/admin/admin_mass_email.php b/upload/admin/admin_mass_email.php
index 884a738ba..95875f69f 100644
--- a/upload/admin/admin_mass_email.php
+++ b/upload/admin/admin_mass_email.php
@@ -1,13 +1,11 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Mods']['Mass_Email'] = basename(__FILE__);
+	$module['MODS']['MASS_EMAIL'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 @set_time_limit(1200);
 
diff --git a/upload/admin/admin_phpinfo.php b/upload/admin/admin_phpinfo.php
index 75578c2e7..1c70efd1e 100644
--- a/upload/admin/admin_phpinfo.php
+++ b/upload/admin/admin_phpinfo.php
@@ -1,12 +1,10 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['General']['Php_info'] = basename(__FILE__);
+	$module['GENERAL']['PHP_INFO'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 phpinfo();
\ No newline at end of file
diff --git a/upload/admin/admin_ranks.php b/upload/admin/admin_ranks.php
index 220d1e8f8..dd9f6df05 100644
--- a/upload/admin/admin_ranks.php
+++ b/upload/admin/admin_ranks.php
@@ -1,19 +1,16 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Users']['Ranks'] = basename(__FILE__);
+	$module['USERS']['RANKS'] = basename(__FILE__);
 	return;
 }
-
 require('./pagestart.php');
-// ACP Header - END
 
 $_POST['special_rank'] = 1;
 $_POST['min_posts'] = -1;
 
-if(isset($_GET['mode']) || isset($_POST['mode']))
+if (isset($_GET['mode']) || isset($_POST['mode']))
 {
 	$mode = isset($_GET['mode']) ? $_GET['mode'] : $_POST['mode'];
 }
diff --git a/upload/admin/admin_rebuild_search.php b/upload/admin/admin_rebuild_search.php
index 8600334d9..391c2917f 100644
--- a/upload/admin/admin_rebuild_search.php
+++ b/upload/admin/admin_rebuild_search.php
@@ -1,16 +1,13 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	if(IS_SUPER_ADMIN){
-	$module['General']['Rebuild_Search_Index'] = basename(__FILE__);}
+	if (IS_SUPER_ADMIN) $module['GENERAL']['REBUILD_SEARCH_INDEX'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
-if(!IS_SUPER_ADMIN) bb_die($lang['NOT_ADMIN']);
+if (!IS_SUPER_ADMIN) bb_die($lang['NOT_ADMIN']);
 
 require(INC_DIR .'bbcode.php');
 
diff --git a/upload/admin/admin_reports.php b/upload/admin/admin_reports.php
index e18e1c17a..612ae7a90 100644
--- a/upload/admin/admin_reports.php
+++ b/upload/admin/admin_reports.php
@@ -2,11 +2,9 @@
 
 if (!empty($setmodules))
 {
-	if($bb_cfg['reports_enabled']){
-	$module['Mods']['REPORTS'] = basename(__FILE__) .'?mode=config';}
+	if ($bb_cfg['reports_enabled']) $module['MODS']['REPORTS'] = basename(__FILE__) .'?mode=config';
 	return;
 }
-
 require('./pagestart.php');
 
 require(INC_DIR . 'functions_report.php');
diff --git a/upload/admin/admin_sitemap.php b/upload/admin/admin_sitemap.php
index 122178815..0354e5792 100644
--- a/upload/admin/admin_sitemap.php
+++ b/upload/admin/admin_sitemap.php
@@ -2,7 +2,7 @@
 
 if (!empty($setmodules))
 {
-	$module['Mods']['SITEMAP'] = basename(__FILE__);
+	$module['MODS']['SITEMAP'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
diff --git a/upload/admin/admin_smilies.php b/upload/admin/admin_smilies.php
index 9427a59c0..4d60e7090 100644
--- a/upload/admin/admin_smilies.php
+++ b/upload/admin/admin_smilies.php
@@ -1,17 +1,14 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['General']['Smilies'] = basename(__FILE__);
+	$module['GENERAL']['SMILIES'] = basename(__FILE__);
 	return;
 }
-
 require('./pagestart.php');
-// ACP Header - END
 
 // Check to see what mode we should operate in
-if( isset($_POST['mode']) || isset($_GET['mode']) )
+if (isset($_POST['mode']) || isset($_GET['mode']))
 {
 	$mode = ( isset($_POST['mode']) ) ? $_POST['mode'] : $_GET['mode'];
 	$mode = htmlspecialchars($mode);
diff --git a/upload/admin/admin_ug_auth.php b/upload/admin/admin_ug_auth.php
index ea01ecfb7..1fd568925 100644
--- a/upload/admin/admin_ug_auth.php
+++ b/upload/admin/admin_ug_auth.php
@@ -1,16 +1,14 @@
 <?php
 
-$max_forum_name_length = 50;
-
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Users']['Permissions']  = basename(__FILE__) .'?mode=user';
-	$module['Groups']['Permissions'] = basename(__FILE__) .'?mode=group';
+	$module['USERS']['PERMISSIONS']  = basename(__FILE__) .'?mode=user';
+	$module['GROUPS']['PERMISSIONS'] = basename(__FILE__) .'?mode=group';
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
+
+$max_forum_name_length = 50;
 
 require(INC_DIR .'functions_group.php');
 
diff --git a/upload/admin/admin_user_ban.php b/upload/admin/admin_user_ban.php
index a069c9d53..72cbac3ff 100644
--- a/upload/admin/admin_user_ban.php
+++ b/upload/admin/admin_user_ban.php
@@ -1,15 +1,13 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Users']['Ban_Management'] = basename(__FILE__);
+	$module['USERS']['BAN_MANAGEMENT'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
-if ( isset($_POST['submit']) )
+if (isset($_POST['submit']))
 {
 	$user_bansql = '';
 	$email_bansql = '';
diff --git a/upload/admin/admin_user_search.php b/upload/admin/admin_user_search.php
index b4113f27d..31d3465ad 100644
--- a/upload/admin/admin_user_search.php
+++ b/upload/admin/admin_user_search.php
@@ -1,13 +1,11 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['Users']['Search'] = basename(__FILE__);
+	$module['USERS']['SEARCH'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 array_deep($_POST, 'trim');
 
diff --git a/upload/admin/admin_words.php b/upload/admin/admin_words.php
index 11bef0b02..e46de3025 100644
--- a/upload/admin/admin_words.php
+++ b/upload/admin/admin_words.php
@@ -1,13 +1,11 @@
 <?php
 
-// ACP Header - START
 if (!empty($setmodules))
 {
-	$module['General']['Word_Censor'] = basename(__FILE__);
+	$module['GENERAL']['WORD_CENSOR'] = basename(__FILE__);
 	return;
 }
 require('./pagestart.php');
-// ACP Header - END
 
 if (!$bb_cfg['use_word_censor'])
 {
diff --git a/upload/admin/index.php b/upload/admin/index.php
index 17cad936b..cd5f5d4d2 100644
--- a/upload/admin/index.php
+++ b/upload/admin/index.php
@@ -5,21 +5,22 @@ require('./pagestart.php');
 // Generate relevant output
 if (isset($_GET['pane']) && $_GET['pane'] == 'left')
 {
-	$dir = @opendir('.');
-
-	$setmodules = 1;
-	while ($file = @readdir($dir))
+	if (!$module = CACHE('bb_cache')->get('admin_module'))
 	{
-		if (preg_match('/^admin_.*?\.php$/', $file))
+		$dir = @opendir('.');
+		$setmodules = 1;
+		while ($file = @readdir($dir))
 		{
-			include('./' . $file);
+			if (preg_match('/^admin_.*?\.php$/', $file))
+			{
+				include('./' . $file);
+			}
 		}
+		unset($setmodules);
+		@closedir($dir);
+		CACHE('bb_cache')->set('admin_module', $module, 600);
 	}
 
-	@closedir($dir);
-
-	unset($setmodules);
-
 	$template->assign_vars(array(
 		'TPL_ADMIN_NAVIGATE' => true,
 		'U_FORUM_INDEX' => '../index.php',
@@ -30,7 +31,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left')
 
 	while (list($cat, $action_array) = each($module))
 	{
-		$cat = (!empty($lang[strtoupper($cat)])) ? $lang[strtoupper($cat)] : preg_replace('/_/', ' ', $cat);
+		$cat = (!empty($lang[$cat])) ? $lang[$cat] : preg_replace('/_/', ' ', $cat);
 
 		$template->assign_block_vars('catrow', array(
 			'ADMIN_CATEGORY' => $cat,
@@ -43,7 +44,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left')
 		{
 			$row_class = !($row_count % 2) ? 'row1' : 'row2';
 
-			$action = ( !empty($lang[strtoupper($action)]) ) ? $lang[strtoupper($action)] : preg_replace('/_/', ' ', $action);
+			$action = (!empty($lang[$action])) ? $lang[$action] : preg_replace('/_/', ' ', $action);
 
 			$template->assign_block_vars('catrow.modulerow', array(
 				'ROW_CLASS' => $row_class,
diff --git a/upload/attach_mod/attachment_mod.php b/upload/attach_mod/attachment_mod.php
index 3c87a76b0..c6f3eac02 100644
--- a/upload/attach_mod/attachment_mod.php
+++ b/upload/attach_mod/attachment_mod.php
@@ -70,7 +70,7 @@ function get_config()
 // Get Attachment Config
 $attach_config = array();
 
-if (!($attach_config = CACHE('bb_cache')->get('attach_config')))
+if (!$attach_config = CACHE('bb_cache')->get('attach_config'))
 {
 	$attach_config = get_config();
 	CACHE('bb_cache')->set('attach_config', $attach_config, 86400);
diff --git a/upload/language/en/main.php b/upload/language/en/main.php
index 93331a5df..345f8e734 100644
--- a/upload/language/en/main.php
+++ b/upload/language/en/main.php
@@ -1714,7 +1714,7 @@ $lang['USERS'] = 'User Admin';
 $lang['GROUPS'] = 'Group Admin';
 $lang['FORUMS'] = 'Forum Admin';
 $lang['MODS'] = 'Modifications';
-$lang['TORRENTPIER'] = 'Product configuration';
+$lang['TP'] = 'TorrentPier II';
 
 $lang['CONFIGURATION'] = 'Configuration';
 $lang['MANAGE'] = 'Management';
@@ -1940,7 +1940,7 @@ $lang['ENABLE_PRUNE'] = 'Enable Forum Pruning';
 $lang['ALLOW_BBCODE'] = 'Allow BBCode';
 $lang['ALLOW_SMILIES'] = 'Allow Smilies';
 $lang['SMILIES_PATH'] = 'Smilies Storage Path';
-$lang['SMILIES_PATH_EXPLAIN'] = 'Path under your phpBB root dir, e.g. images/smiles';
+$lang['SMILIES_PATH_EXPLAIN'] = 'Path under your TorrentPier II root dir, e.g. images/smiles';
 $lang['ALLOW_SIG'] = 'Allow Signatures';
 $lang['MAX_SIG_LENGTH'] = 'Maximum signature length';
 $lang['MAX_SIG_LENGTH_EXPLAIN'] = 'Maximum number of characters in user signatures';
@@ -2335,7 +2335,7 @@ $lang['ATTACH_NUMBER_SETTINGS'] = 'Attachment Number Settings';
 $lang['ATTACH_OPTIONS_SETTINGS'] = 'Attachment Options';
 
 $lang['UPLOAD_DIRECTORY'] = 'Upload Directory';
-$lang['UPLOAD_DIRECTORY_EXPLAIN'] = 'Enter the relative path from your phpBB2 installation to the Attachments upload directory. For example, enter \'files\' if your phpBB2 Installation is located at http://www.yourdomain.com/phpBB2 and the Attachment Upload Directory is located at http://www.yourdomain.com/phpBB2/files.';
+$lang['UPLOAD_DIRECTORY_EXPLAIN'] = 'Enter the relative path from your TorrentPier II installation to the Attachments upload directory. For example, enter \'files\' if your TorrentPier II Installation is located at http://www.yourdomain.com/torrentpier and the Attachment Upload Directory is located at http://www.yourdomain.com/torrentpier/files.';
 $lang['ATTACH_IMG_PATH'] = 'Attachment Posting Icon';
 $lang['ATTACH_IMG_PATH_EXPLAIN'] = 'This Image is displayed next to Attachment Links in individual Postings. Leave this field empty if you don\'t want an icon to be displayed. This Setting will be overwritten by the Settings in Extension Groups Management.';
 $lang['ATTACH_TOPIC_ICON'] = 'Attachment Topic Icon';
diff --git a/upload/language/ru/main.php b/upload/language/ru/main.php
index 01721c91d..8d482a76f 100644
--- a/upload/language/ru/main.php
+++ b/upload/language/ru/main.php
@@ -1714,7 +1714,7 @@ $lang['USERS'] = 'Пользователи';
 $lang['GROUPS'] = 'Группы';
 $lang['FORUMS'] = 'Форумы';
 $lang['MODS'] = 'Модификации';
-$lang['TORRENTPIER'] = 'Технические настройки';
+$lang['TP'] = 'TorrentPier II';
 
 $lang['CONFIGURATION'] = 'Конфигурация';
 $lang['MANAGE'] = 'Управление';
@@ -1940,7 +1940,7 @@ $lang['ENABLE_PRUNE'] = 'Включить чистку форумов';
 $lang['ALLOW_BBCODE'] = 'Разрешить BBCode';
 $lang['ALLOW_SMILIES'] = 'Разрешить смайлики';
 $lang['SMILIES_PATH'] = 'Путь к смайликам';
-$lang['SMILIES_PATH_EXPLAIN'] = 'Каталог ниже корня phpBB, например images/smilies';
+$lang['SMILIES_PATH_EXPLAIN'] = 'Каталог ниже корня TorrentPier II, например images/smilies';
 $lang['ALLOW_SIG'] = 'Разрешить подписи';
 $lang['MAX_SIG_LENGTH'] = 'Макс. длина подписи';
 $lang['MAX_SIG_LENGTH_EXPLAIN'] = 'Максимальное кол-во символов в подписи пользователя';
@@ -2335,7 +2335,7 @@ $lang['ATTACH_NUMBER_SETTINGS'] = 'Настройка количества пр
 $lang['ATTACH_OPTIONS_SETTINGS'] = 'Настройка приложений';
 
 $lang['UPLOAD_DIRECTORY'] = 'Папка для закачанных приложений';
-$lang['UPLOAD_DIRECTORY_EXPLAIN'] = 'Задайте относительный путь от папки форума к папке приложений. Например, задайте \'files\', если путь к форуму http://www.yourdomain.com/phpBB2 и папка приложений находится в http://www.yourdomain.com/phpBB2/files.';
+$lang['UPLOAD_DIRECTORY_EXPLAIN'] = 'Задайте относительный путь от папки форума к папке приложений. Например, задайте \'files\', если путь к форуму http://www.yourdomain.com/torrentpier и папка приложений находится в http://www.yourdomain.com/torrentpier/files.';
 $lang['ATTACH_IMG_PATH'] = 'Иконка для приложений';
 $lang['ATTACH_IMG_PATH_EXPLAIN'] = 'Эта картинка появляется возле ссылок к приложениям в персональных сообщениях. Оставьте это поле пустым, если не хотите видеть иконку. Эта конфигурация будет переписана настройками в Контроле Групп Расширений.';
 $lang['ATTACH_TOPIC_ICON'] = 'Иконка для тем с приложениями';
diff --git a/upload/language/ua/main.php b/upload/language/ua/main.php
index 3e94bb4c2..0544aca1f 100644
--- a/upload/language/ua/main.php
+++ b/upload/language/ua/main.php
@@ -1714,7 +1714,7 @@ $lang['USERS'] = 'Користувачі';
 $lang['GROUPS'] = 'Групи';
 $lang['FORUMS'] = 'Форуми';
 $lang['MODS'] = 'Модифікації';
-$lang['TORRENTPIER'] = 'Технічні налаштування';
+$lang['TP'] = 'TorrentPier II';
 
 $lang['CONFIGURATION'] = 'Конфігурація';
 $lang['MANAGE'] = 'Керування';
@@ -1940,7 +1940,7 @@ $lang['ENABLE_PRUNE'] = 'Включити чистку форумів';
 $lang['ALLOW_BBCODE'] = 'Дозволити BBCode';
 $lang['ALLOW_SMILIES'] = 'Дозволити смайлики';
 $lang['SMILIES_PATH'] = 'Шлях до смайликів';
-$lang['SMILIES_PATH_EXPLAIN'] = 'Каталог нижче кореня phpBB, наприклад images/smilies';
+$lang['SMILIES_PATH_EXPLAIN'] = 'Каталог нижче кореня TorrentPier II, наприклад images/smilies';
 $lang['ALLOW_SIG'] = 'Дозволити підпис';
 $lang['MAX_SIG_LENGTH'] = 'Макс. довжина підпису';
 $lang['MAX_SIG_LENGTH_EXPLAIN'] = 'Максимальна кількість символів у підписі користувача';
@@ -2335,7 +2335,7 @@ $lang['ATTACH_NUMBER_SETTINGS'] = 'Налаштування кількості 
 $lang['ATTACH_OPTIONS_SETTINGS'] = 'Налаштування додатків';
 
 $lang['UPLOAD_DIRECTORY'] = 'Папка для завантажених додатків';
-$lang['UPLOAD_DIRECTORY_EXPLAIN'] = 'Задайте відносний шлях від папки форуму до папки додатків. Наприклад, задайте \'files\', якщо шлях до форуму http://www.yourdomain.com/phpBB2 і папка додатків знаходиться в http://www.yourdomain.com/phpBB2/files.';
+$lang['UPLOAD_DIRECTORY_EXPLAIN'] = 'Задайте відносний шлях від папки форуму до папки додатків. Наприклад, задайте \'files\', якщо шлях до форуму http://www.yourdomain.com/torrentpier і папка додатків знаходиться в http://www.yourdomain.com/torrentpier/files.';
 $lang['ATTACH_IMG_PATH'] = 'Іконка для додатків';
 $lang['ATTACH_IMG_PATH_EXPLAIN'] = "Ця картинка з'являється біля посилань програм в персональних повідомленнях. Залиште це поле порожнім, якщо не хочете бачити іконку. Ця конфігурація буде переписана налаштуваннями в Контролі Груп Розширень.";
 $lang['ATTACH_TOPIC_ICON'] = 'Іконка для тем з додатками';