diff --git a/admin/admin_board.php b/admin/admin_board.php
index a709f7a34..2fe20d6c6 100644
--- a/admin/admin_board.php
+++ b/admin/admin_board.php
@@ -76,7 +76,6 @@ switch ($mode)
 			'BIRTHDAY_CHECK_DAY'      => $new['birthday_check_day'],
 			'PREMOD'                  => $new['premod'],
 			'TOR_COMMENT'             => $new['tor_comment'],
-			'NEW_TPLS'                => $new['new_tpls'],
 			'SEED_BONUS_ENABLED'      => $new['seed_bonus_enabled'],
 			'SEED_BONUS_TOR_SIZE'     => $new['seed_bonus_tor_size'],
 			'SEED_BONUS_USER_REGDATE' => $new['seed_bonus_user_regdate'],
diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql
index 9340ea777..e4aa55ddc 100644
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@@ -452,7 +452,6 @@ INSERT INTO `bb_config` VALUES ('network_news_forum_id', '2');
 INSERT INTO `bb_config` VALUES ('whois_info', 'http://ip-whois.net/ip_geos.php?ip=');
 INSERT INTO `bb_config` VALUES ('show_mod_index', '0');
 INSERT INTO `bb_config` VALUES ('premod', '0');
-INSERT INTO `bb_config` VALUES ('new_tpls', '1');
 INSERT INTO `bb_config` VALUES ('tor_comment', '1');
 INSERT INTO `bb_config` VALUES ('terms', '');
 
diff --git a/install/upgrade/changes.txt b/install/upgrade/changes.txt
index 3ecab6836..729c520d2 100644
--- a/install/upgrade/changes.txt
+++ b/install/upgrade/changes.txt
@@ -62,4 +62,5 @@ DROP TABLE IF EXISTS `bb_attachments_config`;
 DROP TABLE IF EXISTS `bb_attach_quota`;
 DROP TABLE IF EXISTS `bb_quota_limits`;
 ALTER TABLE `bb_topics` ADD `attach_ext_id` TINYINT(4) NOT NULL DEFAULT '0' AFTER `topic_dl_type`;
-ALTER TABLE `bb_topics` ADD `filesize` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER `attach_ext_id`;
\ No newline at end of file
+ALTER TABLE `bb_topics` ADD `filesize` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER `attach_ext_id`;
+DELETE FROM `bb_config` WHERE `config_name` = 'new_tpls';
\ No newline at end of file
diff --git a/styles/templates/admin/admin_board.tpl b/styles/templates/admin/admin_board.tpl
index bd3c15805..23a7f6dc2 100644
--- a/styles/templates/admin/admin_board.tpl
+++ b/styles/templates/admin/admin_board.tpl
@@ -217,13 +217,6 @@
 		<label><input type="radio" name="tor_comment" value="0" <!-- IF not TOR_COMMENT -->checked="checked"<!-- ENDIF --> />{L_DISABLED}</label>
 	</td>
 </tr>
-<tr>
-	<td><h4>{L_DESIGNER}</h4></td>
-	<td>
-		<label><input type="radio" name="new_tpls" value="1" <!-- IF NEW_TPLS -->checked="checked"<!-- ENDIF --> />{L_ENABLED}</label>&nbsp;&nbsp;
-		<label><input type="radio" name="new_tpls" value="0" <!-- IF not NEW_TPLS -->checked="checked"<!-- ENDIF --> />{L_DISABLED}</label>
-	</td>
-</tr>
 
 <tr class="row3 med">
 	<td class="bold tCenter" colspan="2">{L_LATEST_NEWS}</td>
diff --git a/styles/templates/default/viewforum.tpl b/styles/templates/default/viewforum.tpl
index c5655e755..6aa5c7ed6 100644
--- a/styles/templates/default/viewforum.tpl
+++ b/styles/templates/default/viewforum.tpl
@@ -638,18 +638,15 @@ td.topic_id { cursor: pointer; }
 <!-- IF LOGGED_IN -->
 <p class="med"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a></p>
 <!-- IF IS_AM -->
-<p class="mrg_2 tRight">{L_AUTOCLEAN} <!-- IF PRUNE_DAYS --><b>{PRUNE_DAYS} {L_DAYS}</b><!-- ELSE -->{L_DISABLED}<!-- ENDIF --></p>
+<p class="mrg_2 tRight">{L_AUTOCLEAN}: <!-- IF PRUNE_DAYS --><b>{PRUNE_DAYS} {L_DAYS}</b><!-- ELSE -->{L_DISABLED}<!-- ENDIF --></p>
 <!-- ENDIF -->
 
 <!-- IF IS_ADMIN -->
-<div class="med tCenter">
-{L_ADMIN}:&nbsp;
-<!-- IF $bb_cfg['new_tpls'] -->
-<a href="{POSTING_URL}?mode=new_rel&amp;f={FORUM_ID}&amp;edit_tpl=1" class="bold" target="_blank">{L_DESIGNER}</a> &nbsp;&middot;&nbsp;
-<!-- ENDIF -->
-<a href="admin/admin_log.php?f={FORUM_ID}&amp;db={$bb_cfg['log_days_keep']}" target="_blank">{L_FORUM_LOGS}</a> &nbsp;&middot;&nbsp;
-<a href="admin/admin_forums.php?mode=editforum&amp;f={FORUM_ID}" target="_blank">{L_EDIT}</a> &nbsp;&middot;&nbsp;
-<a href="admin/admin_forumauth.php?f={FORUM_ID}" target="_blank">{L_PERMISSIONS}</a> &nbsp;&middot;&nbsp;
+<div class="med tCenter">{L_ADMIN}:
+<a href="{POSTING_URL}?mode=new_rel&amp;f={FORUM_ID}&amp;edit_tpl=1" class="bold" target="_blank">{L_DESIGNER}</a>&nbsp;&middot;
+<a href="admin/admin_log.php?f={FORUM_ID}&amp;db={$bb_cfg['log_days_keep']}" target="_blank">{L_FORUM_LOGS}</a>&nbsp;&middot;
+<a href="admin/admin_forums.php?mode=editforum&amp;f={FORUM_ID}" target="_blank">{L_EDIT}</a>&nbsp;&middot;
+<a href="admin/admin_forumauth.php?f={FORUM_ID}" target="_blank">{L_PERMISSIONS}</a>&nbsp;&middot;
 <a href="admin/admin_forums.php?mode=deleteforum&amp;f={FORUM_ID}" target="_blank">{L_DELETE}</a>
 </div>
 <!-- ENDIF / IS_ADMIN -->