diff --git a/changelog.html b/changelog.html
index 1dcca515..8fc04e55 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,9 @@
+<div class="list-header">3.5.340 <time datetime="2016-10-19">(2016-10-19)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Subscriber count display was broken.</li>
+	<li>Fixed: Dark theme tweaks for Clips.</li>
+</ul>
+
 <div class="list-header">3.5.339 <time datetime="2016-10-18">(2016-10-18)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Changed: Generate proper CSS for room-specific badges to avoid having to use inline styles.</li>
diff --git a/src/less/dark-clips.less b/src/less/dark-clips.less
index ffa8607a..44f63222 100644
--- a/src/less/dark-clips.less
+++ b/src/less/dark-clips.less
@@ -25,6 +25,10 @@
 		}
 	}
 
+	hr {
+		border-color: fade(white, 10%);
+	}
+
 
 	.sub-text { color: darken(@fg-color, 10%) }
 
@@ -38,6 +42,17 @@
 	.svg-logo_twitch, .clips-nav__logo { fill: white }
 
 
+	// Content Meta
+	.nv-clip-content {
+		background-color: @nav-bg-color;
+
+		.nv-clip-content__meta {
+			background-color: @nav-bg-color;
+		}
+
+	}
+
+
 	// Buttons
 
 	.button {
@@ -60,6 +75,12 @@
 		}
 	}
 
+	.button--following {
+		background-color: darken(@nav-bg-color, 2%);
+		color: @fg-color;
+		box-shadow: inset 0 0 0 1px lighten(@bg-color, 10%);
+	}
+
 	.button--hollow.button--dropmenu {
 		&:after {
 
@@ -113,6 +134,49 @@
 	}
 
 
+	// Card~
+	.card__title {
+		color: @fg-color;
+	}
+
+	.more-clips {
+		border-color: fade(white, 10%);
+
+		.card__layout:hover {
+			background-color: lighten(@nav-bg-color, 10%);
+		}
+	}
+
+
+	// Popup Card
+	.popup-card {
+		background-color: lighten(@bg-color, 10%);
+		box-shadow:
+			0 0 0 1px fade(white, 10%),
+			0 1rem 2rem -.8rem fade(#6441A4, 25%);
+
+		.popup-card__header {
+			color: lighten(@fg-color, 10%);
+		}
+
+		.cf-footer {
+			background-color: lighten(@bg-color, 5%);
+			border-top: fade(white, 10%);
+		}
+
+	}
+
+
+	.cf-textarea-input {
+		background-color: fade(white, 5%);
+		color: lighten(@fg-color, 10%);
+
+		textarea {
+			background: transparent;
+		}
+	}
+
+
 	// Modal Content
 	.modal {
 		&__content {
diff --git a/src/main.js b/src/main.js
index b70a80c3..2e4780b7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,7 +35,7 @@ FFZ.channel_metadata = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 339,
+	major: 3, minor: 5, revision: 340,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}
diff --git a/src/tokenize.js b/src/tokenize.js
index 957b6743..6afd2008 100644
--- a/src/tokenize.js
+++ b/src/tokenize.js
@@ -656,7 +656,8 @@ FFZ.prototype.tokenize_chat_line = function(msgObject, prevent_notification, del
 		from_me = user && from_user === user.login,
 		tags = msgObject.tags || {},
 		emotes = tags.emotes,
-		tokens = [msg];
+		tokens = [msg],
+		mod_or_higher = tags.mod || from_user === room_id || tags['user-type'] === 'staff' || tags['user-type'] === 'admin' || tags['user-type'] === 'global_mod';
 
 	// Standard Tokenization
 	if ( tags.bits && bits_helpers && bits_helpers.tokenizeBits )
@@ -667,8 +668,7 @@ FFZ.prototype.tokenize_chat_line = function(msgObject, prevent_notification, del
 	//	tokens = helpers.tokenizeRichContent(tokens, tags.content, delete_links);
 
 	if ( helpers && helpers.linkifyMessage && this.settings.parse_links )
-		tokens = helpers.linkifyMessage(tokens, delete_links && ! tags.mod);
-
+		tokens = helpers.linkifyMessage(tokens, delete_links && ! mod_or_higher);
 
 	if ( user && user.login && helpers && helpers.mentionizeMessage ) {
 		tokens = helpers.mentionizeMessage(tokens, user.login, from_me);
diff --git a/src/ui/menu.js b/src/ui/menu.js
index 25283651..f18bf5d5 100644
--- a/src/ui/menu.js
+++ b/src/ui/menu.js
@@ -271,20 +271,6 @@ FFZ.prototype.build_ui_popup = function(view) {
 		menu.appendChild(el);
 	}
 
-
-	var page = (this._last_page || "channel").split("_", 1)[0];
-
-	// Do we have news?
-	/*if ( this._has_news ) {
-		// Render news, then set the page back so our default doesn't change.
-		this._ui_change_page(view, inner, menu, sub_container, 'about_news');
-		this._last_page = page;
-
-	} else*/
-		// Render Current Page
-		this._ui_change_page(view, inner, menu, sub_container, page);
-
-
 	// Add the menu to the DOM.
 	sub_container.style.maxHeight = Math.max(200, view.$().height() - 172) + "px";
 	view.$('.chat-interface').append(container);
@@ -292,6 +278,10 @@ FFZ.prototype.build_ui_popup = function(view) {
 	// Keep track of the pop-up.
 	this._popup = container;
 	this._popup_allow_parent = true;
+
+	// Render Current Page
+	var page = (this._last_page || "channel").split("_", 1)[0];
+	this._ui_change_page(view, inner, menu, sub_container, page);
 }
 
 
@@ -402,6 +392,10 @@ FFZ.prototype._ui_change_page = function(view, inner, menu, container, page) {
 			submenu.appendChild(tab);
 		}
 
+		// Add this to the container.
+		container.appendChild(subcontainer);
+		container.appendChild(submenu);
+
 		// Activate a Tab
 		var last_subpages = this._last_subpage = this._last_subpage || {},
 			last_subpage = last_subpages[page] = last_subpages[page] || data.default_page || subpages[0][1];
@@ -415,9 +409,6 @@ FFZ.prototype._ui_change_page = function(view, inner, menu, container, page) {
 		jQuery('li.active', menu).removeClass('active');
 		jQuery('#ffz-menu-page-' + page, menu).addClass('active');
 
-		// Add this to the container.
-		container.appendChild(subcontainer);
-		container.appendChild(submenu);
 		return;
 	}
 
diff --git a/src/ui/sub_count.js b/src/ui/sub_count.js
index 8633245b..9a4ff3ca 100644
--- a/src/ui/sub_count.js
+++ b/src/ui/sub_count.js
@@ -26,7 +26,7 @@ FFZ.prototype._update_subscribers = function() {
 		if ( typeof sub_count === "string" )
 			sub_count = parseInt(sub_count.replace(/[,\.]/g, ""));
 
-		if ( typeof sub_count !== "number" || ! sub_count || isNaN(sub_count) || ! isFinite(sub_count) ) {
+		if ( typeof sub_count !== "number" || isNaN(sub_count) || ! isFinite(sub_count) ) {
 			jQuery("#ffz-sub-display").remove();
 
 			var failed = f._failed_sub_checks = (f._failed_sub_checks || 0) + 1;
@@ -62,7 +62,7 @@ FFZ.prototype._update_subscribers = function() {
 			el = utils.createElement('span');
 			stat.appendChild(el);
 
-			utils.api.get("chat/" + channel_id + "/badges", null, {version: 3})
+			utils.api.get("chat/" + f.dashboard_channel + "/badges", null, {version: 3})
 				.done(function(data) {
 					if ( data.subscriber && data.subscriber.image ) {
 						stat.innerHTML = '';