diff --git a/src/ext/betterttv.js b/src/ext/betterttv.js
index 707ac6d3..e58d34be 100644
--- a/src/ext/betterttv.js
+++ b/src/ext/betterttv.js
@@ -46,7 +46,6 @@ FFZ.prototype.setup_bttv = function(delay) {
 	if ( this.is_dashboard ) {
 		this._update_subscribers();
         this._remove_dash_chart();
-		//this._remove_dash_feed();
     }
 
 	document.body.classList.add('ffz-bttv');
@@ -61,8 +60,6 @@ FFZ.prototype.setup_bttv = function(delay) {
 		this._chatv.ffzUnloadHost();
 	}
 
-	this.disconnect_extra_chat();
-
 	if ( this._roomv ) {
 		// Disable Chat Pause
 		if ( this.settings.chat_hover_pause )
@@ -73,6 +70,8 @@ FFZ.prototype.setup_bttv = function(delay) {
 			this._roomv.ffzUpdateStatus();
 	}
 
+	this.disconnect_extra_chat();
+
 	// Disable style blocks.
 	this.toggle_style('chat-setup');
 	this.toggle_style('chat-padding');
diff --git a/src/styles/badges-transparent.css b/src/styles/badges-transparent.css
index e32c96f3..84dc1e35 100644
--- a/src/styles/badges-transparent.css
+++ b/src/styles/badges-transparent.css
@@ -4,11 +4,11 @@
 
 
 /* Invert Some Badges */
-body:not(.ffz-dark) .app-main:not(.theatre) .conversation-window .badges .badge:not(.subscriber):not(.ffz-badge-0),
-body:not(.ffz-dark) > .chat-container:not(.dark):not(.force-dark) .badges .badge:not(.subscriber):not(.ffz-badge-0),
-body:not(.ffz-dark) > .ember-chat-container:not(.dark):not(.force-dark) .badges .badge:not(.subscriber):not(.ffz-badge-0),
-.app-main:not(.theatre) .chat-container:not(.dark):not(.force-dark) .badges .badge:not(.subscriber):not(.ffz-badge-0),
-.app-main:not(.theatre) .ember-chat-container:not(.dark):not(.force-dark) .badges .badge:not(.subscriber):not(.ffz-badge-0) {
+body:not(.ffz-dark) .app-main:not(.theatre) .conversation-window .badges .badge:not(.subscriber):not(.ffz-badge-1),
+body:not(.ffz-dark) > .chat-container:not(.dark):not(.force-dark) .badges .badge:not(.subscriber):not(.ffz-badge-1),
+body:not(.ffz-dark) > .ember-chat-container:not(.dark):not(.force-dark) .badges .badge:not(.subscriber):not(.ffz-badge-1),
+.app-main:not(.theatre) .chat-container:not(.dark):not(.force-dark) .badges .badge:not(.subscriber):not(.ffz-badge-1),
+.app-main:not(.theatre) .ember-chat-container:not(.dark):not(.force-dark) .badges .badge:not(.subscriber):not(.ffz-badge-1) {
 	filter: invert(100%);
 	-webkit-filter: invert(100%);
 }
\ No newline at end of file
diff --git a/src/ui/notifications.js b/src/ui/notifications.js
index 4de0df9c..18ea4860 100644
--- a/src/ui/notifications.js
+++ b/src/ui/notifications.js
@@ -1,5 +1,6 @@
 var FFZ = window.FrankerFaceZ,
-    utils = require("../utils");
+    utils = require("../utils"),
+	constants = require("../constants");
 
 
 // ---------------------
@@ -193,6 +194,7 @@ FFZ.prototype.show_message = function(message) {
 
 	window.noty({
 		text: message,
+		template: '<div class="noty_message"><span class="noty_text"></span><div class="noty_close">' + constants.CLOSE + '</div></div>',
 		theme: "ffzTheme",
 		layout: "bottomCenter",
 		closeWith: ["button"]