diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00ae5b38c..0786a3153 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 ## v1.14.0
 
+**v1.14.0.4** *(2018-01-27)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.4/builds/4chan-X-noupdate.crx)]
+- Merge v1.13.15.7: Show video contract button unconditionally for now due to changes in Firefox.
+- Merge v1.13.15.7: Fix webm_audio undefined error shown on first install of script. #1778
+- Time Formatting whitespace fix for Tinyboard.
+
 **v1.14.0.3** *(2018-01-25)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.3/builds/4chan-X-noupdate.crx)]
 - Merge v1.13.15.6: Bugfix to captcha opening logic. Don't ask user for new captchas when we have a bypass cookie or at least one captcha, even when many posts are queued.
 - Merge v1.13.15.6: Do not save captchas to disk or share them between tabs. They are too short-lived to be worth it now. This should reduce associated I/O errors.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 37c85826a..be44d27d5 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 5a7355d7c..9b127a473 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.14.0.3
+// @version      1.14.0.4
 // @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 d36aa77a6..0fc477956 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.14.0.3
+// @version      1.14.0.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -157,7 +157,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.14.0.3',
+  VERSION:   '1.14.0.4',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -8905,7 +8905,7 @@ BoardConfig = (function() {
         return false;
       }
       boards = this.boards || Conf['boardConfig'].boards;
-      return boards && !boards[boardID].webm_audio;
+      return boards && boards[boardID] && !boards[boardID].webm_audio;
     },
     title: function(boardID) {
       var ref, ref1;
@@ -13847,7 +13847,7 @@ ImageExpand = (function() {
       el.className = 'full-image';
       $.after(thumb, el);
       if (isVideo) {
-        if (Conf['Show Controls'] && Conf['Click Passthrough'] && !file.videoControls) {
+        if (!file.videoControls) {
           file.videoControls = ImageExpand.videoControls.cloneNode(true);
           $.add(file.text, file.videoControls);
         }
@@ -18467,10 +18467,12 @@ Time = (function() {
       });
     },
     node: function() {
+      var textContent;
       if (this.isClone) {
         return;
       }
-      return this.nodes.date.textContent = Time.format(Conf['time'], this.info.date);
+      textContent = this.nodes.date.textContent;
+      return this.nodes.date.textContent = textContent.match(/^\s*/)[0] + Time.format(Conf['time'], this.info.date) + textContent.match(/\s*$/)[0];
     },
     format: function(formatString, date) {
       return formatString.replace(/%(.)/g, function(s, c) {
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 4332f5f83..ffd59c98e 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 eb756a24a..5c2e67b48 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.14.0.3
+// @version      1.14.0.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -157,7 +157,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.14.0.3',
+  VERSION:   '1.14.0.4',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -8905,7 +8905,7 @@ BoardConfig = (function() {
         return false;
       }
       boards = this.boards || Conf['boardConfig'].boards;
-      return boards && !boards[boardID].webm_audio;
+      return boards && boards[boardID] && !boards[boardID].webm_audio;
     },
     title: function(boardID) {
       var ref, ref1;
@@ -13847,7 +13847,7 @@ ImageExpand = (function() {
       el.className = 'full-image';
       $.after(thumb, el);
       if (isVideo) {
-        if (Conf['Show Controls'] && Conf['Click Passthrough'] && !file.videoControls) {
+        if (!file.videoControls) {
           file.videoControls = ImageExpand.videoControls.cloneNode(true);
           $.add(file.text, file.videoControls);
         }
@@ -18467,10 +18467,12 @@ Time = (function() {
       });
     },
     node: function() {
+      var textContent;
       if (this.isClone) {
         return;
       }
-      return this.nodes.date.textContent = Time.format(Conf['time'], this.info.date);
+      textContent = this.nodes.date.textContent;
+      return this.nodes.date.textContent = textContent.match(/^\s*/)[0] + Time.format(Conf['time'], this.info.date) + textContent.match(/\s*$/)[0];
     },
     format: function(formatString, date) {
       return formatString.replace(/%(.)/g, function(s, c) {
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 12acfcda8..e332f3762 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 ed3cdd40e..aaef3142e 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.14.0.3
+// @version      1.14.0.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index ce237c9e5..711ea5c41 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.14.0.3
+// @version      1.14.0.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -157,7 +157,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.14.0.3',
+  VERSION:   '1.14.0.4',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -8905,7 +8905,7 @@ BoardConfig = (function() {
         return false;
       }
       boards = this.boards || Conf['boardConfig'].boards;
-      return boards && !boards[boardID].webm_audio;
+      return boards && boards[boardID] && !boards[boardID].webm_audio;
     },
     title: function(boardID) {
       var ref, ref1;
@@ -13847,7 +13847,7 @@ ImageExpand = (function() {
       el.className = 'full-image';
       $.after(thumb, el);
       if (isVideo) {
-        if (Conf['Show Controls'] && Conf['Click Passthrough'] && !file.videoControls) {
+        if (!file.videoControls) {
           file.videoControls = ImageExpand.videoControls.cloneNode(true);
           $.add(file.text, file.videoControls);
         }
@@ -18467,10 +18467,12 @@ Time = (function() {
       });
     },
     node: function() {
+      var textContent;
       if (this.isClone) {
         return;
       }
-      return this.nodes.date.textContent = Time.format(Conf['time'], this.info.date);
+      textContent = this.nodes.date.textContent;
+      return this.nodes.date.textContent = textContent.match(/^\s*/)[0] + Time.format(Conf['time'], this.info.date) + textContent.match(/\s*$/)[0];
     },
     format: function(formatString, date) {
       return formatString.replace(/%(.)/g, function(s, c) {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 1be7d7a04..e0f7f3629 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.json b/builds/updates-beta.json
index 220488929..e73aed911 100644
--- a/builds/updates-beta.json
+++ b/builds/updates-beta.json
@@ -3,7 +3,7 @@
     "4chan-x@4chan-x.net": {
       "updates": [
         {
-          "version": "1.14.0.3",
+          "version": "1.14.0.4",
           "update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx"
         }
       ]
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index c14b3da5a..6a853880f 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.14.0.3' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.14.0.4' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.json b/builds/updates.json
index f32d6bce2..d0ea98c31 100644
--- a/builds/updates.json
+++ b/builds/updates.json
@@ -3,7 +3,7 @@
     "4chan-x@4chan-x.net": {
       "updates": [
         {
-          "version": "1.14.0.3",
+          "version": "1.14.0.4",
           "update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
         }
       ]
diff --git a/builds/updates.xml b/builds/updates.xml
index e655b2bb7..4c84e563c 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.14.0.3' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.14.0.4' />
   </app>
 </gupdate>
 
diff --git a/version.json b/version.json
index 12930c9e2..2a0d77790 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
 {
-  "version": "1.14.0.3",
-  "date": "2018-01-25T00:58:59.931Z"
+  "version": "1.14.0.4",
+  "date": "2018-01-27T06:38:45.123Z"
 }
\ No newline at end of file