diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd32efe03..934229f6e 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
 
 ### v1.11.14
 
+**v1.11.14.1** *(2015-10-25)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.1/builds/4chan-X-noupdate.crx "Chromium version")]
+- Add links to images to open them in the oekaki painter (optional, controlled by `Oekaki Links` setting).
+
 **v1.11.14.0** *(2015-10-25)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.0/builds/4chan-X-noupdate.crx "Chromium version")]
 - Based on v1.11.13.9.
 - Allow editing Quick Reply images in the oekaki painter on all boards.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 38e38b036..263209115 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 0b3138e12..61a06d8d9 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.14.0
+// @version      1.11.14.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 8dad60121..40e6b5987 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.14.0
+// @version      1.11.14.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -181,6 +181,7 @@
         'Gallery': [true, 'Adds a simple and cute image gallery.'],
         'Fullscreen Gallery': [false, 'Open gallery in fullscreen mode.', 1],
         'PDF in Gallery': [false, 'Show PDF files in gallery.', 1],
+        'Oekaki Links': [true, 'Add links to edit images in oekaki painter.'],
         'Sauce': [true, 'Add sauce links to images.'],
         'WEBM Metadata': [true, 'Add link to fetch title metadata from webm videos.'],
         'Reveal Spoiler Thumbnails': [false, 'Replace spoiler thumbnails with the original image.'],
@@ -413,7 +414,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.14.0',
+    VERSION: '1.11.14.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7179,8 +7180,18 @@
       status.value = !value ? 'Submit' : QR.cooldown.auto ? "Auto " + value : value;
       return status.disabled = disabled || false;
     },
+    openPost: function() {
+      var index;
+      QR.open();
+      if (QR.selected.isLocked) {
+        index = QR.posts.indexOf(QR.selected);
+        (QR.posts[index + 1] || new QR.post()).select();
+        $.addClass(QR.nodes.el, 'dump');
+        return QR.cooldown.auto = true;
+      }
+    },
     quote: function(e) {
-      var aa, ancestor, caretPos, com, frag, index, insideCode, k, len1, len2, len3, len4, len5, len6, node, post, q, range, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, sel, text, thread, u, v, z;
+      var aa, ancestor, caretPos, com, frag, insideCode, k, len1, len2, len3, len4, len5, len6, node, post, q, range, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, sel, text, thread, u, v, z;
       if (e != null) {
         e.preventDefault();
       }
@@ -7239,13 +7250,7 @@
         }
         text += ">" + (frag.textContent.trim()) + "\n";
       }
-      QR.open();
-      if (QR.selected.isLocked) {
-        index = QR.posts.indexOf(QR.selected);
-        (QR.posts[index + 1] || new QR.post()).select();
-        $.addClass(QR.nodes.el, 'dump');
-        QR.cooldown.auto = true;
-      }
+      QR.openPost();
       ref7 = QR.nodes, com = ref7.com, thread = ref7.thread;
       if (!com.value) {
         thread.value = Get.threadFromNode(this);
@@ -8926,6 +8931,55 @@
   };
 
   QR.oekaki = {
+    init: function() {
+      if (!(Conf['Quick Reply'] && Conf['Oekaki Links'])) {
+        return;
+      }
+      return Post.callbacks.push({
+        name: 'Oekaki Links',
+        cb: this.node
+      });
+    },
+    node: function() {
+      var link, ref;
+      if (!((ref = this.file) != null ? ref.isImage : void 0)) {
+        return;
+      }
+      if (this.isClone) {
+        link = $('.file-edit', this.file.text);
+      } else {
+        link = $.el('a', {
+          className: 'file-edit',
+          href: 'javascript:;',
+          title: 'Edit image'
+        });
+        $.extend(link, {
+          innerHTML: "<i class=\"fa fa-edit\"></i>"
+        });
+        $.add(this.file.text, [$.tn('\u00A0'), link]);
+      }
+      return $.on(link, 'click', QR.oekaki.editFile);
+    },
+    editFile: function() {
+      var post;
+      post = Get.postFromNode(this);
+      return CrossOrigin.file(post.file.url, function(blob) {
+        var com, ref, thread;
+        QR.openPost();
+        ref = QR.nodes, com = ref.com, thread = ref.thread;
+        if (!com.value) {
+          thread.value = (post.context || post).thread.ID;
+        }
+        QR.selected.save(thread);
+        if (blob) {
+          blob.name = post.file.name;
+          QR.handleFiles([blob]);
+          return QR.oekaki.edit();
+        } else {
+          return QR.error("Can't load image.");
+        }
+      });
+    },
     load: function(cb) {
       var n, onload, script, style;
       if ($('script[src^="//s.4cdn.org/js/painter"]', d.head)) {
@@ -20709,7 +20763,7 @@
     cssWWW: "#captcha-cnt {\n" +
 "  height: auto;\n" +
 "}",
-    features: [['Polyfill', Polyfill], ['Captcha Replacement', Captcha.replace], ['Redirect', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Disable Autoplay', AntiAutoplay], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Highlight by User ID', IDHighlight], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Cooldown', QR.cooldown], ['Menu', Menu], ['Index Generator (Menu)', Index.menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Volume Control', Volume], ['WEBM Metadata', Metadata], ['Comment Expansion', ExpandComment], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Stats', ThreadStats], ['Thread Updater', ThreadUpdater], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Mark New IPs', MarkNewIPs], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Banner', Banner], ['Flash Features', Flash]]
+    features: [['Polyfill', Polyfill], ['Captcha Replacement', Captcha.replace], ['Redirect', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Disable Autoplay', AntiAutoplay], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Highlight by User ID', IDHighlight], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Cooldown', QR.cooldown], ['Oekaki Links', QR.oekaki], ['Menu', Menu], ['Index Generator (Menu)', Index.menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Volume Control', Volume], ['WEBM Metadata', Metadata], ['Comment Expansion', ExpandComment], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Stats', ThreadStats], ['Thread Updater', ThreadUpdater], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Mark New IPs', MarkNewIPs], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Banner', Banner], ['Flash Features', Flash]]
   };
 
   Main.init();
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 5d8e92ef0..c80d47d7c 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 a45d7b00a..9c75a50b1 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.14.0
+// @version      1.11.14.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -181,6 +181,7 @@
         'Gallery': [true, 'Adds a simple and cute image gallery.'],
         'Fullscreen Gallery': [false, 'Open gallery in fullscreen mode.', 1],
         'PDF in Gallery': [false, 'Show PDF files in gallery.', 1],
+        'Oekaki Links': [true, 'Add links to edit images in oekaki painter.'],
         'Sauce': [true, 'Add sauce links to images.'],
         'WEBM Metadata': [true, 'Add link to fetch title metadata from webm videos.'],
         'Reveal Spoiler Thumbnails': [false, 'Replace spoiler thumbnails with the original image.'],
@@ -413,7 +414,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.14.0',
+    VERSION: '1.11.14.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7179,8 +7180,18 @@
       status.value = !value ? 'Submit' : QR.cooldown.auto ? "Auto " + value : value;
       return status.disabled = disabled || false;
     },
+    openPost: function() {
+      var index;
+      QR.open();
+      if (QR.selected.isLocked) {
+        index = QR.posts.indexOf(QR.selected);
+        (QR.posts[index + 1] || new QR.post()).select();
+        $.addClass(QR.nodes.el, 'dump');
+        return QR.cooldown.auto = true;
+      }
+    },
     quote: function(e) {
-      var aa, ancestor, caretPos, com, frag, index, insideCode, k, len1, len2, len3, len4, len5, len6, node, post, q, range, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, sel, text, thread, u, v, z;
+      var aa, ancestor, caretPos, com, frag, insideCode, k, len1, len2, len3, len4, len5, len6, node, post, q, range, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, sel, text, thread, u, v, z;
       if (e != null) {
         e.preventDefault();
       }
@@ -7239,13 +7250,7 @@
         }
         text += ">" + (frag.textContent.trim()) + "\n";
       }
-      QR.open();
-      if (QR.selected.isLocked) {
-        index = QR.posts.indexOf(QR.selected);
-        (QR.posts[index + 1] || new QR.post()).select();
-        $.addClass(QR.nodes.el, 'dump');
-        QR.cooldown.auto = true;
-      }
+      QR.openPost();
       ref7 = QR.nodes, com = ref7.com, thread = ref7.thread;
       if (!com.value) {
         thread.value = Get.threadFromNode(this);
@@ -8926,6 +8931,55 @@
   };
 
   QR.oekaki = {
+    init: function() {
+      if (!(Conf['Quick Reply'] && Conf['Oekaki Links'])) {
+        return;
+      }
+      return Post.callbacks.push({
+        name: 'Oekaki Links',
+        cb: this.node
+      });
+    },
+    node: function() {
+      var link, ref;
+      if (!((ref = this.file) != null ? ref.isImage : void 0)) {
+        return;
+      }
+      if (this.isClone) {
+        link = $('.file-edit', this.file.text);
+      } else {
+        link = $.el('a', {
+          className: 'file-edit',
+          href: 'javascript:;',
+          title: 'Edit image'
+        });
+        $.extend(link, {
+          innerHTML: "<i class=\"fa fa-edit\"></i>"
+        });
+        $.add(this.file.text, [$.tn('\u00A0'), link]);
+      }
+      return $.on(link, 'click', QR.oekaki.editFile);
+    },
+    editFile: function() {
+      var post;
+      post = Get.postFromNode(this);
+      return CrossOrigin.file(post.file.url, function(blob) {
+        var com, ref, thread;
+        QR.openPost();
+        ref = QR.nodes, com = ref.com, thread = ref.thread;
+        if (!com.value) {
+          thread.value = (post.context || post).thread.ID;
+        }
+        QR.selected.save(thread);
+        if (blob) {
+          blob.name = post.file.name;
+          QR.handleFiles([blob]);
+          return QR.oekaki.edit();
+        } else {
+          return QR.error("Can't load image.");
+        }
+      });
+    },
     load: function(cb) {
       var n, onload, script, style;
       if ($('script[src^="//s.4cdn.org/js/painter"]', d.head)) {
@@ -20709,7 +20763,7 @@
     cssWWW: "#captcha-cnt {\n" +
 "  height: auto;\n" +
 "}",
-    features: [['Polyfill', Polyfill], ['Captcha Replacement', Captcha.replace], ['Redirect', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Disable Autoplay', AntiAutoplay], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Highlight by User ID', IDHighlight], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Cooldown', QR.cooldown], ['Menu', Menu], ['Index Generator (Menu)', Index.menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Volume Control', Volume], ['WEBM Metadata', Metadata], ['Comment Expansion', ExpandComment], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Stats', ThreadStats], ['Thread Updater', ThreadUpdater], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Mark New IPs', MarkNewIPs], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Banner', Banner], ['Flash Features', Flash]]
+    features: [['Polyfill', Polyfill], ['Captcha Replacement', Captcha.replace], ['Redirect', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Disable Autoplay', AntiAutoplay], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Highlight by User ID', IDHighlight], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Cooldown', QR.cooldown], ['Oekaki Links', QR.oekaki], ['Menu', Menu], ['Index Generator (Menu)', Index.menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Volume Control', Volume], ['WEBM Metadata', Metadata], ['Comment Expansion', ExpandComment], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Stats', ThreadStats], ['Thread Updater', ThreadUpdater], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Mark New IPs', MarkNewIPs], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Banner', Banner], ['Flash Features', Flash]]
   };
 
   Main.init();
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 353d0c6cc..6504b1290 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 00bea6ea1..608139780 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.14.0
+// @version      1.11.14.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 30efccbbf..b5af0b0d4 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.14.0
+// @version      1.11.14.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -181,6 +181,7 @@
         'Gallery': [true, 'Adds a simple and cute image gallery.'],
         'Fullscreen Gallery': [false, 'Open gallery in fullscreen mode.', 1],
         'PDF in Gallery': [false, 'Show PDF files in gallery.', 1],
+        'Oekaki Links': [true, 'Add links to edit images in oekaki painter.'],
         'Sauce': [true, 'Add sauce links to images.'],
         'WEBM Metadata': [true, 'Add link to fetch title metadata from webm videos.'],
         'Reveal Spoiler Thumbnails': [false, 'Replace spoiler thumbnails with the original image.'],
@@ -413,7 +414,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.14.0',
+    VERSION: '1.11.14.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7179,8 +7180,18 @@
       status.value = !value ? 'Submit' : QR.cooldown.auto ? "Auto " + value : value;
       return status.disabled = disabled || false;
     },
+    openPost: function() {
+      var index;
+      QR.open();
+      if (QR.selected.isLocked) {
+        index = QR.posts.indexOf(QR.selected);
+        (QR.posts[index + 1] || new QR.post()).select();
+        $.addClass(QR.nodes.el, 'dump');
+        return QR.cooldown.auto = true;
+      }
+    },
     quote: function(e) {
-      var aa, ancestor, caretPos, com, frag, index, insideCode, k, len1, len2, len3, len4, len5, len6, node, post, q, range, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, sel, text, thread, u, v, z;
+      var aa, ancestor, caretPos, com, frag, insideCode, k, len1, len2, len3, len4, len5, len6, node, post, q, range, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, sel, text, thread, u, v, z;
       if (e != null) {
         e.preventDefault();
       }
@@ -7239,13 +7250,7 @@
         }
         text += ">" + (frag.textContent.trim()) + "\n";
       }
-      QR.open();
-      if (QR.selected.isLocked) {
-        index = QR.posts.indexOf(QR.selected);
-        (QR.posts[index + 1] || new QR.post()).select();
-        $.addClass(QR.nodes.el, 'dump');
-        QR.cooldown.auto = true;
-      }
+      QR.openPost();
       ref7 = QR.nodes, com = ref7.com, thread = ref7.thread;
       if (!com.value) {
         thread.value = Get.threadFromNode(this);
@@ -8926,6 +8931,55 @@
   };
 
   QR.oekaki = {
+    init: function() {
+      if (!(Conf['Quick Reply'] && Conf['Oekaki Links'])) {
+        return;
+      }
+      return Post.callbacks.push({
+        name: 'Oekaki Links',
+        cb: this.node
+      });
+    },
+    node: function() {
+      var link, ref;
+      if (!((ref = this.file) != null ? ref.isImage : void 0)) {
+        return;
+      }
+      if (this.isClone) {
+        link = $('.file-edit', this.file.text);
+      } else {
+        link = $.el('a', {
+          className: 'file-edit',
+          href: 'javascript:;',
+          title: 'Edit image'
+        });
+        $.extend(link, {
+          innerHTML: "<i class=\"fa fa-edit\"></i>"
+        });
+        $.add(this.file.text, [$.tn('\u00A0'), link]);
+      }
+      return $.on(link, 'click', QR.oekaki.editFile);
+    },
+    editFile: function() {
+      var post;
+      post = Get.postFromNode(this);
+      return CrossOrigin.file(post.file.url, function(blob) {
+        var com, ref, thread;
+        QR.openPost();
+        ref = QR.nodes, com = ref.com, thread = ref.thread;
+        if (!com.value) {
+          thread.value = (post.context || post).thread.ID;
+        }
+        QR.selected.save(thread);
+        if (blob) {
+          blob.name = post.file.name;
+          QR.handleFiles([blob]);
+          return QR.oekaki.edit();
+        } else {
+          return QR.error("Can't load image.");
+        }
+      });
+    },
     load: function(cb) {
       var n, onload, script, style;
       if ($('script[src^="//s.4cdn.org/js/painter"]', d.head)) {
@@ -20709,7 +20763,7 @@
     cssWWW: "#captcha-cnt {\n" +
 "  height: auto;\n" +
 "}",
-    features: [['Polyfill', Polyfill], ['Captcha Replacement', Captcha.replace], ['Redirect', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Disable Autoplay', AntiAutoplay], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Highlight by User ID', IDHighlight], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Cooldown', QR.cooldown], ['Menu', Menu], ['Index Generator (Menu)', Index.menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Volume Control', Volume], ['WEBM Metadata', Metadata], ['Comment Expansion', ExpandComment], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Stats', ThreadStats], ['Thread Updater', ThreadUpdater], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Mark New IPs', MarkNewIPs], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Banner', Banner], ['Flash Features', Flash]]
+    features: [['Polyfill', Polyfill], ['Captcha Replacement', Captcha.replace], ['Redirect', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Disable Autoplay', AntiAutoplay], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Highlight by User ID', IDHighlight], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Cooldown', QR.cooldown], ['Oekaki Links', QR.oekaki], ['Menu', Menu], ['Index Generator (Menu)', Index.menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Volume Control', Volume], ['WEBM Metadata', Metadata], ['Comment Expansion', ExpandComment], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Stats', ThreadStats], ['Thread Updater', ThreadUpdater], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Mark New IPs', MarkNewIPs], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Banner', Banner], ['Flash Features', Flash]]
   };
 
   Main.init();
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 80bcb6d88..454b7510d 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 28dd65c8c..11a2c827d 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.11.14.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.14.1' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index 94c1e3b01..63fba8901 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.11.14.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.14.1' />
   </app>
 </gupdate>
 
diff --git a/package.json b/package.json
index 50f945518..4ff1d4604 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
   "meta": {
     "name": "4chan X",
     "fork": "ccd0",
-    "version": "1.11.14.0",
-    "date": "2015-10-25T08:56:13.424Z",
+    "version": "1.11.14.1",
+    "date": "2015-10-25T11:04:23.010Z",
     "page": "https://www.4chan-x.net/",
     "downloads": "https://www.4chan-x.net/builds/",
     "oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",