diff --git a/lib/wpscan/wpscan_options.rb b/lib/wpscan/wpscan_options.rb
index 569f55ac..7893729a 100644
--- a/lib/wpscan/wpscan_options.rb
+++ b/lib/wpscan/wpscan_options.rb
@@ -21,8 +21,10 @@ class WpscanOptions
   ACCESSOR_OPTIONS = [
       :enumerate_plugins,
       :enumerate_only_vulnerable_plugins,
+      :enumerate_all_plugins,
       :enumerate_themes,
       :enumerate_only_vulnerable_themes,
+      :enumerate_all_themes,
       :enumerate_timthumbs,
       :enumerate_usernames,
       :enumerate_usernames_range,
diff --git a/spec/lib/wpscan/wpscan_options_spec.rb b/spec/lib/wpscan/wpscan_options_spec.rb
index 8428a02d..b3e4fb98 100644
--- a/spec/lib/wpscan/wpscan_options_spec.rb
+++ b/spec/lib/wpscan/wpscan_options_spec.rb
@@ -165,6 +165,38 @@ describe "WpscanOptions" do
     end
   end
 
+  describe "#enumerate_all_themes=" do
+    it "should raise an error" do
+      @wpscan_options.enumerate_themes = true
+      expect { @wpscan_options.enumerate_all_themes = true }.to raise_error(
+        RuntimeError, "Please choose only one theme enumeration option"
+      )
+    end
+
+    it "should not raise an error" do
+      @wpscan_options.enumerate_themes = false
+      @wpscan_options.enumerate_all_themes = true
+
+      @wpscan_options.enumerate_all_themes.should be_true
+    end
+  end
+
+  describe "#enumerate_all_plugins=" do
+    it "should raise an error" do
+      @wpscan_options.enumerate_plugins = true
+      expect { @wpscan_options.enumerate_all_plugins = true }.to raise_error(
+        RuntimeError, "Please choose only one plugin enumeration option"
+      )
+    end
+
+    it "should not raise an error" do
+      @wpscan_options.enumerate_plugins = false
+      @wpscan_options.enumerate_all_plugins = true
+
+      @wpscan_options.enumerate_all_plugins.should be_true
+    end
+  end
+
   describe "#to_h" do
     it "should return an empty hash" do
       @wpscan_options.to_h.should be_a Hash