diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57db87994..1ce3b2ad2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+**MayhemYDG**:
+- Remove /s4s/ from warosu archive
+- Fix CAPTCHA duplication on the report page
+- Small bug fixes
+
+**seaweedchan**:
+- Rename `Indicate Spoilers` to `Reveal Spoilers`
+- If `Reveal Spoilers` is enabled but `Remove Spoilers` is not, act as if the spoiler is hovered
+
 ### v1.2.13
 *2013-05-28*
 
diff --git a/builds/4chan-X.js b/builds/4chan-X.js
index 01d83f546..fd4c01593 100644
--- a/builds/4chan-X.js
+++ b/builds/4chan-X.js
@@ -136,7 +136,7 @@
         'Emoji': [false, 'Adds icons next to names for different emails'],
         'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'],
         'Remove Spoilers': [false, 'Remove all spoilers in text.'],
-        'Indicate Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.']
+        'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.']
       },
       'Linkification': {
         'Linkify': [true, 'Convert text into links where applicable.'],
@@ -9263,13 +9263,13 @@
 
   RemoveSpoilers = {
     init: function() {
-      if (Conf['Indicate Spoilers'] && !Conf['Remove Spoilers']) {
+      if (Conf['Reveal Spoilers'] && !Conf['Remove Spoilers']) {
         $.addClass(doc, 'reveal-spoilers');
       }
       if (!Conf['Remove Spoilers']) {
         return;
       }
-      if (Conf['Indicate Spoilers']) {
+      if (Conf['Reveal Spoilers']) {
         this.wrapper = function(text) {
           return "[spoiler]" + text + "[/spoiler]";
         };
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index f7047864b..72e113b4a 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -136,7 +136,7 @@
         'Emoji': [false, 'Adds icons next to names for different emails'],
         'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'],
         'Remove Spoilers': [false, 'Remove all spoilers in text.'],
-        'Indicate Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.']
+        'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.']
       },
       'Linkification': {
         'Linkify': [true, 'Convert text into links where applicable.'],
@@ -9257,13 +9257,13 @@
 
   RemoveSpoilers = {
     init: function() {
-      if (Conf['Indicate Spoilers'] && !Conf['Remove Spoilers']) {
+      if (Conf['Reveal Spoilers'] && !Conf['Remove Spoilers']) {
         $.addClass(doc, 'reveal-spoilers');
       }
       if (!Conf['Remove Spoilers']) {
         return;
       }
-      if (Conf['Indicate Spoilers']) {
+      if (Conf['Reveal Spoilers']) {
         this.wrapper = function(text) {
           return "[spoiler]" + text + "[/spoiler]";
         };
diff --git a/builds/crx/script.js b/builds/crx/script.js
index a4dc7aebe..514690c02 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -116,7 +116,7 @@
         'Emoji': [false, 'Adds icons next to names for different emails'],
         'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'],
         'Remove Spoilers': [false, 'Remove all spoilers in text.'],
-        'Indicate Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.']
+        'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.']
       },
       'Linkification': {
         'Linkify': [true, 'Convert text into links where applicable.'],
@@ -9244,13 +9244,13 @@
 
   RemoveSpoilers = {
     init: function() {
-      if (Conf['Indicate Spoilers'] && !Conf['Remove Spoilers']) {
+      if (Conf['Reveal Spoilers'] && !Conf['Remove Spoilers']) {
         $.addClass(doc, 'reveal-spoilers');
       }
       if (!Conf['Remove Spoilers']) {
         return;
       }
-      if (Conf['Indicate Spoilers']) {
+      if (Conf['Reveal Spoilers']) {
         this.wrapper = function(text) {
           return "[spoiler]" + text + "[/spoiler]";
         };
diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 11406a2d6..48d9a4407 100644
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -71,7 +71,7 @@ Config =
         false
         'Remove all spoilers in text.'
       ]
-      'Indicate Spoilers': [
+      'Reveal Spoilers': [
         false
         'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.'
       ]
diff --git a/src/Miscellaneous/RemoveSpoilers.coffee b/src/Miscellaneous/RemoveSpoilers.coffee
index 5b767ec0e..b9e5d0e58 100644
--- a/src/Miscellaneous/RemoveSpoilers.coffee
+++ b/src/Miscellaneous/RemoveSpoilers.coffee
@@ -1,11 +1,11 @@
 RemoveSpoilers =
   init: ->
-    if Conf['Indicate Spoilers'] and !Conf['Remove Spoilers']
+    if Conf['Reveal Spoilers'] and !Conf['Remove Spoilers']
       $.addClass doc, 'reveal-spoilers'
 
     return unless Conf['Remove Spoilers']
 
-    if Conf['Indicate Spoilers']
+    if Conf['Reveal Spoilers']
       @wrapper = (text) ->
         "[spoiler]#{text}[/spoiler]"