diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08524dbfd..d6e8f09bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## v1.13.0
 
+**v1.13.0.1** *(2016-10-01)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.1/builds/4chan-X-noupdate.crx)]
+- Merge v1.12.3.5: Fix cooldowns.
+- Merge v1.12.3.5: Fix party hat alignment when Thread Hiding Buttons are enabled.
+
 **v1.13.0.0** *(2016-09-29)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.0/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.0/builds/4chan-X-noupdate.crx)]
 - Based on v1.12.3.4.
 - Major rework of the 4chan X catalog:
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 18744cb17..5d0613fb4 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 eeb1bd5e5..faed8d0a2 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.13.0.0
+// @version      1.13.0.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 fc94b816d..c2d842a10 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.13.0.0
+// @version      1.13.0.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -136,7 +136,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.0.0',
+  VERSION:   '1.13.0.1',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -2521,6 +2521,7 @@ input[name=\"Default Volume\"] {\n\
 }\n\
 .hide-thread-button {\n\
   margin-top: -1px;\n\
+  width: 11px;\n\
 }\n\
 .stub ~ * {\n\
   display: none !important;\n\
@@ -2534,6 +2535,9 @@ input[name=\"Default Volume\"] {\n\
 :root.reply-hide div.sideArrows {\n\
   display: none;\n\
 }\n\
+:root.thread-hide .party-hat {\n\
+  left: 19px;\n\
+}\n\
 /* QR */\n\
 :root.hide-original-post-form #togglePostFormLink,\n\
 #qr.autohide:not(.focus):not(:hover):not(:active) > form,\n\
@@ -7519,6 +7523,9 @@ ThreadHiding = (function() {
       }
       this.catalogSet(g.BOARD);
       $.on(d, 'IndexRefreshInternal', this.onIndexRefresh);
+      if (Conf['Thread Hiding Buttons']) {
+        $.addClass(doc, 'thread-hide');
+      }
       return Callbacks.Post.push({
         name: 'Thread Hiding',
         cb: this.node
@@ -20847,9 +20854,11 @@ QR = (function() {
       return $.sync('cooldowns', this.sync);
     },
     setup: function() {
-      var delay, m, ref, type;
+      var base, base1, delay, m, ref, type;
       if (m = Get.scriptData().match(/\bcooldowns *= *({[^}]+})/)) {
         $.extend(QR.cooldown.delays, JSON.parse(m[1]));
+        (base = QR.cooldown.delays).reply_intra || (base.reply_intra = QR.cooldown.delays.reply);
+        (base1 = QR.cooldown.delays).image_intra || (base1.image_intra = QR.cooldown.delays.image);
       }
       QR.cooldown.maxDelay = 0;
       ref = QR.cooldown.delays;
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index d222359ab..09a559b8c 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 a87888df2..7c0d44ae2 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.0.0
+// @version      1.13.0.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -136,7 +136,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.0.0',
+  VERSION:   '1.13.0.1',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -2521,6 +2521,7 @@ input[name=\"Default Volume\"] {\n\
 }\n\
 .hide-thread-button {\n\
   margin-top: -1px;\n\
+  width: 11px;\n\
 }\n\
 .stub ~ * {\n\
   display: none !important;\n\
@@ -2534,6 +2535,9 @@ input[name=\"Default Volume\"] {\n\
 :root.reply-hide div.sideArrows {\n\
   display: none;\n\
 }\n\
+:root.thread-hide .party-hat {\n\
+  left: 19px;\n\
+}\n\
 /* QR */\n\
 :root.hide-original-post-form #togglePostFormLink,\n\
 #qr.autohide:not(.focus):not(:hover):not(:active) > form,\n\
@@ -7519,6 +7523,9 @@ ThreadHiding = (function() {
       }
       this.catalogSet(g.BOARD);
       $.on(d, 'IndexRefreshInternal', this.onIndexRefresh);
+      if (Conf['Thread Hiding Buttons']) {
+        $.addClass(doc, 'thread-hide');
+      }
       return Callbacks.Post.push({
         name: 'Thread Hiding',
         cb: this.node
@@ -20847,9 +20854,11 @@ QR = (function() {
       return $.sync('cooldowns', this.sync);
     },
     setup: function() {
-      var delay, m, ref, type;
+      var base, base1, delay, m, ref, type;
       if (m = Get.scriptData().match(/\bcooldowns *= *({[^}]+})/)) {
         $.extend(QR.cooldown.delays, JSON.parse(m[1]));
+        (base = QR.cooldown.delays).reply_intra || (base.reply_intra = QR.cooldown.delays.reply);
+        (base1 = QR.cooldown.delays).image_intra || (base1.image_intra = QR.cooldown.delays.image);
       }
       QR.cooldown.maxDelay = 0;
       ref = QR.cooldown.delays;
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index f6c4b78ce..220ec124f 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 a7ee9720b..5f27b393f 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.0.0
+// @version      1.13.0.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 098f7306b..9f3c5d6aa 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.0.0
+// @version      1.13.0.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -136,7 +136,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.0.0',
+  VERSION:   '1.13.0.1',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -2521,6 +2521,7 @@ input[name=\"Default Volume\"] {\n\
 }\n\
 .hide-thread-button {\n\
   margin-top: -1px;\n\
+  width: 11px;\n\
 }\n\
 .stub ~ * {\n\
   display: none !important;\n\
@@ -2534,6 +2535,9 @@ input[name=\"Default Volume\"] {\n\
 :root.reply-hide div.sideArrows {\n\
   display: none;\n\
 }\n\
+:root.thread-hide .party-hat {\n\
+  left: 19px;\n\
+}\n\
 /* QR */\n\
 :root.hide-original-post-form #togglePostFormLink,\n\
 #qr.autohide:not(.focus):not(:hover):not(:active) > form,\n\
@@ -7519,6 +7523,9 @@ ThreadHiding = (function() {
       }
       this.catalogSet(g.BOARD);
       $.on(d, 'IndexRefreshInternal', this.onIndexRefresh);
+      if (Conf['Thread Hiding Buttons']) {
+        $.addClass(doc, 'thread-hide');
+      }
       return Callbacks.Post.push({
         name: 'Thread Hiding',
         cb: this.node
@@ -20847,9 +20854,11 @@ QR = (function() {
       return $.sync('cooldowns', this.sync);
     },
     setup: function() {
-      var delay, m, ref, type;
+      var base, base1, delay, m, ref, type;
       if (m = Get.scriptData().match(/\bcooldowns *= *({[^}]+})/)) {
         $.extend(QR.cooldown.delays, JSON.parse(m[1]));
+        (base = QR.cooldown.delays).reply_intra || (base.reply_intra = QR.cooldown.delays.reply);
+        (base1 = QR.cooldown.delays).image_intra || (base1.image_intra = QR.cooldown.delays.image);
       }
       QR.cooldown.maxDelay = 0;
       ref = QR.cooldown.delays;
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index a47274c67..53f0c5db1 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 0e01f9e71..b0171de66 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://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.0.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.0.1' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index 3f647e73e..b7f5395c6 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://www.4chan-x.net/builds/4chan-X.crx' version='1.13.0.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.0.1' />
   </app>
 </gupdate>
 
diff --git a/version.json b/version.json
index 4d36c44ae..a89324d82 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
 {
-  "version": "1.13.0.0",
-  "date": "2016-09-29T23:41:30.861Z"
+  "version": "1.13.0.1",
+  "date": "2016-10-01T12:26:42.104Z"
 }
\ No newline at end of file