diff --git a/classes/class_torrents.php b/classes/class_torrents.php
index b14bbe0c..30cccaf5 100644
--- a/classes/class_torrents.php
+++ b/classes/class_torrents.php
@@ -453,9 +453,9 @@ public static function torrent_info($Data, $ShowMedia = false, $ShowEdition = fa
 			if (count($EditionInfo)) { $Info[]=implode(' ',$EditionInfo); }
 		}
 		if ($Data['IsSnatched']) { $Info[]='<strong class="snatched_torrent_label">Snatched!</strong>'; }
-		if ($Data['FreeTorrent'] == '1') { $Info[]='<strong>Freeleech!</strong>'; }
-		if ($Data['FreeTorrent'] == '2') { $Info[]='<strong>Neutral Leech!</strong>'; }
-		if ($Data['PersonalFL']) { $Info[]='<strong>Personal Freeleech!</strong>'; }
+		if ($Data['FreeTorrent'] == '1') { $Info[]='<strong class="freeleech_torrent_label">Freeleech!</strong>'; }
+		if ($Data['FreeTorrent'] == '2') { $Info[]='<strong class="neutral_leech_torrent_label">Neutral Leech!</strong>'; }
+		if ($Data['PersonalFL']) { $Info[]='<strong class="personal_freeleech_torrent_label">Personal Freeleech!</strong>'; }
 		return implode(' / ', $Info);
 	}
 
diff --git a/design/privateheader.php b/design/privateheader.php
index 5902caeb..f2fdb6b4 100644
--- a/design/privateheader.php
+++ b/design/privateheader.php
@@ -207,7 +207,7 @@
 		$Cache->cache_value('forums_quotes_'.$LoggedUser['ID'], $QuoteNotificationsCount, 0);
         }
 		if($QuoteNotificationsCount > 0) {
-			$Alerts[] = '<a href="userhistory.php?action=quote_notifications">'. 'New Quote'. ($QuoteNotificationsCount > 1 ? 's' : '') . '</a>';
+			$Alerts[] = '<a href="userhistory.php?action=quote_notifications">'. 'New quote'. ($QuoteNotificationsCount > 1 ? 's' : '') . '</a>';
 		}
 }
 
diff --git a/sections/ajax/bookmarks/torrents.php b/sections/ajax/bookmarks/torrents.php
index a8babc40..93443646 100644
--- a/sections/ajax/bookmarks/torrents.php
+++ b/sections/ajax/bookmarks/torrents.php
@@ -48,149 +48,6 @@ function compare($X, $Y){
 	}
 }
 
-$Title = ($Sneaky)?"$Username's bookmarked torrents":'Your bookmarked torrents';
-
-
-// Loop through the result set, building up $Collage and $TorrentTable
-// Then we print them.
-$Collage = array();
-$TorrentTable = '';
-
-$NumGroups = 0;
-$Artists = array();
-$Tags = array();
-
-foreach ($TorrentList as $GroupID=>$Group) {
-	list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TagList, $ReleaseType, $GroupVanityHouse, $Torrents, $GroupArtists) = array_values($Group);
-	list($GroupID2, $Image, $GroupCategoryID, $AddedTime) = array_values($CollageDataList[$GroupID]);
-	
-	// Handle stats and stuff
-	$NumGroups++;
-	
-	if($GroupArtists) {
-		foreach($GroupArtists as $Artist) {
-			if(!isset($Artists[$Artist['id']])) {
-				$Artists[$Artist['id']] = array('name'=>$Artist['name'], 'count'=>1);
-			} else {
-				$Artists[$Artist['id']]['count']++;
-			}
-		}
-	}
-	
-	$TagList = explode(' ',str_replace('_','.',$TagList));
-
-	$TorrentTags = array();
-	foreach($TagList as $Tag) {
-		if(!isset($Tags[$Tag])) {
-			$Tags[$Tag] = array('name'=>$Tag, 'count'=>1);
-		} else {
-			$Tags[$Tag]['count']++;
-		}
-		$TorrentTags[]='<a href="torrents.php?taglist='.$Tag.'">'.$Tag.'</a>';
-	}
-	$PrimaryTag = $TagList[0];
-	$TorrentTags = implode(', ', $TorrentTags);
-	$TorrentTags='<br /><div class="tags">'.$TorrentTags.'</div>';
-
-	$DisplayName = '';
-	if(count($GroupArtists)>0) {
-		$DisplayName = Artists::display_artists(array('1'=>$GroupArtists));
-	}
-	$DisplayName .= '<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
-	if($GroupYear>0) { $DisplayName = $DisplayName. ' ['. $GroupYear .']';}
-	if($GroupVanityHouse) { $DisplayName .= ' [<abbr title="This is a vanity house release">VH</abbr>]'; }
-	
-	// Start an output buffer, so we can store this output in $TorrentTable
-	ob_start(); 
-	if(count($Torrents)>1 || $GroupCategoryID==1) {
-			// Grouped torrents
-			$ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1);
-		$LastRemasterYear = '-';
-		$LastRemasterTitle = '';
-		$LastRemasterRecordLabel = '';
-		$LastRemasterCatalogueNumber = '';
-		$LastMedia = '';
-		
-		$EditionID = 0;
-		unset($FirstUnknown);
-		
-		foreach ($Torrents as $TorrentID => $Torrent) {
-
-			if ($Torrent['Remastered'] && !$Torrent['RemasterYear']) {
-				$FirstUnknown = !isset($FirstUnknown);
-			}
-			
-			if($Torrent['RemasterTitle'] != $LastRemasterTitle || $Torrent['RemasterYear'] != $LastRemasterYear ||
-			$Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber || $FirstUnknown || $Torrent['Media'] != $LastMedia) {
-				
-				$EditionID++;
-				if($Torrent['Remastered'] && $Torrent['RemasterYear'] != 0) {
-					
-					$RemasterName = $Torrent['RemasterYear'];
-					$AddExtra = " - ";
-					if($Torrent['RemasterRecordLabel']) { $RemasterName .= $AddExtra.display_str($Torrent['RemasterRecordLabel']); $AddExtra=' / '; }
-					if($Torrent['RemasterCatalogueNumber']) { $RemasterName .= $AddExtra.display_str($Torrent['RemasterCatalogueNumber']); $AddExtra=' / '; }
-					if($Torrent['RemasterTitle']) { $RemasterName .= $AddExtra.display_str($Torrent['RemasterTitle']); $AddExtra=' / '; }
-					$RemasterName .= $AddExtra.display_str($Torrent['Media']);
-					
-				} else {
-					$AddExtra = " / ";
-					if (!$Torrent['Remastered']) {
-						$MasterName = "Original Release";
-						if($GroupRecordLabel) { $MasterName .= $AddExtra.$GroupRecordLabel; $AddExtra=' / '; }
-						if($GroupCatalogueNumber) { $MasterName .= $AddExtra.$GroupCatalogueNumber; $AddExtra=' / '; }
-					} else {
-						$MasterName = "Unknown Release(s)";
-					}
-					$MasterName .= $AddExtra.display_str($Torrent['Media']);
-				}
-			}
-			$LastRemasterTitle = $Torrent['RemasterTitle'];
-			$LastRemasterYear = $Torrent['RemasterYear'];
-			$LastRemasterRecordLabel = $Torrent['RemasterRecordLabel'];
-			$LastRemasterCatalogueNumber = $Torrent['RemasterCatalogueNumber'];
-			$LastMedia = $Torrent['Media'];
-		}
-	} else {
-		// Viewing a type that does not require grouping
-		
-		list($TorrentID, $Torrent) = each($Torrents);
-		
-		$DisplayName = '<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
-		
-		if(!empty($Torrent['FreeTorrent'])) {
-			$DisplayName .=' <strong>Freeleech!</strong>'; 
-		}
-	}
-	$TorrentTable.=ob_get_clean();
-	
-	// Album art
-	
-	ob_start();
-	
-	$DisplayName = '';
-	if(!empty($GroupArtists)) {
-		$DisplayName.= Artists::display_artists(array('1'=>$GroupArtists), false);
-	}
-	$DisplayName .= $GroupName;
-	if($GroupYear>0) { $DisplayName = $DisplayName. ' ['. $GroupYear .']';}
-	$Collage[]=ob_get_clean();
-	
-}
-
-uasort($Tags, 'compare');
-$i = 0;
-foreach ($Tags as $TagName => $Tag) {
-	$i++;
-	if($i>5) { break; }
-}
-uasort($Artists, 'compare');
-$i = 0;
-foreach ($Artists as $ID => $Artist) {
-	$i++;
-	if($i>10) { break; }
-}
-
 $JsonBookmarks = array();
 foreach ($TorrentList as $Torrent) {
 	$JsonTorrents = array();
diff --git a/sections/bookmarks/torrents.php b/sections/bookmarks/torrents.php
index fbd8553c..350c78bb 100644
--- a/sections/bookmarks/torrents.php
+++ b/sections/bookmarks/torrents.php
@@ -193,11 +193,11 @@ function compare($X, $Y){
 			$DisplayName .= ' <strong class="snatched_torrent_label">Snatched!</strong>';
 		}
 		if ($Torrent['FreeTorrent'] == '1') {
-			$DisplayName .= ' <strong>Freeleech!</strong>';
+			$DisplayName .= ' <strong class="freeleech_torrent_label">Freeleech!</strong>';
 		} elseif ($Torrent['FreeTorrent'] == '2') {
-			$DisplayName .= ' <strong>Neutral Leech!</strong>';
+			$DisplayName .= ' <strong class="neutral_leech_torrent_label">Neutral Leech!</strong>';
 		} elseif ($Torrent['PersonalFL']) {
-			$DisplayName .= '<strong>Personal Freeleech!</strong>';
+			$DisplayName .= '<strong class="personal_freeleech_torrent_label">Personal Freeleech!</strong>';
 		}
 ?>
 	<tr class="torrent" id="group_<?=$GroupID?>">
diff --git a/sections/collages/collage.php b/sections/collages/collage.php
index 7428c799..f84b334c 100644
--- a/sections/collages/collage.php
+++ b/sections/collages/collage.php
@@ -268,11 +268,11 @@ function compare($X, $Y){
 			$DisplayName .= ' <strong class="snatched_torrent_label">Snatched!</strong>';
 		}
 		if ($Torrent['FreeTorrent'] == '1') {
-			$DisplayName .= ' <strong>Freeleech!</strong>';
+			$DisplayName .= ' <strong class="freeleech_torrent_label">Freeleech!</strong>';
 		} elseif ($Torrent['FreeTorrent'] == '2') {
-			$DisplayName .= ' <strong>Neutral Leech!</strong>';
+			$DisplayName .= ' <strong class="neutral_leech_torrent_label">Neutral Leech!</strong>';
 		} elseif ($Torrent['PersonalFL']) {
-			$DisplayName .= $AddExtra.'<strong>Personal Freeleech!</strong>';
+			$DisplayName .= '<strong class="personal_freeleech_torrent_label">Personal Freeleech!</strong>';
 		}
 ?>
 	<tr class="torrent<?=$IsSnatched ? ' snatched_torrent' : ''?>" id="group_<?=$GroupID?>">
diff --git a/sections/top10/votes.php b/sections/top10/votes.php
index 26a6836f..46458dde 100644
--- a/sections/top10/votes.php
+++ b/sections/top10/votes.php
@@ -312,11 +312,11 @@
 			$DisplayName .= ' <strong class="snatched_torrent_label">Snatched!</strong>';
 		}
 		if ($Torrent['FreeTorrent'] == '1') {
-			$DisplayName .= ' <strong>Freeleech!</strong>';
+			$DisplayName .= ' <strong class="freeleech_torrent_label">Freeleech!</strong>';
 		} elseif ($Torrent['FreeTorrent'] == '2') {
-			$DisplayName .= ' <strong>Neutral Leech!</strong>';
-		} elseif(Torrents::has_token($TorrentID)) {
-			$DisplayName .= $AddExtra.'<strong>Personal Freeleech!</strong>';
+			$DisplayName .= ' <strong class="neutral_leech_torrent_label">Neutral Leech!</strong>';
+		} elseif (Torrents::has_token($TorrentID)) {
+			$DisplayName .= '<strong class="personal_freeleech_torrent_label">Personal Freeleech!</strong>';
 		}
 
 ?>
diff --git a/sections/torrents/browse.php b/sections/torrents/browse.php
index 98df16c3..ef1711cb 100644
--- a/sections/torrents/browse.php
+++ b/sections/torrents/browse.php
@@ -948,7 +948,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 				if(trim($Torrents['remastertitle'][$Key])) {  $ExtraInfo.=$AddExtra.$Torrents['remastertitle'][$Key]; $AddExtra=" - "; }
 				elseif($Torrents['remastered'][$Key]=="1") { $ExtraInfo.=$AddExtra."Remastered"; $AddExtra=" - "; }
 				if($Torrents['year'][$Key]>"0") 	{ $ExtraInfo.=$AddExtra.$Torrents['year'][$Key]; $AddExtra=" / "; }
-				if($Torrents['freetorrent'][$Key]=="1") { $ExtraInfo.=$AddExtra."<strong>Freeleech!</strong>"; $AddExtra=" / "; }
+				if($Torrents['freetorrent'][$Key]=="1") { $ExtraInfo.=$AddExtra.'<strong class="freeleech_torrent_label">Freeleech!</strong>'; $AddExtra=" / "; }
 ?>
 	<tr class="group_torrent groupid_<?=$GroupID?> <?=$HideGroup?>">
 		<td colspan="3">
@@ -988,7 +988,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 			if(trim($Torrents['remastertitle'][0])) {  $ExtraInfo.=$AddExtra.$Torrents['remastertitle'][0]; $AddExtra=" - "; }
 			elseif($Torrents['remastered'][0]=="1") { $ExtraInfo.=$AddExtra."Remastered"; $AddExtra=" - "; }
 			if($Torrents['year'][0]>"0") 		{ $ExtraInfo.=$AddExtra.$Torrents['year'][0]; $AddExtra=" / "; }
-			if($Torrents['freetorrent'][0]=="1") 	{ $ExtraInfo.=$AddExtra."<strong>Freeleech!</strong>"; $AddExtra=" / "; }
+			if($Torrents['freetorrent'][0]=="1") 	{ $ExtraInfo.=$AddExtra.'<strong class="freeleech_torrent_label">Freeleech!</strong>'; $AddExtra=" / "; }
 			if($ExtraInfo!='') 			{ $ExtraInfo="[".$ExtraInfo."]"; }
 			if($GroupYear>0) 			{ $ExtraInfo.=" [".$GroupYear."]"; }
 			
diff --git a/sections/torrents/details.php b/sections/torrents/details.php
index 911ce0a0..b41eec2e 100644
--- a/sections/torrents/details.php
+++ b/sections/torrents/details.php
@@ -467,9 +467,9 @@ function filelist($Str) {
 		$ExtraInfo = $GroupName ; $AddExtra=' / ';
 	}
 	if($IsSnatched) { $ExtraInfo.=$AddExtra.'<strong class="snatched_torrent_label">Snatched!</strong>'; $AddExtra=' / '; }
-	if($FreeTorrent == '1') { $ExtraInfo.=$AddExtra.'<strong>Freeleech!</strong>'; $AddExtra=' / '; }
-	if($FreeTorrent == '2') { $ExtraInfo.=$AddExtra.'<strong>Neutral Leech!</strong>'; $AddExtra=' / '; }
-	if($PersonalFL) { $ExtraInfo.=$AddExtra.'<strong>Personal Freeleech!</strong>'; $AddExtra=' / '; }
+	if($FreeTorrent == '1') { $ExtraInfo.=$AddExtra.'<strong class="freeleech_torrent_label">Freeleech!</strong>'; $AddExtra=' / '; }
+	if($FreeTorrent == '2') { $ExtraInfo.=$AddExtra.'<strong class="neutral_leech_torrent_label">Neutral Leech!</strong>'; $AddExtra=' / '; }
+	if($PersonalFL) { $ExtraInfo.=$AddExtra.'<strong class="personal_freeleech_torrent_label">Personal Freeleech!</strong>'; $AddExtra=' / '; }
 	if($Reported) { $ExtraInfo.=$AddExtra.'<strong>Reported</strong>'; $AddExtra=' / '; }
 	if(!empty($BadTags)) { $ExtraInfo.=$AddExtra.'<strong>Bad Tags</strong>'; $AddExtra=' / '; }
 	if(!empty($BadFolders)) { $ExtraInfo.=$AddExtra.'<strong>Bad Folders</strong>'; $AddExtra=' / '; }
diff --git a/sections/userhistory/subscribed_collages.php b/sections/userhistory/subscribed_collages.php
index afcef1a9..2f8cb179 100644
--- a/sections/userhistory/subscribed_collages.php
+++ b/sections/userhistory/subscribed_collages.php
@@ -246,7 +246,7 @@
 					$DisplayName .=' <strong class="snatched_torrent_label">Snatched!</strong>';
 				}
 				if(!empty($Torrent['FreeTorrent'])) {
-					$DisplayName .=' <strong>Freeleech!</strong>';
+					$DisplayName .=' <strong class="freeleech_torrent_label">Freeleech!</strong>';
 				}
 ?>
 	<tr class="torrent<?=$Torrent['IsSnatched'] ? ' snatched_torrent' : ''?>" id="group_<?=$CollageID . $GroupID?>">