diff --git a/gazelle.sql b/gazelle.sql
index 1044ea4f..89d46797 100644
--- a/gazelle.sql
+++ b/gazelle.sql
@@ -282,6 +282,7 @@ CREATE TABLE `forums` (
   `LastPostTopicID` int(10) NOT NULL DEFAULT '0',
   `LastPostTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `AutoLock` enum('0','1') COLLATE utf8_bin DEFAULT '1',
+  `AutoLockWeeks` int(3) unsigned NOT NULL DEFAULT '4',
   PRIMARY KEY (`ID`),
   KEY `Sort` (`Sort`),
   KEY `MinClassRead` (`MinClassRead`)
diff --git a/sections/collages/collage.php b/sections/collages/collage.php
index bec93fac..782a889b 100644
--- a/sections/collages/collage.php
+++ b/sections/collages/collage.php
@@ -390,7 +390,7 @@ function compare($X, $Y){
 if (check_perms('site_collages_manage') && !$Locked) { ?>
 			<a href="collages.php?action=manage&amp;collageid=<?=$CollageID?>">[Manage torrents]</a>
 <? } ?>
-			<a href="reports.php?action=report&amp;type=collage&amp;id=<?=$CollageID?>">[Report collage]</a>
+			<a href="reports.php?action=report&amp;type=collage&amp;id=<?=$CollageID?>">[Report Collage]</a>
 <? if (check_perms('site_collages_delete') || $CreatorID == $LoggedUser['ID']) { ?>
 			<a href="collages.php?action=delete&amp;collageid=<?=$CollageID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to delete this collage?.');">[Delete]</a>
 <? } ?>
diff --git a/sections/forums/forum.php b/sections/forums/forum.php
index 3839c122..4254071d 100644
--- a/sections/forums/forum.php
+++ b/sections/forums/forum.php
@@ -70,9 +70,9 @@
 	<h2><a href="forums.php">Forums</a> &gt; <?=$ForumName?></h2>
 	<div class="linkbox">
 <? if(check_forumperm($ForumID, 'Write') && check_forumperm($ForumID, 'Create')){ ?>
-		[<a href="forums.php?action=new&amp;forumid=<?=$ForumID?>">New thread</a>]
+		[<a href="forums.php?action=new&amp;forumid=<?=$ForumID?>">New Thread</a>]
 <? } ?>
-		[<a href="#" onclick="$('#searchforum').toggle(); this.innerHTML = (this.innerHTML == 'Search this forum'?'Hide search':'Search this forum'); return false;">Search this forum</a>]
+		[<a href="#" onclick="$('#searchforum').toggle(); this.innerHTML = (this.innerHTML == 'Search this Forum'?'Hide Search':'Search this Forum'); return false;">Search this Forum</a>]
 		<div id="searchforum" class="hidden center">
 			<div style="display: inline-block;">
 				<h3>Search this forum:</h3>
@@ -110,9 +110,9 @@
 	if(check_perms('users_mod')) {
 	$DB->query("SELECT ForumID from subscribed_forums WHERE ForumID='$ForumID' AND SubscriberID='$LoggedUser[ID]'");
         if($DB->record_count() == 0) { ?>
-		[<a href="forums.php?action=forum_subscribe&amp;perform=add&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Subscribe to forum</a>]
+		[<a href="forums.php?action=forum_subscribe&amp;perform=add&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Subscribe to Forum</a>]
 <?      } else { ?> 
-		[<a href="forums.php?action=forum_subscribe&amp;perform=remove&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Unsubscribe from forum</a>]
+		[<a href="forums.php?action=forum_subscribe&amp;perform=remove&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Unsubscribe from Forum</a>]
 <?      } 
 	}
  */
@@ -121,7 +121,7 @@
 	</div>
 <? if(check_perms('site_moderate_forums')) { ?>
 	<div class="linkbox">
-		[<a href="forums.php?action=edit_rules&amp;forumid=<?=$ForumID?>">Change specific rules</a>]
+		<a href="forums.php?action=edit_rules&amp;forumid=<?=$ForumID?>">Change specific rules</a>
 	</div>
 <? } ?>
 <? if(!empty($Forums[$ForumID]['SpecificRules'])) { ?>
diff --git a/sections/forums/newthread.php b/sections/forums/newthread.php
index 92696d8b..c4944990 100644
--- a/sections/forums/newthread.php
+++ b/sections/forums/newthread.php
@@ -27,7 +27,7 @@
 	<div class="hidden" id="newthreadpreview">
 		<div class="linkbox">
 			<div class="center">
-				<a href="#" onclick="return false;">[Report thread]</a>
+				<a href="#" onclick="return false;">[Report Thread]</a>
 				<a href="#" onclick="return false;"><?=!empty($HeavyInfo['AutoSubscribe']) ? '[Unsubscribe]' : '[Subscribe]'?></a>
 			</div>
 		</div>
@@ -56,7 +56,7 @@
 					Just now
 					</span>
 					<span id="barpreview" style="float:right;">
-						<a href="#newthreadpreview">[Report post]</a>
+						<a href="#newthreadpreview">[Report Post]</a>
 						&nbsp;
 						<a href="#">&uarr;</a>
 					</span>
diff --git a/sections/forums/thread.php b/sections/forums/thread.php
index 4e8bba04..8a951cea 100644
--- a/sections/forums/thread.php
+++ b/sections/forums/thread.php
@@ -162,9 +162,9 @@
 	</h2>
 	<div class="linkbox">
 		<div class="center">
-			<a href="reports.php?action=report&amp;type=thread&amp;id=<?=$ThreadID?>">[Report thread]</a>
+			<a href="reports.php?action=report&amp;type=thread&amp;id=<?=$ThreadID?>">[Report Thread]</a>
 			<a href="#" onclick="Subscribe(<?=$ThreadID?>);return false;" id="subscribelink<?=$ThreadID?>">[<?=(in_array($ThreadID, $UserSubscriptions) ? 'Unsubscribe' : 'Subscribe')?>]</a>
-			<a href="#" onclick="$('#searchthread').toggle(); this.innerHTML = (this.innerHTML == '[Search this Thread]'?'[Hide Search]':'[Search this Thread]'); return false;">[Search this thread]</a>
+			<a href="#" onclick="$('#searchthread').toggle(); this.innerHTML = (this.innerHTML == '[Search this Thread]'?'[Hide Search]':'[Search this Thread]'); return false;">[Search this Thread]</a>
 		</div>
 		<div id="searchthread" class="hidden center">
 			<div style="display: inline-block;">