diff --git a/classes/class_invite_tree.php b/classes/class_invite_tree.php
index eb9671e1..62b9652c 100644
--- a/classes/class_invite_tree.php
+++ b/classes/class_invite_tree.php
@@ -30,32 +30,37 @@ function make_tree() {
 		if (!$TreeID) {
 			return;
 		}
-		$DB->query("SELECT
-			TreePosition FROM invite_tree
-			WHERE TreeID=$TreeID AND TreeLevel=$TreeLevel AND TreePosition>$TreePosition
-			ORDER BY TreePosition ASC LIMIT 1");
+		$DB->query("
+			SELECT TreePosition
+			FROM invite_tree
+			WHERE TreeID=$TreeID
+				AND TreeLevel=$TreeLevel
+				AND TreePosition>$TreePosition
+			ORDER BY TreePosition ASC
+			LIMIT 1");
 		if ($DB->record_count()) {
 			list($MaxPosition) = $DB->next_record(MYSQLI_NUM, false);
 		} else {
 			$MaxPosition = false;
 		}
-		$TreeQuery = $DB->query("SELECT
-			it.UserID,
-			Enabled,
-			PermissionID,
-			Donor,
-			Uploaded,
-			Downloaded,
-			Paranoia,
-			TreePosition,
-			TreeLevel
+		$TreeQuery = $DB->query("
+			SELECT
+				it.UserID,
+				Enabled,
+				PermissionID,
+				Donor,
+				Uploaded,
+				Downloaded,
+				Paranoia,
+				TreePosition,
+				TreeLevel
 			FROM invite_tree AS it
-			JOIN users_main AS um ON um.ID=it.UserID
-			JOIN users_info AS ui ON ui.UserID=it.UserID
+				JOIN users_main AS um ON um.ID=it.UserID
+				JOIN users_info AS ui ON ui.UserID=it.UserID
 			WHERE TreeID=$TreeID
-			AND TreePosition>$TreePosition".
-			($MaxPosition ? " AND TreePosition<$MaxPosition" : '')."
-			AND TreeLevel>$TreeLevel
+				AND TreePosition>$TreePosition".
+				($MaxPosition ? " AND TreePosition<$MaxPosition" : '')."
+				AND TreeLevel>$TreeLevel
 			ORDER BY TreePosition");
 
 		$PreviousTreeLevel = $TreeLevel;
@@ -108,20 +113,18 @@ function make_tree() {
 			// Manage tree depth
 			if ($TreeLevel > $PreviousTreeLevel) {
 				for ($i = 0; $i < $TreeLevel - $PreviousTreeLevel; $i++) {
-					echo '<ul class="invitetree"><li>';
+					echo "<ul class=\"invitetree\">\n\t<li>";
 				}
 			} elseif ($TreeLevel < $PreviousTreeLevel) {
 				for ($i = 0; $i < $PreviousTreeLevel - $TreeLevel; $i++) {
-					echo '</li></ul>';
+					echo "\t</li>\n</ul>";
 				}
-				echo '</li>';
-				echo '<li>';
+				echo "\t</li>\n<li>";
 			} else {
-				echo '</li>';
-				echo '<li>';
+				echo "\t</li>\n<li>";
 			}
 ?>
-				<strong><?=Users::format_username($ID, true, true, $Enabled != 2 ? false : true, true)?></strong>
+				<strong><?=Users::format_username($ID, true, true, ($Enabled != 2 ? false : true), true)?></strong>
 <?
 			if (check_paranoia(array('uploaded', 'downloaded'), $Paranoia, $UserClass)) {
 				$TotalUpload += $Uploaded;
@@ -145,13 +148,13 @@ function make_tree() {
 
 		$Tree = ob_get_clean();
 		for ($i = 0; $i < $PreviousTreeLevel - $OriginalTreeLevel; $i++) {
-			$Tree .= "</li></ul>\n";
+			$Tree .= "\t</li>\n</ul>\n";
 		}
 
 		if ($Count) {
 
 ?> 		<p style="font-weight: bold;">
-			This tree has <?=$Count?> entries, <?=$Branches?> branches, and a depth of <?=$MaxTreeLevel - $OriginalTreeLevel?>.
+			This tree has <?=number_format($Count)?> entries, <?=number_format($Branches)?> branches, and a depth of <?=number_format($MaxTreeLevel - $OriginalTreeLevel)?>.
 			It has
 <?
 			$ClassStrings = array();
@@ -208,10 +211,10 @@ function make_tree() {
 			echo 'The total amount uploaded by direct invitees (the top level) was '.Format::get_size($TopLevelUpload);
 			echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload);
 			echo '; and the total ratio is '.Format::get_ratio_html($TopLevelUpload, $TopLevelDownload).'. ';
-			
-			
+
+
 			echo 'These numbers include the stats of paranoid users and will be factored into the invitation giving script.</p>';
-			
+
 			if ($ParanoidCount) {
 				echo '<p style="font-weight: bold;">';
 				echo $ParanoidCount;
diff --git a/classes/class_misc.php b/classes/class_misc.php
index 12c6d132..478b7b2c 100644
--- a/classes/class_misc.php
+++ b/classes/class_misc.php
@@ -72,21 +72,30 @@ public static function send_pm($ToID,$FromID,$Subject,$Body,$ConvID='') {
 					WHERE UserID IN (".implode(',', $ToID).")
 					AND ConvID='$ConvID'");
 
-			$DB->query("UPDATE pm_conversations_users SET
+			$DB->query("
+				UPDATE pm_conversations_users
+				SET
 					InSentbox='1',
 					SentDate='".sqltime()."'
-					WHERE UserID='$FromID'
+				WHERE UserID='$FromID'
 					AND ConvID='$ConvID'");
 		}
 
 		// Now that we have a $ConvID for sure, send the message.
-		$DB->query("INSERT INTO pm_messages
-				(SenderID, ConvID, SentDate, Body) VALUES
-				('$FromID', '$ConvID', '".sqltime()."', '".$Body."')");
+		$DB->query("
+			INSERT INTO pm_messages
+				(SenderID, ConvID, SentDate, Body)
+			VALUES
+				('$FromID', '$ConvID', '".sqltime()."', '$Body')");
 
 		// Update the cached new message count.
 		foreach ($ToID as $ID) {
-			$DB->query("SELECT COUNT(ConvID) FROM pm_conversations_users WHERE UnRead = '1' and UserID='$ID' AND InInbox = '1'");
+			$DB->query("
+				SELECT COUNT(ConvID)
+				FROM pm_conversations_users
+				WHERE UnRead = '1'
+					AND UserID='$ID'
+					AND InInbox = '1'");
 			list($UnRead) = $DB->next_record();
 			$Cache->cache_value('inbox_new_'.$ID, $UnRead);
 		}
@@ -94,15 +103,20 @@ public static function send_pm($ToID,$FromID,$Subject,$Body,$ConvID='') {
 		$DB->query("SELECT Username FROM users_main WHERE ID = '$FromID'");
 		list($SenderName) = $DB->next_record();
 		foreach ($ToID as $ID) {
-			$DB->query("SELECT COUNT(ConvID) FROM pm_conversations_users WHERE UnRead = '1' and UserID='$ID' AND InInbox = '1'");
+			$DB->query("
+				SELECT COUNT(ConvID)
+				FROM pm_conversations_users
+				WHERE UnRead = '1'
+					AND UserID='$ID'
+					AND InInbox = '1'");
 			list($UnRead) = $DB->next_record();
 			$Cache->cache_value('inbox_new_'.$ID, $UnRead);
-			
+
 		}
 
 		return $ConvID;
 	}
-	
+
 
 	/**
 	 * Create thread function, things should already be escaped when sent here.
@@ -129,34 +143,40 @@ public static function create_thread($ForumID, $AuthorID, $Title, $PostBody) {
 		$ThreadInfo['IsLocked'] = 0;
 		$ThreadInfo['IsSticky'] = 0;
 
-		$DB->query("INSERT INTO forums_topics
-			(Title, AuthorID, ForumID, LastPostTime, LastPostAuthorID)
-			Values
-			('".$Title."', '".$AuthorID."', '$ForumID', '".sqltime()."', '".$AuthorID."')");
+		$DB->query("
+			INSERT INTO forums_topics
+				(Title, AuthorID, ForumID, LastPostTime, LastPostAuthorID)
+			VALUES
+				('$Title', '$AuthorID', '$ForumID', '".sqltime()."', '$AuthorID')");
 		$TopicID = $DB->inserted_id();
 		$Posts = 1;
 
-		$DB->query("INSERT INTO forums_posts
+		$DB->query("
+			INSERT INTO forums_posts
 				(TopicID, AuthorID, AddedTime, Body)
-				VALUES
-				('$TopicID', '".$AuthorID."', '".sqltime()."', '".$PostBody."')");
+			VALUES
+				('$TopicID', '$AuthorID', '".sqltime()."', '$PostBody')");
 		$PostID = $DB->inserted_id();
 
-		$DB->query("UPDATE forums SET
-					NumPosts  = NumPosts+1,
-					NumTopics = NumTopics+1,
-					LastPostID = '$PostID',
-					LastPostAuthorID = '".$AuthorID."',
-					LastPostTopicID = '$TopicID',
-					LastPostTime = '".sqltime()."'
-					WHERE ID = '$ForumID'");
+		$DB->query("
+			UPDATE forums
+			SET
+				NumPosts  = NumPosts+1,
+				NumTopics = NumTopics+1,
+				LastPostID = '$PostID',
+				LastPostAuthorID = '$AuthorID',
+				LastPostTopicID = '$TopicID',
+				LastPostTime = '".sqltime()."'
+			WHERE ID = '$ForumID'");
 
-		$DB->query("UPDATE forums_topics SET
+		$DB->query("
+			UPDATE forums_topics
+			SET
 				NumPosts = NumPosts+1,
 				LastPostID = '$PostID',
-				LastPostAuthorID = '".$AuthorID."',
+				LastPostAuthorID = '$AuthorID',
 				LastPostTime = '".sqltime()."'
-				WHERE ID = '$TopicID'");
+			WHERE ID = '$TopicID'");
 
 		// Bump this topic to head of the cache
 		list($Forum,,,$Stickies) = $Cache->get_value('forums_'.$ForumID);
@@ -164,12 +184,14 @@ public static function create_thread($ForumID, $AuthorID, $Title, $PostBody) {
 			if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
 				array_pop($Forum);
 			}
-			$DB->query("SELECT f.IsLocked, f.IsSticky, f.NumPosts FROM forums_topics AS f
+			$DB->query("
+				SELECT f.IsLocked, f.IsSticky, f.NumPosts
+				FROM forums_topics AS f
 				WHERE f.ID ='$TopicID'");
-			list($IsLocked,$IsSticky,$NumPosts) = $DB->next_record();
-			$Part1 = array_slice($Forum,0,$Stickies,true); //Stickys
+			list($IsLocked, $IsSticky, $NumPosts) = $DB->next_record();
+			$Part1 = array_slice($Forum, 0, $Stickies, true); //Stickys
 			$Part2 = array(
-				$TopicID=>array(
+				$TopicID => array(
 					'ID' => $TopicID,
 					'Title' => $Title,
 					'AuthorID' => $AuthorID,
@@ -181,10 +203,10 @@ public static function create_thread($ForumID, $AuthorID, $Title, $PostBody) {
 					'LastPostAuthorID' => $AuthorID,
 					)
 				); //Bumped thread
-			$Part3 = array_slice($Forum,$Stickies,TOPICS_PER_PAGE,true); //Rest of page
+			$Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE, true); //Rest of page
 			if ($Stickies > 0) {
-				$Part1 = array_slice($Forum,0,$Stickies,true); //Stickies
-				$Part3 = array_slice($Forum,$Stickies,TOPICS_PER_PAGE-$Stickies-1,true); //Rest of page
+				$Part1 = array_slice($Forum, 0, $Stickies, true); //Stickies
+				$Part3 = array_slice($Forum, $Stickies, TOPICS_PER_PAGE - $Stickies - 1, true); //Rest of page
 			} else {
 				$Part1 = array();
 				$Part3 = $Forum;
@@ -192,7 +214,7 @@ public static function create_thread($ForumID, $AuthorID, $Title, $PostBody) {
 			if (is_null($Part1)) { $Part1 = array(); }
 			if (is_null($Part3)) { $Part3 = array(); }
 			$Forum = $Part1 + $Part2 + $Part3;
-			$Cache->cache_value('forums_'.$ForumID, array($Forum,'',0,$Stickies), 0);
+			$Cache->cache_value('forums_'.$ForumID, array($Forum, '', 0, $Stickies), 0);
 		}
 
 		//Update the forum root
@@ -209,12 +231,12 @@ public static function create_thread($ForumID, $AuthorID, $Title, $PostBody) {
 			'IsSticky'=>$ThreadInfo['IsSticky']
 			);
 
-		$UpdateArray['NumTopics']='+1';
+		$UpdateArray['NumTopics'] = '+1';
 
 		$Cache->update_row($ForumID, $UpdateArray);
 		$Cache->commit_transaction(0);
 
-		$CatalogueID = floor((POSTS_PER_PAGE*ceil($Posts/POSTS_PER_PAGE)-POSTS_PER_PAGE)/THREAD_CATALOGUE);
+		$CatalogueID = floor((POSTS_PER_PAGE * ceil($Posts / POSTS_PER_PAGE) - POSTS_PER_PAGE) / THREAD_CATALOGUE);
 		$Cache->begin_transaction('thread_'.$TopicID.'_catalogue_'.$CatalogueID);
 		$Post = array(
 			'ID'=>$PostID,
@@ -271,7 +293,7 @@ public static function in_array_partial($Needle, $Haystack) {
 		}
 		foreach ($Haystack as $String) {
 			if (substr($String, -1) == '*') {
-				if (!strncmp($Needle, $String, strlen($String)-1)) {
+				if (!strncmp($Needle, $String, strlen($String) - 1)) {
 					$Searches[$Needle] = true;
 					return true;
 				}
@@ -293,7 +315,7 @@ public static function in_array_partial($Needle, $Haystack) {
 	 * @param boolean $AllowEmpty If set to true, a key that is in the request but blank will not throw an error.
 	 * @param int $Error The error code to throw if one of the keys isn't in the array.
 	 */
-	public static function assert_isset_request($Request, $Keys=NULL, $AllowEmpty = False, $Error=0) {
+	public static function assert_isset_request($Request, $Keys = NULL, $AllowEmpty = False, $Error = 0) {
 		if (isset($Keys)) {
 			foreach ($Keys as $K) {
 				if (!isset($Request[$K]) || ($AllowEmpty == False && $Request[$K] == '')) {
@@ -329,7 +351,10 @@ public static function get_tags($TagNames) {
 			}
 		}
 		if (count($TagNames) > 0) {
-			$DB->query("SELECT ID, Name FROM tags WHERE Name IN ('".implode("', '", $TagNames)."')");
+			$DB->query("
+				SELECT ID, Name
+				FROM tags
+				WHERE Name IN ('".implode("', '", $TagNames)."')");
 			$SQLTagIDs = $DB->to_array();
 			foreach ($SQLTagIDs as $Tag) {
 				$TagIDs[$Tag['ID']] = $Tag['Name'];
@@ -348,13 +373,13 @@ public static function get_tags($TagNames) {
 	 * @return string The aliased tag.
 	 */
 	public static function get_alias_tag($BadTag) {
-			 global $DB;
-			 $DB->query("SELECT AliasTag FROM tag_aliases WHERE BadTag = '". $BadTag ."' LIMIT 1");
-					if ($DB->record_count() > 0) {
-							list($AliasTag) = $DB->next_record();
-							return $AliasTag;
-			 }
-			 return $BadTag;
+		global $DB;
+		$DB->query("SELECT AliasTag FROM tag_aliases WHERE BadTag = '". $BadTag ."' LIMIT 1");
+		if ($DB->record_count() > 0) {
+			list($AliasTag) = $DB->next_record();
+			return $AliasTag;
+		}
+		return $BadTag;
 	}
 
 
@@ -365,8 +390,9 @@ public static function get_alias_tag($BadTag) {
 	 */
 	public static function write_log($Message) {
 		global $DB,$Time;
-		$DB->query('INSERT INTO log (Message, Time) VALUES (\''
-			.db_string($Message).'\', \''.sqltime().'\')');
+		$DB->query("
+			INSERT INTO log (Message, Time)
+			VALUES ('" . db_string($Message) . "', '" . sqltime() . "')");
 	}
 
 
@@ -417,10 +443,10 @@ public static function is_new_torrent(&$Data) {
 	public static function display_recommend($ID, $Type, $Hide = true) {
 		global $DB, $LoggedUser;
 		if ($Hide) {
-			$Hide = 'style="display: none;"';
+			$Hide = ' style="display: none;"';
 		}
 		?>
-		<div id="recommendation_div" data-id="<?=$ID?>" data-type="<?=$Type?>" <?=$Hide?> class="center">
+		<div id="recommendation_div" data-id="<?=$ID?>" data-type="<?=$Type?>"<?=$Hide?> class="center">
 			<div style="display: inline-block;">
 				<strong>Recommend to:</strong>
 				<select id="friend" name="friend">
@@ -431,7 +457,7 @@ public static function display_recommend($ID, $Type, $Hide = true) {
 			</div>
 			<div class="new" id="recommendation_status"><br /></div>
 		</div>
-		<?
+<?
 	}
 }
 ?>
diff --git a/classes/class_text.php b/classes/class_text.php
index ae2da922..43fac825 100644
--- a/classes/class_text.php
+++ b/classes/class_text.php
@@ -831,7 +831,7 @@ private function to_html ($Array) {
 					}
 
 					break;
-				
+
 			}
 		}
 		}
@@ -857,7 +857,7 @@ private function raw_text ($Array) {
 				case 'size':
 				case 'quote':
 				case 'align':
-				
+
 					$Str.=$this->raw_text($Block['Val']);
 					break;
 				case 'tex': //since this will never strip cleanly, just remove it
diff --git a/classes/class_text2.php b/classes/class_text2.php
index 7dc4bbb7..27ffda6a 100644
--- a/classes/class_text2.php
+++ b/classes/class_text2.php
@@ -600,9 +600,8 @@ function to_html($Array) {
 							$Str.='<a rel="noreferrer" target="_blank" href="'.$Block['Attr'].'">'.$Block['Attr'].'</a>';
 						}
 					}
-
 					break;
-				
+
 			}
 		}
 		$this->Levels--;
@@ -626,7 +625,7 @@ function raw_text($Array) {
 				case 'size':
 				case 'quote':
 				case 'align':
-				
+
 					$Str.=$this->raw_text($Block['Val']);
 					break;
 				case 'tex': //since this will never strip cleanly, just remove it
diff --git a/classes/class_text3.php b/classes/class_text3.php
index 862718a6..450b05ee 100644
--- a/classes/class_text3.php
+++ b/classes/class_text3.php
@@ -565,7 +565,7 @@ function to_html($Array) {
 					}
 
 					break;
-				
+
 			}
 		}
 		$this->Levels--;
@@ -589,7 +589,7 @@ function raw_text($Array) {
 				case 'size':
 				case 'quote':
 				case 'align':
-				
+
 					$Str.=$this->raw_text($Block['Val']);
 					break;
 				case 'tex': //since this will never strip cleanly, just remove it
diff --git a/classes/class_tools.php b/classes/class_tools.php
index fc60a952..3fe310a1 100644
--- a/classes/class_tools.php
+++ b/classes/class_tools.php
@@ -130,7 +130,7 @@ public static function lookup_ip($IP) {
 	public static function display_ip($IP) {
 		$Line = display_str($IP).' ('.Tools::get_country_code_by_ajax($IP).') ';
 		$Line .= '<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&amp;matchtype=strict" title="Search" class="brackets">S</a>';
-		
+
 		return $Line;
 	}
 
@@ -141,7 +141,7 @@ public static function get_country_code_by_ajax($IP) {
 	}
 
 
-	
+
 
 	/**
 	 * Disable an array of users.
@@ -161,7 +161,7 @@ public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
 				m.can_leech='0',
 				i.AdminComment = CONCAT('".sqltime()." - ".($AdminComment ? $AdminComment : 'Disabled by system')."\n\n', i.AdminComment),
 				i.BanDate='".sqltime()."',
-				i.BanReason='".$BanReason."',
+				i.BanReason='$BanReason',
 				i.RatioWatchDownload=".($BanReason == 2 ? 'm.Downloaded' : "'0'")."
 			WHERE m.ID IN(".implode(',',$UserIDs).") ");
 		$Cache->decrement('stats_user_count',$DB->affected_rows());
@@ -176,14 +176,14 @@ public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
 				$Cache->delete_value('session_'.$UserID.'_'.$SessionID);
 			}
 			$Cache->delete_value('users_sessions_'.$UserID);
-			
-			
+
+
 			$DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'");
-			
+
 		}
 
 		// Remove the users from the tracker.
-		$DB->query("SELECT torrent_pass FROM users_main WHERE ID in (".implode(", ",$UserIDs).")");
+		$DB->query("SELECT torrent_pass FROM users_main WHERE ID in (".implode(', ',$UserIDs).')');
 		$PassKeys = $DB->collect('torrent_pass');
 		$Concat = '';
 		foreach ($PassKeys as $PassKey) {
@@ -223,10 +223,12 @@ public static function warn_user($UserID, $Duration, $Reason) {
 
 			$AdminComment = date('Y-m-d').' - Warning (Clash) extended to expire at '.$NewExpDate.' by '.$LoggedUser['Username']."\nReason: $Reason\n\n";
 
-			$DB->query('UPDATE users_info SET
-				Warned=\''.db_string($NewExpDate).'\',
-				WarnedTimes=WarnedTimes+1,
-				AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
+			$DB->query('
+				UPDATE users_info
+				SET
+					Warned=\''.db_string($NewExpDate).'\',
+					WarnedTimes=WarnedTimes+1,
+					AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
 				WHERE UserID=\''.db_string($UserID).'\'');
 		} else {
 			//Not changing, user was not already warned
@@ -238,10 +240,12 @@ public static function warn_user($UserID, $Duration, $Reason) {
 
 			$AdminComment = date('Y-m-d').' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']."\nReason: $Reason\n\n";
 
-			$DB->query('UPDATE users_info SET
-				Warned=\''.db_string($WarnTime).'\',
-				WarnedTimes=WarnedTimes+1,
-				AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
+			$DB->query('
+				UPDATE users_info
+				SET
+					Warned=\''.db_string($WarnTime).'\',
+					WarnedTimes=WarnedTimes+1,
+					AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
 				WHERE UserID=\''.db_string($UserID).'\'');
 		}
 	}
@@ -253,9 +257,10 @@ public static function warn_user($UserID, $Duration, $Reason) {
 	 */
 	public static function update_user_notes($UserID, $AdminComment) {
 		global $DB;
-		$DB->query('UPDATE users_info SET
-					AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
-					WHERE UserID=\''.db_string($UserID).'\'');
+		$DB->query('
+			UPDATE users_info
+			SET AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
+			WHERE UserID=\''.db_string($UserID).'\'');
 	}
 }
 ?>
diff --git a/classes/class_torrents.php b/classes/class_torrents.php
index b888459c..65fce62e 100644
--- a/classes/class_torrents.php
+++ b/classes/class_torrents.php
@@ -243,7 +243,7 @@ public static function delete_torrent($ID, $GroupID=0, $OcelotReason=-1) {
 			}
 		}
 
-		
+
 		$DB->query("SELECT info_hash FROM torrents WHERE ID = ".$ID);
 		list($InfoHash) = $DB->next_record(MYSQLI_BOTH, false);
 		$DB->query("DELETE FROM torrents WHERE ID = ".$ID);
@@ -314,7 +314,7 @@ public static function delete_group($GroupID) {
 		}
 		$Cache->decrement('stats_group_count');
 
-		
+
 
 		// Collages
 		$DB->query("SELECT CollageID FROM collages_torrents WHERE GroupID='$GroupID'");
diff --git a/classes/class_user_rank.php b/classes/class_user_rank.php
index fc4869f8..2d7e335a 100644
--- a/classes/class_user_rank.php
+++ b/classes/class_user_rank.php
@@ -48,10 +48,9 @@ function table_query($TableName) {
 				$Query = "SELECT COUNT(p.ID) AS Posts FROM users_main AS um JOIN forums_posts AS p ON p.AuthorID=um.ID WHERE um.Enabled='1' GROUP BY um.ID ORDER BY Posts;";
 				break;
 			case 'bounty':
-				
-				
+
 				$Query = "SELECT SUM(rv.Bounty) AS Bounty FROM users_main AS um JOIN requests_votes AS rv ON rv.UserID=um.ID WHERE um.Enabled='1' GROUP BY um.ID ORDER BY Bounty;";
-				
+
 				break;
 			case 'artists':
 				$Query = "SELECT COUNT(ta.ArtistID) AS Artists FROM torrents_artists AS ta JOIN torrents_group AS tg ON tg.ID=ta.GroupID JOIN torrents AS t ON t.GroupID = tg.ID WHERE t.UserID != ta.UserID GROUP BY tg.ID ORDER BY Artists ASC";
diff --git a/classes/class_users.php b/classes/class_users.php
index cd79a949..fa3de6c6 100644
--- a/classes/class_users.php
+++ b/classes/class_users.php
@@ -16,7 +16,7 @@ public static function get_classes() {
 			$Cache->cache_value('classes', array($Classes, $ClassLevels), 0);
 		}
 		$Debug->set_flag('Loaded permissions');
-		
+
 		return array($Classes, $ClassLevels);
 	}
 
@@ -47,30 +47,31 @@ public static function user_info($UserID) {
 		// the !isset($UserInfo['Paranoia']) can be removed after a transition period
 		if (empty($UserInfo) || empty($UserInfo['ID']) || !isset($UserInfo['Paranoia']) || empty($UserInfo['Class'])) {
 			$OldQueryID = $DB->get_query_id();
-	
-	
-			$DB->query("SELECT
-				m.ID,
-				m.Username,
-				m.PermissionID,
-				m.Paranoia,
-				i.Artist,
-				i.Donor,
-				i.Warned,
-				i.Avatar,
-				m.Enabled,
-				m.Title,
-				i.CatchupTime,
-				m.Visible,
-				GROUP_CONCAT(ul.PermissionID SEPARATOR ',') AS Levels
+
+
+			$DB->query("
+				SELECT
+					m.ID,
+					m.Username,
+					m.PermissionID,
+					m.Paranoia,
+					i.Artist,
+					i.Donor,
+					i.Warned,
+					i.Avatar,
+					m.Enabled,
+					m.Title,
+					i.CatchupTime,
+					m.Visible,
+					GROUP_CONCAT(ul.PermissionID SEPARATOR ',') AS Levels
 				FROM users_main AS m
-				INNER JOIN users_info AS i ON i.UserID=m.ID
-				LEFT JOIN users_levels AS ul ON ul.UserID = m.ID
+					INNER JOIN users_info AS i ON i.UserID=m.ID
+					LEFT JOIN users_levels AS ul ON ul.UserID = m.ID
 				WHERE m.ID='$UserID'
 				GROUP BY m.ID");
 			if ($DB->record_count() == 0) { // Deleted user, maybe?
 				$UserInfo = array('ID'=>'','Username'=>'','PermissionID'=>0,'Artist'=>false,'Donor'=>false,'Warned'=>'0000-00-00 00:00:00','Avatar'=>'','Enabled'=>0,'Title'=>'', 'CatchupTime'=>0, 'Visible'=>'1');
-	
+
 			} else {
 				$UserInfo = $DB->next_record(MYSQLI_ASSOC, array('Paranoia', 'Title'));
 				$UserInfo['CatchupTime'] = strtotime($UserInfo['CatchupTime']);
@@ -118,39 +119,40 @@ public static function user_heavy_info($UserID) {
 		global $DB, $Cache;
 
 		$HeavyInfo = $Cache->get_value('user_info_heavy_'.$UserID);
-	
+
 		if (empty($HeavyInfo)) {
-	
-			$DB->query("SELECT
-				m.Invites,
-				m.torrent_pass,
-				m.IP,
-				m.CustomPermissions,
-				m.can_leech AS CanLeech,
-				i.AuthKey,
-				i.RatioWatchEnds,
-				i.RatioWatchDownload,
-				i.StyleID,
-				i.StyleURL,
-				i.DisableInvites,
-				i.DisablePosting,
-				i.DisableUpload,
-				i.DisableWiki,
-				i.DisableAvatar,
-				i.DisablePM,
-				i.DisableRequests,
-				i.DisableForums,
-				i.DisableTagging,
-				i.SiteOptions,
-				i.DownloadAlt,
-				i.LastReadNews,
-				i.LastReadBlog,
-				i.RestrictedForums,
-				i.PermittedForums,
-				m.FLTokens,
-				m.PermissionID
+
+			$DB->query("
+				SELECT
+					m.Invites,
+					m.torrent_pass,
+					m.IP,
+					m.CustomPermissions,
+					m.can_leech AS CanLeech,
+					i.AuthKey,
+					i.RatioWatchEnds,
+					i.RatioWatchDownload,
+					i.StyleID,
+					i.StyleURL,
+					i.DisableInvites,
+					i.DisablePosting,
+					i.DisableUpload,
+					i.DisableWiki,
+					i.DisableAvatar,
+					i.DisablePM,
+					i.DisableRequests,
+					i.DisableForums,
+					i.DisableTagging,
+					i.SiteOptions,
+					i.DownloadAlt,
+					i.LastReadNews,
+					i.LastReadBlog,
+					i.RestrictedForums,
+					i.PermittedForums,
+					m.FLTokens,
+					m.PermissionID
 				FROM users_main AS m
-				INNER JOIN users_info AS i ON i.UserID=m.ID
+					INNER JOIN users_info AS i ON i.UserID=m.ID
 				WHERE m.ID='$UserID'");
 			$HeavyInfo = $DB->next_record(MYSQLI_ASSOC, array('CustomPermissions', 'SiteOptions'));
 
diff --git a/classes/script_start.php b/classes/script_start.php
index 76dbf34e..739189a9 100644
--- a/classes/script_start.php
+++ b/classes/script_start.php
@@ -11,7 +11,9 @@
 /********************************************************/
 require 'config.php'; //The config contains all site wide configuration information
 //Deal with dumbasses
-if (isset($_REQUEST['info_hash']) && isset($_REQUEST['peer_id'])) { die('d14:failure reason40:Invalid .torrent, try downloading again.e'); }
+if (isset($_REQUEST['info_hash']) && isset($_REQUEST['peer_id'])) {
+	die('d14:failure reason40:Invalid .torrent, try downloading again.e');
+}
 
 require(SERVER_ROOT.'/classes/class_proxies.php');
 
@@ -221,15 +223,16 @@
 
 	$UserSessions = $Cache->get_value('users_sessions_'.$UserID);
 	if (!is_array($UserSessions)) {
-		$DB->query("SELECT
-			SessionID,
-			Browser,
-			OperatingSystem,
-			IP,
-			LastUpdate
+		$DB->query("
+			SELECT
+				SessionID,
+				Browser,
+				OperatingSystem,
+				IP,
+				LastUpdate
 			FROM users_sessions
 			WHERE UserID='$UserID'
-			AND Active = 1
+				AND Active = 1
 			ORDER BY LastUpdate DESC");
 		$UserSessions = $DB->to_array('SessionID',MYSQLI_ASSOC);
 		$Cache->cache_value('users_sessions_'.$UserID, $UserSessions, 0);
@@ -243,20 +246,21 @@
 	$Enabled = $Cache->get_value('enabled_'.$LoggedUser['ID']);
 	if ($Enabled === false) {
 		$DB->query("SELECT Enabled FROM users_main WHERE ID='$LoggedUser[ID]'");
-		list($Enabled)=$DB->next_record();
+		list($Enabled) = $DB->next_record();
 		$Cache->cache_value('enabled_'.$LoggedUser['ID'], $Enabled, 0);
 	}
-	if ($Enabled==2) {
-		
+	if ($Enabled == 2) {
+
 		logout();
 	}
 
-	
-
 	// Up/Down stats
 	$UserStats = $Cache->get_value('user_stats_'.$LoggedUser['ID']);
 	if (!is_array($UserStats)) {
-		$DB->query("SELECT Uploaded AS BytesUploaded, Downloaded AS BytesDownloaded, RequiredRatio FROM users_main WHERE ID='$LoggedUser[ID]'");
+		$DB->query("
+			SELECT Uploaded AS BytesUploaded, Downloaded AS BytesDownloaded, RequiredRatio
+			FROM users_main
+			WHERE ID='$LoggedUser[ID]'");
 		$UserStats = $DB->next_record(MYSQLI_ASSOC);
 		$Cache->cache_value('user_stats_'.$LoggedUser['ID'], $UserStats, 3600);
 	}
@@ -273,11 +277,11 @@
 
 	$LoggedUser['RSS_Auth']=md5($LoggedUser['ID'].RSS_HASH.$LoggedUser['torrent_pass']);
 
-	//$LoggedUser['RatioWatch'] as a bool to disable things for users on Ratio Watch
+	// $LoggedUser['RatioWatch'] as a bool to disable things for users on Ratio Watch
 	$LoggedUser['RatioWatch'] = (
 		$LoggedUser['RatioWatchEnds'] != '0000-00-00 00:00:00' &&
 		time() < strtotime($LoggedUser['RatioWatchEnds']) &&
-		($LoggedUser['BytesDownloaded']*$LoggedUser['RequiredRatio'])>$LoggedUser['BytesUploaded']
+		($LoggedUser['BytesDownloaded'] * $LoggedUser['RequiredRatio']) > $LoggedUser['BytesUploaded']
 	);
 	if (!isset($LoggedUser['ID'])) {
 		$Debug->log_var($LightInfo, 'LightInfo');
@@ -286,19 +290,30 @@
 		$Debug->log_var($UserStats, 'UserStats');
 	}
 
-	//Load in the permissions
+	// Load in the permissions
 	$LoggedUser['Permissions'] = Permissions::get_permissions_for_user($LoggedUser['ID'], $LoggedUser['CustomPermissions']);
 
-	//Change necessary triggers in external components
+	// Change necessary triggers in external components
 	$Cache->CanClear = check_perms('admin_clear_cache');
 
 	// Because we <3 our staff
 	if (check_perms('site_disable_ip_history')) { $_SERVER['REMOTE_ADDR'] = '127.0.0.1'; }
 
 	// Update LastUpdate every 10 minutes
-	if (strtotime($UserSessions[$SessionID]['LastUpdate'])+600<time()) {
-		$DB->query("UPDATE users_main SET LastAccess='".sqltime()."' WHERE ID='$LoggedUser[ID]'");
-		$DB->query("UPDATE users_sessions SET IP='".$_SERVER['REMOTE_ADDR']."', Browser='".$Browser."', OperatingSystem='".$OperatingSystem."', LastUpdate='".sqltime()."' WHERE UserID='$LoggedUser[ID]' AND SessionID='".db_string($SessionID)."'");
+	if (strtotime($UserSessions[$SessionID]['LastUpdate']) + 600 < time()) {
+		$DB->query("
+			UPDATE users_main
+			SET LastAccess='".sqltime()."'
+			WHERE ID='$LoggedUser[ID]'");
+		$DB->query("
+			UPDATE users_sessions
+			SET
+				IP='".$_SERVER['REMOTE_ADDR']."',
+				Browser='$Browser',
+				OperatingSystem='$OperatingSystem',
+				LastUpdate='".sqltime()."'
+			WHERE UserID='$LoggedUser[ID]'
+				AND SessionID='".db_string($SessionID)."'");
 		$Cache->begin_transaction('users_sessions_'.$UserID);
 		$Cache->delete_row($SessionID);
 		$Cache->insert_front($SessionID,array(
@@ -327,23 +342,26 @@
 	}
 
 	// IP changed
-	
-	
+
+
 	if ($LoggedUser['IP'] != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
-	
+
 		if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) {
-			error('Your IP has been banned.');
+			error('Your IP address has been banned.');
 		}
 
 		$CurIP = db_string($LoggedUser['IP']);
 		$NewIP = db_string($_SERVER['REMOTE_ADDR']);
-		$DB->query("UPDATE users_history_ips SET
-				EndTime='".sqltime()."'
-				WHERE EndTime IS NULL
+		$DB->query("
+			UPDATE users_history_ips
+			SET EndTime='".sqltime()."'
+			WHERE EndTime IS NULL
 				AND UserID='$LoggedUser[ID]'
 				AND IP='$CurIP'");
-		$DB->query("INSERT IGNORE INTO users_history_ips
-				(UserID, IP, StartTime) VALUES
+		$DB->query("
+			INSERT IGNORE INTO users_history_ips
+				(UserID, IP, StartTime)
+			VALUES
 				('$LoggedUser[ID]', '$NewIP', '".sqltime()."')");
 
 		$ipcc = Tools::geoip($NewIP);
@@ -352,10 +370,9 @@
 		$Cache->update_row(false, array('IP' => $_SERVER['REMOTE_ADDR']));
 		$Cache->commit_transaction(0);
 
-		
+
 	}
 
-	
 
 	// Get stylesheets
 	$Stylesheets = $Cache->get_value('stylesheets');
@@ -388,10 +405,10 @@ function logout() {
 	setcookie('keeplogged', '', time() - 60 * 60 * 24 * 365, '/', '', false);
 	setcookie('session', '', time() - 60 * 60 * 24 * 365, '/', '', false);
 	if ($SessionID) {
-		
-		
+
+
 		$DB->query("DELETE FROM users_sessions WHERE UserID='$LoggedUser[ID]' AND SessionID='".db_string($SessionID)."'");
-		
+
 		$Cache->begin_transaction('users_sessions_'.$LoggedUser['ID']);
 		$Cache->delete_row($SessionID);
 		$Cache->commit_transaction(0);
diff --git a/design/privateheader.php b/design/privateheader.php
index 9afdfd7e..6102b50a 100644
--- a/design/privateheader.php
+++ b/design/privateheader.php
@@ -110,7 +110,7 @@
 <?
 if (check_perms('site_send_unlimited_invites')) {
 	$Invites = ' (∞)';
-} elseif ($LoggedUser['Invites']>0) {
+} elseif ($LoggedUser['Invites'] > 0) {
 	$Invites = ' ('.$LoggedUser['Invites'].')';
 } else {
 	$Invites = '';
@@ -118,7 +118,7 @@
 ?>
 			<li id="nav_invite" class="brackets<?=Format::add_class($PageID, array('user','invite'), 'active', false)?>"><a href="user.php?action=invite">Invite<?=$Invites?></a></li>
 			<li id="nav_donate" class="brackets<?=Format::add_class($PageID, array('donate'), 'active', false)?>"><a href="donate.php">Donate</a></li>
-			
+
 		</ul>
 		<ul id="userinfo_stats">
 			<li id="stats_seeding"><a href="torrents.php?type=seeding&amp;userid=<?=$LoggedUser['ID']?>">Up</a>: <span class="stat" title="<?=Format::get_size($LoggedUser['BytesUploaded'], 5)?>"><?=Format::get_size($LoggedUser['BytesUploaded'])?></span></li>
@@ -139,20 +139,21 @@
 		$RestrictedForums = implode("','", array_keys($LoggedUser['CustomForums'], 0));
 		$PermittedForums = implode("','", array_keys($LoggedUser['CustomForums'], 1));
 	}
-	$DB->query("SELECT COUNT(s.TopicID)
-				FROM users_subscriptions AS s
-					JOIN forums_last_read_topics AS l ON s.UserID = l.UserID AND s.TopicID = l.TopicID
-					JOIN forums_topics AS t ON l.TopicID = t.ID
-					JOIN forums AS f ON t.ForumID = f.ID
-				WHERE (f.MinClassRead <= ".$LoggedUser['Class']." OR f.ID IN ('$PermittedForums'))
-					AND l.PostID < t.LastPostID
-					AND s.UserID = ".$LoggedUser['ID'].
-				(!empty($RestrictedForums) ? "
-					AND f.ID NOT IN ('".$RestrictedForums."')" : ""));
+	$DB->query("
+		SELECT COUNT(s.TopicID)
+		FROM users_subscriptions AS s
+			JOIN forums_last_read_topics AS l ON s.UserID = l.UserID AND s.TopicID = l.TopicID
+			JOIN forums_topics AS t ON l.TopicID = t.ID
+			JOIN forums AS f ON t.ForumID = f.ID
+		WHERE (f.MinClassRead <= ".$LoggedUser['Class']." OR f.ID IN ('$PermittedForums'))
+			AND l.PostID < t.LastPostID
+			AND s.UserID = ".$LoggedUser['ID'].
+		(!empty($RestrictedForums) ? "
+			AND f.ID NOT IN ('$RestrictedForums')" : ''));
 	list($NewSubscriptions) = $DB->next_record();
 	$Cache->cache_value('subscriptions_user_new_'.$LoggedUser['ID'], $NewSubscriptions, 0);
 } ?>
-		<ul id="userinfo_minor"<?=$NewSubscriptions ? ' class="highlite"' : ''?>>
+		<ul id="userinfo_minor"<?=($NewSubscriptions ? ' class="highlite"' : '')?>>
 			<li id="nav_inbox"<?=Format::add_class($PageID, array('inbox'), 'active', true)?>><a onmousedown="Stats('inbox');" href="inbox.php">Inbox</a></li>
 			<li id="nav_staffinbox"<?=Format::add_class($PageID, array('staffpm'), 'active', true)?>><a onmousedown="Stats('staffpm');" href="staffpm.php">Staff Inbox</a></li>
 			<li id="nav_uploaded"<?=Format::add_class($PageID, array('torrents',false,'uploaded'), 'active', true, 'userid')?>><a onmousedown="Stats('uploads');" href="torrents.php?type=uploaded&amp;userid=<?=$LoggedUser['ID']?>">Uploads</a></li>
@@ -194,11 +195,15 @@
 			$RestrictedForums = implode("','", array_keys($LoggedUser['CustomForums'], 0));
 			$PermittedForums = implode("','", array_keys($LoggedUser['CustomForums'], 1));
 		}
-		$sql = "SELECT COUNT(q.UnRead)
-				FROM users_notify_quoted AS q
-					LEFT JOIN forums_topics AS t ON t.ID = q.PageID
-					LEFT JOIN forums AS f ON f.ID = t.ForumID
-				WHERE q.UserID=$LoggedUser[ID] AND q.UnRead=1 AND q.Page = 'forums' AND ((f.MinClassRead<='$LoggedUser[Class]'";
+		$sql = "
+			SELECT COUNT(q.UnRead)
+			FROM users_notify_quoted AS q
+				LEFT JOIN forums_topics AS t ON t.ID = q.PageID
+				LEFT JOIN forums AS f ON f.ID = t.ForumID
+			WHERE q.UserID=$LoggedUser[ID]
+				AND q.UnRead=1
+				AND q.Page = 'forums'
+				AND ((f.MinClassRead<='$LoggedUser[Class]'";
 		if (!empty($RestrictedForums)) {
 			$sql .= " AND f.ID NOT IN ('$RestrictedForums')";
 		}
diff --git a/sections/ajax/index.php b/sections/ajax/index.php
index e7a49aed..fe7cda46 100644
--- a/sections/ajax/index.php
+++ b/sections/ajax/index.php
@@ -30,7 +30,7 @@
 				'response' => 'Rate limit exceeded.'
 				)
 			);
-		
+
 		json_die("failure", "rate limit exceeded");
 	} else {
 		$Cache->increment_value('ajax_requests_'.$UserID);
@@ -58,7 +58,7 @@
 	case 'stats':
 		require(SERVER_ROOT . '/sections/ajax/stats.php');
 		break;
-	
+
 	case 'checkprivate':
 		include('checkprivate.php');
 		break;
diff --git a/sections/ajax/usersearch.php b/sections/ajax/usersearch.php
index 609a2926..01f66d42 100644
--- a/sections/ajax/usersearch.php
+++ b/sections/ajax/usersearch.php
@@ -13,7 +13,7 @@
 
 if (isset($_GET['username'])) {
 	$_GET['username'] = trim($_GET['username']);
-	
+
 	list($Page,$Limit) = Format::page_limit(USERS_PER_PAGE);
 	$DB->query("
 		SELECT SQL_CALC_FOUND_ROWS
diff --git a/sections/artist/artist.php b/sections/artist/artist.php
index cdc6399a..a449c074 100644
--- a/sections/artist/artist.php
+++ b/sections/artist/artist.php
@@ -886,7 +886,7 @@ function require(file, callback) {
 			</div>
 			<div id="body" class="body"><?=$Text->full_format($Body)?></div>
 		</div>
-<!--	-->
+<!---->
 <?php
 // --- Comments ---
 
@@ -909,9 +909,9 @@ function require(file, callback) {
 		WHERE ArtistID = $ArtistID
 			AND ID <= $_GET[postid]");
 	list($PostNum) = $DB->next_record();
-	list($Page,$Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE,$PostNum);
+	list($Page, $Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE, $PostNum);
 } else {
-	list($Page,$Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE,$Results);
+	list($Page, $Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE, $Results);
 }
 
 //Get the cache catalogue
@@ -937,12 +937,12 @@ function require(file, callback) {
 		WHERE c.ArtistID = '$ArtistID'
 		ORDER BY c.ID
 		LIMIT $CatalogueLimit");
-	$Catalogue = $DB->to_array(false,MYSQLI_ASSOC);
+	$Catalogue = $DB->to_array(false, MYSQLI_ASSOC);
 	$Cache->cache_value('artist_comments_'.$ArtistID.'_catalogue_'.$CatalogueID, $Catalogue, 0);
 }
 
 //This is a hybrid to reduce the catalogue down to the page elements: We use the page limit % catalogue
-$Thread = array_slice($Catalogue,((TORRENT_COMMENTS_PER_PAGE * $Page - TORRENT_COMMENTS_PER_PAGE) % THREAD_CATALOGUE),TORRENT_COMMENTS_PER_PAGE,true);
+$Thread = array_slice($Catalogue, ((TORRENT_COMMENTS_PER_PAGE * $Page - TORRENT_COMMENTS_PER_PAGE) % THREAD_CATALOGUE), TORRENT_COMMENTS_PER_PAGE, true);
 ?>
 	<div id="artistcomments" class="linkbox">
 		<a name="comments"></a>
diff --git a/sections/blog/index.php b/sections/blog/index.php
index a14387e3..aec5691d 100644
--- a/sections/blog/index.php
+++ b/sections/blog/index.php
@@ -61,13 +61,14 @@
 					}
 				}
 
-				$DB->query("INSERT INTO blog (UserID, Title, Body, Time, ThreadID, Important)
-							VALUES ('".$LoggedUser['ID']."',
-									'".db_string($_POST['title'])."',
-									'".db_string($_POST['body'])."',
-									'".sqltime()."',
-									$ThreadID,
-									'".(($_POST['important'] == '1') ? '1' : '0')."')");
+				$DB->query("
+					INSERT INTO blog (UserID, Title, Body, Time, ThreadID, Important)
+					VALUES ('".$LoggedUser['ID']."',
+							'".db_string($_POST['title'])."',
+							'".db_string($_POST['body'])."',
+							'".sqltime()."',
+							$ThreadID,
+							'".(($_POST['important'] == '1') ? '1' : '0')."')");
 				$Cache->delete_value('blog');
 				if ($_POST['important'] == '1') {
 					$Cache->delete_value('blog_latest_id');
@@ -76,7 +77,6 @@
 					$DB->query("INSERT IGNORE INTO users_subscriptions VALUES ('$LoggedUser[ID]', $ThreadID)");
 					$Cache->delete_value('subscriptions_user_'.$LoggedUser['ID']);
 				}
-				
 				header('Location: blog.php');
 				break;
 		}
diff --git a/sections/bookmarks/torrents.php b/sections/bookmarks/torrents.php
index 539e4526..f694f6ca 100644
--- a/sections/bookmarks/torrents.php
+++ b/sections/bookmarks/torrents.php
@@ -143,7 +143,7 @@ function compare($X, $Y) {
 		</td>
 		<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
 		<td><?=number_format($Torrent['Snatched'])?></td>
-		<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td>
+		<td<?=(($Torrent['Seeders'] == 0) ? ' class="r00"' : '')?>><?=number_format($Torrent['Seeders'])?></td>
 		<td><?=number_format($Torrent['Leechers'])?></td>
 	</tr>
 <?
diff --git a/sections/collages/collage.php b/sections/collages/collage.php
index 7dcbef6c..5217d8e3 100644
--- a/sections/collages/collage.php
+++ b/sections/collages/collage.php
@@ -218,7 +218,7 @@ function compare($X, $Y) {
 		</td>
 		<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
 		<td><?=number_format($Torrent['Snatched'])?></td>
-		<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td>
+		<td<?=(($Torrent['Seeders'] == 0) ? ' class="r00"' : '')?>><?=number_format($Torrent['Seeders'])?></td>
 		<td><?=number_format($Torrent['Leechers'])?></td>
 	</tr>
 <?
diff --git a/sections/collages/edit.php b/sections/collages/edit.php
index 5d9f5369..7257c220 100644
--- a/sections/collages/edit.php
+++ b/sections/collages/edit.php
@@ -66,7 +66,7 @@
 				<td class="label">Tags</td>
 				<td><input type="text" name="tags" size="60" value="<?=$TagList?>" /></td>
 			</tr>
-<? if ($CategoryID == 0) { // CategoryID==0 is for "personal" collages ?>
+<? if ($CategoryID == 0) { // CategoryID == 0 is for "personal" collages ?>
 			<tr>
 				<td class="label"><span title="A &quot;featured&quot; personal collage will be listed first on your profile, along with a preview of the included torrents.">Featured</span></td>
 				<td><input type="checkbox" name="featured"<?=($Featured ? ' checked="checked"' : '')?> /></td>
diff --git a/sections/collages/manage.php b/sections/collages/manage.php
index fd236613..5a6e935a 100644
--- a/sections/collages/manage.php
+++ b/sections/collages/manage.php
@@ -26,7 +26,7 @@
 
 	$GroupIDs = $DB->collect('GroupID');
 
-	$CollageDataList=$DB->to_array('GroupID', MYSQLI_ASSOC);
+	$CollageDataList = $DB->to_array('GroupID', MYSQLI_ASSOC);
 	if (count($GroupIDs) > 0) {
 		$TorrentList = Torrents::get_groups($GroupIDs);
 		$TorrentList = $TorrentList['matches'];
diff --git a/sections/comments/artistcomments.php b/sections/comments/artistcomments.php
index 01d8df9a..e6eaf0c9 100644
--- a/sections/comments/artistcomments.php
+++ b/sections/comments/artistcomments.php
@@ -56,8 +56,7 @@
 	comment_body($UserID, $PostID, $postheader, $permalink, $Body, $EditorID, $AddedTime, $EditedTime);
 
 } /* end while loop*/ ?>
-	<div class="linkbox"><?= $Pages; ?></div>
+	<div class="linkbox"><?=($Pages)?></div>
 </div>
 <?
 View::show_footer();
-
diff --git a/sections/comments/torrentcomments.php b/sections/comments/torrentcomments.php
index 4041364b..040a121c 100644
--- a/sections/comments/torrentcomments.php
+++ b/sections/comments/torrentcomments.php
@@ -83,7 +83,7 @@
 	comment_body($UserID, $PostID, $postheader, $permalink, $Body, $EditorID, $AddedTime, $EditedTime);
 
 } /* end while loop*/ ?>
-	<div class="linkbox"><?= $Pages; ?></div>
+	<div class="linkbox"><?=($Pages)?></div>
 </div>
 <?
 
diff --git a/sections/donate/config.php b/sections/donate/config.php
index f4c58cb6..74cecc6f 100644
--- a/sections/donate/config.php
+++ b/sections/donate/config.php
@@ -8,11 +8,11 @@
 define('PAYPAL_MINIMUM',5);
 
 function btc_received() {
-	
+
 }
 
 function btc_balance() {
-	
+
 }
 
 // This will be rarely called, so let's go directly to the database
@@ -22,9 +22,9 @@ function btc_address($UserID, $GenAddress = false) {
 	$DB->query("SELECT BitcoinAddress FROM users_info WHERE UserID = '$UserID'");
 	list($Addr) = $DB->next_record();
 
-	if (!empty($Addr)) { return $Addr; }
-	elseif ($GenAddress) {
-		
+	if (!empty($Addr)) {
+		return $Addr;
+	} elseif ($GenAddress) {
 		if (empty($NewAddr)) {
 			error(0);
 		}
diff --git a/sections/donate/index.php b/sections/donate/index.php
index ecb804bc..a91492f1 100644
--- a/sections/donate/index.php
+++ b/sections/donate/index.php
@@ -9,7 +9,6 @@
 		case 'ipn': // PayPal hits this page when a donation is received
 			include(SERVER_ROOT.'/sections/donate/ipn.php');
 			break;
-		
 		case 'complete':
 			include(SERVER_ROOT.'/sections/donate/complete.php');
 			break;
diff --git a/sections/donate/ipn.php b/sections/donate/ipn.php
index e10cd884..dfb9c121 100644
--- a/sections/donate/ipn.php
+++ b/sections/donate/ipn.php
@@ -55,7 +55,7 @@
 						Misc::send_pm($_POST['custom'], 0, 'Thank you for your donation', 'Your donation from '.$_POST['payer_email'].' of '.$_POST['mc_gross'].' '.PAYPAL_CURRENCY.' has been successfully processed. Your continued support is highly appreciated and helps to make this place possible.');
 					}
 
-					
+
 				}
 			}
 		}
@@ -66,7 +66,10 @@
 		} else {
 			//Failed pending donation
 			$Message = "User https://".SSL_SITE_URL."/user.php?id=".$_POST['custom']." had donation of ".$TotalDonated." ".PAYPAL_CURRENCY." at ".$DonationTime." UTC from ".$_POST['payer_email']." returned.";
-			$DB->query('SELECT SUM(Amount), MIN(Time) FROM donations WHERE UserID=\''.$_POST['custom'].'\';');
+			$DB->query('
+				SELECT SUM(Amount), MIN(Time)
+				FROM donations
+				WHERE UserID=\''.$_POST['custom'].'\';');
 			list($TotalDonated,$DonationTime) = $DB->next_record();
 			if ($TotalDonated+$_POST['mc_gross'] == 0) {
 				$DB->query("SELECT Invites FROM users_main WHERE ID='".$_POST['custom']."'");
@@ -92,17 +95,22 @@
 			}
 		}
 	}
-	$DB->query("UPDATE users_info
+	$DB->query("
+		UPDATE users_info
 		SET
-		AdminComment=CONCAT('".sqltime()." - User donated ".db_string($_POST['mc_gross'])." ".db_string(PAYPAL_CURRENCY)." from ".db_string($_POST['payer_email']).".\n',AdminComment)
+			AdminComment=CONCAT('".sqltime()." - User donated ".db_string($_POST['mc_gross'])." ".db_string(PAYPAL_CURRENCY)." from ".db_string($_POST['payer_email']).".\n',AdminComment)
 		WHERE UserID='".$_POST['custom']."'");
-	$DB->query("INSERT INTO donations
-	(UserID, Amount, Email, Time)	VALUES
-	('".$_POST['custom']."', '".db_string($_POST['mc_gross'])."', '".db_string($_POST['payer_email'])."', '".sqltime()."')");
+	$DB->query("
+		INSERT INTO donations
+			(UserID, Amount, Email, Time)
+		VALUES
+			('".$_POST['custom']."', '".db_string($_POST['mc_gross'])."', '".db_string($_POST['payer_email'])."', '".sqltime()."')");
 } else {
-	$DB->query("INSERT INTO ip_bans
-	(FromIP, ToIP, Reason) VALUES
-	('".Tools::ip_to_unsigned($_SERVER['REMOTE_ADDR'])."','".ip2long($_SERVER['REMOTE_ADDR'])."', 'Attempted to exploit donation system.')");
+	$DB->query("
+		INSERT INTO ip_bans
+			(FromIP, ToIP, Reason)
+		VALUES
+			('".Tools::ip_to_unsigned($_SERVER['REMOTE_ADDR'])."','".ip2long($_SERVER['REMOTE_ADDR'])."', 'Attempted to exploit donation system.')");
 }
 fclose ($Socket);
 if (check_perms('site_debug')) {
diff --git a/sections/forums/forum.php b/sections/forums/forum.php
index 749a5368..9205746b 100644
--- a/sections/forums/forum.php
+++ b/sections/forums/forum.php
@@ -48,7 +48,7 @@
 		ORDER BY t.IsSticky DESC, t.LastPostTime DESC
 		LIMIT $Limit"); // Can be cached until someone makes a new post
 	$Forum = $DB->to_array('ID',MYSQLI_ASSOC, false);
-	
+
 	if ($Page == 1) {
 		$DB->query("SELECT COUNT(ID) FROM forums_topics WHERE ForumID='$ForumID' AND IsSticky='1'");
 		list($Stickies) = $DB->next_record();
@@ -56,7 +56,6 @@
 	}
 }
 
-
 if (!isset($Forums[$ForumID])) {
 	error(404);
 }
@@ -68,7 +67,6 @@
 }
 
 
-
 $ForumName = display_str($Forums[$ForumID]['Name']);
 if ($LoggedUser['CustomForums'][$ForumID] != 1 && $Forums[$ForumID]['MinClassRead'] > $LoggedUser['Class']) {
 	error(403);
@@ -247,7 +245,7 @@
 		unset($PageLinks);
 		$Title = display_str($Title);
 		$DisplayTitle = $Title;
-		
+
 ?>
 				<strong>
 					<a href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>" title="<?=$Title?>"><?=Format::cut_string($DisplayTitle, $TopicLength) ?></a>
diff --git a/sections/forums/mod_thread.php b/sections/forums/mod_thread.php
index a5748cc7..bf468473 100644
--- a/sections/forums/mod_thread.php
+++ b/sections/forums/mod_thread.php
@@ -128,7 +128,7 @@
 	}
 
 } else { // If we're just editing it
-	
+
 	$Cache->begin_transaction('thread_'.$TopicID.'_info');
 	$UpdateArray = array(
 		'IsSticky' => $Sticky,
@@ -287,5 +287,5 @@
 		$Cache->delete_value('polls_'.$TopicID);
 	}
 	header('Location: forums.php?action=viewthread&threadid='.$TopicID.'&page='.$Page);
-	
+
 }
diff --git a/sections/forums/thread.php b/sections/forums/thread.php
index 89dcdcbd..97151174 100644
--- a/sections/forums/thread.php
+++ b/sections/forums/thread.php
@@ -113,10 +113,10 @@
 	}
 
 	//Handle last read
-	
-	
+
+
 	if (!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
-	
+
 		$DB->query("
 			SELECT PostID
 			FROM forums_last_read_topics
diff --git a/sections/image/index.php b/sections/image/index.php
index cacdd8ca..371927c2 100644
--- a/sections/image/index.php
+++ b/sections/image/index.php
@@ -82,7 +82,7 @@
 
 Your avatar at $DBURL has been found to exceed these rules. As such, it has been automatically reset. You are welcome to reinstate your avatar once it has been resized down to an acceptable size.");
 
-			
+
 		}
 	}
 }
diff --git a/sections/inbox/inbox.php b/sections/inbox/inbox.php
index 65142e73..952d03fd 100644
--- a/sections/inbox/inbox.php
+++ b/sections/inbox/inbox.php
@@ -123,7 +123,7 @@
 				<tr class="colhead">
 					<td width="10"><input type="checkbox" onclick="toggleChecks('messageform',this)" /></td>
 					<td width="50%">Subject</td>
-					<td><?=(($Section == 'sentbox')? 'Receiver' : 'Sender')?></td>
+					<td><?=(($Section == 'sentbox') ? 'Receiver' : 'Sender')?></td>
 					<td>Date</td>
 <?		if (check_perms('users_mod')) { ?>
 					<td>Forwarded to</td>
diff --git a/sections/login/index.php b/sections/login/index.php
index cf2ad7f8..a992ec8e 100644
--- a/sections/login/index.php
+++ b/sections/login/index.php
@@ -66,7 +66,7 @@
 							AND i.UserID=m.ID");
 					$Reset = true; // Past tense form of "to reset", meaning that password has now been reset
 
-					
+
 				}
 			}
 
@@ -182,46 +182,51 @@ function log_attempt($UserID) {
 		$IP = Tools::ip_to_unsigned($IPStr);
 		if ($AttemptID) { // User has attempted to log in recently
 			$Attempts++;
-			if ($Attempts>5) { // Only 6 allowed login attempts, ban user's IP
-				$BannedUntil=time_plus(60*60*6);
-				$DB->query("UPDATE login_attempts SET
-					LastAttempt='".sqltime()."',
-					Attempts='".db_string($Attempts)."',
-					BannedUntil='".db_string($BannedUntil)."',
-					Bans=Bans+1
+			if ($Attempts > 5) { // Only 6 allowed login attempts, ban user's IP
+				$BannedUntil = time_plus(60 * 60 * 6);
+				$DB->query("
+					UPDATE login_attempts
+					SET
+						LastAttempt='".sqltime()."',
+						Attempts='".db_string($Attempts)."',
+						BannedUntil='".db_string($BannedUntil)."',
+						Bans=Bans+1
 					WHERE ID='".db_string($AttemptID)."'");
-				
+
 				if ($Bans > 9) { // Automated bruteforce prevention
 					$DB->query("SELECT Reason FROM ip_bans WHERE ".$IP." BETWEEN FromIP AND ToIP");
 					if ($DB->record_count() > 0) {
 						//Ban exists already, only add new entry if not for same reason
 						list($Reason) = $DB->next_record(MYSQLI_BOTH, false);
 						if ($Reason != 'Automated ban per >60 failed login attempts') {
-							$DB->query("UPDATE ip_bans
+							$DB->query("
+								UPDATE ip_bans
 								SET Reason = CONCAT('Automated ban per >60 failed login attempts AND ', Reason)
-								WHERE FromIP = ".$IP." AND ToIP = ".$IP);
+								WHERE FromIP = $IP AND ToIP = $IP");
 						}
 					} else {
 						//No ban
-						$DB->query("INSERT IGNORE INTO ip_bans
-							(FromIP, ToIP, Reason) VALUES
-							('$IP','$IP', 'Automated ban per >60 failed login attempts')");
+						$DB->query("
+							INSERT IGNORE INTO ip_bans (FromIP, ToIP, Reason)
+							VALUES ('$IP','$IP', 'Automated ban per >60 failed login attempts')");
 						$Cache->delete_value('ip_bans_'.$IPA);
 					}
 				}
 			} else {
 				// User has attempted fewer than 6 logins
-				$DB->query("UPDATE login_attempts SET
-					LastAttempt='".sqltime()."',
-					Attempts='".db_string($Attempts)."',
-					BannedUntil='0000-00-00 00:00:00'
+				$DB->query("
+					UPDATE login_attempts
+					SET
+						LastAttempt='".sqltime()."',
+						Attempts='".db_string($Attempts)."',
+						BannedUntil='0000-00-00 00:00:00'
 					WHERE ID='".db_string($AttemptID)."'");
 			}
 		} else { // User has not attempted to log in recently
-			$Attempts=1;
-			$DB->query("INSERT INTO login_attempts
-				(UserID,IP,LastAttempt,Attempts) VALUES
-				('".db_string($UserID)."','".db_string($IPStr)."','".sqltime()."',1)");
+			$Attempts = 1;
+			$DB->query("
+				INSERT INTO login_attempts (UserID,IP,LastAttempt,Attempts)
+				VALUES ('".db_string($UserID)."','".db_string($IPStr)."','".sqltime()."',1)");
 		}
 	} // end log_attempt function
 
@@ -231,7 +236,7 @@ function log_attempt($UserID) {
 			header("Location: login.php");
 			die();
 		}
-		$Err=$Validate->ValidateForm($_POST);
+		$Err = $Validate->ValidateForm($_POST);
 
 		if (!$Err) {
 			// Passes preliminary validation (username and password "look right")
@@ -274,7 +279,7 @@ function log_attempt($UserID) {
 							isset($CustomPermissions['site_disable_ip_history'])
 						) { $_SERVER['REMOTE_ADDR'] = '127.0.0.1'; }
 
-						
+
 
 						$DB->query("INSERT INTO users_sessions
 							(UserID, SessionID, KeepLogged, Browser, OperatingSystem, IP, LastUpdate, FullUA)
@@ -290,11 +295,12 @@ function log_attempt($UserID) {
 								));
 						$Cache->commit_transaction(0);
 
-						$Sql = "UPDATE users_main
+						$Sql = "
+							UPDATE users_main
 							SET
 								LastLogin='".sqltime()."',
 								LastAccess='".sqltime()."'";
-						
+
 						$Sql .= "	WHERE ID='".db_string($UserID)."'";
 
 						$DB->query($Sql);
@@ -311,7 +317,7 @@ function log_attempt($UserID) {
 					} else {
 						log_attempt($UserID);
 						if ($Enabled == 2) {
-							
+
 							header('location:login.php?action=disabled');
 						} elseif ($Enabled == 0) {
 							$Err = "Your account has not been confirmed.<br />Please check your email.";
@@ -320,7 +326,7 @@ function log_attempt($UserID) {
 					}
 				} else {
 					log_attempt($UserID);
-					
+
 					$Err = "Your username or password was incorrect.";
 					setcookie('keeplogged','',time() + 60 * 60 * 24 * 365,'/','',false);
 				}
diff --git a/sections/register/index.php b/sections/register/index.php
index bc156abd..57e62394 100644
--- a/sections/register/index.php
+++ b/sections/register/index.php
@@ -2,7 +2,7 @@
 
 /*
 if (isset($LoggedUser)) {
-	
+
 	//Silly user, what are you doing here!
 	header('Location: index.php');
 	die();
@@ -82,7 +82,7 @@
 			}
 
 			$IPcc = Tools::geoip($_SERVER['REMOTE_ADDR']);
-			
+
 			
 			$DB->query("INSERT INTO users_main
 				(Username,Email,PassHash,torrent_pass,IP,PermissionID,Enabled,Invites,Uploaded,ipcc) VALUES
@@ -104,7 +104,7 @@
 					(UserID, IP, StartTime) VALUES
 					('$UserID', '".db_string($_SERVER['REMOTE_ADDR'])."', '".sqltime()."')");
 
-			
+
 
 
 			$DB->query("INSERT INTO users_history_emails
@@ -197,7 +197,7 @@
 			Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $torrent_pass));
 			$Sent = 1;
 
-			
+
 		}
 
 	} elseif ($_GET['invite']) {
diff --git a/sections/reportsv2/ajax_new_report.php b/sections/reportsv2/ajax_new_report.php
index 9d7d054d..6d3b2f77 100644
--- a/sections/reportsv2/ajax_new_report.php
+++ b/sections/reportsv2/ajax_new_report.php
@@ -14,82 +14,84 @@
 
 
 
-$DB->query("SELECT
-				r.ID,
-				r.ReporterID,
-				reporter.Username,
-				r.TorrentID,
-				r.Type,
-				r.UserComment,
-				r.ResolverID,
-				resolver.Username,
-				r.Status,
-				r.ReportedTime,
-				r.LastChangeTime,
-				r.ModComment,
-				r.Track,
-				r.Image,
-				r.ExtraID,
-				r.Link,
-				r.LogMessage,
-				tg.Name,
-				tg.ID,
-				CASE COUNT(ta.GroupID)
-					WHEN 1 THEN aa.ArtistID
-					WHEN 0 THEN '0'
-					ELSE '0'
-				END AS ArtistID,
-				CASE COUNT(ta.GroupID)
-					WHEN 1 THEN aa.Name
-					WHEN 0 THEN ''
-					ELSE 'Various Artists'
-				END AS ArtistName,
-				tg.Year,
-				tg.CategoryID,
-				t.Time,
-				t.Remastered,
-				t.RemasterTitle,
-				t.RemasterYear,
-				t.Media,
-				t.Format,
-				t.Encoding,
-				t.Size,
-				t.HasCue,
-				t.HasLog,
-				t.LogScore,
-				t.UserID AS UploaderID,
-				t.Tasted,
-				uploader.Username
-			FROM reportsv2 AS r
-				LEFT JOIN torrents AS t ON t.ID=r.TorrentID
-				LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
-				LEFT JOIN torrents_artists AS ta ON ta.GroupID=tg.ID AND ta.Importance='1'
-				LEFT JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
-				LEFT JOIN users_main AS resolver ON resolver.ID=r.ResolverID
-				LEFT JOIN users_main AS reporter ON reporter.ID=r.ReporterID
-				LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID
-			WHERE r.Status = 'New'
-			GROUP BY r.ID
-			ORDER BY ReportedTime ASC
-			LIMIT 1");
-
+$DB->query("
+	SELECT
+		r.ID,
+		r.ReporterID,
+		reporter.Username,
+		r.TorrentID,
+		r.Type,
+		r.UserComment,
+		r.ResolverID,
+		resolver.Username,
+		r.Status,
+		r.ReportedTime,
+		r.LastChangeTime,
+		r.ModComment,
+		r.Track,
+		r.Image,
+		r.ExtraID,
+		r.Link,
+		r.LogMessage,
+		tg.Name,
+		tg.ID,
+		CASE COUNT(ta.GroupID)
+			WHEN 1 THEN aa.ArtistID
+			WHEN 0 THEN '0'
+			ELSE '0'
+		END AS ArtistID,
+		CASE COUNT(ta.GroupID)
+			WHEN 1 THEN aa.Name
+			WHEN 0 THEN ''
+			ELSE 'Various Artists'
+		END AS ArtistName,
+		tg.Year,
+		tg.CategoryID,
+		t.Time,
+		t.Remastered,
+		t.RemasterTitle,
+		t.RemasterYear,
+		t.Media,
+		t.Format,
+		t.Encoding,
+		t.Size,
+		t.HasCue,
+		t.HasLog,
+		t.LogScore,
+		t.UserID AS UploaderID,
+		t.Tasted,
+		uploader.Username
+	FROM reportsv2 AS r
+		LEFT JOIN torrents AS t ON t.ID=r.TorrentID
+		LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
+		LEFT JOIN torrents_artists AS ta ON ta.GroupID=tg.ID AND ta.Importance='1'
+		LEFT JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
+		LEFT JOIN users_main AS resolver ON resolver.ID=r.ResolverID
+		LEFT JOIN users_main AS reporter ON reporter.ID=r.ReporterID
+		LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID
+	WHERE r.Status = 'New'
+	GROUP BY r.ID
+	ORDER BY ReportedTime ASC
+	LIMIT 1");
 
 		if ($DB->record_count() < 1) {
 			die();
 		}
-		
-		
+
+
 		list($ReportID, $ReporterID, $ReporterName, $TorrentID, $Type, $UserComment, $ResolverID, $ResolverName, $Status, $ReportedTime, $LastChangeTime,
 			$ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle,
 			$RemasterYear, $Media, $Format, $Encoding, $Size, $HasCue, $HasLog, $LogScore, $UploaderID, $UploaderName) = $DB->next_record(MYSQLI_BOTH, array("ModComment"));
-		
+
 		if (!$GroupID) {
 			//Torrent already deleted
-			$DB->query("UPDATE reportsv2
-						SET Status='Resolved',
-							LastChangeTime='".sqltime()."',
-							ModComment='Report already dealt with (torrent deleted)'
-						WHERE ID=".$ReportID);
+			$DB->query("
+				UPDATE reportsv2
+				SET
+					Status='Resolved',
+					LastChangeTime='".sqltime()."',
+					ModComment='Report already dealt with (torrent deleted)'
+				WHERE ID=".$ReportID);
 ?>
 	<div>
 		<table class="layout">
@@ -250,7 +252,6 @@
 				$Extras = explode(' ', $ExtraIDs);
 				foreach ($Extras as $ExtraID) {
 
-
 						$DB->query("
 								SELECT
 									tg.Name,
diff --git a/sections/reportsv2/report.php b/sections/reportsv2/report.php
index 1a9520f2..548eac50 100644
--- a/sections/reportsv2/report.php
+++ b/sections/reportsv2/report.php
@@ -114,7 +114,7 @@
 				}
 				foreach ($TypeList as $Type => $Data) {
 					?>
-							<option value="<?= $Type ?>"><?= $Data['title'] ?></option>
+							<option value="<?=($Type)?>"><?=($Data['title'])?></option>
 <?				} ?>
 						</select>
 					</td>
@@ -126,7 +126,7 @@
 			<br />
 
 			<div id="dynamic_form">
-				<?
+<?
 				/*
 				 * THIS IS WHERE SEXY AJAX COMES IN
 				 * The following malarky is needed so that if you get sent back here the fields are filled in
diff --git a/sections/reportsv2/static.php b/sections/reportsv2/static.php
index 768be64f..89b78bc9 100644
--- a/sections/reportsv2/static.php
+++ b/sections/reportsv2/static.php
@@ -122,69 +122,70 @@
 
 
 
-$DB->query("SELECT SQL_CALC_FOUND_ROWS
-			r.ID,
-			r.ReporterID,
-			reporter.Username,
-			r.TorrentID,
-			r.Type,
-			r.UserComment,
-			r.ResolverID,
-			resolver.Username,
-			r.Status,
-			r.ReportedTime,
-			r.LastChangeTime,
-			r.ModComment,
-			r.Track,
-			r.Image,
-			r.ExtraID,
-			r.Link,
-			r.LogMessage,
-			tg.Name,
-			tg.ID,
-			CASE COUNT(ta.GroupID)
-				WHEN 1 THEN aa.ArtistID
-				WHEN 0 THEN '0'
-				ELSE '0'
-			END AS ArtistID,
-			CASE COUNT(ta.GroupID)
-				WHEN 1 THEN aa.Name
-				WHEN 0 THEN ''
-				ELSE 'Various Artists'
-			END AS ArtistName,
-			tg.Year,
-			tg.CategoryID,
-			t.Time,
-			t.Remastered,
-			t.RemasterTitle,
-			t.RemasterYear,
-			t.Media,
-			t.Format,
-			t.Encoding,
-			t.Size,
-			t.HasCue,
-			t.HasLog,
-			t.LogScore,
-			t.UserID AS UploaderID,
-			uploader.Username
-			FROM reportsv2 AS r
-				LEFT JOIN torrents AS t ON t.ID=r.TorrentID
-				LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
-				LEFT JOIN torrents_artists AS ta ON ta.GroupID=tg.ID AND ta.Importance='1'
-				LEFT JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
-				LEFT JOIN users_main AS resolver ON resolver.ID=r.ResolverID
-				LEFT JOIN users_main AS reporter ON reporter.ID=r.ReporterID
-				LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID "
-			.$Where."
-			GROUP BY r.ID "
-			.$Order."
-			LIMIT ".$Limit);
+$DB->query("
+	SELECT SQL_CALC_FOUND_ROWS
+		r.ID,
+		r.ReporterID,
+		reporter.Username,
+		r.TorrentID,
+		r.Type,
+		r.UserComment,
+		r.ResolverID,
+		resolver.Username,
+		r.Status,
+		r.ReportedTime,
+		r.LastChangeTime,
+		r.ModComment,
+		r.Track,
+		r.Image,
+		r.ExtraID,
+		r.Link,
+		r.LogMessage,
+		tg.Name,
+		tg.ID,
+		CASE COUNT(ta.GroupID)
+			WHEN 1 THEN aa.ArtistID
+			WHEN 0 THEN '0'
+			ELSE '0'
+		END AS ArtistID,
+		CASE COUNT(ta.GroupID)
+			WHEN 1 THEN aa.Name
+			WHEN 0 THEN ''
+			ELSE 'Various Artists'
+		END AS ArtistName,
+		tg.Year,
+		tg.CategoryID,
+		t.Time,
+		t.Remastered,
+		t.RemasterTitle,
+		t.RemasterYear,
+		t.Media,
+		t.Format,
+		t.Encoding,
+		t.Size,
+		t.HasCue,
+		t.HasLog,
+		t.LogScore,
+		t.UserID AS UploaderID,
+		uploader.Username
+	FROM reportsv2 AS r
+		LEFT JOIN torrents AS t ON t.ID=r.TorrentID
+		LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
+		LEFT JOIN torrents_artists AS ta ON ta.GroupID=tg.ID AND ta.Importance='1'
+		LEFT JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
+		LEFT JOIN users_main AS resolver ON resolver.ID=r.ResolverID
+		LEFT JOIN users_main AS reporter ON reporter.ID=r.ReporterID
+		LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID
+	$Where
+	GROUP BY r.ID
+	$Order
+	LIMIT $Limit");
 
 $Reports = $DB->to_array();
 
 $DB->query('SELECT FOUND_ROWS()');
 list($Results) = $DB->next_record();
-$PageLinks=Format::get_pages($Page,$Results,REPORTS_PER_PAGE,11);
+$PageLinks = Format::get_pages($Page, $Results, REPORTS_PER_PAGE, 11);
 
 View::show_header('Reports V2!', 'reportsv2,bbcode');
 
@@ -222,19 +223,21 @@
 <?
 } else {
 	foreach ($Reports as $Report) {
-		
-		
+
+
 		list($ReportID, $ReporterID, $ReporterName, $TorrentID, $Type, $UserComment, $ResolverID, $ResolverName, $Status, $ReportedTime, $LastChangeTime,
 			$ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle,
 			$RemasterYear, $Media, $Format, $Encoding, $Size, $HasCue, $HasLog, $LogScore, $UploaderID, $UploaderName) = Misc::display_array($Report, array("ModComment"));
-		
+
 		if (!$GroupID && $Status != 'Resolved') {
 			//Torrent already deleted
-			$DB->query("UPDATE reportsv2 SET
-			Status='Resolved',
-			LastChangeTime='".sqltime()."',
-			ModComment='Report already dealt with (torrent deleted)'
-			WHERE ID=".$ReportID);
+			$DB->query("
+				UPDATE reportsv2
+				SET
+					Status='Resolved',
+					LastChangeTime='".sqltime()."',
+					ModComment='Report already dealt with (torrent deleted)'
+				WHERE ID=".$ReportID);
 			$Cache->decrement('num_torrent_reportsv2');
 ?>
 	<div id="report<?=$ReportID?>">
@@ -406,41 +409,41 @@
 					$Extras = explode(' ', $ExtraIDs);
 					foreach ($Extras as $ExtraID) {
 
-
-						$DB->query("SELECT
-									tg.Name,
-									tg.ID,
-									CASE COUNT(ta.GroupID)
-										WHEN 1 THEN aa.ArtistID
-										WHEN 0 THEN '0'
-										ELSE '0'
-									END AS ArtistID,
-									CASE COUNT(ta.GroupID)
-										WHEN 1 THEN aa.Name
-										WHEN 0 THEN ''
-										ELSE 'Various Artists'
-									END AS ArtistName,
-									tg.Year,
-									t.Time,
-									t.Remastered,
-									t.RemasterTitle,
-									t.RemasterYear,
-									t.Media,
-									t.Format,
-									t.Encoding,
-									t.Size,
-									t.HasCue,
-									t.HasLog,
-									t.LogScore,
-									t.UserID AS UploaderID,
-									uploader.Username
-									FROM torrents AS t
-										LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
-										LEFT JOIN torrents_artists AS ta ON ta.GroupID=tg.ID AND ta.Importance='1'
-										LEFT JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
-										LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID
-									WHERE t.ID='$ExtraID'
-									GROUP BY tg.ID");
+						$DB->query("
+							SELECT
+								tg.Name,
+								tg.ID,
+								CASE COUNT(ta.GroupID)
+									WHEN 1 THEN aa.ArtistID
+									WHEN 0 THEN '0'
+									ELSE '0'
+								END AS ArtistID,
+								CASE COUNT(ta.GroupID)
+									WHEN 1 THEN aa.Name
+									WHEN 0 THEN ''
+									ELSE 'Various Artists'
+								END AS ArtistName,
+								tg.Year,
+								t.Time,
+								t.Remastered,
+								t.RemasterTitle,
+								t.RemasterYear,
+								t.Media,
+								t.Format,
+								t.Encoding,
+								t.Size,
+								t.HasCue,
+								t.HasLog,
+								t.LogScore,
+								t.UserID AS UploaderID,
+								uploader.Username
+							FROM torrents AS t
+								LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
+								LEFT JOIN torrents_artists AS ta ON ta.GroupID=tg.ID AND ta.Importance='1'
+								LEFT JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
+								LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID
+							WHERE t.ID='$ExtraID'
+							GROUP BY tg.ID");
 
 						list($ExtraGroupName, $ExtraGroupID, $ExtraArtistID, $ExtraArtistName, $ExtraYear, $ExtraTime, $ExtraRemastered, $ExtraRemasterTitle,
 							$ExtraRemasterYear, $ExtraMedia, $ExtraFormat, $ExtraEncoding, $ExtraSize, $ExtraHasCue, $ExtraHasLog, $ExtraLogScore, $ExtraUploaderID, $ExtraUploaderName) = Misc::display_array($DB->next_record());
diff --git a/sections/requests/takevote.php b/sections/requests/takevote.php
index 7cfb057a..12eb6878 100644
--- a/sections/requests/takevote.php
+++ b/sections/requests/takevote.php
@@ -62,7 +62,7 @@
 	// Subtract amount from user
 	$DB->query("UPDATE users_main SET Uploaded = (Uploaded - $Amount) WHERE ID = ".$LoggedUser['ID']);
 	$Cache->delete_value('user_stats_'.$LoggedUser['ID']);
-	
+
 	Requests::update_sphinx_requests($RequestID);
 	echo 'success';
 } elseif ($LoggedUser['BytesUploaded'] < $Amount) {
diff --git a/sections/rules/upload.php b/sections/rules/upload.php
index e46a9e74..0ac6fd75 100644
--- a/sections/rules/upload.php
+++ b/sections/rules/upload.php
@@ -361,7 +361,7 @@
 						</ul>
 					</li>
 				</ul>
-				<span style="font-style: italic;">Note: The "Year" tag is optional, but strongly encouraged. However, if missing or incorrect, this is not grounds for trumping a torrent.</span>
+				<span style="font-style: italic;">Note: The "Year" tag is optional but strongly encouraged. However, if missing or incorrect, this is not grounds for trumping a torrent.</span>
 				</li>
 				<li id="r2.3.17"><a href="#h2.3"><strong>&uarr;_</strong></a> <a href="#r2.3.17">2.3.17.</a> <strong>The torrent artist for classical works should use the full composer name.</strong> Before uploading see <a href="wiki.php?action=article&amp;id=700">this wiki</a> for guidelines on uploading classical music torrents. Also, consult <a href="wiki.php?action=article&amp;id=691">this wiki</a> for a full explanation of the classical music tagging system.</li>
 				<li id="r2.3.18"><a href="#h2.3"><strong>&uarr;_</strong></a> <a href="#r2.3.18">2.3.18.</a> <strong>Newly re-tagged torrents trumping badly tagged torrents must reflect a substantial improvement over the previous tags.</strong> Small changes that include replacing ASCII characters with proper foreign language characters with diacritical marks, fixing slight misspellings, or missing an alternate spelling of an artist (e.g., excluding "The" before a band name) are insufficient grounds for replacing other torrents. Artist names that are misspelled in the tags are grounds for trumping; this includes character accents and characters that mean one letter in one language and a different letter in another language. Improper capitalization in the tags is grounds for trumping; this includes artist tags (or composer tags) that contain names that are all capitalized or track titles that are all capitalized. Tags with multiple entries in the same tag (e.g., track number and track title in the track title tags; or track number, artist, and track title in the artist tags) are subject to trumping. You may trump a release if the tags do not follow the data from a reputable music cataloguing service such as <a href="https://musicbrainz.org/" target="_blank">MusicBrainz</a> or <a href="http://www.discogs.com/" target="_blank">Discogs</a>. In the case of a conflict between reputable listings, either tagged version is equally preferred on the site and cannot trump the other. For example, an album is tagged differently in <a href="https://musicbrainz.org/" target="_blank">MusicBrainz</a> and in <a href="http://www.discogs.com/" target="_blank">Discogs</a>. Either style of tagging is permitted; neither is "better" than the other. In that case, any newly tagged torrents replacing an already properly tagged torrent, which follows good tagging convention, will result in a dupe. Note: For classical music, please follow these <a href="wiki.php?action=article&amp;id=691">tagging guidelines</a>.</li>
diff --git a/sections/schedule/index.php b/sections/schedule/index.php
index 4a902229..5b526678 100644
--- a/sections/schedule/index.php
+++ b/sections/schedule/index.php
@@ -302,7 +302,7 @@ function next_hour() {
 
 	$AgoMins = time_minus(60 * 30);
 	$AgoDays = time_minus(3600 * 24 * 30);
-	
+
 	
 	$SessionQuery = $DB->query("SELECT UserID, SessionID
 								FROM users_sessions
@@ -316,7 +316,7 @@ function next_hour() {
 		$Cache->commit_transaction(0);
 	}
 
-	
+
 	//------------- Lower Login Attempts ------------------------------------//
 	$DB->query("UPDATE login_attempts SET Attempts=Attempts-1 WHERE Attempts>0");
 	$DB->query("DELETE FROM login_attempts WHERE LastAttempt<'".time_minus(3600 * 24 * 90)."'");
@@ -593,7 +593,7 @@ function next_hour() {
 				i.AdminComment=CONCAT('$sqltime - Leeching ability disabled by ratio watch system - required ratio: ', m.RequiredRatio,'', i.AdminComment)
 			WHERE m.ID IN(".implode(',',$UserIDs).")");
 
-		
+
 		$DB->query("DELETE FROM users_torrent_history WHERE UserID IN (".implode(',',$UserIDs).")");
 	}
 
@@ -770,7 +770,7 @@ function next_hour() {
 
 	// Exceptions for inactivity deletion
 	$InactivityExceptionsMade = array(//UserID => expiry time of exception
-		
+
 	);
 	foreach ($TorrentIDs as $TorrentID) {
 		list($ID, $GroupID, $Name, $ArtistName, $LastAction, $Format, $Encoding, $UserID, $Media, $InfoHash) = $TorrentID;
@@ -821,7 +821,7 @@ function next_hour() {
 		$DB->query("DELETE FROM artists_similar_votes WHERE SimilarID IN($SimilarIDs)");
 	}
 
-	
+
 
 	// Daily top 10 history.
 	$DB->query("INSERT INTO top10_history (Date, Type) VALUES ('".$sqltime."', 'Daily')");
diff --git a/sections/staffpm/assign.php b/sections/staffpm/assign.php
index 0306fcd8..374b9ab6 100644
--- a/sections/staffpm/assign.php
+++ b/sections/staffpm/assign.php
@@ -70,7 +70,7 @@
 					AssignedToUser=$NewLevel,
 					Level=$Level
 				WHERE ID=$ConvID");
-			
+
 		}
 		echo '1';
 
diff --git a/sections/staffpm/takepost.php b/sections/staffpm/takepost.php
index bb6e3867..49d6657d 100644
--- a/sections/staffpm/takepost.php
+++ b/sections/staffpm/takepost.php
@@ -1,7 +1,7 @@
 <?
 if ($Message = db_string($_POST['message'])) {
 	if ($Subject = db_string($_POST['subject'])) {
-		// New staff pm conversation
+		// New staff PM conversation
 		$Level = db_string($_POST['level']);
 		$DB->query("
 			INSERT INTO staff_pm_conversations
@@ -25,8 +25,6 @@
 		// Check if conversation belongs to user
 		$DB->query("SELECT UserID, AssignedToUser FROM staff_pm_conversations WHERE ID=$ConvID");
 		list($UserID, $AssignedToUser) = $DB->next_record();
-		
-
 
 		if ($UserID == $LoggedUser['ID'] || $IsFLS || $UserID == $AssignedToUser) {
 			// Response to existing conversation
@@ -40,11 +38,17 @@
 			// Update conversation
 			if ($IsFLS) {
 				// FLS/Staff
-				$DB->query("UPDATE staff_pm_conversations SET Date='".sqltime()."', Unread=true, Status='Open' WHERE ID=$ConvID");
+				$DB->query("
+					UPDATE staff_pm_conversations
+					SET Date='".sqltime()."', Unread=true, Status='Open'
+					WHERE ID=$ConvID");
 				$Cache->delete_value('num_staff_pms_'.$LoggedUser['ID']);
 			} else {
 				// User
-				$DB->query("UPDATE staff_pm_conversations SET Date='".sqltime()."', Unread=true, Status='Unanswered' WHERE ID=$ConvID");
+				$DB->query("
+					UPDATE staff_pm_conversations
+					SET Date='".sqltime()."', Unread=true, Status='Unanswered'
+					WHERE ID=$ConvID");
 			}
 
 			// Clear cache for user
@@ -56,18 +60,17 @@
 			// User is trying to respond to conversation that does no belong to them
 			error(403);
 		}
-
 	} else {
-		// Message but no subject or conversation id
+		// Message but no subject or conversation ID
 		header("Location: staffpm.php?action=viewconv&id=$ConvID");
 
 	}
 } elseif ($ConvID = (int)$_POST['convid']) {
-	// No message, but conversation id
+	// No message, but conversation ID
 	header("Location: staffpm.php?action=viewconv&id=$ConvID");
 
 } else {
-	// No message or conversation id
+	// No message or conversation ID
 	header('Location: staffpm.php');
 }
 
diff --git a/sections/stats/users.php b/sections/stats/users.php
index d6bbb134..8caf71e2 100644
--- a/sections/stats/users.php
+++ b/sections/stats/users.php
@@ -59,14 +59,14 @@
 }
 if (!$PlatformDistribution = $Cache->get_value('platform_distribution')) {
 	include_once(SERVER_ROOT.'/classes/class_charts.php');
-	
-	
+
+
 	$DB->query("
 		SELECT OperatingSystem, COUNT(UserID) AS Users
 		FROM users_sessions
 		GROUP BY OperatingSystem
 		ORDER BY Users DESC");
-	
+
 	$Platforms = $DB->to_array();
 	$Pie = new PIE_CHART(750,400,array('Other'=>1,'Percentage'=>1));
 	foreach ($Platforms as $Platform) {
@@ -82,7 +82,7 @@
 
 if (!$BrowserDistribution = $Cache->get_value('browser_distribution')) {
 	include_once(SERVER_ROOT.'/classes/class_charts.php');
-	
+
 	
 	$DB->query("
 		SELECT Browser, COUNT(UserID) AS Users
diff --git a/sections/tools/index.php b/sections/tools/index.php
index 26768799..860c301c 100644
--- a/sections/tools/index.php
+++ b/sections/tools/index.php
@@ -163,7 +163,7 @@
 		$DB->query("INSERT INTO news (UserID, Title, Body, Time)
 					VALUES ('$LoggedUser[ID]', '".db_string($_POST['title'])."', '".db_string($_POST['body'])."', '".sqltime()."')");
 
-		
+
 
 		$Cache->cache_value('news_latest_id', $DB->inserted_id(), 0);
 		$Cache->delete_value('news');
diff --git a/sections/tools/tools.php b/sections/tools/tools.php
index ece44b85..8361ebbe 100644
--- a/sections/tools/tools.php
+++ b/sections/tools/tools.php
@@ -51,7 +51,7 @@
 			<tr><td><a href="tools.php?action=registration_log">Registration log</a></td></tr>
 <?	} if (check_perms('users_view_invites')) { ?>
 			<tr><td><a href="tools.php?action=invite_pool">Invite pool</a></td></tr>
-			
+
 <?	} if (check_perms('site_view_flow')) { ?>
 			<tr><td><a href="tools.php?action=upscale_pool">Upscale pool</a></td></tr>
 			<tr><td><a href="tools.php?action=user_flow">User flow</a></td></tr>
@@ -74,7 +74,7 @@
 <?	}
 	if (check_perms('users_mod')) { ?>
 			<tr><td><a href="tools.php?action=manipulate_tree">Manipulate tree</a></td></tr>
-<?	} 
+<?	}
 	if (check_perms('admin_update_geoip')) { ?>
 			<tr><td><a href="tools.php?action=update_geoip">Update GeoIP </a></td></tr>
 <?	} if (check_perms('admin_create_users')) { ?>
diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php
index f32e0f52..d70c13c3 100644
--- a/sections/torrents/browse2.php
+++ b/sections/torrents/browse2.php
@@ -1018,7 +1018,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 		<td class="nobr"><?=time_diff($GroupTime,1)?></td>
 		<td class="nobr"><?=Format::get_size($MaxSize)?> (Max)</td>
 		<td><?=number_format($TotalSnatched)?></td>
-		<td<?=($TotalSeeders==0)?' class="r00"':''?>><?=number_format($TotalSeeders)?></td>
+		<td<?=(($TotalSeeders == 0) ? ' class="r00"' : '')?>><?=number_format($TotalSeeders)?></td>
 		<td><?=number_format($TotalLeechers)?></td>
 	</tr>
 <?
diff --git a/sections/torrents/details.php b/sections/torrents/details.php
index d415d788..d2e0a823 100644
--- a/sections/torrents/details.php
+++ b/sections/torrents/details.php
@@ -542,11 +542,10 @@ function filelist($Str) {
 						| <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" title="Report">RP</a>
 <?	if ($CanEdit) { ?>
 						| <a href="torrents.php?action=edit&amp;id=<?=$TorrentID ?>" title="Edit">ED</a>
-<?	} ?>
-<?	if (check_perms('torrents_delete') || $UserID == $LoggedUser['ID']) { ?>
+<?	}
+	if (check_perms('torrents_delete') || $UserID == $LoggedUser['ID']) { ?>
 						| <a href="torrents.php?action=delete&amp;torrentid=<?=$TorrentID ?>" title="Remove">RM</a>
-<?	} ?>
-
+<?	}?>
 						| <a href="torrents.php?torrentid=<?=$TorrentID ?>" title="Permalink">PL</a>
 					]</span>
 					&raquo; <a href="#" onclick="$('#torrent_<?=$TorrentID?>').toggle(); return false;"><?=$ExtraInfo; ?></a>
@@ -561,18 +560,17 @@ function filelist($Str) {
 					<div id="release_<?=$TorrentID?>" class="no_overflow">
 						<blockquote>
 							Uploaded by <?=Users::format_username($UserID, false, false, false)?> <?=time_diff($TorrentTime);?>
-<?	if ($Seeders == 0) { ?>
-<?
-					if ($LastActive != '0000-00-00 00:00:00' && time() - strtotime($LastActive) >= 1209600) { ?>
+<?	if ($Seeders == 0) {
+		if ($LastActive != '0000-00-00 00:00:00' && time() - strtotime($LastActive) >= 1209600) { ?>
 						<br /><strong>Last active: <?=time_diff($LastActive); ?></strong>
-<?					} else { ?>
+<?		} else { ?>
 						<br />Last active: <?=time_diff($LastActive); ?>
-<?					}
-					if ($LastActive != '0000-00-00 00:00:00' && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) { ?>
+<?		}
+		if ($LastActive != '0000-00-00 00:00:00' && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) { ?>
 						<br /><a href="torrents.php?action=reseed&amp;torrentid=<?=$TorrentID?>&amp;groupid=<?=$GroupID?>" class="brackets">Request re-seed</a>
-<?					} ?>
+<?		} ?>
 
-<?	} ?>
+<?	}?>
 						</blockquote>
 					</div>
 <?	if (check_perms('site_moderate_requests')) { ?>
@@ -585,7 +583,7 @@ function filelist($Str) {
 <?	if (check_perms('site_view_torrent_snatchlist')) { ?>
 						<a href="#" class="brackets" onclick="show_downloads('<?=$TorrentID?>', 0);return false;" title="View the list of users that have clicked the &quot;DL&quot; button.">View download list</a>
 						<a href="#" class="brackets" onclick="show_snatches('<?=$TorrentID?>', 0);return false;" title="View the list of users that have reported a snatch to the tracker.">View snatch list</a>
-<?	} ?>
+<?	}?>
 						<a href="#" class="brackets" onclick="show_files('<?=$TorrentID?>');return false;">View file list</a>
 <?	if ($Reported) { ?>
 						<a href="#" class="brackets" onclick="show_reported('<?=$TorrentID?>');return false;">View report information</a>
diff --git a/sections/torrents/functions.php b/sections/torrents/functions.php
index 9135c6e5..4ac0747e 100644
--- a/sections/torrents/functions.php
+++ b/sections/torrents/functions.php
@@ -458,8 +458,8 @@ function filelist($Str) {
 
 		$EditionID++;
 ?>
-				<tr class="releases_<?= $ReleaseType ?> groupid_<?= $GroupID ?> edition group_torrent">
-					<td colspan="5" class="edition_info"><strong><a href="#" onclick="toggle_edition(<?= $GroupID ?>, <?= $EditionID ?>, this, event)" title="Collapse this edition. Hold &quot;Ctrl&quot; while clicking to collapse all editions in this torrent group.">&minus;</a> <?= Torrents::edition_string($Torrent, $TorrentDetails) ?></strong></td>
+				<tr class="releases_<?=($ReleaseType)?> groupid_<?=($GroupID)?> edition group_torrent">
+					<td colspan="5" class="edition_info"><strong><a href="#" onclick="toggle_edition(<?=($GroupID)?>, <?=($EditionID)?>, this, event)" title="Collapse this edition. Hold &quot;Ctrl&quot; while clicking to collapse all editions in this torrent group.">&minus;</a> <?= Torrents::edition_string($Torrent, $TorrentDetails) ?></strong></td>
 				</tr>
 <?
 	}
@@ -469,65 +469,65 @@ function filelist($Str) {
 	$LastRemasterCatalogueNumber = $RemasterCatalogueNumber;
 	$LastMedia = $Media;
 		?>
-				<tr class="torrent_row releases_<?= $ReleaseType ?> groupid_<?= $GroupID ?> edition_<?= $EditionID ?> group_torrent<?= $IsSnatched ? ' snatched_torrent' : '' ?>" style="font-weight: normal;" id="torrent<?= $TorrentID ?>">
+				<tr class="torrent_row releases_<?=($ReleaseType)?> groupid_<?=($GroupID)?> edition_<?=($EditionID)?> group_torrent<?=($IsSnatched ? ' snatched_torrent' : '')?>" style="font-weight: normal;" id="torrent<?=($TorrentID)?>">
 					<td>
-						<span>[ <a href="torrents.php?action=download&amp;id=<?= $TorrentID ?>&amp;authkey=<?= $LoggedUser['AuthKey'] ?>&amp;torrent_pass=<?= $LoggedUser['torrent_pass'] ?>" title="Download"><?= $HasFile ? 'DL' : 'Missing' ?></a>
+						<span>[ <a href="torrents.php?action=download&amp;id=<?=($TorrentID)?>&amp;authkey=<?=($LoggedUser['AuthKey'])?>&amp;torrent_pass=<?=($LoggedUser['torrent_pass'])?>" title="Download"><?=($HasFile ? 'DL' : 'Missing')?></a>
 <?	if (Torrents::can_use_token($Torrent)) { ?>
-							| <a href="torrents.php?action=download&amp;id=<?= $TorrentID ?>&amp;authkey=<?= $LoggedUser['AuthKey'] ?>&amp;torrent_pass=<?= $LoggedUser['torrent_pass'] ?>&amp;usetoken=1" title="Use a FL Token" onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a>
+							| <a href="torrents.php?action=download&amp;id=<?=($TorrentID)?>&amp;authkey=<?=($LoggedUser['AuthKey'])?>&amp;torrent_pass=<?=($LoggedUser['torrent_pass'])?>&amp;usetoken=1" title="Use a FL Token" onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a>
 <?	} ?>
-							| <a href="reportsv2.php?action=report&amp;id=<?= $TorrentID ?>" title="Report">RP</a>
+							| <a href="reportsv2.php?action=report&amp;id=<?=($TorrentID)?>" title="Report">RP</a>
 <?	if ($CanEdit) { ?>
-							| <a href="torrents.php?action=edit&amp;id=<?= $TorrentID ?>" title="Edit">ED</a>
+							| <a href="torrents.php?action=edit&amp;id=<?=($TorrentID)?>" title="Edit">ED</a>
 <?	}
 	if (check_perms('torrents_delete') || $UserID == $LoggedUser['ID']) { ?>
-							| <a href="torrents.php?action=delete&amp;torrentid=<?= $TorrentID ?>" title="Remove">RM</a>
+							| <a href="torrents.php?action=delete&amp;torrentid=<?=($TorrentID)?>" title="Remove">RM</a>
 <?	} ?>
-							| <a href="torrents.php?torrentid=<?= $TorrentID ?>" title="Permalink">PL</a>
+							| <a href="torrents.php?torrentid=<?=($TorrentID)?>" title="Permalink">PL</a>
 						]</span>
-						&raquo; <a href="#" onclick="$('#torrent_<?= $TorrentID ?>').toggle(); return false;"><?= $ExtraInfo; ?></a>
+						&raquo; <a href="#" onclick="$('#torrent_<?=($TorrentID)?>').toggle(); return false;"><?=($ExtraInfo)?></a>
 					</td>
-					<td class="nobr"><?= Format::get_size($Size) ?></td>
-					<td><?= number_format($Snatched) ?></td>
-					<td><?= number_format($Seeders) ?></td>
-					<td><?= number_format($Leechers) ?></td>
+					<td class="nobr"><?=(Format::get_size($Size))?></td>
+					<td><?=(number_format($Snatched))?></td>
+					<td><?=(number_format($Seeders))?></td>
+					<td><?=(number_format($Leechers))?></td>
 				</tr>
-				<tr class="releases_<?= $ReleaseType ?> groupid_<?= $GroupID ?> edition_<?= $EditionID ?> torrentdetails pad<? if (!isset($_GET['torrentid']) || $_GET['torrentid'] != $TorrentID) { ?> hidden<? } ?>" id="torrent_<?= $TorrentID; ?>">
+				<tr class="releases_<?=($ReleaseType)?> groupid_<?=($GroupID)?> edition_<?=($EditionID)?> torrentdetails pad<? if (!isset($_GET['torrentid']) || $_GET['torrentid'] != $TorrentID) { ?> hidden<? } ?>" id="torrent_<?=($TorrentID)?>">
 					<td colspan="5">
 						<blockquote>
-							Uploaded by <?= Users::format_username($UserID, false, false, false) ?> <?= time_diff($TorrentTime); ?>
+							Uploaded by <?=(Users::format_username($UserID, false, false, false))?> <?=time_diff($TorrentTime);?>
 <?	if ($Seeders == 0) {
 		if ($LastActive != '0000-00-00 00:00:00' && time() - strtotime($LastActive) >= 1209600) { ?>
-								<br /><strong>Last active: <?= time_diff($LastActive); ?></strong>
+								<br /><strong>Last active: <?=time_diff($LastActive);?></strong>
 <?		} else { ?>
-								<br />Last active: <?= time_diff($LastActive); ?>
+								<br />Last active: <?=time_diff($LastActive);?>
 <?		}
 		if ($LastActive != '0000-00-00 00:00:00' && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) { ?>
-								<br /><a href="torrents.php?action=reseed&amp;torrentid=<?= $TorrentID ?>&amp;groupid=<?= $GroupID ?>" class="brackets">Request re-seed</a>
+								<br /><a href="torrents.php?action=reseed&amp;torrentid=<?=($TorrentID)?>&amp;groupid=<?=($GroupID)?>" class="brackets">Request re-seed</a>
 <?		}
 	} ?>
 						</blockquote>
 <?	if (check_perms('site_moderate_requests')) { ?>
 						<div class="linkbox">
-							<a href="torrents.php?action=masspm&amp;id=<?= $GroupID ?>&amp;torrentid=<?= $TorrentID ?>" class="brackets">Mass PM snatchers</a>
+							<a href="torrents.php?action=masspm&amp;id=<?=($GroupID)?>&amp;torrentid=<?=($TorrentID)?>" class="brackets">Mass PM snatchers</a>
 						</div>
 <?	} ?>
 						<div class="linkbox">
-							<a href="#" class="brackets" onclick="show_peers('<?= $TorrentID ?>', 0);return false;">View peer list</a>
+							<a href="#" class="brackets" onclick="show_peers('<?=($TorrentID)?>', 0);return false;">View peer list</a>
 <?	if (check_perms('site_view_torrent_snatchlist')) { ?>
-							<a href="#" class="brackets" onclick="show_downloads('<?= $TorrentID ?>', 0);return false;" title="View the list of users that have clicked the &quot;DL&quot; button.">View download list</a>
-							<a href="#" class="brackets" onclick="show_snatches('<?= $TorrentID ?>', 0);return false;" title="View the list of users that have reported a snatch to the tracker.">View snatch list</a>
+							<a href="#" class="brackets" onclick="show_downloads('<?=($TorrentID)?>', 0);return false;" title="View the list of users that have clicked the &quot;DL&quot; button.">View download list</a>
+							<a href="#" class="brackets" onclick="show_snatches('<?=($TorrentID)?>', 0);return false;" title="View the list of users that have reported a snatch to the tracker.">View snatch list</a>
 <?	} ?>
-							<a href="#" class="brackets" onclick="show_files('<?= $TorrentID ?>');return false;">View file list</a>
+							<a href="#" class="brackets" onclick="show_files('<?=($TorrentID)?>');return false;">View file list</a>
 <?	if ($Reported) { ?>
-							<a href="#" class="brackets" onclick="show_reported('<?= $TorrentID ?>');return false;">View report information</a>
+							<a href="#" class="brackets" onclick="show_reported('<?=($TorrentID)?>');return false;">View report information</a>
 <?	} ?>
 						</div>
-						<div id="peers_<?= $TorrentID ?>" class="hidden"></div>
-						<div id="downloads_<?= $TorrentID ?>" class="hidden"></div>
-						<div id="snatches_<?= $TorrentID ?>" class="hidden"></div>
-						<div id="files_<?= $TorrentID ?>" class="hidden"><?= $FileTable ?></div>
+						<div id="peers_<?=($TorrentID)?>" class="hidden"></div>
+						<div id="downloads_<?=($TorrentID)?>" class="hidden"></div>
+						<div id="snatches_<?=($TorrentID)?>" class="hidden"></div>
+						<div id="files_<?=($TorrentID)?>" class="hidden"><?=($FileTable)?></div>
 <?	if ($Reported) { ?>
-						<div id="reported_<?= $TorrentID ?>" class="hidden"><?= $ReportInfo ?></div>
+						<div id="reported_<?=($TorrentID)?>" class="hidden"><?=($ReportInfo)?></div>
 <?	}
 	if (!empty($Description)) {
 		echo '<blockquote>' . $Text->full_format($Description) . '</blockquote>';
diff --git a/sections/torrents/index.php b/sections/torrents/index.php
index 15d6efa6..7d34cfa3 100644
--- a/sections/torrents/index.php
+++ b/sections/torrents/index.php
@@ -247,16 +247,21 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 			}
 
 			// Mainly
-			$DB->query("SELECT
-				tc.Body,
-				tc.AuthorID,
-				tc.GroupID,
-				tc.AddedTime
+			$DB->query("
+				SELECT
+					tc.Body,
+					tc.AuthorID,
+					tc.GroupID,
+					tc.AddedTime
 				FROM torrents_comments AS tc
 				WHERE tc.ID='".db_string($_POST['post'])."'");
-			list($OldBody, $AuthorID,$GroupID,$AddedTime)=$DB->next_record();
+			list($OldBody, $AuthorID,$GroupID,$AddedTime) = $DB->next_record();
 
-			$DB->query("SELECT ceil(COUNT(ID) / ".TORRENT_COMMENTS_PER_PAGE.") AS Page FROM torrents_comments WHERE GroupID = $GroupID AND ID <= $_POST[post]");
+			$DB->query("
+				SELECT ceil(COUNT(ID) / ".TORRENT_COMMENTS_PER_PAGE.") AS Page
+				FROM torrents_comments
+				WHERE GroupID = $GroupID
+					AND ID <= $_POST[post]");
 			list($Page) = $DB->next_record();
 
 			if ($LoggedUser['ID'] != $AuthorID && !check_perms('site_moderate_forums')) {
@@ -267,10 +272,12 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 			}
 
 			// Perform the update
-			$DB->query("UPDATE torrents_comments SET
-				Body = '".db_string($_POST['body'])."',
-				EditedUserID = '".db_string($LoggedUser['ID'])."',
-				EditedTime = '".sqltime()."'
+			$DB->query("
+				UPDATE torrents_comments
+				SET
+					Body = '".db_string($_POST['body'])."',
+					EditedUserID = '".db_string($LoggedUser['ID'])."',
+					EditedTime = '".sqltime()."'
 				WHERE ID='".db_string($_POST['post'])."'");
 
 			// Update the cache
diff --git a/sections/torrents/redownload.php b/sections/torrents/redownload.php
index 590879b9..6fa9bfb0 100644
--- a/sections/torrents/redownload.php
+++ b/sections/torrents/redownload.php
@@ -17,7 +17,7 @@
 if (empty($_GET['type'])) {
 	error(0);
 } else {
-	
+
 	switch ($_GET['type']) {
 		case 'uploads':
 			if (!check_paranoia('uploads', $User['Paranoia'], $UserClass, $UserID)) {
@@ -45,19 +45,20 @@
 	}
 }
 
-$DownloadsQ = $DB->query("SELECT
-	t.ID AS TorrentID,
-	DATE_FORMAT(".$Month.",'%Y - %m') AS Month,
-	t.GroupID,
-	t.Media,
-	t.Format,
-	t.Encoding,
-	IF(t.RemasterYear=0,tg.Year,t.RemasterYear) AS Year,
-	tg.Name,
-	t.Size
+$DownloadsQ = $DB->query("
+	SELECT
+		t.ID AS TorrentID,
+		DATE_FORMAT($Month,'%Y - %m') AS Month,
+		t.GroupID,
+		t.Media,
+		t.Format,
+		t.Encoding,
+		IF(t.RemasterYear=0,tg.Year,t.RemasterYear) AS Year,
+		tg.Name,
+		t.Size
 	FROM torrents as t
-	JOIN torrents_group AS tg ON t.GroupID=tg.ID
-	".$SQL."
+		JOIN torrents_group AS tg ON t.GroupID=tg.ID
+	$SQL
 	GROUP BY TorrentID");
 
 $Collector = new TorrentsDL($DownloadsQ, "$Username's ".ucfirst($_GET['type']));
@@ -65,7 +66,10 @@
 while (list($Downloads, $GroupIDs) = $Collector->get_downloads('TorrentID')) {
 	$Artists = Artists::get_artists($GroupIDs);
 	$TorrentIDs = array_keys($GroupIDs);
-	$TorrentFilesQ = $DB->query("SELECT TorrentID, File FROM torrents_files WHERE TorrentID IN (".implode(',', $TorrentIDs).")", false);
+	$TorrentFilesQ = $DB->query('
+		SELECT TorrentID, File
+		FROM torrents_files
+		WHERE TorrentID IN ('.implode(',', $TorrentIDs).')', false);
 	if (is_int($TorrentFilesQ)) {
 		// Query failed. Let's not create a broken zip archive
 		foreach ($TorrentIDs as $TorrentID) {
diff --git a/sections/torrents/user.php b/sections/torrents/user.php
index 3a3756ac..2ec0533b 100644
--- a/sections/torrents/user.php
+++ b/sections/torrents/user.php
@@ -28,7 +28,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 
 if (!empty($_GET['page']) && is_number($_GET['page']) && $_GET['page'] > 0) {
 	$Page = $_GET['page'];
-	$Limit = ($Page-1)*TORRENTS_PER_PAGE.', '.TORRENTS_PER_PAGE;
+	$Limit = ($Page - 1) * TORRENTS_PER_PAGE.', '.TORRENTS_PER_PAGE;
 } else {
 	$Page = 1;
 	$Limit = TORRENTS_PER_PAGE;
@@ -461,7 +461,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 
 		extract(Torrents::array_group($Results[$GroupID]));
 		$Torrent = $Torrents[$TorrentID];
-		
+
 
 		$TorrentTags = new Tags($TagList);
 
@@ -512,7 +512,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 			<td<?=($Torrent['Seeders'] == 0) ? ' class="r00"' : ''?>><?=number_format($Torrent['Seeders'])?></td>
 			<td><?=number_format($Torrent['Leechers'])?></td>
 		</tr>
-<?		} ?>
+<?		}?>
 	</table>
 <?	} ?>
 	<div class="linkbox"><?=$Pages?></div>
diff --git a/sections/torrents/vote.php b/sections/torrents/vote.php
index 065e7c31..d09cda40 100644
--- a/sections/torrents/vote.php
+++ b/sections/torrents/vote.php
@@ -5,12 +5,12 @@
 	$TotalVotes = $GroupVotes['Total'];
 	$UpVotes	= $GroupVotes['Ups'];
 
-	$Voted = isset($UserVotes[$GroupID])?$UserVotes[$GroupID]['Type']:false;
+	$Voted = isset($UserVotes[$GroupID]) ? $UserVotes[$GroupID]['Type'] : false;
 ?>
 <div class="box" id="votes">
 	<div class="head"><strong>Album votes</strong></div>
 	<div class="album_votes body">
-		This has <span id="upvotes" class="favoritecount"><?=number_format($UpVotes)?></span> <?=(($UpVotes==1) ? 'upvote' : 'upvotes')?> out of <span id="totalvotes" class="favoritecount"><?=number_format($TotalVotes)?></span> total<span id="upvoted"<?=(($Voted!='Up') ? ' class="hidden"' : '')?>>, including your upvote</span><span id="downvoted"<?=(($Voted!='Down') ? ' class="hidden"' : '')?>>, including your downvote</span>.
+		This has <span id="upvotes" class="favoritecount"><?=number_format($UpVotes)?></span> <?=(($UpVotes == 1) ? 'upvote' : 'upvotes')?> out of <span id="totalvotes" class="favoritecount"><?=number_format($TotalVotes)?></span> total<span id="upvoted"<?=(($Voted != 'Up') ? ' class="hidden"' : '')?>>, including your upvote</span><span id="downvoted"<?=(($Voted != 'Down') ? ' class="hidden"' : '')?>>, including your downvote</span>.
 		<br /><br />
 <?	if (check_perms('site_album_votes')) { ?>
 		<span<?=($Voted ? ' class="hidden"' : '')?> id="vote_message"><a href="#" class="brackets upvote" onclick="UpVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;">Upvote</a> - <a href="#" class="brackets downvote" onclick="DownVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;">Downvote</a></span>
diff --git a/sections/upload/insert_extra_torrents.php b/sections/upload/insert_extra_torrents.php
index 6d3f25c2..f12efdec 100644
--- a/sections/upload/insert_extra_torrents.php
+++ b/sections/upload/insert_extra_torrents.php
@@ -22,7 +22,7 @@
 
 	Tracker::update_tracker('add_torrent', array('id' => $ExtraTorrentID, 'info_hash' => rawurlencode($ExtraTorrent['InfoHash']), 'freetorrent' => $T['FreeLeech']));
 
-	
+
 
 	//******************************************************************************//
 	//--------------- Write torrent file -------------------------------------------//
diff --git a/sections/user/advancedsearch.php b/sections/user/advancedsearch.php
index 67f4ab22..ec84d11a 100644
--- a/sections/user/advancedsearch.php
+++ b/sections/user/advancedsearch.php
@@ -195,27 +195,30 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 		$Order = '';
 
 
-		$SQL = 'SQL_CALC_FOUND_ROWS
-			um1.ID,
-			um1.Username,
-			um1.Uploaded,
-			um1.Downloaded,';
+		$SQL = '
+				SQL_CALC_FOUND_ROWS
+				um1.ID,
+				um1.Username,
+				um1.Uploaded,
+				um1.Downloaded,';
 		if ($_GET['snatched'] == "off") {
 			$SQL .= "'X' AS Snatches,";
 		} else {
 			$SQL .= "(SELECT COUNT(uid) FROM xbt_snatched AS xs WHERE xs.uid=um1.ID) AS Snatches,";
 		}
-		$SQL .= 'um1.PermissionID,
-			um1.Email,
-			um1.Enabled,
-			um1.IP,
-			um1.Invites,
-			ui1.DisableInvites,
-			ui1.Warned,
-			ui1.Donor,
-			ui1.JoinDate,
-			um1.LastAccess
-			FROM users_main AS um1 JOIN users_info AS ui1 ON ui1.UserID=um1.ID ';
+		$SQL .= '
+				um1.PermissionID,
+				um1.Email,
+				um1.Enabled,
+				um1.IP,
+				um1.Invites,
+				ui1.DisableInvites,
+				ui1.Warned,
+				ui1.Donor,
+				ui1.JoinDate,
+				um1.LastAccess
+			FROM users_main AS um1
+				JOIN users_info AS ui1 ON ui1.UserID=um1.ID ';
 
 
 		if (!empty($_GET['username'])) {
@@ -225,17 +228,19 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 		if (!empty($_GET['email'])) {
 			if (isset($_GET['email_history'])) {
 				$Distinct = 'DISTINCT ';
-				$Join['he']=' JOIN users_history_emails AS he ON he.UserID=um1.ID ';
-				$Where[]= ' he.Email '.$Match.wrap($_GET['email']);
-				
+				$Join['he'] = ' JOIN users_history_emails AS he ON he.UserID=um1.ID ';
+				$Where[] = ' he.Email '.$Match.wrap($_GET['email']);
 			} else {
-				$Where[]='um1.Email'.$Match.wrap($_GET['email']);
+				$Where[] = 'um1.Email'.$Match.wrap($_GET['email']);
 			}
 		}
-		
 
 		if (!empty($_GET['email_cnt']) && is_number($_GET['email_cnt'])) {
-			$Query = "SELECT UserID FROM users_history_emails GROUP BY UserID HAVING COUNT(DISTINCT Email) ";
+			$Query = "
+				SELECT UserID
+				FROM users_history_emails
+				GROUP BY UserID
+				HAVING COUNT(DISTINCT Email) ";
 			if ($_GET['emails_opt'] === 'equal') {
 				$operator = '=';
 			}
@@ -249,7 +254,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 			$DB->query($Query);
 			$Users = implode(',', $DB->collect('UserID'));
 			if (!empty($Users)) {
-				$Where[] = "um1.ID IN (".$Users.")";
+				$Where[] = "um1.ID IN ($Users)";
 			}
 		}
 
@@ -257,37 +262,35 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 		if (!empty($_GET['ip'])) {
 			if (isset($_GET['ip_history'])) {
 				$Distinct = 'DISTINCT ';
-				$Join['hi']=' JOIN users_history_ips AS hi ON hi.UserID=um1.ID ';
-				$Where[]= ' hi.IP '.$Match.wrap($_GET['ip'], '', true);
-				
+				$Join['hi'] = ' JOIN users_history_ips AS hi ON hi.UserID=um1.ID ';
+				$Where[] = ' hi.IP '.$Match.wrap($_GET['ip'], '', true);
 			} else {
-				$Where[]='um1.IP'.$Match.wrap($_GET['ip'], '', true);
+				$Where[] = 'um1.IP'.$Match.wrap($_GET['ip'], '', true);
 			}
 		}
-		
 
 		if (!empty($_GET['cc'])) {
 			if ($_GET['cc_op'] == "equal") {
-				$Where[]="um1.ipcc = '".db_string($_GET['cc'])."'";
+				$Where[] = "um1.ipcc = '".db_string($_GET['cc'])."'";
 			} else {
-				$Where[]="um1.ipcc != '".db_string($_GET['cc'])."'";
+				$Where[] = "um1.ipcc != '".db_string($_GET['cc'])."'";
 			}
 		}
 
 		if (!empty($_GET['tracker_ip'])) {
 				$Distinct = 'DISTINCT ';
-				$Join['xfu']=' JOIN xbt_files_users AS xfu ON um1.ID=xfu.uid ';
-				$Where[]= ' xfu.ip '.$Match.wrap($_GET['tracker_ip'], '', true);
+				$Join['xfu'] = ' JOIN xbt_files_users AS xfu ON um1.ID=xfu.uid ';
+				$Where[] = ' xfu.ip '.$Match.wrap($_GET['tracker_ip'], '', true);
 		}
 
 //		if (!empty($_GET['tracker_ip'])) {
 //				$Distinct = 'DISTINCT ';
-//				$Join['xs']=' JOIN xbt_snatched AS xs ON um1.ID=xs.uid ';
-//				$Where[]= ' xs.IP '.$Match.wrap($_GET['ip']);
+//				$Join['xs'] = ' JOIN xbt_snatched AS xs ON um1.ID=xs.uid ';
+//				$Where[] = ' xs.IP '.$Match.wrap($_GET['ip']);
 //		}
 
 		if (!empty($_GET['comment'])) {
-			$Where[]='ui1.AdminComment'.$Match.wrap($_GET['comment']);
+			$Where[] = 'ui1.AdminComment'.$Match.wrap($_GET['comment']);
 		}
 
 		if (!empty($_GET['lastfm'])) {
@@ -300,27 +303,27 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 		if (strlen($_GET['invites1'])) {
 			$Invites1 = round($_GET['invites1']);
 			$Invites2 = round($_GET['invites2']);
-			$Where[]=implode(' AND ', num_compare('Invites', $_GET['invites'], $Invites1, $Invites2));
+			$Where[] = implode(' AND ', num_compare('Invites', $_GET['invites'], $Invites1, $Invites2));
 		}
 
 		if ($_GET['disabled_invites'] == 'yes') {
-			$Where[]='ui1.DisableInvites=\'1\'';
+			$Where[] = 'ui1.DisableInvites=\'1\'';
 		} elseif ($_GET['disabled_invites'] == 'no') {
-			$Where[]='ui1.DisableInvites=\'0\'';
+			$Where[] = 'ui1.DisableInvites=\'0\'';
 		}
 
 		if ($_GET['disabled_uploads'] == 'yes') {
-			$Where[]='ui1.DisableUpload=\'1\'';
+			$Where[] = 'ui1.DisableUpload=\'1\'';
 		} elseif ($_GET['disabled_uploads'] == 'no') {
-			$Where[]='ui1.DisableUpload=\'0\'';
+			$Where[] = 'ui1.DisableUpload=\'0\'';
 		}
 
 		if ($_GET['join1']) {
-			$Where[]=implode(' AND ', date_compare('ui1.JoinDate', $_GET['joined'], $_GET['join1'], $_GET['join2']));
+			$Where[] = implode(' AND ', date_compare('ui1.JoinDate', $_GET['joined'], $_GET['join1'], $_GET['join2']));
 		}
 
 		if ($_GET['lastactive1']) {
-			$Where[]=implode(' AND ', date_compare('um1.LastAccess', $_GET['lastactive'], $_GET['lastactive1'], $_GET['lastactive2']));
+			$Where[] = implode(' AND ', date_compare('um1.LastAccess', $_GET['lastactive'], $_GET['lastactive1'], $_GET['lastactive2']));
 		}
 
 		if ($_GET['ratio1']) {
@@ -328,16 +331,16 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 			if (!$Decimals) {
 				$Decimals = 0;
 			}
-			$Where[]=implode(' AND ', num_compare("ROUND(Uploaded/Downloaded,$Decimals)", $_GET['ratio'], $_GET['ratio1'], $_GET['ratio2']));
+			$Where[] = implode(' AND ', num_compare("ROUND(Uploaded/Downloaded,$Decimals)", $_GET['ratio'], $_GET['ratio1'], $_GET['ratio2']));
 		}
 
 		if (strlen($_GET['uploaded1'])) {
 			$Upload1 = round($_GET['uploaded1']);
 			$Upload2 = round($_GET['uploaded2']);
-			if ($_GET['uploaded']!='buffer') {
-				$Where[]=implode(' AND ', num_compare('ROUND(Uploaded/1024/1024/1024)', $_GET['uploaded'], $Upload1, $Upload2));
+			if ($_GET['uploaded'] != 'buffer') {
+				$Where[] = implode(' AND ', num_compare('ROUND(Uploaded/1024/1024/1024)', $_GET['uploaded'], $Upload1, $Upload2));
 			} else {
-				$Where[]=implode(' AND ', num_compare('ROUND((Uploaded/1024/1024/1024)-(Downloaded/1024/1024/1023))', 'between', $Upload1*0.9, $Upload1*1.1));
+				$Where[] = implode(' AND ', num_compare('ROUND((Uploaded/1024/1024/1024)-(Downloaded/1024/1024/1023))', 'between', $Upload1 * 0.9, $Upload1 * 1.1));
 			}
 		}
 
@@ -360,7 +363,6 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 		if ($_GET['class'] != '') {
 			$Where[]='um1.PermissionID='.wrap($_GET['class'], '=');
 		}
-		
 
 		if ($_GET['secclass'] != '') {
 			$Join['ul']=' JOIN users_levels AS ul ON um1.ID=ul.UserID ';
diff --git a/sections/user/community_stats.php b/sections/user/community_stats.php
index 0224bb47..02c20265 100644
--- a/sections/user/community_stats.php
+++ b/sections/user/community_stats.php
@@ -2,10 +2,11 @@
 // These stats used to be all together in one UNION'd query
 // But we broke them up because they had a habit of locking each other to death.
 // They all run really quickly anyways.
-$DB->query("SELECT COUNT(x.uid), COUNT(DISTINCT x.fid)
-			FROM xbt_snatched AS x
-				INNER JOIN torrents AS t ON t.ID=x.fid
-			WHERE x.uid='$UserID'");
+$DB->query("
+	SELECT COUNT(x.uid), COUNT(DISTINCT x.fid)
+	FROM xbt_snatched AS x
+		INNER JOIN torrents AS t ON t.ID=x.fid
+	WHERE x.uid='$UserID'");
 list($Snatched, $UniqueSnatched) = $DB->next_record();
 
 $DB->query("SELECT COUNT(ID) FROM torrents_comments WHERE AuthorID='$UserID'");
@@ -20,27 +21,30 @@
 $DB->query("SELECT COUNT(ID) FROM collages WHERE Deleted='0' AND UserID='$UserID'");
 list($NumCollages) = $DB->next_record();
 
-$DB->query("SELECT COUNT(DISTINCT CollageID)
-			FROM collages_torrents AS ct
-				JOIN collages ON CollageID = ID
-			WHERE Deleted='0' AND ct.UserID='$UserID'");
+$DB->query("
+	SELECT COUNT(DISTINCT CollageID)
+	FROM collages_torrents AS ct
+		JOIN collages ON CollageID = ID
+	WHERE Deleted='0'
+		AND ct.UserID='$UserID'");
 list($NumCollageContribs) = $DB->next_record();
 
 $DB->query("SELECT COUNT(DISTINCT GroupID) FROM torrents WHERE UserID = '$UserID'");
 list($UniqueGroups) = $DB->next_record();
 
-$DB->query("SELECT COUNT(ID)
-			FROM torrents
-			WHERE ((LogScore = 100 AND Format = 'FLAC')
-					OR (Media = 'Vinyl' AND Format = 'FLAC')
-					OR (Media = 'WEB' AND Format = 'FLAC')
-					OR (Media = 'DVD' AND Format = 'FLAC')
-					OR (Media = 'Soundboard' AND Format = 'FLAC')
-					OR (Media = 'Cassette' AND Format = 'FLAC')
-					OR (Media = 'SACD' AND Format = 'FLAC')
-					OR (Media = 'Blu-ray' AND Format = 'FLAC')
-					OR (Media = 'DAT' AND Format = 'FLAC'))
-				AND UserID = '$UserID'");
+$DB->query("
+	SELECT COUNT(ID)
+	FROM torrents
+	WHERE ((LogScore = 100 AND Format = 'FLAC')
+			OR (Media = 'Vinyl' AND Format = 'FLAC')
+			OR (Media = 'WEB' AND Format = 'FLAC')
+			OR (Media = 'DVD' AND Format = 'FLAC')
+			OR (Media = 'Soundboard' AND Format = 'FLAC')
+			OR (Media = 'Cassette' AND Format = 'FLAC')
+			OR (Media = 'SACD' AND Format = 'FLAC')
+			OR (Media = 'Blu-ray' AND Format = 'FLAC')
+			OR (Media = 'DAT' AND Format = 'FLAC'))
+		AND UserID = '$UserID'");
 list($PerfectFLACs) = $DB->next_record();
 ?>
 		<div class="box box_info box_userinfo_community">
@@ -48,33 +52,33 @@
 			<ul class="stats nobullet">
 				<li>Forum posts: <?=number_format($ForumPosts)?> <a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>" class="brackets" title="View">View</a></li>
 <?	if (($Override = check_paranoia_here('torrentcomments+'))) { ?>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?>>Torrent comments: <?=number_format($NumComments)?>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Torrent comments: <?=number_format($NumComments)?>
 <?				if ($Override = check_paranoia_here('torrentcomments')) { ?>
-					<a href="comments.php?id=<?=$UserID?>" class="brackets<?= $Override===2 ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<a href="comments.php?id=<?=$UserID?>" class="brackets<?=($Override === 2 ? ' paranoia_override' : '')?>" title="View">View</a>
 <?				} ?>
 				</li>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?>>Artist comments: <?=number_format($NumArtistComments)?>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Artist comments: <?=number_format($NumArtistComments)?>
 <?				if ($Override = check_paranoia_here('torrentcomments')) { ?>
-					<a href="comments.php?id=<?=$UserID?>&amp;action=artists" class="brackets<?= $Override===2 ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<a href="comments.php?id=<?=$UserID?>&amp;action=artists" class="brackets<?=($Override === 2 ? ' paranoia_override' : '')?>" title="View">View</a>
 <?				} ?>
 				</li>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?>>Request comments: <?=number_format($NumRequestComments)?>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Request comments: <?=number_format($NumRequestComments)?>
 <?				if ($Override = check_paranoia_here('torrentcomments')) { ?>
-					<a href="comments.php?id=<?=$UserID?>&amp;action=requests" class="brackets<?= $Override===2 ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<a href="comments.php?id=<?=$UserID?>&amp;action=requests" class="brackets<?=($Override === 2 ? ' paranoia_override' : '')?>" title="View">View</a>
 <?				} ?>
 				</li>
 <?	}
 	if (($Override = check_paranoia_here('collages+'))) { ?>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?>>Collages started: <?=number_format($NumCollages)?>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Collages started: <?=number_format($NumCollages)?>
 <?				if (($Override = check_paranoia_here('collages'))) { ?>
-					<a href="collages.php?userid=<?=$UserID?>" class="brackets<?= ($Override===2) ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<a href="collages.php?userid=<?=$UserID?>" class="brackets<?=(($Override === 2) ? ' paranoia_override' : '')?>" title="View">View</a>
 <?				} ?>
 				</li>
 <?	}
 	if (($Override = check_paranoia_here('collagecontribs+'))) { ?>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?>>Collages contributed to: <? echo number_format($NumCollageContribs); ?>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Collages contributed to: <? echo number_format($NumCollageContribs); ?>
 <?				if (($Override = check_paranoia_here('collagecontribs'))) { ?>
-					<a href="collages.php?userid=<?=$UserID?>&amp;contrib=1" class="brackets<?= ($Override===2) ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<a href="collages.php?userid=<?=$UserID?>&amp;contrib=1" class="brackets<?=(($Override === 2) ? ' paranoia_override' : '')?>" title="View">View</a>
 <?				} ?>
 				</li>
 <?	}
@@ -92,9 +96,9 @@
 				<li>Requests filled: <?=number_format($RequestsFilled)?> for <?=Format::get_size($TotalBounty)?></li>
 <?	} elseif ($ViewAll) { ?>
 				<li>
-					<span<?= ($ViewCount === 2) ? ' class="paranoia_override"' : ''?>>Requests filled: <?=number_format($RequestsFilled)?></span>
-					<span<?= ($ViewBounty === 2) ? ' class="paranoia_override"' : ''?>> for <?=Format::get_size($TotalBounty) ?></span>
-					<a href="requests.php?type=filled&amp;userid=<?=$UserID?>" class="brackets<?= ($ViewAll === 2) ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<span<?=(($ViewCount === 2) ? ' class="paranoia_override"' : '')?>>Requests filled: <?=number_format($RequestsFilled)?></span>
+					<span<?=(($ViewBounty === 2) ? ' class="paranoia_override"' : '')?>> for <?=Format::get_size($TotalBounty) ?></span>
+					<a href="requests.php?type=filled&amp;userid=<?=$UserID?>" class="brackets<?=(($ViewAll === 2) ? ' paranoia_override' : '')?>" title="View">View</a>
 				</li>
 <?	}
 
@@ -114,57 +118,59 @@
 				<li>Requests voted: <?=number_format($RequestsVoted)?> for <?=Format::get_size($TotalSpent)?></li>
 <?	} elseif ($ViewAll) { ?>
 				<li>
-					<span<?= ($ViewCount === 2) ? ' class="paranoia_override"' : ''?>>Requests created: <?=number_format($RequestsCreated)?></span>
-					<span<?= ($ViewBounty === 2) ? ' class="paranoia_override"' : ''?>> for <?=Format::get_size($RequestsCreatedSpent)?></span>
-					<a href="requests.php?type=created&amp;userid=<?=$UserID?>" class="brackets<?= ($ViewAll === 2) ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<span<?=(($ViewCount === 2) ? ' class="paranoia_override"' : '')?>>Requests created: <?=number_format($RequestsCreated)?></span>
+					<span<?=(($ViewBounty === 2) ? ' class="paranoia_override"' : '')?>> for <?=Format::get_size($RequestsCreatedSpent)?></span>
+					<a href="requests.php?type=created&amp;userid=<?=$UserID?>" class="brackets<?=(($ViewAll === 2) ? ' paranoia_override' : '')?>" title="View">View</a>
 				</li>
 				<li>
-					<span<?= ($ViewCount === 2) ? ' class="paranoia_override"' : ''?>>Requests voted: <?=number_format($RequestsVoted)?></span>
-					<span<?= ($ViewBounty === 2) ? ' class="paranoia_override"' : ''?>> for <?=Format::get_size($TotalSpent)?></span>
-					<a href="requests.php?type=voted&amp;userid=<?=$UserID?>" class="brackets<?= ($ViewAll === 2) ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<span<?=(($ViewCount === 2) ? ' class="paranoia_override"' : '')?>>Requests voted: <?=number_format($RequestsVoted)?></span>
+					<span<?=(($ViewBounty === 2) ? ' class="paranoia_override"' : '')?>> for <?=Format::get_size($TotalSpent)?></span>
+					<a href="requests.php?type=voted&amp;userid=<?=$UserID?>" class="brackets<?=(($ViewAll === 2) ? ' paranoia_override' : '')?>" title="View">View</a>
 				</li>
 <?	}
 	if (($Override = check_paranoia_here('uploads+'))) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>>Uploaded: <?=number_format($Uploads)?>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Uploaded: <?=number_format($Uploads)?>
 <?					if (($Override = check_paranoia_here('uploads'))) { ?>
-					<a href="torrents.php?type=uploaded&amp;userid=<?=$UserID?>" class="brackets<?= $Override === 2 ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<a href="torrents.php?type=uploaded&amp;userid=<?=$UserID?>" class="brackets<?=($Override === 2 ? ' paranoia_override' : '')?>" title="View">View</a>
 <?						if (check_perms('zip_downloader')) { ?>
-					<a href="torrents.php?action=redownload&amp;type=uploads&amp;userid=<?=$UserID?>" onclick="return confirm('If you no longer have the content, your ratio WILL be affected; be sure to check the size of all torrents before redownloading.');" class="brackets<?= $Override === 2 ? ' paranoia_override' : '' ?>" title="Download">Download</a>
+					<a href="torrents.php?action=redownload&amp;type=uploads&amp;userid=<?=$UserID?>" onclick="return confirm('If you no longer have the content, your ratio WILL be affected; be sure to check the size of all torrents before redownloading.');" class="brackets<?=($Override === 2 ? ' paranoia_override' : '')?>" title="Download">Download</a>
 <?						}
 					}
 ?>
 				</li>
 <?	}
 	if (($Override = check_paranoia_here('uniquegroups+'))) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>>Unique groups: <? echo number_format($UniqueGroups); ?>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Unique groups: <? echo number_format($UniqueGroups); ?>
 <?					if (($Override = check_paranoia_here('uniquegroups'))) { ?>
-					<a href="torrents.php?type=uploaded&amp;userid=<?=$UserID?>&amp;filter=uniquegroup" class="brackets<?= $Override === 2 ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<a href="torrents.php?type=uploaded&amp;userid=<?=$UserID?>&amp;filter=uniquegroup" class="brackets<?=($Override === 2 ? ' paranoia_override' : '')?>" title="View">View</a>
 <?					} ?>
 				</li>
 <?	}
 	if (($Override = check_paranoia_here('perfectflacs+'))) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>>"Perfect" FLACs: <? echo number_format($PerfectFLACs); ?>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>"Perfect" FLACs: <? echo number_format($PerfectFLACs); ?>
 <?					if (($Override = check_paranoia_here('perfectflacs'))) { ?>
-					<a href="torrents.php?type=uploaded&amp;userid=<?=$UserID?>&amp;filter=perfectflac" class="brackets<?= $Override === 2 ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<a href="torrents.php?type=uploaded&amp;userid=<?=$UserID?>&amp;filter=perfectflac" class="brackets<?=($Override === 2 ? ' paranoia_override' : '')?>" title="View">View</a>
 <?					} ?>
 				</li>
 <?	}
 	if (check_paranoia_here('seeding+') || check_paranoia_here('leeching+')) {
-	$DB->query("SELECT IF(remaining=0,'Seeding','Leeching') AS Type, COUNT(x.uid)
-				FROM xbt_files_users AS x
-					INNER JOIN torrents AS t ON t.ID=x.fid
-				WHERE x.uid='$UserID' AND x.active=1
-				GROUP BY Type");
+	$DB->query("
+		SELECT IF(remaining=0,'Seeding','Leeching') AS Type, COUNT(x.uid)
+		FROM xbt_files_users AS x
+			INNER JOIN torrents AS t ON t.ID=x.fid
+		WHERE x.uid='$UserID'
+			AND x.active=1
+		GROUP BY Type");
 	$PeerCount = $DB->to_array(0, MYSQLI_NUM, false);
-	$Seeding = isset($PeerCount['Seeding'][1]) ? $PeerCount['Seeding'][1] : 0;
-	$Leeching = isset($PeerCount['Leeching'][1]) ? $PeerCount['Leeching'][1] : 0;
+	$Seeding = (isset($PeerCount['Seeding'][1]) ? $PeerCount['Seeding'][1] : 0);
+	$Leeching = (isset($PeerCount['Leeching'][1]) ? $PeerCount['Leeching'][1] : 0);
 	} ?>
 <?	if (($Override = check_paranoia_here('seeding+'))) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>>Seeding: <?=number_format($Seeding)?>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Seeding: <?=number_format($Seeding)?>
 <?					if (($AOverride = check_paranoia_here('seeding'))) {
 						echo ((($Override = check_paranoia_here('snatched')) && $UniqueSnatched > 0 )
-						? '<span'.($Override === 2 ? ' class="paranoia_override"' : '').'> (' . 100 * min(1,round($Seeding / $UniqueSnatched,2)).'%)</span>' : ''); ?>
-					<a href="torrents.php?type=seeding&amp;userid=<?=$UserID?>" class="brackets<?= $AOverride === 2 ? ' paranoia_override' :'' ?>" title="View">View</a>
+						? '<span'.($Override === 2 ? ' class="paranoia_override"' : '').'> (' . 100 * min(1, round($Seeding / $UniqueSnatched, 2)).'%)</span>' : ''); ?>
+					<a href="torrents.php?type=seeding&amp;userid=<?=$UserID?>" class="brackets<?=($AOverride === 2 ? ' paranoia_override' : '')?>" title="View">View</a>
 <?						if (check_perms('zip_downloader')) { ?>
 					<a href="torrents.php?action=redownload&amp;type=seeding&amp;userid=<?=$UserID?>" onclick="return confirm('If you no longer have the content, your ratio WILL be affected; be sure to check the size of all torrents before redownloading.');" class="brackets" title="Download">Download</a>
 <?						}
@@ -173,35 +179,36 @@
 				</li>
 <?	}
 	if (($Override = check_paranoia_here('leeching+'))) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>>Leeching: <? echo number_format($Leeching); ?>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Leeching: <? echo number_format($Leeching); ?>
 <?					if (($Override = check_paranoia_here('leeching'))) { ?>
-					<a href="torrents.php?type=leeching&amp;userid=<?=$UserID?>" class="brackets<?= $Override === 2 ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<a href="torrents.php?type=leeching&amp;userid=<?=$UserID?>" class="brackets<?=($Override === 2 ? ' paranoia_override' : '')?>" title="View">View</a>
 <?					}
 					echo ($DisableLeech == 0 && check_perms('users_view_ips')) ? ' <strong>(Disabled)</strong>' : ''
 ?>
 				</li>
 <?	}
 	if (($Override = check_paranoia_here('snatched+'))) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>>Snatched: <?=number_format($Snatched)?>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Snatched: <?=number_format($Snatched)?>
 <?					if (($Override = check_perms('site_view_torrent_snatchlist', $Class))) { ?>
-						(<?= $Override === 2 ? '<span class="paranoia_override">'.number_format($UniqueSnatched).'</span>' : number_format($UniqueSnatched) ?>)
+						(<?=($Override === 2 ? '<span class="paranoia_override">'.number_format($UniqueSnatched).'</span>' : number_format($UniqueSnatched))?>)
 <?					}
 	}
 	if (($Override = check_paranoia_here('snatched'))) { ?>
-					<a href="torrents.php?type=snatched&amp;userid=<?=$UserID?>" class="brackets<?= $Override === 2 ? ' paranoia_override' : '' ?>" title="View">View</a>
+					<a href="torrents.php?type=snatched&amp;userid=<?=$UserID?>" class="brackets<?=($Override === 2 ? ' paranoia_override' : '')?>" title="View">View</a>
 <?					if (check_perms('zip_downloader')) { ?>
 					<a href="torrents.php?action=redownload&amp;type=snatches&amp;userid=<?=$UserID?>" onclick="return confirm('If you no longer have the content, your ratio WILL be affected, be sure to check the size of all torrents before redownloading.');" class="brackets" title="Download">Download</a>
 <?					} ?>
 				</li>
 <?	}
 	if (($Override = check_perms('site_view_torrent_snatchlist', $Class))) {
-	$DB->query("SELECT COUNT(ud.UserID), COUNT(DISTINCT ud.TorrentID)
-				FROM users_downloads AS ud
-					INNER JOIN torrents AS t ON t.ID=ud.TorrentID
-				WHERE ud.UserID='$UserID'");
+	$DB->query("
+		SELECT COUNT(ud.UserID), COUNT(DISTINCT ud.TorrentID)
+		FROM users_downloads AS ud
+			INNER JOIN torrents AS t ON t.ID=ud.TorrentID
+		WHERE ud.UserID='$UserID'");
 	list($NumDownloads, $UniqueDownloads) = $DB->next_record();
 ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>>Downloaded: <?=number_format($NumDownloads)?> (<?=number_format($UniqueDownloads)?>)
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Downloaded: <?=number_format($NumDownloads)?> (<?=number_format($UniqueDownloads)?>)
 					<a href="torrents.php?type=downloaded&amp;userid=<?=$UserID?>" class="brackets" title="View">View</a>
 				</li>
 <?	}
diff --git a/sections/user/edit.php b/sections/user/edit.php
index fdb9479b..d7dd81b1 100644
--- a/sections/user/edit.php
+++ b/sections/user/edit.php
@@ -7,24 +7,25 @@
 global $Cache;
 
 
-$DB->query("SELECT
-			m.Username,
-			m.Email,
-			m.IRCKey,
-			m.Paranoia,
-			i.Info,
-			i.Avatar,
-			i.Country,
-			i.StyleID,
-			i.StyleURL,
-			i.SiteOptions,
-			i.UnseededAlerts,
-			p.Level AS Class
-			FROM users_main AS m
-				JOIN users_info AS i ON i.UserID = m.ID
-				LEFT JOIN permissions AS p ON p.ID=m.PermissionID
-			WHERE m.ID = '".db_string($UserID)."'");
-list($Username,$Email,$IRCKey,$Paranoia,$Info,$Avatar,$Country,$StyleID,$StyleURL,$SiteOptions,$UnseededAlerts,$Class)=$DB->next_record(MYSQLI_NUM, array(3,9));
+$DB->query("
+	SELECT
+		m.Username,
+		m.Email,
+		m.IRCKey,
+		m.Paranoia,
+		i.Info,
+		i.Avatar,
+		i.Country,
+		i.StyleID,
+		i.StyleURL,
+		i.SiteOptions,
+		i.UnseededAlerts,
+		p.Level AS Class
+	FROM users_main AS m
+		JOIN users_info AS i ON i.UserID = m.ID
+		LEFT JOIN permissions AS p ON p.ID=m.PermissionID
+	WHERE m.ID = '".db_string($UserID)."'");
+list($Username, $Email, $IRCKey, $Paranoia, $Info, $Avatar, $Country, $StyleID, $StyleURL, $SiteOptions, $UnseededAlerts, $Class) = $DB->next_record(MYSQLI_NUM, array(3, 9));
 
 
 if ($UserID != $LoggedUser['ID'] && !check_perms('users_edit_profiles', $Class)) {
@@ -58,7 +59,7 @@ function checked($Checked) {
 	$SiteOptions = array();
 }
 
-View::show_header($Username.' > Settings','user,jquery,jquery-ui,release_sort,password_validate,validate,push_settings,cssgallery');
+View::show_header($Username.' > Settings','user,jquery,jquery-ui,release_sort,password_validate,validate,push_settings,cssgallery,preview_paranoia');
 
 
 
@@ -99,7 +100,7 @@ function checked($Checked) {
 							 <? foreach ($Stylesheets as $Style) { ?>
 								<div class="preview_wrapper">
 									<div class="preview_image" name="<?=$Style['Name']?>" style="background: url('<?=STATIC_SERVER.'thumb_'.$Style['Name'].'.png'?>') no-repeat scroll center top #CCC"></div>
-									<p class="preview_name"><input type="radio" name="stylesheet_gallery" value="<?= $Style['ID'] ?>" /> <?= $Style["ProperName"] ?></p>
+									<p class="preview_name"><input type="radio" name="stylesheet_gallery" value="<?=($Style['ID'])?>" /> <?=($Style['ProperName'])?></p>
 								</div>
 							<? } ?>
 					</div>
@@ -267,7 +268,7 @@ function checked($Checked) {
 					</select>
 				</td>
 			</tr>
-		<!--						-->
+<!---->
 			<tr>
 				<td class="label"><strong>Auto-save text</strong></td>
 				<td>
@@ -469,6 +470,10 @@ function checked($Checked) {
 					<br /><label><input type="checkbox" name="p_artistsadded" <?=checked(!in_array('artistsadded', $Paranoia))?>/> Number of artists added</label>
 				</td>
 			</tr>
+			<tr>
+				<td></td>
+				<td><a href="#" id="preview_paranoia" class="brackets">Preview paranoia</a><noscript> (Requires Javascript)</noscript></td>
+			</tr>
 			<tr class="colhead_dark">
 				<td colspan="2">
 					<strong>Reset passkey</strong>
diff --git a/sections/user/index.php b/sections/user/index.php
index c9e9d011..010a40b0 100644
--- a/sections/user/index.php
+++ b/sections/user/index.php
@@ -38,9 +38,7 @@
 	case 'search':// User search
 		if (check_perms('admin_advanced_user_search') && check_perms('users_view_ips') && check_perms('users_view_email')) {
 			include('advancedsearch.php');
-		}
-		
-		else {
+		} else {
 			include('search.php');
 		}
 		break;
@@ -95,8 +93,8 @@
 		$Cache->delete_value('collage_subs_user_new_'.$UserID);
 		include(SERVER_ROOT.'/sections/user/user.php');
 		break;
-	
-	//Provide public methods for Last.fm data gets.
+
+	// Provide public methods for Last.fm data gets.
 	case 'lastfm_compare':
 		if (isset($_GET['username'])) {
 			echo LastFM::compare_user_with($_GET['username']);
diff --git a/sections/user/invite.php b/sections/user/invite.php
index bdd76b64..a99aa13f 100644
--- a/sections/user/invite.php
+++ b/sections/user/invite.php
@@ -15,7 +15,7 @@
 
 	$UserID = $LoggedUser['ID'];
 	$Sneaky = false;
-	
+
 }
 
 list($UserID, $Username, $PermissionID) = array_values(Users::user_info($UserID));
diff --git a/sections/user/lastfm.php b/sections/user/lastfm.php
index 7143e41f..38f80802 100644
--- a/sections/user/lastfm.php
+++ b/sections/user/lastfm.php
@@ -10,9 +10,9 @@
 		<div class="head colhead_dark">Last.fm</div>
 		<ul class="stats nobullet">
 			<li>
-				Username: <a id="lastfm_username" href="<?= $LastFMInfo['user']['url'] ?>" target="_blank" title="<?= $LastFMInfo['user']['name'] ?> on Last.fm: <?= number_format($LastFMInfo['user']['playcount']) ?> plays, <?= number_format($LastFMInfo['user']['playlists']) ?> playlists."><?= $LastFMInfo['user']['name'] ?></a>
+				Username: <a id="lastfm_username" href="<?=($LastFMInfo['user']['url'])?>" target="_blank" title="<?=($LastFMInfo['user']['name'])?> on Last.fm: <?=(number_format($LastFMInfo['user']['playcount']))?> plays, <?=(number_format($LastFMInfo['user']['playlists']))?> playlists."><?=($LastFMInfo['user']['name'])?></a>
 			</li>
-			<div id="lastfm_stats"<? if ($OwnProfile == true): ?> data-uid="<?= $OwnProfile ?>"<? endif; ?>>
+			<div id="lastfm_stats"<? if ($OwnProfile == true): ?> data-uid="<?=($OwnProfile)?>"<? endif; ?>>
 			</div>
 			<li>
 				<a href="#" id="lastfm_expand" onclick="return false" class="brackets">Show more info</a>
diff --git a/sections/user/search.php b/sections/user/search.php
index d1c2609b..d3b3ea7d 100644
--- a/sections/user/search.php
+++ b/sections/user/search.php
@@ -4,14 +4,14 @@
  **********************************************************************/
 
 if (!empty($_GET['search'])) {
-	
+
 	$_GET['username'] = $_GET['search'];
 }
 
 define('USERS_PER_PAGE', 30);
 
 if (isset($_GET['username'])) {
-	
+
 	$_GET['username'] = trim($_GET['username']);
 	// form submitted
 	$Val->SetFields('username','1','username','Please enter a username.');
diff --git a/sections/user/takeedit.php b/sections/user/takeedit.php
index 76ec0595..9e03f01b 100644
--- a/sections/user/takeedit.php
+++ b/sections/user/takeedit.php
@@ -150,7 +150,7 @@
 		die();
 	}
 
-	
+
 }
 //End Email change
 
@@ -271,17 +271,20 @@
 
 
 
-$SQL="UPDATE users_main AS m JOIN users_info AS i ON m.ID=i.UserID SET
-	i.StyleID='".db_string($_POST['stylesheet'])."',
-	i.StyleURL='".db_string($_POST['styleurl'])."',
-	i.Avatar='".db_string($_POST['avatar'])."',
-	i.SiteOptions='".db_string(serialize($Options))."',
-	i.NotifyOnQuote = '".db_string($Options['NotifyOnQuote'])."',
-	i.Info='".db_string($_POST['info'])."',
-	i.DownloadAlt='$DownloadAlt',
-	i.UnseededAlerts='$UnseededAlerts',
-	m.Email='".db_string($_POST['email'])."',
-	m.IRCKey='".db_string($_POST['irckey'])."',";
+$SQL = "
+	UPDATE users_main AS m
+		JOIN users_info AS i ON m.ID=i.UserID
+	SET
+		i.StyleID='".db_string($_POST['stylesheet'])."',
+		i.StyleURL='".db_string($_POST['styleurl'])."',
+		i.Avatar='".db_string($_POST['avatar'])."',
+		i.SiteOptions='".db_string(serialize($Options))."',
+		i.NotifyOnQuote = '".db_string($Options['NotifyOnQuote'])."',
+		i.Info='".db_string($_POST['info'])."',
+		i.DownloadAlt='$DownloadAlt',
+		i.UnseededAlerts='$UnseededAlerts',
+		m.Email='".db_string($_POST['email'])."',
+		m.IRCKey='".db_string($_POST['irckey'])."',";
 
 $SQL .= "m.Paranoia='".db_string(serialize($Paranoia))."'";
 
@@ -289,24 +292,25 @@
 	$ChangerIP = db_string($LoggedUser['IP']);
 	$PassHash=Users::make_crypt_hash($_POST['new_pass_1']);
 	$SQL.=",m.PassHash='".db_string($PassHash)."'";
-	$DB->query("INSERT INTO users_history_passwords
-		(UserID, ChangerIP, ChangeTime) VALUES
-		('$UserID', '$ChangerIP', '".sqltime()."')");
+	$DB->query("
+		INSERT INTO users_history_passwords
+			(UserID, ChangerIP, ChangeTime)
+		VALUES
+			('$UserID', '$ChangerIP', '".sqltime()."')");
 
-	
 }
 
 if (isset($_POST['resetpasskey'])) {
 
-	
-
 	$UserInfo = Users::user_heavy_info($UserID);
 	$OldPassKey = db_string($UserInfo['torrent_pass']);
 	$NewPassKey = db_string(Users::make_secret());
 	$ChangerIP = db_string($LoggedUser['IP']);
 	$SQL.=",m.torrent_pass='$NewPassKey'";
-	$DB->query("INSERT INTO users_history_passkeys
-			(UserID, OldPassKey, NewPassKey, ChangerIP, ChangeTime) VALUES
+	$DB->query("
+		INSERT INTO users_history_passkeys
+			(UserID, OldPassKey, NewPassKey, ChangerIP, ChangeTime)
+		VALUES
 			('$UserID', '$OldPassKey', '$NewPassKey', '$ChangerIP', '".sqltime()."')");
 	$Cache->begin_transaction('user_info_heavy_'.$UserID);
 	$Cache->update_row(false, array('torrent_pass'=>$NewPassKey));
diff --git a/sections/user/takeinvite.php b/sections/user/takeinvite.php
index c94c78cd..1d24f386 100644
--- a/sections/user/takeinvite.php
+++ b/sections/user/takeinvite.php
@@ -81,7 +81,7 @@
 
 	Misc::send_email($CurEmail, 'You have been invited to '.SITE_NAME, $Message,'noreply');
 
-	
+
 }
 
 header('Location: user.php?action=invite');
diff --git a/sections/user/takemoderate.php b/sections/user/takemoderate.php
index ed6dc59f..14ae10e2 100644
--- a/sections/user/takemoderate.php
+++ b/sections/user/takemoderate.php
@@ -228,10 +228,10 @@
 			$Cache->delete_value('session_'.$UserID.'_'.$SessionID);
 		}
 		$Cache->delete_value('users_sessions_'.$UserID);
-		
-		
+
+
 		$DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'");
-		
+
 	}
 }
 
@@ -340,7 +340,7 @@
 	$Values = array();
 	foreach ($AddedClasses as $PermID) {
 		$Values[] = "($UserID, $PermID)";
-		
+
 	}
 	$DB->query("INSERT INTO users_levels (UserID, PermissionID) VALUES ".implode(', ',$Values));
 	//$LightUpdates['ExtraClasses'] = array_fill_keys($SecondaryClasses, 1);
@@ -653,10 +653,10 @@
 		$Cache->delete_value('session_'.$UserID.'_'.$SessionID);
 	}
 	$Cache->delete_value('users_sessions_'.$UserID);
-	
-	
+
+
 	$DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'");
-	
+
 }
 
 if (empty($UpdateSet) && empty($EditSummary)) {
@@ -695,13 +695,13 @@
 		$Summary .= "\nReason: ".$Reason;
 	}
 
-	
+
 
 	$Summary .= "\n\n".$AdminComment;
 } elseif (empty($UpdateSet) && empty($EditSummary) && $Cur['AdminComment'] == $_POST['AdminComment']) {
 	$Summary = sqltime().' - '.'Comment added by '.$LoggedUser['Username'].': '.$Reason."\n\n";
 
-	
+
 }
 
 
@@ -718,11 +718,11 @@
 
 $SET = implode(', ', $UpdateSet);
 
-$sql = "UPDATE users_main AS m JOIN users_info AS i ON m.ID=i.UserID SET $SET WHERE m.ID='$UserID'";
+$SQL = "UPDATE users_main AS m JOIN users_info AS i ON m.ID=i.UserID SET $SET WHERE m.ID='$UserID'";
 
 // Perform update
-//die($sql);
-$DB->query($sql);
+//die($SQL);
+$DB->query($SQL);
 
 if (isset($ClearStaffIDCache)) {
 	$Cache->delete_value('staff_ids');
@@ -731,8 +731,8 @@
 // redirect to user page
 header("location: user.php?id=$UserID");
 
-function translateUserStatus($status) {
-	switch ($status) {
+function translateUserStatus($Status) {
+	switch ($Status) {
 		case 0:
 			return 'Unconfirmed';
 		case 1:
@@ -740,18 +740,18 @@ function translateUserStatus($status) {
 		case 2:
 			return 'Disabled';
 		default:
-			return $status;
+			return $Status;
 	}
 }
 
-function translateLeechStatus($status) {
-	switch ($status) {
+function translateLeechStatus($Status) {
+	switch ($Status) {
 		case 0:
 			return 'Disabled';
 		case 1:
 			return 'Enabled';
 		default:
-			return $status;
+			return $Status;
 	}
 }
 ?>
diff --git a/sections/user/user.php b/sections/user/user.php
index d77c16b6..be223d33 100644
--- a/sections/user/user.php
+++ b/sections/user/user.php
@@ -3,109 +3,123 @@
 include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
 $Text = new TEXT;
 
-if (empty($_GET['id']) || !is_numeric($_GET['id']))
-	error(404);
+include(SERVER_ROOT.'/sections/requests/functions.php');
 
+if (empty($_GET['id']) || !is_numeric($_GET['id']) || (!empty($_GET['preview']) && !is_numeric($_GET['preview']))) {
+	error(404);
+}
 $UserID = $_GET['id'];
+$Preview = $_GET['preview'];
 if ($UserID == $LoggedUser['ID']) {
 	$OwnProfile = true;
+	if ($Preview == 1) {
+		$OwnProfile = false;
+		$ParanoiaString = $_GET['paranoia'];
+		$CustomParanoia = explode(',', $ParanoiaString);
+	}
 } else {
 	$OwnProfile = false;
+	//Don't allow any kind of previewing on others' profiles
+	$Preview = 0;
 }
 
 
 
 if (check_perms('users_mod')) { // Person viewing is a staff member
-	$DB->query("SELECT
-		m.Username,
-		m.Email,
-		m.LastAccess,
-		m.IP,
-		p.Level AS Class,
-		m.Uploaded,
-		m.Downloaded,
-		m.RequiredRatio,
-		m.Title,
-		m.torrent_pass,
-		m.Enabled,
-		m.Paranoia,
-		m.Invites,
-		m.can_leech,
-		m.Visible,
-		i.JoinDate,
-		i.Info,
-		i.Avatar,
-		i.Country,
-		i.AdminComment,
-		i.Donor,
-		i.Artist,
-		i.Warned,
-		i.SupportFor,
-		i.RestrictedForums,
-		i.PermittedForums,
-		i.Inviter,
-		inviter.Username,
-		COUNT(posts.id) AS ForumPosts,
-		i.RatioWatchEnds,
-		i.RatioWatchDownload,
-		i.DisableAvatar,
-		i.DisableInvites,
-		i.DisablePosting,
-		i.DisableForums,
-		i.DisableTagging,
-		i.DisableUpload,
-		i.DisableWiki,
-		i.DisablePM,
-		i.DisableIRC,
-		i.DisableRequests,
-		i.HideCountryChanges,
-		m.FLTokens,
-		SHA1(i.AdminComment)
+	$DB->query("
+		SELECT
+			m.Username,
+			m.Email,
+			m.LastAccess,
+			m.IP,
+			p.Level AS Class,
+			m.Uploaded,
+			m.Downloaded,
+			m.RequiredRatio,
+			m.Title,
+			m.torrent_pass,
+			m.Enabled,
+			m.Paranoia,
+			m.Invites,
+			m.can_leech,
+			m.Visible,
+			i.JoinDate,
+			i.Info,
+			i.Avatar,
+			i.Country,
+			i.AdminComment,
+			i.Donor,
+			i.Artist,
+			i.Warned,
+			i.SupportFor,
+			i.RestrictedForums,
+			i.PermittedForums,
+			i.Inviter,
+			inviter.Username,
+			COUNT(posts.id) AS ForumPosts,
+			i.RatioWatchEnds,
+			i.RatioWatchDownload,
+			i.DisableAvatar,
+			i.DisableInvites,
+			i.DisablePosting,
+			i.DisableForums,
+			i.DisableTagging,
+			i.DisableUpload,
+			i.DisableWiki,
+			i.DisablePM,
+			i.DisableIRC,
+			i.DisableRequests,
+			i.HideCountryChanges,
+			m.FLTokens,
+			SHA1(i.AdminComment)
 		FROM users_main AS m
 			JOIN users_info AS i ON i.UserID = m.ID
 			LEFT JOIN users_main AS inviter ON i.Inviter = inviter.ID
 			LEFT JOIN permissions AS p ON p.ID=m.PermissionID
 			LEFT JOIN forums_posts AS posts ON posts.AuthorID = m.ID
-		WHERE m.ID = '".$UserID."' GROUP BY AuthorID");
+		WHERE m.ID = '$UserID'
+		GROUP BY AuthorID");
 
 	if ($DB->record_count() == 0) { // If user doesn't exist
 		header("Location: log.php?search=User+".$UserID);
 	}
 
-	list($Username,	$Email,	$LastAccess, $IP, $Class, $Uploaded, $Downloaded, $RequiredRatio, $CustomTitle, $torrent_pass, $Enabled, $Paranoia, $Invites, $DisableLeech, $Visible, $JoinDate, $Info, $Avatar, $Country, $AdminComment, $Donor, $Artist, $Warned, $SupportFor, $RestrictedForums, $PermittedForums, $InviterID, $InviterName, $ForumPosts, $RatioWatchEnds, $RatioWatchDownload, $DisableAvatar, $DisableInvites, $DisablePosting, $DisableForums, $DisableTagging, $DisableUpload, $DisableWiki, $DisablePM, $DisableIRC, $DisableRequests, $DisableCountry, $FLTokens, $CommentHash) = $DB->next_record(MYSQLI_NUM, array(8,11));
+	list($Username,	$Email,	$LastAccess, $IP, $Class, $Uploaded, $Downloaded, $RequiredRatio, $CustomTitle, $torrent_pass, $Enabled, $Paranoia, $Invites, $DisableLeech, $Visible, $JoinDate, $Info, $Avatar, $Country, $AdminComment, $Donor, $Artist, $Warned, $SupportFor, $RestrictedForums, $PermittedForums, $InviterID, $InviterName, $ForumPosts, $RatioWatchEnds, $RatioWatchDownload, $DisableAvatar, $DisableInvites, $DisablePosting, $DisableForums, $DisableTagging, $DisableUpload, $DisableWiki, $DisablePM, $DisableIRC, $DisableRequests, $DisableCountry, $FLTokens, $CommentHash) = $DB->next_record(MYSQLI_NUM, array(8, 11));
 } else { // Person viewing is a normal user
-	$DB->query("SELECT
-		m.Username,
-		m.Email,
-		m.LastAccess,
-		m.IP,
-		p.Level AS Class,
-		m.Uploaded,
-		m.Downloaded,
-		m.RequiredRatio,
-		m.Enabled,
-		m.Paranoia,
-		m.Invites,
-		m.Title,
-		m.torrent_pass,
-		m.can_leech,
-		i.JoinDate,
-		i.Info,
-		i.Avatar,
-		m.FLTokens,
-		i.Country,
-		i.Donor,
-		i.Warned,
-		COUNT(posts.id) AS ForumPosts,
-		i.Inviter,
-		i.DisableInvites,
-		inviter.username
+	$DB->query("
+		SELECT
+			m.Username,
+			m.Email,
+			m.LastAccess,
+			m.IP,
+			p.Level AS Class,
+			m.Uploaded,
+			m.Downloaded,
+			m.RequiredRatio,
+			m.Enabled,
+			m.Paranoia,
+			m.Invites,
+			m.Title,
+			m.torrent_pass,
+			m.can_leech,
+			i.JoinDate,
+			i.Info,
+			i.Avatar,
+			m.FLTokens,
+			i.Country,
+			i.Donor,
+			i.Warned,
+			COUNT(posts.id) AS ForumPosts,
+			i.Inviter,
+			i.DisableInvites,
+			inviter.username
 		FROM users_main AS m
 			JOIN users_info AS i ON i.UserID = m.ID
 			LEFT JOIN permissions AS p ON p.ID=m.PermissionID
 			LEFT JOIN users_main AS inviter ON i.Inviter = inviter.ID
 			LEFT JOIN forums_posts AS posts ON posts.AuthorID = m.ID
-		WHERE m.ID = $UserID GROUP BY AuthorID");
+		WHERE m.ID = $UserID
+		GROUP BY AuthorID");
 
 	if ($DB->record_count() == 0) { // If user doesn't exist
 		header("Location: log.php?search=User+".$UserID);
@@ -117,14 +131,23 @@
 // Image proxy CTs
 $DisplayCustomTitle = $CustomTitle;
 if (check_perms('site_proxy_images') && !empty($CustomTitle)) {
-	$DisplayCustomTitle = preg_replace_callback('~src=("?)(http.+?)(["\s>])~', function($Matches) {
-																		return 'src=' . $Matches[1] . ImageTools::process($Matches[2]) . $Matches[3];
-																	}, $CustomTitle);
+	$DisplayCustomTitle = preg_replace_callback('~src=("?)(http.+?)(["\s>])~',
+								function($Matches) {
+									return 'src=' . $Matches[1] . ImageTools::process($Matches[2]) . $Matches[3];
+								}, $CustomTitle);
 }
 
-$Paranoia = unserialize($Paranoia);
-if (!is_array($Paranoia)) {
-	$Paranoia = array();
+if ($Preview == 1) {
+	if (strlen($ParanoiaString) == 0) {
+		$Paranoia = array();
+	} else {
+		$Paranoia =  $CustomParanoia;
+	}
+} else {
+	$Paranoia = unserialize($Paranoia);
+	if (!is_array($Paranoia)) {
+		$Paranoia = array();
+	}
 }
 $ParanoiaLevel = 0;
 foreach ($Paranoia as $P) {
@@ -138,17 +161,21 @@
 $LastAccess = time_diff($LastAccess);
 
 function check_paranoia_here($Setting) {
-	global $Paranoia, $Class, $UserID;
-	return check_paranoia($Setting, $Paranoia, $Class, $UserID);
+	global $Paranoia, $Class, $UserID, $Preview;
+	if ($Preview == 1) {
+		return check_paranoia($Setting, $Paranoia, $Class);
+	} else {
+		return check_paranoia($Setting, $Paranoia, $Class, $UserID);
+	}
 }
 
-$Badges=($Donor) ? '<a href="donate.php"><img src="'.STATIC_SERVER.'common/symbols/donor.png" alt="Donor" /></a>' : '';
+$Badges = (($Donor) ? '<a href="donate.php"><img src="'.STATIC_SERVER.'common/symbols/donor.png" alt="Donor" /></a>' : '');
 
 
-$Badges.=($Warned!='0000-00-00 00:00:00') ? '<img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" />' : '';
-$Badges.=($Enabled == '1' || $Enabled == '0' || !$Enabled) ? '': '<img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" />';
+$Badges.=(($Warned!='0000-00-00 00:00:00') ? '<img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" />' : '');
+$Badges.=(($Enabled == '1' || $Enabled == '0' || !$Enabled) ? '' : '<img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" />');
 
-View::show_header($Username,'user,bbcode,requests,jquery,lastfm');
+View::show_header($Username, 'user,bbcode,requests,jquery,lastfm');
 
 ?>
 <div class="thin">
@@ -214,7 +241,7 @@ function check_paranoia_here($Setting) {
 ?>
 		<div class="box box_image box_image_avatar">
 			<div class="head colhead_dark">Avatar</div>
-			<div align="center"><img src="<?=display_str($Avatar)?>" width="150" style="max-height:400px;" alt="<?=$Username?>'s avatar" /></div>
+			<div align="center"><img src="<?=display_str($Avatar)?>" width="150" style="max-height: 400px;" alt="<?=$Username?>'s avatar" /></div>
 		</div>
 <? } ?>
 		<div class="box box_info box_userinfo_stats">
@@ -222,50 +249,58 @@ function check_paranoia_here($Setting) {
 			<ul class="stats nobullet">
 				<li>Joined: <?=$JoinedDate?></li>
 <?	if (($Override = check_paranoia_here('lastseen'))) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>>Last seen: <?=$LastAccess?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Last seen: <?=$LastAccess?></li>
 <?	}
 	if (($Override=check_paranoia_here('uploaded'))) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?> title="<?=Format::get_size($Uploaded, 5)?>">Uploaded: <?=Format::get_size($Uploaded)?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?> title="<?=Format::get_size($Uploaded, 5)?>">Uploaded: <?=Format::get_size($Uploaded)?></li>
 <?	}
 	if (($Override=check_paranoia_here('downloaded'))) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?> title="<?=Format::get_size($Downloaded, 5)?>">Downloaded: <?=Format::get_size($Downloaded)?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?> title="<?=Format::get_size($Downloaded, 5)?>">Downloaded: <?=Format::get_size($Downloaded)?></li>
 <?	}
 	if (($Override=check_paranoia_here('ratio'))) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>>Ratio: <?=Format::get_ratio_html($Uploaded, $Downloaded)?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Ratio: <?=Format::get_ratio_html($Uploaded, $Downloaded)?></li>
 <?	}
 	if (($Override=check_paranoia_here('requiredratio')) && isset($RequiredRatio)) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>>Required ratio: <?=number_format((double)$RequiredRatio, 2)?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Required ratio: <?=number_format((double)$RequiredRatio, 2)?></li>
 <?	}
 	if ($OwnProfile || ($Override=check_paranoia_here(false)) || check_perms('users_mod')) { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>><a href="userhistory.php?action=token_history&amp;userid=<?=$UserID?>">Tokens</a>: <?=number_format($FLTokens)?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>><a href="userhistory.php?action=token_history&amp;userid=<?=$UserID?>">Tokens</a>: <?=number_format($FLTokens)?></li>
 <?	}
 	if (($OwnProfile || check_perms('users_mod')) && $Warned!='0000-00-00 00:00:00') { ?>
-				<li<?= $Override === 2 ? ' class="paranoia_override"' : ''?>>Warning expires: <?= date('Y-m-d H:i', strtotime($Warned)) ?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Warning expires: <?=(date('Y-m-d H:i', strtotime($Warned)))?></li>
 <?	} ?>
 			</ul>
 		</div>
 
 
 <?
-//Last.fm statistics and comparability
+// Last.fm statistics and comparability
 include(SERVER_ROOT.'/sections/user/lastfm.php');
 
 if (check_paranoia_here('requestsfilled_count') || check_paranoia_here('requestsfilled_bounty')) {
-	$DB->query("SELECT
-					COUNT(DISTINCT r.ID),
-					SUM(rv.Bounty)
-				FROM requests AS r
-					LEFT JOIN requests_votes AS rv ON r.ID=rv.RequestID
-				WHERE r.FillerID = ".$UserID);
+	$DB->query("
+		SELECT
+			COUNT(DISTINCT r.ID),
+			SUM(rv.Bounty)
+		FROM requests AS r
+			LEFT JOIN requests_votes AS rv ON r.ID=rv.RequestID
+		WHERE r.FillerID = $UserID");
 	list($RequestsFilled, $TotalBounty) = $DB->next_record();
 } else {
 	$RequestsFilled = $TotalBounty = 0;
 }
 
 if (check_paranoia_here('requestsvoted_count') || check_paranoia_here('requestsvoted_bounty')) {
-	$DB->query("SELECT COUNT(rv.RequestID), SUM(rv.Bounty) FROM requests_votes AS rv WHERE rv.UserID = ".$UserID);
+	$DB->query("
+		SELECT COUNT(rv.RequestID), SUM(rv.Bounty)
+		FROM requests_votes AS rv
+		WHERE rv.UserID = $UserID");
 	list($RequestsVoted, $TotalSpent) = $DB->next_record();
-	$DB->query('SELECT COUNT(r.ID), SUM(rv.Bounty) FROM requests AS r LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID AND rv.UserID = r.UserID WHERE r.UserID = ' . $UserID);
+	$DB->query("
+		SELECT COUNT(r.ID), SUM(rv.Bounty)
+		FROM requests AS r
+			LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID AND rv.UserID = r.UserID
+		WHERE r.UserID = $UserID");
 	list($RequestsCreated, $RequestsCreatedSpent) = $DB->next_record();
 } else {
 	$RequestsVoted = $TotalSpent = $RequestsCreated = $RequestsCreatedSpent = 0;
@@ -301,7 +336,7 @@ function check_paranoia_here($Setting) {
 } elseif ($Uploaded == 0) {
 	$Ratio = 0.5;
 } else {
-	$Ratio = round($Uploaded/$Downloaded, 2);
+	$Ratio = round($Uploaded / $Downloaded, 2);
 }
 $OverallRank = $Rank->overall_score($UploadedRank, $DownloadedRank, $UploadsRank, $RequestRank, $PostRank, $BountyRank, $ArtistsRank, $Ratio);
 
@@ -310,23 +345,23 @@ function check_paranoia_here($Setting) {
 			<div class="head colhead_dark">Percentile rankings (hover for values)</div>
 			<ul class="stats nobullet">
 <? if (($Override=check_paranoia_here('uploaded'))) { ?>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?> title="<?=Format::get_size($Uploaded)?>">Data uploaded: <?=$UploadedRank === false ? 'Server busy' : number_format($UploadedRank)?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?> title="<?=Format::get_size($Uploaded)?>">Data uploaded: <?=$UploadedRank === false ? 'Server busy' : number_format($UploadedRank)?></li>
 <? } ?>
 <? if (($Override=check_paranoia_here('downloaded'))) { ?>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?> title="<?=Format::get_size($Downloaded)?>">Data downloaded: <?=$DownloadedRank === false ? 'Server busy' : number_format($DownloadedRank)?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?> title="<?=Format::get_size($Downloaded)?>">Data downloaded: <?=$DownloadedRank === false ? 'Server busy' : number_format($DownloadedRank)?></li>
 <? } ?>
 <? if (($Override=check_paranoia_here('uploads+'))) { ?>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?> title="<?=number_format($Uploads)?>">Torrents uploaded: <?=$UploadsRank === false ? 'Server busy' : number_format($UploadsRank)?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?> title="<?=number_format($Uploads)?>">Torrents uploaded: <?=$UploadsRank === false ? 'Server busy' : number_format($UploadsRank)?></li>
 <? } ?>
 <? if (($Override=check_paranoia_here('requestsfilled_count'))) { ?>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?> title="<?=number_format($RequestsFilled)?>">Requests filled: <?=$RequestRank === false ? 'Server busy' : number_format($RequestRank)?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?> title="<?=number_format($RequestsFilled)?>">Requests filled: <?=$RequestRank === false ? 'Server busy' : number_format($RequestRank)?></li>
 <? } ?>
 <? if (($Override=check_paranoia_here('requestsvoted_bounty'))) { ?>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?> title="<?=Format::get_size($TotalSpent)?>">Bounty spent: <?=$BountyRank === false ? 'Server busy' : number_format($BountyRank)?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?> title="<?=Format::get_size($TotalSpent)?>">Bounty spent: <?=$BountyRank === false ? 'Server busy' : number_format($BountyRank)?></li>
 <? } ?>
 				<li title="<?=number_format($ForumPosts)?>">Posts made: <?=$PostRank === false ? 'Server busy' : number_format($PostRank)?></li>
 <? if (($Override=check_paranoia_here('artistsadded'))) { ?>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?> title="<?=number_format($ArtistsAdded)?>">Artists added: <?=$ArtistsRank === false ? 'Server busy' : number_format($ArtistsRank)?></li>
+				<li<?=($Override === 2 ? ' class="paranoia_override"' : '')?> title="<?=number_format($ArtistsAdded)?>">Artists added: <?=$ArtistsRank === false ? 'Server busy' : number_format($ArtistsRank)?></li>
 <? } ?>
 <? if (check_paranoia_here(array('uploaded', 'downloaded', 'uploads+', 'requestsfilled_count', 'requestsvoted_bounty', 'artistsadded'))) { ?>
 				<li><strong>Overall rank: <?=$OverallRank === false ? 'Server busy' : number_format($OverallRank)?></strong></li>
@@ -362,12 +397,12 @@ function check_paranoia_here($Setting) {
 	if (check_perms('users_view_ips',$Class)) {
 ?>
 			<li>IPs: <?=number_format($IPChanges)?> <a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>" class="brackets">View</a>&nbsp;<a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>&amp;usersonly=1" class="brackets">View users</a></li>
-<?		if (check_perms('users_view_ips',$Class) && check_perms('users_mod',$Class)) { ?>
+<?		if (check_perms('users_view_ips', $Class) && check_perms('users_mod', $Class)) { ?>
 			<li>Tracker IPs: <?=number_format($TrackerIPs)?> <a href="userhistory.php?action=tracker_ips&amp;userid=<?=$UserID?>" class="brackets">View</a></li>
 <?		} ?>
 <?
 	}
-	if (check_perms('users_view_keys',$Class)) {
+	if (check_perms('users_view_keys', $Class)) {
 ?>
 			<li>Passkeys: <?=number_format($PasskeyChanges)?> <a href="userhistory.php?action=passkeys&amp;userid=<?=$UserID?>" class="brackets">View</a></li>
 <?
@@ -377,7 +412,7 @@ function check_paranoia_here($Setting) {
 			<li>Passwords: <?=number_format($PasswordChanges)?> <a href="userhistory.php?action=passwords&amp;userid=<?=$UserID?>" class="brackets">View</a></li>
 			<li>Stats: N/A <a href="userhistory.php?action=stats&amp;userid=<?=$UserID?>" class="brackets">View</a></li>
 <?
-			
+
 	}
 ?>
 		</ul>
@@ -416,7 +451,7 @@ function check_paranoia_here($Setting) {
 }
 ?>
 				<li>Paranoia level: <span title="<?=$ParanoiaLevel?>"><?=$ParanoiaLevelText?></span></li>
-<?	if (check_perms('users_view_email',$Class) || $OwnProfile) { ?>
+<?	if (check_perms('users_view_email', $Class) || $OwnProfile) { ?>
 				<li>Email: <a href="mailto:<?=display_str($Email)?>"><?=display_str($Email)?></a>
 <?		if (check_perms('users_view_email',$Class)) { ?>
 					<a href="user.php?action=search&amp;email_history=on&amp;email=<?=display_str($Email)?>" title="Search" class="brackets">S</a>
@@ -441,7 +476,7 @@ function check_paranoia_here($Setting) {
 	} else {
 		$Invited='<a href="user.php?id='.$InviterID.'">'.$InviterName.'</a>';
 	}
-	
+
 ?>
 				<li>Invited by: <?=$Invited?></li>
 				<li>Invites: <?
@@ -452,7 +487,7 @@ function check_paranoia_here($Setting) {
 				} else {
 					echo number_format($Invites);
 				}
-				echo " (".$Pending.")"
+				echo " ($Pending)"
 				?></li>
 <?
 }
@@ -461,12 +496,12 @@ function check_paranoia_here($Setting) {
 	$DB->query("SELECT SupportFor FROM users_info WHERE UserID = ".$LoggedUser['ID']);
 	list($SupportFor) = $DB->next_record();
 }
-if ($Override=check_perms('users_mod') || $OwnProfile || !empty($SupportFor)) {
+if ($Override = check_perms('users_mod') || $OwnProfile || !empty($SupportFor)) {
 	?>
-		<li <?= $Override===2 || $SupportFor ? 'class="paranoia_override"' : ''?>>Clients: <?
+		<li <?=($Override === 2 || $SupportFor ? 'class="paranoia_override"' : '')?>>Clients: <?
 		$DB->query("SELECT DISTINCT useragent FROM xbt_files_users WHERE uid = ".$UserID);
 		$Clients = $DB->collect(0);
-		echo implode("; ", $Clients);
+		echo implode('; ', $Clients);
 		?></li>
 <?
 }
diff --git a/sections/userhistory/email_history.php b/sections/userhistory/email_history.php
index 5545244f..eefb3fd0 100644
--- a/sections/userhistory/email_history.php
+++ b/sections/userhistory/email_history.php
@@ -117,7 +117,7 @@
 		<td><?=display_str($IP)?></td>
 <? $UserURL = "https://".SSL_SITE_URL."/user.php?id=$UserID2";
 			$DB->query("SELECT Enabled FROM users_main WHERE ID = ".$UserID2);
-			list($Enabled)=$DB->next_record();
+			list($Enabled) = $DB->next_record();
 			$DB->set_query_id($ueQuery);
 ?>
 		<td><a href="<?=display_str($UserURL)?>"><?=Users::format_username($UserID2, false, false, true)?></a></td>
diff --git a/sections/userhistory/index.php b/sections/userhistory/index.php
index 320948ec..63f6f23f 100644
--- a/sections/userhistory/index.php
+++ b/sections/userhistory/index.php
@@ -61,7 +61,7 @@
 		case 'catchup_collages':
 			require('catchup_collages.php');
 			break;
-			
+
 		case 'token_history':
 			require('token_history.php');
 			break;
diff --git a/sections/userhistory/ip_history.php b/sections/userhistory/ip_history.php
index ada36a78..6fbc84be 100644
--- a/sections/userhistory/ip_history.php
+++ b/sections/userhistory/ip_history.php
@@ -37,7 +37,7 @@
 	$SearchIPQuery = " AND h1.IP = '$SearchIP' ";
 }
 
-View::show_header("IP history for $Username");
+View::show_header("IP address history for $Username");
 ?>
 <script type="text/javascript">//<![CDATA[
 function ShowIPs(rowname) {
@@ -54,7 +54,7 @@ function Ban(ip, id, elemID) {
 			xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
 		}
 		xmlhttp.onreadystatechange=function() {
-			if (xmlhttp.readyState==4 && xmlhttp.status==200) {
+			if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
 				document.getElementById(elemID).innerHTML = "<strong>[Banned]</strong>";
 			}
 		}
@@ -72,9 +72,9 @@ function UnBan(ip, id, elemID) {
 			xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
 		}
 		xmlhttp.onreadystatechange=function() {
-			if (xmlhttp.readyState==4 && xmlhttp.status==200) {
+			if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
 				document.getElementById(elemID).innerHTML = "Ban";
-				document.getElementById(elemID).onclick = function() { Ban(ip, id, elemID); return false;};
+				document.getElementById(elemID).onclick = function() { Ban(ip, id, elemID); return false; };
 			}
 		}
 		xmlhttp.open("GET","tools.php?action=quick_ban&perform=delete&id=" + id + "&ip=" + ip,true);
diff --git a/static/functions/autocomplete.js b/static/functions/autocomplete.js
index c306e2ca..b70d820f 100644
--- a/static/functions/autocomplete.js
+++ b/static/functions/autocomplete.js
@@ -42,13 +42,13 @@ var autocomp = {
 			case 38: //up
 			case 40: //down
 				this.highlight(key);
-				if(this.pos !== -1) {
+				if (this.pos !== -1) {
 					this.artistid = this.list.children[this.pos].artistid;
 					this.input.value = this.list.children[this.pos].textContent || this.list.children[this.pos].value;
 				}
 				break;
 			case 13:
-				if(this.artistid != null) {
+				if (this.artistid != null) {
 					window.location = this.id + '.php?id='+this.artistid;
 				}
 				return 0;
@@ -139,9 +139,9 @@ var autocomp = {
 			});
 			listener.set(li,'click',function(e) {
 			    var location = autocomp.id + '.php?id='+this.artistid;
-			    if(e.button == 0) {
+			    if (e.button == 0) {
 			        window.open(location, '_self');
-			    } else if(e.button == 1) {
+			    } else if (e.button == 1) {
 			        var win = window.open(location, '_blank');
 					win.focus();
 			    }
diff --git a/static/functions/collage.js b/static/functions/collage.js
index 78296aa0..4786f253 100644
--- a/static/functions/collage.js
+++ b/static/functions/collage.js
@@ -2,7 +2,7 @@ function Add(input) {
 	if (input.checked == false) {
 		Cancel();
 	} else {
-		if(document.getElementById("choices").raw().value == "") {
+		if (document.getElementById("choices").raw().value == "") {
 			document.getElementById("choices").raw().value += input.name;
 		} else {
 			document.getElementById("choices").raw().value += "|" + input.name;
diff --git a/static/functions/preview_paranoia.js b/static/functions/preview_paranoia.js
new file mode 100644
index 00000000..929db989
--- /dev/null
+++ b/static/functions/preview_paranoia.js
@@ -0,0 +1,44 @@
+(function($){
+	// Used to get user ID from URL.
+	function getURLParameter(name) {
+		return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search)||[,""])[1].replace(/\+/g, '%20'))||null;
+	}
+	// Attach click event on document ready.
+	$(function(){
+		$('a#preview_paranoia').click(function(event) {
+			event.preventDefault();
+			var paranoia = {};
+			// Build an object of unchecked (hidden, not allowed for others to see) paranoias.
+			// We "abuse" object keys to implement sets in JavaScript. This is simpler and
+			// more memory efficient than building a string and working through that each time.
+			$('input[name^="p_"]').each(function() {
+				if (!$(this).prop('checked')) {
+					var attribute = $(this).attr('name').replace(/^p_/,'');
+					if (/_c$/.test(attribute)) {
+						paranoia[attribute.replace(/_.$/,'') + '+'] = 1;
+					} else if (/_l$/.test(attribute)) {
+						if (typeof paranoia[attribute.replace(/_.$/,'') + '+'] == "undefined") {
+							paranoia[attribute.replace(/_.$/,'')] = 1;
+						}
+					} else {
+						paranoia[attribute] = 1;
+					}
+				}
+			});
+			// Build into a comma-delimited string.
+			var paranoiaString = "";
+			for (var key in paranoia) {
+				if (key === 'length' || !paranoia.hasOwnProperty(key)) {
+					continue;
+				}
+				paranoiaString += key+',';
+			}
+			// Get rid of trailing comma.
+			paranoiaString = paranoiaString.substring(0, paranoiaString.length - 1);
+			// Get user ID from URL parameter.
+			var userId = getURLParameter("userid");
+			// Open a new tab with specified paranoia settings.
+			window.open('user.php?id=' + encodeURIComponent(userId) + '&preview=1&paranoia=' + encodeURIComponent(paranoiaString), '_blank');
+		});
+	});
+})(jQuery);
diff --git a/static/styles/proton/style.css b/static/styles/proton/style.css
index dfd653e3..9d7da612 100644
--- a/static/styles/proton/style.css
+++ b/static/styles/proton/style.css
@@ -7,8 +7,9 @@ body {
 	margin-bottom: 0;
 }
 
-
-a, a:visited, a:active {
+a,
+a:visited,
+a:active {
 	color: #007dc6;
 	text-decoration: none;
 }
@@ -45,6 +46,40 @@ a img {
 	width: 950px;
 }
 
+#footer p {
+	width: 235px;
+	height: 36px;
+	border-left: 1px solid #6f6f6f;
+	margin: 0 20px 0 0;
+	padding: 0 0 0 20px;
+	display: table-cell;
+	vertical-align: middle;
+}
+
+#footer p strong {
+	padding-left: 3px;
+}
+
+#footer p:first-child {
+	background: url('images/what_logo.png') 15px 0 no-repeat;
+	padding: 0 0 0 130px;
+	border: 0;
+	width: 180px;
+}
+
+#footer p:last-child {
+	margin: 0;
+	width: 295px;
+}
+
+#footer a {
+	color: #a5a5a5;
+}
+
+#footer a:hover {
+	color: #c4c4c4;
+}
+
 #footer #disclaimer_container {
 	font-weight: normal;
 	text-align: left !important;
@@ -53,58 +88,32 @@ a img {
 	border-bottom: 1px solid #6f6f6f;
 }
 
-#footer p {
-	float: left;
-	width: 170px;
-	width: 150px;
-	height: 50px;
-	border-left: 1px solid #6f6f6f;
-	margin: 0 20px 0 0;
-	padding: 0 0 0 20px;
-}
-
-#footer p:first-child {
-	background: url('images/what_logo.png') 15px 0 no-repeat;
-	padding: 0 0 0 130px;
-	border: 0;
-}
-
-#footer p:last-child {
-	margin: 0;
-}
-
-#footer a {
-	color: #c4c4c4;
-}
-
 #header {
 	padding: 0;
 	margin: 20px 0 0 0;
 }
 
-
 /* GENERAL */
-
-
-
-
-.hidden, .hide {
+.hidden,
+.hide {
 	display: none;
 }
 
-
-h1,h2,h3,h4{
+h1,
+h2,
+h3,
+h4 {
 	margin-top: 0;
 	padding: 0;
 }
 
 .nobr {
-	white-space:nowrap;
-	font-weight: normal ;
+	white-space: nowrap;
+	font-weight: normal;
 }
 
 .rowa td {
-	background-color: #f6f6f6;
+	background-color: #f5f5f5;
 }
 
 .rowb td {
@@ -128,7 +137,9 @@ input[type="text"] {
 	cursor: text;
 }
 
-input, select, textarea {
+input,
+select,
+textarea {
 	font-family: Arial, sans-serif;
 	font-size: 1em;
 	border: 1px solid #9c9c9c;
@@ -139,12 +150,17 @@ textarea {
 	height: 100px;
 }
 
-input, textarea {
+input,
+textarea {
 	color: #999999;
 	padding: 3px;
 	background: white url('images/inputbg.png') top left repeat-x;
 }
 
+input[type="file"] {
+	padding: 1px 3px;
+}
+
 select {
 	padding: 1px;
 }
@@ -163,7 +179,9 @@ select {
 	padding: 20px !important;
 }
 
-input:focus, textarea:focus, #searchbars input:focus {
+input:focus,
+textarea:focus,
+#searchbars input:focus {
 	border: 1px solid #575757;
 	color: #575757;
 }
@@ -174,14 +192,16 @@ input:focus, textarea:focus, #searchbars input:focus {
 	height: 19px !important;
 	width: 131px !important;
 	margin: 0 !important;
-	padding: 4px 5px 0 19px !important;
+	padding: 3px 5px 0 19px !important;
+	outline: none;
 }
 
 #searchbars input:focus {
 	background: transparent url('images/searchbox.png') 0 -23px no-repeat;
 }
 
-input[type="submit"], input[type="button"] {
+input[type="submit"],
+input[type="button"] {
 	background-color: #f4f4f4;
 	background-image: none;
 	border-top: 1px solid #cdcdcd;
@@ -191,12 +211,13 @@ input[type="submit"], input[type="button"] {
 	font-weight: bold;
 }
 
-
-input[type="submit"]:active, input[type="button"]:active {
+input[type="submit"]:active,
+input[type="button"]:active {
 	color: #007dc7 !important;
 }
 
-input[value="Upload torrent"], input[value="Upload torrents"] {
+input[value="Upload torrent"],
+input[value="Upload torrents"] {
 	margin: 15px 0 0 0;
 	background-color: #007dc7;
 	color: white;
@@ -207,14 +228,14 @@ input[value="Upload torrent"], input[value="Upload torrents"] {
 	border-right: 1px solid #005488;
 }
 
-input[value="Upload torrent"],input[value="Upload torrents"]:active {
+input[value="Upload torrent"],
+input[value="Upload torrents"]:active {
 	color: #f4f4f4 !important;
 }
 
-
 /* TOP MENUS */
-
-#menu ul, ul#userinfo_minor {
+#menu ul,
+ul#userinfo_minor {
 	border-right: 1px solid #c4c4c4;
 	width: 150px;
 	list-style: none;
@@ -242,13 +263,17 @@ ul#userinfo_minor li {
 	width: 95px;
 }
 
-ul#userinfo_username, ul#userinfo_major, ul#userinfo_stats {
+ul#userinfo_username,
+ul#userinfo_major,
+ul#userinfo_stats {
 	margin: 0;
 	padding: 0;
 	list-style: none;
 }
 
-ul#userinfo_username li, ul#userinfo_major li, ul#userinfo_stats li {
+ul#userinfo_username li,
+ul#userinfo_major li,
+ul#userinfo_stats li {
 	display: inline;
 	font-weight: bold;
 }
@@ -294,15 +319,9 @@ ul#userinfo_stats li a {
 }
 
 .alertbar {
-	font-weight:normal;
-	background-color:#007dc6;
-	padding:5px;
-	color: white;
-}
-
-.blend {
-	background-color: #E6E6E6;
-	color: #626262;
+	font-weight: normal;
+	background-color: #007dc6;
+	padding: 3px 5px;
 }
 
 .alertbar a {
@@ -310,6 +329,23 @@ ul#userinfo_stats li a {
 	font-weight: bold;
 }
 
+.alertbar:hover {
+	background-color: #0070b7;
+}
+
+.alertbar:first-of-type {
+	padding-top: 4px;
+}
+
+.alertbar:last-of-type {
+	padding-bottom: 4px;
+}
+
+.blend {
+	background-color: #E6E6E6;
+	color: #626262;
+}
+
 .blend a {
 	color: #575757;
 }
@@ -321,6 +357,7 @@ ul#userinfo_stats li a {
 
 ul#userinfo_stats li span.stat {
 	color: #007dc6;
+	margin-right: 2px;
 }
 
 ul#userinfo_minor a {
@@ -351,7 +388,6 @@ ul#userinfo_minor a:hover {
 }
 
 /* ARRANGING MENUS */
-
 #logo {
 	width: 120px;
 	height: 80px;
@@ -359,7 +395,6 @@ ul#userinfo_minor a:hover {
 	position: absolute;
 }
 
-
 #logo a {
 	display: block;
 	height: 120px;
@@ -368,12 +403,15 @@ ul#userinfo_minor a:hover {
 	margin-top: -18px;
 }
 
-
-#menu ul, ul#userinfo_major, ul#userinfo_minor, ul#userinfo_stats, ul#userinfo_username, #alerts {
+#menu ul,
+ul#userinfo_major,
+ul#userinfo_minor,
+ul#userinfo_stats,
+ul#userinfo_username,
+#alerts {
 	position: absolute;
 }
 
-
 #menu ul {
 	z-index: 6;
 	padding-left: 120px;
@@ -411,7 +449,6 @@ ul#userinfo_username {
 }
 
 /* SEARCH BARS */
-
 #searchbars {
 	clear: both;
 }
@@ -462,14 +499,13 @@ ul#userinfo_username {
 	height: 80px;
 	width: 118px;
 	text-indent: -2000em;
-/*	background: transparent url('images/what_head3.jpg') no-repeat top left;*/
+	/*	background: transparent url('images/what_head3.jpg') no-repeat top left;*/
 	padding: 0;
 	margin: 0;
 	float: left;
 }
 
 /* CONTENT */
-
 #content {
 	padding: 20px 20px 20px 20px;
 	margin: 38px 0 0 0;
@@ -481,9 +517,14 @@ ul#userinfo_username {
 	z-index: 2;
 	position: relative;
 	border: 1px solid #b5b5b5;
+	-moz-background-clip: padding-box;
+	background-clip: padding-box;
+	-webkit-background-clip: border-box;
 }
 
-#content .header h2 {
+#content .header h2,
+#content > .thin > h2:first-of-type,
+#content > .thin > .header:first-of-type > h3:first-of-type {
 	background-color: #f0f0f0;
 	margin: 20px -20px -1px -20px !important;
 	padding: 20px;
@@ -495,16 +536,25 @@ ul#userinfo_username {
 	border-top-right-radius: 11px;
 	border-bottom: 1px solid #c6c6c6;
 	position: relative;
-	z-index:3;
+	z-index: 3;
 }
 
-#content .header:first-child h2 {
+#content .header:first-child h2,
+#content > .thin > h2:first-of-type,
+#content > .thin > .header:first-of-type > h3:first-of-type {
 	margin-top: -20px !important;
 }
 
+#content > .thin > .header:first-of-type > h3:first-of-type {
+	width: 100% !important;
+}
 
+body:not(#requests):not(#friends) .box table:not(#vanityhouse) {
+	margin: 0;
+	background-color: white;
+}
 
-#content .box h2 {
+body:not(#requests):not(#friends) .box h2 {
 	background: none;
 	margin: 0;
 	padding: 0;
@@ -519,17 +569,18 @@ ul#userinfo_username {
 }
 
 .label {
-	width: 15%;
+	width: 16%;
 	border-right: 1px solid #e6e6e6;
 }
 
-#content table {
+table {
 	padding: 0;
 	border-collapse: collapse;
 	width: 100%;
 }
 
-#content table td, #content table th {
+#content table:not(.forum_post) td,
+#content table:not(.forum_post) th {
 	padding: 5px;
 	border-top: 1px solid #e6e6e6;
 }
@@ -544,30 +595,46 @@ ul#userinfo_username {
 	font-weight: bold;
 }
 
-
 #content table .colhead a:hover,
 #content table .colhead_dark a:hover {
 	color: #007dc6;
 }
 
-/* FRIENDS */
+#vanityhouse {
+	margin: 0;
+}
 
+#vanityhouse tr:hover {
+	background-color: #f0f0f0;
+}
+
+/* FRIENDS */
 #friends table {
 	width: 60%;
 	margin: 0 auto;
 }
 
-#friends textarea {
+#friends table textarea {
 	height: 42px;
 	width: 270px !important;
 	margin: 0;
 }
 
-#friends .left {
+#friends table .left {
 	width: 50%;
 	text-align: right;
 }
 
+#friends table .left input[type="submit"] {
+	min-width: 100%;
+	margin-top: 0px;
+	margin-bottom: 5px;
+}
+
+#friends table td.avatar {
+	padding: 0px 0px 5px;
+}
+
 #friends br,
 #footer br {
 	display: none;
@@ -578,12 +645,16 @@ ul#userinfo_username {
 }
 
 /* MESSAGES */
-
-#inbox .vertical_space {
+#inbox .vertical_space:not(#preview) {
 	width: 50%;
 	margin: 0 auto;
 	padding: 20px;
-	background: transparent url('images/convo.png') 50% 35px no-repeat;
+	background: transparent url('images/convo.png') 50% 37px no-repeat;
+}
+
+#inbox .vertical_space:not(#preview) .head {
+	color: #bebebe;
+	margin-bottom: 5px;
 }
 
 #inbox .box .body {
@@ -597,147 +668,111 @@ ul#userinfo_username {
 	padding: 0;
 }
 
-#inbox form textarea {
-	margin: 0 0 10px 0;
+#inbox #preview {
+	padding: 20px;
+	background: transparent url('images/convo.png') 50% 0px no-repeat;
 }
 
-#inbox .vertical_space .head {
-	color: #bebebe;
-	margin-bottom: 5px;
+#inbox table:not(.message_table) td {
+	border-right: 1px solid #e6e6e6;
 }
 
+#inbox table:not(.message_table) td input[type="checkbox"] {
+	margin-left: -140px;
+}
+
+#inbox table:not(.message_table) td:last-of-type {
+	border-right: none;
+}
+
+#inbox table:not(.message_table) .label {
+	border-right: none;
+}
+
+#inbox table:not(.message_table) .label label {
+	padding-left: 22px;
+}
 
 /* FORUMS */
-
 #forums h3 {
 	margin: 15px 0;
 }
 
-#forums h3:first-child {
-	margin: 0 0 15px 0;
-}
-
 #quickreplypreview {
-	background-color:#F0F0F0;
-	border:1px solid #C6C6C6;
+	background-color: #F0F0F0;
+	border: 1px solid #C6C6C6;
 }
 
-#forums .forum_post td,
-#userhistory .forum_post td,
-#collage .forum_post td,
-#artist .forum_post td,
-#torrents .forum_post td,
-#comments .forum_post td,
-#requests .forum_post td {
-	border: 1px solid #d4d4d4;
-	border-bottom: 0;
-}
-
-#forums .forum_post,
-#userhistory .forum_post,
-#collage .forum_post,
-#torrents .forum_post,
-#comments .forum_post,
-#requests .forum_post {
-	border: 0;
-	margin: 0 0 10px 0;
-}
-
-.col_avatar,
-#forums .forum_post td.avatar,
-#userhistory .forum_post td.avatar,
-#collage .forum_post td.avatar,
-#artist .forum_post td.avatar,
-#torrents .forum_post td.avatar,
-#comments .forum_post td.avatar,
-#requests .forum_post td.avatar {
-	border: 0;
-	padding: 1px 1px 1px 0;
-	background-color: white;
-	width: 150px;
-}
-
-#forums .forum_post blockquote,
-#userhistory .forum_post blockquote,
-#collage .forum_post blockquote,
-#artist .forum_post blockquote,
-#torrents .forum_post blockquote,
-#comments .forum_post blockquote,
-#requests .forum_post blockquote,
-#wiki .box blockquote.spoiler,
+.forum_post blockquote,
+#wiki .box blockquote,
 #blog blockquote {
 	border: 1px dotted #dcdcdc;
 	padding: 6px;
 	background: white url('images/quote_bg.png') -10px -5px no-repeat;
+	margin-left: 25px;
+	margin-right: 25px;
 }
 
-#forums .forum_post blockquote.spoiler,
-#userhistory .forum_post blockquote.spoiler,
-#collage .forum_post blockquote.spoiler,
-#artist .forum_post blockquote.spoiler,
-#torrents .forum_post blockquote.spoiler,
-#comments .forum_post blockquote.spoiler,
-#requests .forum_post blockquote.spoiler,
+#forums blockquote {
+	margin-left: 40px;
+	margin-right: 40px;
+}
+
+.torrentdetails blockquote {
+	background-image: none;
+	background-color: rgba(255, 255, 255, 0.6);
+}
+
+.forum_post blockquote.spoiler,
 #wiki .box blockquote.spoiler,
 #blog div.spoiler {
 	background: white;
 }
 
-#forums .forum_post .body,
-#userhistory .forum_post .body,
-#collage .forum_post .body,
-#artist .forum_post .body,
-#torrents .forum_post .body,
-#comments .forum_post .body,
-#requests .forum_post .body {
-	padding: 0;
-	background: transparent url('images/forum_postbgspeech3.png') -2px 100% no-repeat;
-	border-left: 0;
+.forum_post {
+	border: none;
+	margin: 0 0 10px 0;
+	border-collapse: separate;
+	border-spacing: 0px;
 }
 
-#forums .forum_post,
-#userhistory .forum_post,
-#collage .forum_post,
-#artist .forum_post,
-#torrents .forum_post,
-#comments .forum_post,
-#requests .forum_post {
-	background: #f6f6f6 url('images/forum_postbgspeech2.png') 149px 0 repeat-y;
+.forum_post .avatar {
+	width: 150px;
+	padding: 0px 13px 0px 0px;
 }
 
-#forums .forum_post td,
-#userhistory .forum_post td,
-#collage .forum_post td,
-#artist .forum_post td,
-#torrents .forum_post td,
-#comments .forum_post td,
-#requests .forum_post td {
-	border-left: 0;
-	border-right: 0;
+.forum_post .colhead_dark td {
+	padding: 5px;
 }
 
-#forums .forum_post .body div,
-#collage .forum_post .body div,
-#artist .forum_post .body div,
-#torrents .forum_post .body div,
-#userhistory .forum_post .body,
-#comments .forum_post .body,
-#requests .forum_post .body {
-	background: transparent url('images/forum_postbgspeech1.png') -2px 0 no-repeat;
-	padding: 20px 20px 25px 40px;
-	max-width:697px;
+.forum_post .body {
+	padding: 10px 20px 15px 15px;
+	-webkit-border-bottom-right-radius: 10px;
+	-webkit-border-bottom-left-radius: 10px;
+	-moz-border-radius-bottomright: 10px;
+	-moz-border-radius-bottomleft: 10px;
+	border-bottom-right-radius: 10px;
+	border-bottom-left-radius: 10px;
+	border: 1px solid #d9d9d9;
+	border-top-style: none !important;
+	-webkit-box-shadow: -4px 1px 8px rgba(187, 215, 235, 0.8);
+	-moz-box-shadow: -4px 1px 8px rgba(187, 215, 235, 0.8);
+	box-shadow: -4px 1px 8px rgba(187, 215, 235, 0.8);
+	background-color: #F5F5F5;
 }
 
-#forums .forum_post .body div a,
-#collage .forum_post .body div a,
-#artist .forum_post .body div a,
-#torrents .forum_post .body div a,
-#userhistory .forum_post .body a,
-#comments .forum_post .body div a,
-#requests .forum_post .body div a {
+.forum_post .body div {
+	margin: 10px;
+}
+
+.forum_post .body div a {
 	word-wrap: break-word;
 }
 
+#forums .forum_post .body {
+	max-width: 708px;
+}
+
 #artist .forum_post .body textarea,
 #torrents .forum_post .body textarea,
 #requests .forum_post .body textarea {
@@ -748,12 +783,6 @@ ul#userinfo_username {
 	padding: 20px 20px 20px 40px;
 }
 
-#userhistory .forum_post tr,
-#comments .forum_post tr,
-#requests .forum_post tr {
-	background: transparent url('images/forum_postbgspeech3.png') 149px 100% no-repeat;
-}
-
 #userhistory .forum_post tr.colhead_dark {
 	background-color: #e8e8e8;
 	background-image: none;
@@ -762,7 +791,7 @@ ul#userinfo_username {
 #forums .forum_post .body div div,
 #collage .forum_post .body div div,
 #artist .forum_post .body div div,
-#torrents .forum_post .body div div{
+#torrents .forum_post .body div div {
 	background: none;
 	padding: 0;
 }
@@ -771,13 +800,12 @@ ul#userinfo_username {
 	padding: 0;
 }
 
-
 #forums .forum_post li {
 	margin: 0 0 0 20px;
 	padding: 0;
 }
 
-#forums #content .thin .box form .box input[type="Text"]{
+#forums #content .thin .box form .box input[type="Text"] {
 	font-size: 20px;
 	width: 500px;
 }
@@ -793,7 +821,6 @@ strong.quoteheader {
 }
 
 /* TORRENTS */
-
 .sidebar .box .stats li div {
 	letter-spacing: 0 !important;
 }
@@ -803,10 +830,11 @@ strong.quoteheader {
 }
 
 #torrents .sidebar .box .stats li span.remove_artist a {
-	color: #575757;
+	/*	color: #575757;*/
 	font-family: monospace;
 }
 
+#torrents .sidebar .remove_tag a:hover,
 #torrents .sidebar .box .stats li span.remove_artist a:hover {
 	color: red;
 }
@@ -815,7 +843,8 @@ strong.quoteheader {
 	margin: 5px 0 30px 0;
 }
 
-#torrents input[value="Change group ID"], #torrents input[value="Split into new group"] {
+#torrents input[value="Change group ID"],
+#torrents input[value="Split into new group"] {
 	margin: 0 0 0 -5px;
 }
 
@@ -823,9 +852,11 @@ strong.quoteheader {
 	margin: 5px 0;
 }
 
-#torrents .filter_torrents,
+/*#torrents .filter_torrents,*/
+#torrents #content .search_form,
 #inbox #searchbox {
 	width: 70%;
+	margin: 20px auto 0 auto;
 	border: 1px solid #dcdcdc;
 	-moz-border-radius: 7px;
 	-webkit-border-radius: 7px;
@@ -834,12 +865,24 @@ strong.quoteheader {
 	background: #f3f3f3 url('images/filter.png') -30px -30px no-repeat;
 }
 
-#torrents .filter_torrents {
-	margin: 20px auto 0 auto;
+#torrents .filter_torrents h3 {
+	margin: 0 0 10px 0;
+	font-size: 14px;
 }
 
 #torrents .filter_torrents table {
-	background-color: transparent;
+	background-color: transparent !important;
+}
+
+#torrents .filter_torrents table td {
+	padding: 2px 5px;
+	border: 0;
+}
+
+#torrents .filter_torrents table td.label {
+	text-align: left;
+	padding: 0;
+	width: 20%;
 }
 
 #torrents .filter_torrents .cat_list {
@@ -848,12 +891,6 @@ strong.quoteheader {
 	height: 30px;
 }
 
-#torrents .filter_torrents td {
-	padding: 2px 5px;
-	border: 0;
-}
-
-
 #torrents .filter_torrents .inputtext {
 	width: 150px;
 }
@@ -862,12 +899,6 @@ strong.quoteheader {
 	width: 80px;
 }
 
-#torrents .filter_torrents table td.label {
-	text-align: left;
-	padding: 0;
-	width: 20%;
-}
-
 #torrents .filter_torrents a#swaptags {
 	font-weight: bold;
 	text-align: center;
@@ -887,7 +918,7 @@ strong.quoteheader {
 }
 
 .torrent a {
-	font-weight:bold;
+	font-weight: bold;
 }
 
 .linkbox {
@@ -904,7 +935,6 @@ strong.quoteheader {
 	border-top: 0px;
 }
 
-
 .show_torrents_link {
 	border: none;
 	width: 28px;
@@ -928,7 +958,8 @@ strong.quoteheader {
 	font-weight: normal;
 }
 
-.tags, .tags a {
+.tags,
+.tags a {
 	font-weight: normal;
 	color: #888888;
 }
@@ -948,7 +979,6 @@ strong.quoteheader {
 #torrent_table {
 	margin: 0;
 	padding: 0;
-	border-collapse: collapse;
 	width: 100%;
 }
 
@@ -956,34 +986,47 @@ strong.quoteheader {
 	border: 0;
 }
 
-#torrent_table td {
-	margin: 0;
-	padding: 3px;
-	background-color: #f6f6f6;
+.torrent_table tr.group:not(.discog) {
+	background-color: #f5f5f5;
 }
 
-#torrents .torrent_table tr.group:hover td {
+.torrent_table tr.group:not(.discog):hover {
 	background-color: #eeeeee !important;
 }
 
-#torrents .torrent_table tr.group_torrent:hover td {
+.torrent_table tr.group.discog td:nth-of-type(1) {
+	width: 28px;
+}
+
+.torrent_table tr.group_torrent {
+	background-color: white;
+}
+
+.torrent_table tr.group_torrent:hover {
 	background-color: #f5f5f5 !important;
 }
 
-.colhead td, .colhead th, .colhead_dark td {
+.torrent_table td {
+	margin: 0;
+	padding: 3px;
+}
+
+.colhead td,
+.colhead_dark td {
 	background-color: #E6E6E6 !important;
 	font-weight: bold;
 	border-top: 1px solid #cccccc !important;
 	border-bottom: 1px solid #cccccc !important;
 }
 
-
-#torrent_table .group_torrent td {
-	background-color: white;
+tr.torrent .bookmark > a:before {
+	content: "[";
+	font-weight: bold;
 }
 
-.torrent_table .group_torrent td {
-	background-color: #f6f6f6;
+tr.torrent .bookmark > a:after {
+	content: "]";
+	font-weight: bold;
 }
 
 .torrent_table .pad td {
@@ -1002,8 +1045,10 @@ strong.quoteheader {
 	padding: 5px !important;
 }
 
-#torrent_table tr.group_torrent td span {
-	padding-left: 35px;
+#torrent_table tr.group_torrent td span,
+#torrent_table tr.group td span,
+#torrent_table tr.torrent td span {
+	padding-left: 15px;
 }
 
 #torrent_table tr.group_torrent td span a,
@@ -1051,8 +1096,6 @@ strong.quoteheader {
 }
 
 /* HOME AND ARTISTS */
-
-
 .main_column {
 	width: 645px;
 }
@@ -1066,12 +1109,8 @@ strong.quoteheader {
 	margin: 0 0 20px 0;
 }
 
-.box table {
-	margin: 0;
-	background-color: white;
-}
-
-#discog_table, #collage_table {
+#discog_table,
+#collage_table {
 	margin-top: 1px;
 }
 
@@ -1091,12 +1130,23 @@ strong.quoteheader {
 	background-color: #f0f0f0;
 	padding: 10px !important;
 	border-bottom: 1px solid #c6c6c6;
+	-moz-border-radius-topleft: 4px;
+	-webkit-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	-webkit-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+}
+
+#more_news.box .head {
+	background: none;
+	border: none;
 }
 
 .sidebar .box,
-.main_column .box,
+.main_column .box:not(.forum_post),
 #blog .box {
-	background-color: #f6f6f6;
+	background-color: #f5f5f5;
 	border: 1px solid #dcdcdc;
 	margin: 0 0 20px 0;
 	-moz-border-radius: 4px;
@@ -1125,11 +1175,14 @@ strong.quoteheader {
 	padding: 0;
 }
 
-#wiki .sidebar ul ul, #wiki .sidebar ol ol {
+#wiki .sidebar ul ul,
+#wiki .sidebar ol ol {
 	margin: 0 0 0 10px;
 }
 
-#wiki .main_column .box h1, h2, h3 {
+#wiki .main_column .box h1,
+#wiki .main_column .box h2,
+#wiki .main_column .box h3 {
 	margin: 5px 0;
 }
 
@@ -1141,6 +1194,10 @@ strong.quoteheader {
 	font-size: 13px;
 }
 
+#wiki .main_column .box h4 {
+	margin-bottom: 0;
+}
+
 .sidebar .box li {
 	margin: 0 0 2px 0;
 }
@@ -1173,7 +1230,8 @@ strong.quoteheader {
 }
 
 .main_column .body,
-.sidebar .box .body { /*ADD TAG ON ALBUM PAGE */
+.sidebar .box .body {
+	/*ADD TAG ON ALBUM PAGE */
 	padding: 10px;
 }
 
@@ -1187,10 +1245,6 @@ strong.quoteheader {
 	border: 0 !important;
 }
 
-#discog_table .center {
-	background-image: none;
-}
-
 .main_column .group td a {
 	color: #454545;
 }
@@ -1199,47 +1253,36 @@ strong.quoteheader {
 	color: white;
 }
 
-.main_column .group td .tags {
+.main_column .group .center {
+	background-image: none;
+}
+
+.main_column .group .tags {
 	background: url('images/tags.png') 0 60% no-repeat;
 	padding: 0 0 0 19px;
-/*
-	filter: alpha(opacity=99);
-	-moz-opacity: 0.99;
-	opacity: 0.99;
-*/
 }
 
-/*
-.main_column .group td .tags * {
-	filter: alpha(opacity=100);
-	-moz-opacity: 1;
-	opacity: 1;
-}
-*/
-
-.main_column .group td .tags a {
+.main_column .group .tags a {
 	color: #656565;
 }
 
-.main_column .group td .tags a:hover {
+.main_column .group .tags a:hover {
 	color: #8c8c8c;
 }
 
 /* Toolbox */
-
 .permission_container {
 	float: left;
 	width: 33.3%;
 }
 
 /* TORRENTS */
-
 .main_column .torrent_table .pad {
 	padding: 15px !important;
 }
 
 .main_column .torrent_table .torrent {
-	background-color: #f6f6f6;
+	background-color: #f5f5f5;
 }
 
 .main_column .torrent_table .pad blockquote {
@@ -1248,16 +1291,11 @@ strong.quoteheader {
 	padding: 5px;
 }
 
-
-
 /* POLLS */
-
-
-
 .poll {
 	list-style: none;
-	padding: 10px;
-	margin: 5px;
+	padding: 3px 5px;
+	margin: 0px;
 }
 
 .poll li {
@@ -1265,7 +1303,7 @@ strong.quoteheader {
 }
 
 .poll .graph {
-	padding: 0 0 15px 0;
+	padding: 0 0 5px 0;
 }
 
 .poll .graph span {
@@ -1288,42 +1326,103 @@ strong.quoteheader {
 	background: url('images/poll_right.png') top left no-repeat;
 }
 
-
-
 /* MISC */
+.r00 {
+	color: #FF0000;
+}
 
+.r01 {
+	color: #FF1300;
+}
 
+.r02 {
+	color: #FF1300;
+}
 
-.r00 { color: #FF0000; }
-.r01 { color: #FF1300; }
-.r02 { color: #FF1300; }
-.r03 { color: #FF2600; }
-.r04 { color: #FF4C00; }
-.r05 { color: #FF5E00; }
-.r06 { color: #FF5E00; }
-.r07 { color: #FF7100; }
-.r08 { color: #FF9700; }
-.r09 { color: #FFAA00; }
-.r10 { color: #74C42E; }
-.r20 { color: #418B00; }
-.r50 { color: #418B00; }
-.r99 { color: #418B00; }
+.r03 {
+	color: #FF2600;
+}
 
+.r04 {
+	color: #FF4C00;
+}
+
+.r05 {
+	color: #FF5E00;
+}
+
+.r06 {
+	color: #FF5E00;
+}
+
+.r07 {
+	color: #FF7100;
+}
+
+.r08 {
+	color: #FF9700;
+}
+
+.r09 {
+	color: #FFAA00;
+}
+
+.r10 {
+	color: #74C42E;
+}
+
+.r20 {
+	color: #418B00;
+}
+
+.r50 {
+	color: #418B00;
+}
+
+.r99 {
+	color: #418B00;
+}
 
 /* Styles generated by the BBCode parser */
+span.size1 {
+	font-size: 0.8em;
+}
 
-span.size1 { font-size:0.75em; }
-span.size2 { font-size:1em; }
-span.size3 { font-size:1.25em; }
-span.size4 { font-size:1.5em; }
-span.size5 { font-size:1.75em; }
-span.size6 { font-size:2em; }
-span.size7 { font-size:2.25em; }
-span.size8 { font-size:2.5em; }
-span.size9 { font-size:2.75em; }
-span.size10 { font-size:3em; }
+span.size2 {
+	font-size: 1em;
+}
 
+span.size3 {
+	font-size: 1.25em;
+}
 
+span.size4 {
+	font-size: 1.5em;
+}
+
+span.size5 {
+	font-size: 1.75em;
+}
+
+span.size6 {
+	font-size: 2em;
+}
+
+span.size7 {
+	font-size: 2.25em;
+}
+
+span.size8 {
+	font-size: 2.5em;
+}
+
+span.size9 {
+	font-size: 2.75em;
+}
+
+span.size10 {
+	font-size: 3em;
+}
 
 td.r00 {
 	background-color: #faefed !important;
@@ -1336,9 +1435,9 @@ td.r00 {
 	width: 100%;
 	height: 100%;
 	background: #111 50% 0 no-repeat fixed;
-	z-index:1001;
+	z-index: 1001;
 	-moz-opacity: 0.9;
-	opacity:.90;
+	opacity: .90;
 	filter: alpha(opacity=90);
 }
 
@@ -1350,7 +1449,7 @@ td.r00 {
 	width: 90%;
 	height: 90%;
 	padding: 0px;
-	z-index:1002;
+	z-index: 1002;
 	overflow: auto;
 }
 
@@ -1402,11 +1501,12 @@ td.r00 {
 	padding: 10px;
 }
 
-
 /*CLEARFIXES*/
-
-
-#menu ul:after, ul#userinfo_minor:after, div.sidebar:after, #content:after, #footer:after {
+#menu ul:after,
+ul#userinfo_minor:after,
+div.sidebar:after,
+#content:after,
+#footer:after {
 	content: ".";
 	display: block;
 	height: 0;
@@ -1414,22 +1514,33 @@ td.r00 {
 	visibility: hidden;
 }
 
-#menu ul, ul#userinfo_minor, div.sidebar, #content , #footer {display: inline-block;}
+#menu ul,
+ul#userinfo_minor,
+div.sidebar,
+#content,
+#footer {
+	display: inline-block;
+}
 
 /* Hides from IE-mac \*/
+* html #menu ul,
+* html ul#userinfo_minor,
+* html div.sidebar,
+* html #content,
+* html #footer {
+	height: 1%;
+}
 
-* html #menu ul, * html ul#userinfo_minor, * html div.sidebar, * html #content, * html #footer {height: 1%;}
-
-#menu ul, ul#userinfo_minor, div.sidebar, #content, #footer {display: block;}
+#menu ul,
+ul#userinfo_minor,
+div.sidebar,
+#content,
+#footer {
+	display: block;
+}
 
 /* End hide from IE-mac */
-
 /* Further updates - 23/09/08 */
-
-
-
-
-
 /* COLLAGES */
 ul.collage_images img {
 	height: 127px !important;
@@ -1464,20 +1575,26 @@ ul.collage_images {
 	margin: 0 !important;
 }
 
-
-/*
-
-#upload_table .label, #collage form .label, #requests form .label, #requests form .label, #inbox form .box .label {
-	border-right: 1px solid #d4d4d4 !important;
+#upload .box.pad {
+	width: 780px !important;
 }
 
-*/
+#upload #dnulist td:first-child {
+	width: 210px;
+}
 
 #upload .thin {
 	width: 700px;
 	margin: 30px auto 0 auto;
 }
 
+#upload td.label {
+	width: 112px;
+}
+
+#requests .box.box_votes {
+	background-color: #FFF;
+}
 
 #requests .tags {
 	color: #656565;
@@ -1491,6 +1608,25 @@ ul.collage_images {
 	color: #575757;
 }
 
+#requests td:nth-child(1) {
+	width: 101px;
+}
+
+#requests .edit_form strong {
+	float: left;
+}
+
+#requests .edit_form input[type="Submit"] {
+	position: relative;
+	top: -40px;
+	left: 289px;
+}
+
+#requests label {
+	display: inline-block;
+	min-width: 60px;
+}
+
 #quickreplybuttons {
 	margin-top: 5px;
 }
@@ -1510,7 +1646,7 @@ h3 {
 .user_options select#stylesheet,
 .user_options select#searchtype,
 .user_options select#discogview,
-.user_options select#hidecollage{
+.user_options select#hidecollage {
 	width: 130px;
 }
 
@@ -1518,6 +1654,23 @@ h3 {
 	padding: 0;
 }
 
+#sortable .sortable_item:hover {
+	background-color: #F0F0F0;
+}
+
+#user #sortable {
+	width: 40%;
+}
+
+#user .layout.recent tr:not(.colhead) td {
+	padding: 0px;
+}
+
+#user .layout.recent img {
+	width: 129px;
+	height: 129px;
+}
+
 #user .linkbox,
 #artist .linkbox,
 #collage .linkbox,
@@ -1533,6 +1686,15 @@ h3 {
 	padding-bottom: 0;
 }
 
+#rules #content .rule_summary,
+#rules #content .rule_table {
+	margin: 0 auto;
+}
+
+#rules #content h3 {
+	margin: 20px auto 10px;
+}
+
 #rules #content li {
 	margin: 0 0 5px -10px;
 }
@@ -1557,14 +1719,14 @@ h3 {
 
 .forum_unread .colhead_dark td {
 	background-color: #e3f1f9 !important;
-/*	border: 2px solid #a8d3ec !important; */
 }
 
-#forums td[value="unread"]{
-	color:red !important;
+#forums td[value="unread"] {
+	color: red !important;
 }
 
-#bookmarks .main_column, #bookmarks .sidebar {
+#bookmarks .main_column,
+#bookmarks .sidebar {
 	margin-top: 20px;
 }
 
@@ -1591,39 +1753,47 @@ h3 {
 	float: right;
 }
 
-#bookmarks .group span div a, #bookmarks .group span strong a {
+#bookmarks .group span div a,
+#bookmarks .group span strong a {
 	float: none;
 }
 
+#bookmarks .header + table {
+	margin-top: 20px;
+}
+
 #top10 p {
 	margin: 10px 0;
 }
 
-/*#top10 .rowa {
-	background: #F6F6F6 url('images/download_bottom.png') 50% 100% no-repeat;
+#top10 div.linkbox:nth-of-type(2) {
+	display: inline-block;
+	float: right;
 }
 
-#top10 .rowb {
-	background: white url('images/download_bottom.png') 50% 100% no-repeat;
+#musicbrainz_popup {
+	left: 22% !important;
+	right: 22% !important;
+	font-size: 12px !important;
+	/* the p.mb was put in, in case the code that generates these is updated to use a class. This just works around a bug in What.CD's HTML */
 }
 
-#top10 .rowa td, #top10 .rowb td {
-	background-color: transparent !important;
+#musicbrainz_popup a#mb,
+#musicbrainz_popup a.mb {
+	background: transparent url(https://whatimg.com/i/i7umji.png) no-repeat !important;
+	display: inline-block;
+	text-indent: -5000px;
+	overflow: hidden;
+	width: 16px;
+	margin-left: 5px;
 }
 
-#top10 .group_torrent img {
-
+#musicbrainz_popup p#mb,
+#musicbrainz_popup p.mb {
+	display: block;
 }
 
-#top10 .group_torrent td:first-child {
-	font-size: 14px;
-}
-#top10 .group_torrent .center {
-
-}*/
-
 /* OINKPLUS */
-
 .OiNK #ArtistName {
 	text-indent: -2000em;
 }
@@ -1632,43 +1802,67 @@ h3 {
 	padding: 30px 10px 10px 10px;
 }
 
-.OiNK #LastFMSimilar, .OiNK #History {
+.OiNK #LastFMSimilar,
+.OiNK #History {
 	padding: 5px 0 0 5px;
 }
 
 .OiNK input {
-	color:#999999;
-	padding:3px;
-	border:1px solid #9C9C9C !important;
-	font-family:Arial,sans-serif;
+	color: #999999;
+	padding: 3px;
+	border: 1px solid #9C9C9C !important;
+	font-family: Arial,sans-serif;
 }
 
 .OiNK #MySpacePlayer object {
 	width: 450px;
 }
 
-div[style="clear: both;"]{
+div[style="clear: both;"] {
 	display: none;
 }
 
-div.box[style=""] div{
+div.box[style=""] div {
 	text-align: center;
 	margin: 0 auto;
 }
 
-div.box[style=""] .head{
+div.box[style=""] .head {
 	text-align: left;
 	margin: 0;
 }
 
-.unread_locked_sticky{background: url('images/locked_sticky_unread.gif') no-repeat center center;}
-.read_locked_sticky{background: url('images/locked_sticky_read.gif') no-repeat center center;}
-.read_sticky{background: url('images/sticky_read.gif') no-repeat center center;}
-.unread_sticky{background: url('images/sticky_unread.gif') no-repeat center center;}
-.unread_locked{background: url('images/locked_unread.gif') no-repeat center center;}
-.read_locked{background: url('images/locked_read.gif') no-repeat center center;}
-.unread{background: url('images/unread.gif') no-repeat center center;}
-.read{background: url('images/read.gif') no-repeat center center;}
+.unread_locked_sticky {
+	background: url('images/locked_sticky_unread.gif') no-repeat center center;
+}
+
+.read_locked_sticky {
+	background: url('images/locked_sticky_read.gif') no-repeat center center;
+}
+
+.read_sticky {
+	background: url('images/sticky_read.gif') no-repeat center center;
+}
+
+.unread_sticky {
+	background: url('images/sticky_unread.gif') no-repeat center center;
+}
+
+.unread_locked {
+	background: url('images/locked_unread.gif') no-repeat center center;
+}
+
+.read_locked {
+	background: url('images/locked_read.gif') no-repeat center center;
+}
+
+.unread {
+	background: url('images/unread.gif') no-repeat center center;
+}
+
+.read {
+	background: url('images/read.gif') no-repeat center center;
+}
 
 .unread_locked_sticky,
 .read_locked_sticky,
@@ -1678,28 +1872,67 @@ div.box[style=""] .head{
 .read_locked,
 .unread,
 .read {
-	padding:0 0 0 30px !important;
+	padding: 0 0 0 30px !important;
 }
 
-.cats_applications { width: 28px; height: 28px; background: url('images/apps.png') no-repeat center center; }
-.cats_audiobooks { width: 28px; height: 28px; background: url('images/audiobook.png') no-repeat center center; }
-.cats_comedy { width: 28px; height: 28px; background: url('images/comedy.png') no-repeat center center; }
-.cats_comics { width: 28px; height: 28px; background: url('images/comics.png') no-repeat center center; }
-.cats_ebooks { width: 28px; height: 28px; background: url('images/ebook.png') no-repeat center center; }
-.cats_elearningvideos { width: 28px; height: 28px; background: url('images/elearning.png') no-repeat center center; }
-.cats_music { width: 28px; height: 28px; background: url('images/music.png') no-repeat center center; }
+.cats_applications {
+	width: 28px;
+	height: 28px;
+	background: url('images/apps.png') no-repeat center center;
+}
 
-#forums img[width="500"] {width:100%;height:100%;border-right:5px #007DC6 solid;cursor:pointer;margin:2px auto;}
+.cats_audiobooks {
+	width: 28px;
+	height: 28px;
+	background: url('images/audiobook.png') no-repeat center center;
+}
 
-.forum_post ul, .main_column .box ul {
-	margin: 0 0 -0px 10px;
+.cats_comedy {
+	width: 28px;
+	height: 28px;
+	background: url('images/comedy.png') no-repeat center center;
+}
+
+.cats_comics {
+	width: 28px;
+	height: 28px;
+	background: url('images/comics.png') no-repeat center center;
+}
+
+.cats_ebooks {
+	width: 28px;
+	height: 28px;
+	background: url('images/ebook.png') no-repeat center center;
+}
+
+.cats_elearningvideos {
+	width: 28px;
+	height: 28px;
+	background: url('images/elearning.png') no-repeat center center;
+}
+
+.cats_music {
+	width: 28px;
+	height: 28px;
+	background: url('images/music.png') no-repeat center center;
+}
+
+#forums img[width="500"] {
+	width: 100%;
+	height: 100%;
+	border-right: 5px #007DC6 solid;
+	cursor: pointer;
+	margin: 2px auto;
+}
+
+.forum_post ul,
+.main_column .box ul {
+	margin: 0 0 0px 10px;
 	list-style-position: inside;
-	padding:0;
+	padding: 0;
 }
 
-
 /* update - 07/12/2009 */
-
 .edition_info {
 	padding-left: 40px !important;
 }
@@ -1717,7 +1950,6 @@ div.box[style=""] .head{
 	padding: 5px;
 }
 
-
 #inbox #searchbox {
 	margin: 0 auto 20px auto;
 }
@@ -1727,9 +1959,24 @@ div.invitetree ul.invitetree {
 	padding-left: 10px;
 }
 
-.last_read { width: 15px; height: 15px; background: url('images/go_last_read.png') no-repeat center center; margin-left: 5px; margin-left: 5px;}
-.last_read a { border: none; width: 100%; height: 100%; display: block; }
-.last_read a:hover { border: none; }
+.last_read {
+	width: 15px;
+	height: 15px;
+	background: url('images/go_last_read.png') no-repeat center center;
+	margin-left: 5px;
+	margin-left: 5px;
+}
+
+.last_read a {
+	border: none;
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+.last_read a:hover {
+	border: none;
+}
 
 .center {
 	text-align: center;
@@ -1741,12 +1988,20 @@ div.invitetree ul.invitetree {
 	font-weight: bold;
 }
 
-table.noavatar, table.noavatar tr, table.noavatar td.body, table.noavatar td.body div {
+table.noavatar,
+table.noavatar tr,
+table.noavatar td.body,
+table.noavatar td.body div {
 	background-image: none !important;
 }
 
-tr.torrent .bookmark > a:before { content:""; }
-tr.torrent .bookmark > a:after { content:""; }
+tr.torrent .bookmark > a:before {
+	content: "";
+}
+
+tr.torrent .bookmark > a:after {
+	content: "";
+}
 
 .linkbox .brackets:before,
 .linkbox .brackets:after,
@@ -1755,6 +2010,28 @@ tr.torrent .bookmark > a:after { content:""; }
 	color: #575757;
 }
 
-.group_image + .group_info { margin: 0; padding: 0 5px; display: table-cell; vertical-align: middle; height: 90px; }
-#torrents .group_image + .group_info { width: 450px; }
-#top10 .group_image + .group_info { width: 585px; }
+.group_image + .group_info {
+	margin: 0;
+	padding: 0 5px;
+	display: table-cell;
+	vertical-align: middle;
+	height: 90px;
+}
+
+#torrents .group_image + .group_info {
+	width: 450px;
+}
+
+.grouped.release_table .group_image + .group_info {
+	width: 550px;
+}
+
+#top10 .group_image + .group_info {
+	width: 585px;
+}
+
+.group_image img {
+	background: url(https://what.cd/static/common/noartwork/music.png) no-repeat top left;
+	background-size: 90px;
+	color: transparent;
+}