diff --git a/LaravelGoto.sublime-commands b/LaravelGoto.sublime-commands
new file mode 100644
index 0000000..5736e54
--- /dev/null
+++ b/LaravelGoto.sublime-commands
@@ -0,0 +1,24 @@
+[
+    {
+        "caption": "LaravelGoto: Goto Implementation",
+        "command": "laravel_goto"
+    },
+    {
+        "caption": "LaravelGoto: Settings",
+        "command": "edit_settings",
+        "args": {
+            "base_file": "${packages}/LaravelGoto/LaravelGoto.sublime-settings",
+            "user_file": "${packages}/User/LaravelGoto.sublime-settings",
+            "default": "// Settings in here override those in \"LaravelGoto/LaravelGoto.sublime-settings\"\n\n{\n\t$0\n}\n",
+        },
+    },
+    {
+        "caption": "LaravelGoto: Key Bindings",
+        "command": "edit_settings",
+        "args": {
+            "base_file": "${packages}/LaravelGoto/Default.sublime-keymap",
+            "user_file": "${packages}/User/Default (${platform}).sublime-keymap",
+            "default": "[\n\t$0\n]\n",
+        }
+    }
+]
\ No newline at end of file
diff --git a/Main.sublime-menu b/Main.sublime-menu
index 8924cd8..2f85929 100644
--- a/Main.sublime-menu
+++ b/Main.sublime-menu
@@ -3,35 +3,36 @@
         "caption": "Preferences",
         "mnemonic": "n",
         "id": "preferences",
-        "children":
-        [
+        "children": [
             {
                 "caption": "Package Settings",
                 "mnemonic": "P",
                 "id": "package-settings",
-                "children":
-                [
+                "children": [
                     {
                         "caption": "Laravel Goto",
-                        "children":
-                        [
+                        "children": [
                             {
                                 "caption": "Settings",
                                 "command": "edit_settings",
                                 "args": {
                                     "base_file": "${packages}/LaravelGoto/LaravelGoto.sublime-settings",
-                                    "default": "{}"
+                                    "user_file": "${packages}/User/LaravelGoto.sublime-settings",
+                                    "default": "// Settings in here override those in \"LaravelGoto/LaravelGoto.sublime-settings\"\n{\n\t$0\n}\n"
                                 }
                             },
-                            { "caption": "-" },
                             {
+                                "caption": "-"
+                            },
+                            {
+                                "caption": "Key Bindings",
                                 "command": "edit_settings",
                                 "args": {
                                     "base_file": "${packages}/LaravelGoto/Default.sublime-keymap",
-                                    "default": "{}"
-                                  },
-                                "caption": "Key Bindings"
-                              }
+                                    "user_file": "${packages}/User/Default (${platform}).sublime-keymap",
+                                    "default": "[\n\t$0\n]\n",
+                                },
+                            }
                         ]
                     }
                 ]