diff --git a/changelog.html b/changelog.html
index a4ee1f25..e8c24b78 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,8 @@
+<div class="list-header">3.5.321 <time datetime="2016-10-03">(2016-10-11)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Theater mode video player height.</li>
+</ul>
+
 <div class="list-header">3.5.320 <time datetime="2016-10-03">(2016-10-11)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Automatic theater mode should hopefully be working for everyone now.</li>
diff --git a/src/ember/layout.js b/src/ember/layout.js
index ca70a2e6..6f9bcbd4 100644
--- a/src/ember/layout.js
+++ b/src/ember/layout.js
@@ -222,7 +222,7 @@ FFZ.prototype.setup_layout = function() {
 				height = size[1],
 				host_height = size[2];
 
-			return "<style>#player,.dynamic-player, .dynamic-player object, .dynamic-player video{width:" + width + "px !important;height:" + height + "px !important} .cn-hosted .dynamic-target-player,.cn-hosted .dynamic-target-player object,.cn-hosted #player, .cn-hosted .dynamic-target-player video{width:" + width + "px !important;height:" + host_height + "px !important}</style><style>.dynamic-player .player object, .dynamic-player .player video{width:100% !important; height:100% !important}</style>";
+			return "<style>.app-main:not(.theatre) #player,.dynamic-player, .dynamic-player object, .dynamic-player video{width:" + width + "px !important;height:" + height + "px !important} .cn-hosted .dynamic-target-player,.cn-hosted .dynamic-target-player object,.app-main:not(.theatre) .cn-hosted #player, .cn-hosted .dynamic-target-player video{width:" + width + "px !important;height:" + host_height + "px !important}</style><style>.dynamic-player .player object, .dynamic-player .player video{width:100% !important; height:100% !important}</style>";
 		}.property("playerSize"),
 
 		ffzPortraitWarning: function() {
diff --git a/src/main.js b/src/main.js
index fb638d5e..a7d3d88a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,7 +34,7 @@ FFZ.msg_commands = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 320,
+	major: 3, minor: 5, revision: 321,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}