diff --git a/Find Results.sublime-settings b/Find Results.sublime-settings
index 48f4eda..2516cda 100644
--- a/Find Results.sublime-settings	
+++ b/Find Results.sublime-settings	
@@ -1,4 +1,6 @@
 {
+  // To enable dark theme uncomment line bellow
+  // "color_scheme": "Packages/BetterFindBuffer/FindResultsDark.hidden-tmTheme",
   "color_scheme": "Packages/BetterFindBuffer/FindResults.hidden-tmTheme",
   "draw_indent_guides": false,
   "gutter": false,
diff --git a/FindResultsDark.hidden-tmTheme b/FindResultsDark.hidden-tmTheme
new file mode 100644
index 0000000..af0f20f
--- /dev/null
+++ b/FindResultsDark.hidden-tmTheme
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>name</key>
+  <string>Sublime Find Results</string>
+  <key>settings</key>
+  <array>
+    <dict>
+      <key>settings</key>
+      <dict>
+        <key>background</key>
+        <string>#131415</string>
+
+        <key>foreground</key>
+        <string>#DAD6CD</string>
+
+        <key>caret</key>
+        <string>#FFFFFF</string>
+
+        <key>invisibles</key>
+        <string>#404040</string>
+
+        <key>lineHighlight</key>
+        <string>#452455</string>
+
+        <key>selection</key>
+        <string>#5B2E73</string>
+        <key>selectionBorder</key>
+        <string>#c862e687</string>
+
+        <key>selectionForeground</key>
+        <string>#000000</string>
+      </dict>
+    </dict>
+
+    <dict>
+      <key>scope</key>
+      <string>variable.total_files_count.find-in-files</string>
+      <key>settings</key>
+      <dict>
+        <key>foreground</key>
+        <string>#FFCC33</string>
+        <key>fontStyle</key>
+        <string>bold</string>
+      </dict>
+    </dict>
+
+    <dict>
+      <key>scope</key>
+      <string>string.query.find-in-files</string>
+      <key>settings</key>
+      <dict>
+        <key>foreground</key>
+        <string>#ffff00</string>
+        <key>fontStyle</key>
+        <string>bold</string>
+      </dict>
+    </dict>
+
+    <dict>
+      <key>scope</key>
+      <string>variable.matched_count.find-in-files</string>
+      <key>settings</key>
+      <dict>
+        <key>foreground</key>
+        <string>#FFCC33</string>
+        <key>fontStyle</key>
+        <string>bold</string>
+      </dict>
+    </dict>
+
+    <dict>
+      <key>scope</key>
+      <string>variable.matched_files_count.find-in-files</string>
+      <key>settings</key>
+      <dict>
+        <key>foreground</key>
+        <string>#FFCC33</string>
+        <key>fontStyle</key>
+        <string>bold</string>
+      </dict>
+    </dict>
+
+    <dict>
+      <key>scope</key>
+      <string>variable.no_matches.find-in-files</string>
+      <key>settings</key>
+      <dict>
+        <key>foreground</key>
+        <string>#ff0000</string>
+        <key>fontStyle</key>
+        <string>bold</string>
+      </dict>
+    </dict>
+
+    <dict>
+      <!-- Color of line numbers -->
+      <key>scope</key>
+      <string>constant.numeric.line-number.find-in-files</string>
+      <key>settings</key>
+      <dict>
+        <key>foreground</key>
+        <string>#F26FBC</string>
+      </dict>
+    </dict>
+
+    <dict>
+      <key>scope</key>
+      <!-- LINES -->
+      <string>match.find-in-files</string>
+      <key>settings</key>
+      <dict>
+        <key>background</key>
+        <string>#1a1a1a</string>
+        <key>foreground</key>
+        <string>#ffff00</string>
+      </dict>
+    </dict>
+
+    <dict>
+      <key>scope</key>
+      <!-- Color of line numbers matched line -->
+      <string>constant.numeric.line-number.match.find-in-files</string>
+      <key>settings</key>
+      <dict>
+        <key>foreground</key>
+        <string>#F26FBC</string>
+        <key>background</key>
+        <string>#4A0A2F</string>
+      </dict>
+    </dict>
+
+    <dict>
+      <key>scope</key>
+      <string>punctuation.line-number.match.find-in-files</string>
+      <key>settings</key>
+      <dict>
+        <key>foreground</key>
+        <string>#FFD42044</string>
+        <key>background</key>
+        <string>#FFD42044</string>
+      </dict>
+    </dict>
+
+
+    <dict>
+      <key>scope</key>
+      <string>entity.name.filename.find-in-files</string>
+      <key>settings</key>
+      <dict>
+        <key>background</key>
+        <string>#332032</string>
+        <key>foreground</key>
+        <string>#A660A6</string>
+        <key>fontStyle</key>
+        <string>bold</string>
+      </dict>
+    </dict>
+
+    <dict>
+      <key>scope</key>
+      <string>footer.find-in-files</string>
+      <key>settings</key>
+      <dict>
+        <key>background</key>
+        <string>#33333322</string>
+      </dict>
+    </dict>
+
+  </array>
+  <key>uuid</key>
+  <string>edcc9b28-ac04-4b4a-8fa3-f4be3c0d3b02</string>
+</dict>
+</plist>
diff --git a/Main.sublime-menu b/Main.sublime-menu
index 424172e..06512a0 100644
--- a/Main.sublime-menu
+++ b/Main.sublime-menu
@@ -9,35 +9,18 @@
       "caption": "BetterFindBuffer",
       "children": [
         {
-          "command": "open_file",
-          "args": {
-            "file": "${packages}/BetterFindBuffer/BetterFindBuffer.sublime-settings"
-          },
-          "caption": "Settings – Default"
+          "caption": "Settings",
+          "command": "edit_settings",
+            "args": {
+            "base_file": "${packages}/BetterFindBuffer/BetterFindBuffer.sublime-settings",
+            "default": "// Settings in here override those in \"BetterFindBuffer/BetterFindBuffer.sublime-settings\",\n\n{\n\t$0\n}\n"}
         },
         {
-          "command": "open_file",
-          "args": {
-            "file": "${packages}/User/BetterFindBuffer.sublime-settings"
-          },
-          "caption": "Settings – User"
-        },
-        {
-          "caption": "-"
-        },
-        {
-          "command": "open_file",
-          "args": {
-            "file": "${packages}/BetterFindBuffer/Find Results.sublime-settings"
-          },
-          "caption": "Find Results Settings – Default"
-        },
-        {
-          "command": "open_file",
-          "args": {
-            "file": "${packages}/User/Find Results.sublime-settings"
-          },
-          "caption": "Find Results Settings – User"
+          "caption": "Find Results Settings",
+          "command": "edit_settings",
+            "args": {
+            "base_file": "${packages}/BetterFindBuffer/Find Results.sublime-settings",
+            "default": "// Settings in here override those in \"BetterFindBuffer/Find Results.sublime-settings\",\n\n{\n\t$0\n}\n"}
         }
       ]
     }]