diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b1eb79cc..82d660e67 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a
 The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x).
 
 <!-- v1.9.6.x -->
+### v1.9.6.7 
+*2014-10-09* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.6.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.6.7/builds/4chan-X-noupdate.crx "Chromium version")]
+
+**ccd0**
+- Add `Restart when Opened` option for GIF/WebM files. Will likely be removed when better approach for restarting GIFs is implemented. See issue [#159](https://github.com/ccd0/4chan-x/issues/159).
+
 ### v1.9.6.6 
 *2014-10-09* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.6.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.6.6/builds/4chan-X-noupdate.crx "Chromium version")]
 
diff --git a/LICENSE b/LICENSE
index 172881b8d..a09a6687e 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.9.6.6
+* 4chan X - Version 1.9.6.7
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 878bee373..46a550000 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 dae9d8bfb..351afe5f7 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.9.6.6
+// @version      1.9.6.7
 // @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 f0cd98d36..4c5b68723 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.9.6.6
+// @version      1.9.6.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -24,7 +24,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.9.6.6
+* 4chan X - Version 1.9.6.7
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -189,6 +189,7 @@
         'Fappe Tyme': [false, 'Hide posts without images when header menu item is checked. *hint* *hint*'],
         'Werk Tyme': [false, 'Hide all post images when header menu item is checked.'],
         'Autoplay': [true, 'Videos begin playing immediately when opened.'],
+        'Restart when Opened': [true, 'Restart GIFs and WebMs when you hover over or expand them.'],
         'Show Controls': [true, 'Show controls on videos expanded inline. Turn this off if you want to contract videos by clicking on them.'],
         'Loop in New Tab': [true, 'Loop videos opened in their own tabs.']
       },
@@ -380,7 +381,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.9.6.6',
+    VERSION: '1.9.6.7',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -8857,7 +8858,9 @@
             $.off(el, eventName, cb);
           }
         }
-        ImageCommon.rewind(file.thumb);
+        if (Conf['Restart when Opened']) {
+          ImageCommon.rewind(file.thumb);
+        }
         delete file.fullImage;
         return $.queueTask(function() {
           if (file.isExpanding || file.isExpanded) {
@@ -8885,7 +8888,7 @@
       } else if (((_ref = ImageCommon.cache) != null ? _ref.dataset.fullID : void 0) === post.fullID) {
         el = file.fullImage = ImageCommon.popCache();
         $.on(el, 'error', ImageExpand.error);
-        if (el.id !== 'ihover') {
+        if (Conf['Restart when Opened'] && el.id !== 'ihover') {
           ImageCommon.rewind(el);
         }
         el.removeAttribute('id');
@@ -9131,8 +9134,10 @@
           $.on(el, 'error', error);
           el.src = file.URL;
         }
-        ImageCommon.rewind(el);
-        ImageCommon.rewind(this);
+        if (Conf['Restart when Opened']) {
+          ImageCommon.rewind(el);
+          ImageCommon.rewind(this);
+        }
         el.id = 'ihover';
         $.after(Header.hover, el);
         if (isVideo) {
@@ -13463,7 +13468,7 @@
         className: 'dialog'
       });
       $.extend(dialog, {
-        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.6.6</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
+        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.6.7</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
       });
       $.on($('.export', Settings.dialog), 'click', Settings["export"]);
       $.on($('.import', Settings.dialog), 'click', Settings["import"]);
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 8840324a9..843ee37ec 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 43d6e8d05..761c9010f 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.9.6.6
+// @version      1.9.6.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -23,7 +23,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.9.6.6
+* 4chan X - Version 1.9.6.7
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -188,6 +188,7 @@
         'Fappe Tyme': [false, 'Hide posts without images when header menu item is checked. *hint* *hint*'],
         'Werk Tyme': [false, 'Hide all post images when header menu item is checked.'],
         'Autoplay': [true, 'Videos begin playing immediately when opened.'],
+        'Restart when Opened': [true, 'Restart GIFs and WebMs when you hover over or expand them.'],
         'Show Controls': [true, 'Show controls on videos expanded inline. Turn this off if you want to contract videos by clicking on them.'],
         'Loop in New Tab': [true, 'Loop videos opened in their own tabs.']
       },
@@ -379,7 +380,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.9.6.6',
+    VERSION: '1.9.6.7',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -8856,7 +8857,9 @@
             $.off(el, eventName, cb);
           }
         }
-        ImageCommon.rewind(file.thumb);
+        if (Conf['Restart when Opened']) {
+          ImageCommon.rewind(file.thumb);
+        }
         delete file.fullImage;
         return $.queueTask(function() {
           if (file.isExpanding || file.isExpanded) {
@@ -8884,7 +8887,7 @@
       } else if (((_ref = ImageCommon.cache) != null ? _ref.dataset.fullID : void 0) === post.fullID) {
         el = file.fullImage = ImageCommon.popCache();
         $.on(el, 'error', ImageExpand.error);
-        if (el.id !== 'ihover') {
+        if (Conf['Restart when Opened'] && el.id !== 'ihover') {
           ImageCommon.rewind(el);
         }
         el.removeAttribute('id');
@@ -9130,8 +9133,10 @@
           $.on(el, 'error', error);
           el.src = file.URL;
         }
-        ImageCommon.rewind(el);
-        ImageCommon.rewind(this);
+        if (Conf['Restart when Opened']) {
+          ImageCommon.rewind(el);
+          ImageCommon.rewind(this);
+        }
         el.id = 'ihover';
         $.after(Header.hover, el);
         if (isVideo) {
@@ -13462,7 +13467,7 @@
         className: 'dialog'
       });
       $.extend(dialog, {
-        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.6.6</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
+        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.6.7</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
       });
       $.on($('.export', Settings.dialog), 'click', Settings["export"]);
       $.on($('.import', Settings.dialog), 'click', Settings["import"]);
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index bb8b759ca..f553110aa 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 f956a61d0..6e61483bd 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.6.6
+// @version      1.9.6.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index bec7af02b..53e7c6d6b 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.9.6.6
+// @version      1.9.6.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -24,7 +24,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.9.6.6
+* 4chan X - Version 1.9.6.7
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -189,6 +189,7 @@
         'Fappe Tyme': [false, 'Hide posts without images when header menu item is checked. *hint* *hint*'],
         'Werk Tyme': [false, 'Hide all post images when header menu item is checked.'],
         'Autoplay': [true, 'Videos begin playing immediately when opened.'],
+        'Restart when Opened': [true, 'Restart GIFs and WebMs when you hover over or expand them.'],
         'Show Controls': [true, 'Show controls on videos expanded inline. Turn this off if you want to contract videos by clicking on them.'],
         'Loop in New Tab': [true, 'Loop videos opened in their own tabs.']
       },
@@ -380,7 +381,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.9.6.6',
+    VERSION: '1.9.6.7',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -8857,7 +8858,9 @@
             $.off(el, eventName, cb);
           }
         }
-        ImageCommon.rewind(file.thumb);
+        if (Conf['Restart when Opened']) {
+          ImageCommon.rewind(file.thumb);
+        }
         delete file.fullImage;
         return $.queueTask(function() {
           if (file.isExpanding || file.isExpanded) {
@@ -8885,7 +8888,7 @@
       } else if (((_ref = ImageCommon.cache) != null ? _ref.dataset.fullID : void 0) === post.fullID) {
         el = file.fullImage = ImageCommon.popCache();
         $.on(el, 'error', ImageExpand.error);
-        if (el.id !== 'ihover') {
+        if (Conf['Restart when Opened'] && el.id !== 'ihover') {
           ImageCommon.rewind(el);
         }
         el.removeAttribute('id');
@@ -9131,8 +9134,10 @@
           $.on(el, 'error', error);
           el.src = file.URL;
         }
-        ImageCommon.rewind(el);
-        ImageCommon.rewind(this);
+        if (Conf['Restart when Opened']) {
+          ImageCommon.rewind(el);
+          ImageCommon.rewind(this);
+        }
         el.id = 'ihover';
         $.after(Header.hover, el);
         if (isVideo) {
@@ -13463,7 +13468,7 @@
         className: 'dialog'
       });
       $.extend(dialog, {
-        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.6.6</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
+        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.6.7</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
       });
       $.on($('.export', Settings.dialog), 'click', Settings["export"]);
       $.on($('.import', Settings.dialog), 'click', Settings["import"]);
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index c33378ce7..4111656e2 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 6943a089d..66ab5dc65 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.9.6.6' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.6.7' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index 7710e6f57..a1024cc41 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.9.6.6' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.6.7' />
   </app>
 </gupdate>
 
diff --git a/package.json b/package.json
index 867591d35..001999172 100755
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
-    "version": "1.9.6.6",
+    "version": "1.9.6.7",
     "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",