diff --git a/changelog.html b/changelog.html
index 9facdc54..cd42702e 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,11 @@
+<div class="list-header">3.5.362 <time datetime="2016-11-03">(2016-11-03)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Twitch changed how the player is sized, particularly in theater mode. This broke positioning of the player in several configurations.</li>
+	<li>Fixed: Issue that could cause Subscriber badges to render invisibly.</li>
+	<li>Fixed: Elements of the Twitch Feed have been renamed. (It used to be Channel Feed.)</li>
+	<li>Changed: Dark theme CSS tweaks.</li>
+</ul>
+
 <div class="list-header">3.5.361 <time datetime="2016-11-02">(2016-11-02)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Twitch renamed VOD chat components internally so no FFZ features were working for it.</li>
@@ -63,13 +71,5 @@
 	<li>Changed: More modifier CSS work.</li>
 </ul>
 
-<div class="list-header">3.5.351 <time datetime="2016-10-25">(2016-10-25)</time></div>
-<ul class="chat-menu-content menu-side-padding">
-	<li>Added: <code>/untimeout</code> support.</li>
-	<li>Fixed: Bits visibility and moderation card positioning.</li>
-	<li>Fixed: Modifer emote CSS was still not good.</li>
-	<li>Fixed: BetterTTV + Modifier Emotes</li>
-</ul>
-
 <div class="list-header" id="ffz-old-news-button"><a href="#">View Older</a></div>
 <div id="ffz-old-news"></div>
\ No newline at end of file
diff --git a/dark.css b/dark.css
index 937788cb..f63ed4f9 100644
--- a/dark.css
+++ b/dark.css
@@ -876,6 +876,8 @@ body.ffz-dark:not([data-page="teams#show"]),
 	background-color: #121212;
 }
 
+.ffz-dark .ct-type-grey { color: #ccc }
+
 .ffz-dark .brick--marked.brick--theme-white,
 .ffz-dark .brick--marked.brick--theme-grey {
 	box-shadow: 3px 0 0 #9a7fcc inset,0 0 0 1px rgba(255,255,255,0.2) inset;
@@ -1380,26 +1382,32 @@ body.ffz-dark:not([data-page="teams#show"]),
 
 .ffz-dark .activity-list-end svg { fill: #474747 }
 
-.ffz-dark .activity-meta-divider:before { background-color: #474747 }
+.ffz-dark .activity-meta-divider:before {
+	background-color: #191919;
+	border-top-color: #474747;
+	border-left-color: #474747;
+}
 
 .ffz-dark .activity-button:hover {
 	border-color: #d5d5d5;
 	background-color: #242424;
 }
 
+.ffz-dark .activity-create:not(.activity-create--expand) { border-color: #474747 }
+
 .ffz-dark .activity-create__actions {
 	background-color: #191919;
-	box-shadow: 0 -1px 0 #474747;
+	border-color: #474747;
+	box-shadow: none;
 }
 
-.ffz-dark .activity-create,
+.ffz-dark .activity-create__container,
 .ffz-dark .activity-button {
 	border-color: #474747;
 	color: #fff !important;
 	background-color: #191919;
 }
 
-.ffz-dark .activity-meta-divider:before,
 .ffz-dark .list-load-more,
 .ffz-dark .activity-card {
 	border-color: #474747;
diff --git a/old_changes.html b/old_changes.html
index f31e087b..42f44332 100644
--- a/old_changes.html
+++ b/old_changes.html
@@ -1,3 +1,11 @@
+<div class="list-header">3.5.351 <time datetime="2016-10-25">(2016-10-25)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Added: <code>/untimeout</code> support.</li>
+	<li>Fixed: Bits visibility and moderation card positioning.</li>
+	<li>Fixed: Modifer emote CSS was still not good.</li>
+	<li>Fixed: BetterTTV + Modifier Emotes</li>
+</ul>
+
 <div class="list-header">3.5.350 <time datetime="2016-10-25">(2016-10-25)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: More tweaks for hover pausing, since that's still glitchy.</li>
diff --git a/src/badges.js b/src/badges.js
index 75eceeb5..51b97240 100644
--- a/src/badges.js
+++ b/src/badges.js
@@ -453,7 +453,7 @@ FFZ.prototype.get_twitch_badges = function(badge_tag, room_id) {
 
 	for(var badge in badge_tag) {
 		var version = badge_tag[badge];
-		if ( ! badge_tag.hasOwnProperty(badge) || ! version )
+		if ( ! badge_tag.hasOwnProperty(badge) || version === undefined || version === null )
 			continue;
 
 		var versions = channel[badge] || globals[badge],
diff --git a/src/ember/feed-card.js b/src/ember/feed-card.js
index 5600e24c..0c32e4cd 100644
--- a/src/ember/feed-card.js
+++ b/src/ember/feed-card.js
@@ -21,16 +21,16 @@ var FFZ = window.FrankerFaceZ,
 
 
 FFZ.prototype.setup_feed_cards = function() {
-	this.update_views('component:channel-feed/card', this.modify_feed_card);
-	this.update_views('component:channel-feed/comment', this.modify_feed_comment);
+	this.update_views('component:twitch-feed/story-card', this.modify_feed_card);
+	this.update_views('component:twitch-feed/comment', this.modify_feed_comment);
 
 	this.rerender_feed_cards();
 }
 
 
 FFZ.prototype.rerender_feed_cards = function(for_set) {
-	var FeedCard = utils.ember_resolve('component:channel-feed/card'),
-		FeedComment = utils.ember_resolve('component:channel-feed/comment'),
+	var FeedCard = utils.ember_resolve('component:twitch-feed/story-card'),
+		FeedComment = utils.ember_resolve('component:twitch-feed/comment'),
 		views = utils.ember_views();
 
 	if ( ! FeedCard )
@@ -44,7 +44,7 @@ FFZ.prototype.rerender_feed_cards = function(for_set) {
 					this.modify_feed_card(view);
 				view.ffz_init(for_set);
 			} catch(err) {
-				this.error("setup component:channel-feed/card ffzInit", err)
+				this.error("setup component:twitch-feed/story-card ffzInit", err)
 			}
 		}
 
@@ -54,7 +54,7 @@ FFZ.prototype.rerender_feed_cards = function(for_set) {
 					this.modify_feed_comment(view);
 				view.ffz_init(for_set);
 			} catch(err) {
-				this.error("setup component:channel-feed/comment ffzInit", err);
+				this.error("setup component:twitch-feed/comment ffzInit", err);
 			}
 		}
 	}
diff --git a/src/ember/layout.js b/src/ember/layout.js
index d8d8ab9a..bc7ae62c 100644
--- a/src/ember/layout.js
+++ b/src/ember/layout.js
@@ -254,11 +254,11 @@ FFZ.prototype.setup_layout = function() {
 			var size = this.get('fullSizePlayerDimensions');
 
 			return '<style>' +
-				'.ffz-small-player:not(.ffz-bttv)[data-current-path^="user."] .app-main:not(.theatre) #player,' +
+				'.ffz-small-player:not(.ffz-bttv)[data-current-path^="user."] .app-main:not(.theatre) .js-player,' +
 				'.dynamic-player, .dynamic-player object, .dynamic-player video {' +
 					'width:' + size.width + 'px !important;' +
 					'height:' + size.height + 'px !important}' +
-				'.ffz-small-player:not(.ffz-bttv)[data-current-path^="user."] .app-main:not(.theatre) #player,' +
+				'.ffz-small-player:not(.ffz-bttv)[data-current-path^="user."] .app-main:not(.theatre) .js-player,' +
 				'.dynamic-target-player, .dynamic-target-player object, .dynamic-target-player video {' +
 					'width:' + size.width + 'px !important;' +
 					'height:' + size.targetHeight + 'px !important}' +
@@ -286,7 +286,7 @@ FFZ.prototype.setup_layout = function() {
 			var window_height = this.get('windowHeight'),
 				window_width = this.get('windowWidth'),
 				width = this.get('rightColumnWidth'),
-				out = 'body.ffz-small-player #player .dynamic-player {' +
+				out = 'body.ffz-small-player .js-player .dynamic-player {' +
 						'position: fixed;' +
 						'z-index: 9;' +
 						'box-shadow: 0 0 20px 0 black;';
@@ -338,14 +338,14 @@ FFZ.prototype.setup_layout = function() {
 								'height:' + chat_height + 'px}' +
 							'body[data-current-path^="user."] .app-main.theatre #left_col .warp,' +
 							'body[data-current-path^="user."] .app-main.theatre #left_col,' +
-							'body[data-current-path^="user."] .app-main.theatre .cn-content #player,' +
+							'body[data-current-path^="user."] .app-main.theatre #player,' +
 							'body[data-current-path^="user."] .app-main.theatre #main_col{' +
 								'top:' + theatre_video_top + 'px;' +
 								'height:' + theatre_video_height + 'px !important}' +
 							'body[data-current-path^="user."] .app-main.theatre #right_col{' +
 								'top:' + theatre_chat_top + 'px;' +
 								'height:' + theatre_chat_height + 'px}' +
-							'.app-main.theatre .cn-content #player {' +
+							'.app-main.theatre #player {' +
 								'right: 0 !important}' +
 							'body.ffz-minimal-channel-bar:not(.ffz-channel-bar-bottom) .cn-bar-fixed {' +
 								'top: ' + (video_top - 40) + 'px}' +
@@ -374,9 +374,9 @@ FFZ.prototype.setup_layout = function() {
 							'body.ffz-sidebar-swap .theatre #main_col:not(.expandRight),' +
 							'body.ffz-sidebar-swap #main_col:not(.expandRight){' +
 								'margin-left:' + width + 'px}' +
-							'body:not(.ffz-sidebar-swap) .app-main.theatre #main_col:not(.expandRight) .cn-content #player {' +
+							'body:not(.ffz-sidebar-swap) .app-main.theatre #main_col:not(.expandRight) #player {' +
 								'right: ' + width + 'px !important}' +
-							'body.ffz-sidebar-swap .app-main.theatre #main_col:not(.expandRight) .cn-content #player {' +
+							'body.ffz-sidebar-swap .app-main.theatre #main_col:not(.expandRight) #player {' +
 								'right: 0 !important;' +
 								'left:' + width + 'px !important}' +
 							'body:not(.ffz-sidebar-swap) #main_col:not(.expandRight) .cn-bar-fixed {' +
diff --git a/src/ember/room.js b/src/ember/room.js
index 32b0b6b9..99f0a365 100644
--- a/src/ember/room.js
+++ b/src/ember/room.js
@@ -1943,9 +1943,9 @@ FFZ.prototype._modify_room = function(room) {
 						msg.tags.badges.subscriber = ( months >= 24 && sub_version[24] ) ? 24 :
 							(months >= 12 && sub_version[12] ) ? 12 :
 							(months >= 6 && sub_version[6] ) ? 6 :
-							(months >= 3 && sub_version[3] ) ? 3 : 1;
+							(months >= 3 && sub_version[3] ) ? 3 : 0;
 					} else
-						msg.tags.badges.subscriber = 1;
+						msg.tags.badges.subscriber = 0;
 
 					msg.tags.subscriber = true;
 					if ( msg.labels && msg.labels.indexOf("subscriber") === -1 )
diff --git a/src/main.js b/src/main.js
index 4a127318..5027570c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 361,
+	major: 3, minor: 5, revision: 362,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}
diff --git a/style.css b/style.css
index 49c610a4..1c770eb8 100644
--- a/style.css
+++ b/style.css
@@ -3603,8 +3603,8 @@ body.ffz-bttv #ffz-feed-tabs .tabs { margin-bottom: 0 }
 	transition: top ease-in-out 75ms, bottom ease-in-out 75ms;
 }
 
-body:not(.ffz-channel-bar-bottom).ffz-small-player #player .dynamic-player { margin-top: 50px }
-body:not(.ffz-channel-bar-bottom).ffz-small-player.ffz-minimal-channel-bar #player .dynamic-player { margin-top: 10px }
+body:not(.ffz-channel-bar-bottom).ffz-small-player .js-player .dynamic-player { margin-top: 50px }
+body:not(.ffz-channel-bar-bottom).ffz-small-player.ffz-minimal-channel-bar .js-player .dynamic-player { margin-top: 10px }
 
 .ffz-minimal-channel-bar .cn-bar-fixed:hover { top: 0 }
 .ffz-minimal-channel-bar.ffz-channel-bar-bottom .cn-bar-fixed { top: auto; bottom: -40px }