diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b3d84076..a17fa3045 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda
 
 ### v1.11.2
 
+**v1.11.2.1** *(2015-06-30)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.2.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.2.1/builds/4chan-X-noupdate.crx "Chromium version")]
+- CSS bugfixes for thread watcher and header.
+
 **v1.11.2.0** *(2015-06-29)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.2.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.2.0/builds/4chan-X-noupdate.crx "Chromium version")]
 - Based on v1.11.1.3.
 - `Use Recaptcha v1` option now works on the original post form.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 73e084416..3a9b4cfe6 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index 83d3202f7..942f11d69 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.11.2.0
+// @version      1.11.2.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index 563077ed3..a384678a2 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.11.2.0
+// @version      1.11.2.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -411,7 +411,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.2.0',
+    VERSION: '1.11.2.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -18022,10 +18022,13 @@
 "#embedding {\n" +
 "  z-index: 11;\n" +
 "}\n" +
-"#thread-watcher {\n" +
+":root.fixed-watcher #thread-watcher {\n" +
 "  z-index: 10;\n" +
 "}\n" +
-":root.fixed:not(.gallery-open) #header-bar:not(.autohide) {\n" +
+":root.fixed:not(.gallery-open) #header-bar:not(:hover) {\n" +
+"  z-index: 8;\n" +
+"}\n" +
+"#thread-watcher {\n" +
 "  z-index: 5;\n" +
 "}\n" +
 "/* Header */\n" +
@@ -18644,11 +18647,13 @@
 "#thread-watcher {\n" +
 "  padding-bottom: 3px;\n" +
 "  padding-left: 3px;\n" +
-"  overflow: hidden;\n" +
 "  white-space: nowrap;\n" +
 "  min-width: 146px;\n" +
-"  max-height: 92%;\n" +
+"}\n" +
+"#watched-threads {\n" +
+"  overflow-x: hidden;\n" +
 "  overflow-y: auto;\n" +
+"  max-height: calc(100vh - 75px);\n" +
 "}\n" +
 "#thread-watcher .refresh {\n" +
 "  padding: 0px 3px;\n" +
@@ -18656,7 +18661,7 @@
 ":root.fixed-watcher #thread-watcher {\n" +
 "  position: fixed;\n" +
 "}\n" +
-":root:not(.fixed-watcher) #thread-watcher:not(:hover) {\n" +
+":root:not(.fixed-watcher) #watched-threads:not(:hover) {\n" +
 "  max-height: 210px;\n" +
 "  overflow-y: hidden;\n" +
 "}\n" +
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index f0d350673..9e356d1cd 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index c065c6353..cfc4c3b91 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.2.0
+// @version      1.11.2.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -410,7 +410,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.2.0',
+    VERSION: '1.11.2.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -18021,10 +18021,13 @@
 "#embedding {\n" +
 "  z-index: 11;\n" +
 "}\n" +
-"#thread-watcher {\n" +
+":root.fixed-watcher #thread-watcher {\n" +
 "  z-index: 10;\n" +
 "}\n" +
-":root.fixed:not(.gallery-open) #header-bar:not(.autohide) {\n" +
+":root.fixed:not(.gallery-open) #header-bar:not(:hover) {\n" +
+"  z-index: 8;\n" +
+"}\n" +
+"#thread-watcher {\n" +
 "  z-index: 5;\n" +
 "}\n" +
 "/* Header */\n" +
@@ -18643,11 +18646,13 @@
 "#thread-watcher {\n" +
 "  padding-bottom: 3px;\n" +
 "  padding-left: 3px;\n" +
-"  overflow: hidden;\n" +
 "  white-space: nowrap;\n" +
 "  min-width: 146px;\n" +
-"  max-height: 92%;\n" +
+"}\n" +
+"#watched-threads {\n" +
+"  overflow-x: hidden;\n" +
 "  overflow-y: auto;\n" +
+"  max-height: calc(100vh - 75px);\n" +
 "}\n" +
 "#thread-watcher .refresh {\n" +
 "  padding: 0px 3px;\n" +
@@ -18655,7 +18660,7 @@
 ":root.fixed-watcher #thread-watcher {\n" +
 "  position: fixed;\n" +
 "}\n" +
-":root:not(.fixed-watcher) #thread-watcher:not(:hover) {\n" +
+":root:not(.fixed-watcher) #watched-threads:not(:hover) {\n" +
 "  max-height: 210px;\n" +
 "  overflow-y: hidden;\n" +
 "}\n" +
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index d473bb7e2..258dc8d7c 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index a8f62949e..2cac81188 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.2.0
+// @version      1.11.2.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index af5a96765..cbf31dfc5 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.2.0
+// @version      1.11.2.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -411,7 +411,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.2.0',
+    VERSION: '1.11.2.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -18022,10 +18022,13 @@
 "#embedding {\n" +
 "  z-index: 11;\n" +
 "}\n" +
-"#thread-watcher {\n" +
+":root.fixed-watcher #thread-watcher {\n" +
 "  z-index: 10;\n" +
 "}\n" +
-":root.fixed:not(.gallery-open) #header-bar:not(.autohide) {\n" +
+":root.fixed:not(.gallery-open) #header-bar:not(:hover) {\n" +
+"  z-index: 8;\n" +
+"}\n" +
+"#thread-watcher {\n" +
 "  z-index: 5;\n" +
 "}\n" +
 "/* Header */\n" +
@@ -18644,11 +18647,13 @@
 "#thread-watcher {\n" +
 "  padding-bottom: 3px;\n" +
 "  padding-left: 3px;\n" +
-"  overflow: hidden;\n" +
 "  white-space: nowrap;\n" +
 "  min-width: 146px;\n" +
-"  max-height: 92%;\n" +
+"}\n" +
+"#watched-threads {\n" +
+"  overflow-x: hidden;\n" +
 "  overflow-y: auto;\n" +
+"  max-height: calc(100vh - 75px);\n" +
 "}\n" +
 "#thread-watcher .refresh {\n" +
 "  padding: 0px 3px;\n" +
@@ -18656,7 +18661,7 @@
 ":root.fixed-watcher #thread-watcher {\n" +
 "  position: fixed;\n" +
 "}\n" +
-":root:not(.fixed-watcher) #thread-watcher:not(:hover) {\n" +
+":root:not(.fixed-watcher) #watched-threads:not(:hover) {\n" +
 "  max-height: 210px;\n" +
 "  overflow-y: hidden;\n" +
 "}\n" +
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 30689977f..3e350e868 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 1eb035660..bb0a6a759 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.11.2.0' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.11.2.1' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index c5287355e..20ad07ff5 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.11.2.0' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.11.2.1' />
   </app>
 </gupdate>
 
diff --git a/package.json b/package.json
index e54b15b69..58f514182 100755
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
-    "version": "1.11.2.0",
-    "date": "2015-06-30T02:36:36.193Z",
+    "version": "1.11.2.1",
+    "date": "2015-06-30T09:05:42.200Z",
     "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",