diff --git a/lib/commands/application.js b/lib/commands/application.js
index b9f8bd6..890d10d 100644
--- a/lib/commands/application.js
+++ b/lib/commands/application.js
@@ -5,7 +5,7 @@ export default [
     name: ">About",
     category: "Application",
     command: "application:about",
-    shortcut: ["test", "red"],
+    shortcut: ["Cmd/Ctrl", "C"],
   },
   {
     name: ">Inspect",
diff --git a/lib/commands/core.js b/lib/commands/core.js
index b0acd18..acd0045 100644
--- a/lib/commands/core.js
+++ b/lib/commands/core.js
@@ -363,4 +363,28 @@ export default [
     selector: ".mde-cm-wrapper",
     shortcut: [""],
   },
+  {
+    name: ">Toggle editor drawer",
+    category: "Core",
+    command: "core:toggle-editor-drawer",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Show editor drawer",
+    category: "Core",
+    command: "core:show-editor-drawer",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Close editor drawer",
+    category: "Core",
+    command: "core:close-editor-drawer",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
 ];
diff --git a/lib/commands/editor.js b/lib/commands/editor.js
index 554e26b..9cb6780 100644
--- a/lib/commands/editor.js
+++ b/lib/commands/editor.js
@@ -1,3 +1,499 @@
 "use babel";
-
-export default [];
+export default [
+{
+name: ".Clear find",
+category: "Editor",
+command: "editor:clear-find",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Change note status none",
+category: "Editor",
+command: "editor:change-note-status-none",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Change note status active",
+category: "Editor",
+command: "editor:change-note-status-active",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Change note status onhold",
+category: "Editor",
+command: "editor:change-note-status-onhold",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Change note status completed",
+category: "Editor",
+command: "editor:change-note-status-completed",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Change note status dropped",
+category: "Editor",
+command: "editor:change-note-status-dropped",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Delete char after",
+category: "Editor",
+command: "editor:delete-char-after",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Delete char before",
+category: "Editor",
+command: "editor:delete-char-before",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Delete group after",
+category: "Editor",
+command: "editor:delete-group-after",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Delete group before",
+category: "Editor",
+command: "editor:delete-group-before",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Delete line",
+category: "Editor",
+command: "editor:delete-line",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Delete word after",
+category: "Editor",
+command: "editor:delete-word-after",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Delete word before",
+category: "Editor",
+command: "editor:delete-word-before",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Delete wrapped line left",
+category: "Editor",
+command: "editor:delete-wrapped-line-left",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Delete wrapped line right",
+category: "Editor",
+command: "editor:delete-wrapped-line-right",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Find",
+category: "Editor",
+command: "editor:find",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Find next",
+category: "Editor",
+command: "editor:find-next",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Find prev",
+category: "Editor",
+command: "editor:find-prev",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Find text",
+category: "Editor",
+command: "editor:find-text",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Focus",
+category: "Editor",
+command: "editor:focus",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Focus mde",
+category: "Editor",
+command: "editor:focus-mde",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Focus preview",
+category: "Editor",
+command: "editor:focus-preview",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go char left",
+category: "Editor",
+command: "editor:go-char-left",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go char right",
+category: "Editor",
+command: "editor:go-char-right",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go doc end",
+category: "Editor",
+command: "editor:go-doc-end",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go doc start",
+category: "Editor",
+command: "editor:go-doc-start",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go group left",
+category: "Editor",
+command: "editor:go-group-left",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go group right",
+category: "Editor",
+command: "editor:go-group-right",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go line down",
+category: "Editor",
+command: "editor:go-line-down",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go line end",
+category: "Editor",
+command: "editor:go-line-end",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go line left",
+category: "Editor",
+command: "editor:go-line-left",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go line right",
+category: "Editor",
+command: "editor:go-line-right",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go line start",
+category: "Editor",
+command: "editor:go-line-start",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go line up",
+category: "Editor",
+command: "editor:go-line-up",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go page down",
+category: "Editor",
+command: "editor:go-page-down",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go page up",
+category: "Editor",
+command: "editor:go-page-up",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go word left",
+category: "Editor",
+command: "editor:go-word-left",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Go word right",
+category: "Editor",
+command: "editor:go-word-right",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Indent",
+category: "Editor",
+command: "editor:indent",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Indent less",
+category: "Editor",
+command: "editor:indent-less",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Indent more",
+category: "Editor",
+command: "editor:indent-more",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Insert images",
+category: "Editor",
+command: "editor:insert-images",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Jump to line",
+category: "Editor",
+command: "editor:jump-to-line",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Kill line",
+category: "Editor",
+command: "editor:kill-line",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".New line",
+category: "Editor",
+command: "editor:new-line",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Open line",
+category: "Editor",
+command: "editor:open-line",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Redo selection",
+category: "Editor",
+command: "editor:redo-selection",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Replace",
+category: "Editor",
+command: "editor:replace",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Replace selection",
+category: "Editor",
+command: "editor:replace-selection",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Save editor scroll",
+category: "Editor",
+command: "editor:save-editor-scroll",
+selector: "It's a private command",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Save preview scroll",
+category: "Editor",
+command: "editor:save-preview-scroll",
+selector: "It's a private command",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Scroll editor to line",
+category: "Editor",
+command: "editor:scroll-editor-to-line",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Scroll preview to line",
+category: "Editor",
+command: "editor:scroll-preview-to-line",
+selector: "body",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Select all",
+category: "Editor",
+command: "editor:select-all",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Select lines downward",
+category: "Editor",
+command: "editor:select-lines-downward",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Select lines upward",
+category: "Editor",
+command: "editor:select-lines-upward",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Single selection",
+category: "Editor",
+command: "editor:single-selection",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Toggle overwrite",
+category: "Editor",
+command: "editor:toggle-overwrite",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Toggle task list",
+category: "Editor",
+command: "editor:toggle-task-list",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Transpose chars",
+category: "Editor",
+command: "editor:transpose-chars",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Undo selection",
+category: "Editor",
+command: "editor:undo-selection",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+{
+name: ".Unindent",
+category: "Editor",
+command: "editor:unindent",
+selector: ".mde-cm-wrapper",
+state: "inprogress",
+shortcut: [""],
+},
+];
\ No newline at end of file
diff --git a/lib/commands/exportimport.js b/lib/commands/exportimport.js
new file mode 100644
index 0000000..adebd81
--- /dev/null
+++ b/lib/commands/exportimport.js
@@ -0,0 +1,51 @@
+"use babel";
+export default [
+  {
+    name: ">Export as HTML",
+    category: "Export",
+    command: "export-as-html:export",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Export as Markdown (all)",
+    category: "Export",
+    command: "export-as-markdown:all",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Export as Markdown (Single)",
+    category: "Export",
+    command: "export-as-markdown:single",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Export as PDF",
+    category: "Export",
+    command: "export-print:export-as-pdf",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Print",
+    category: "Export",
+    command: "export-print:print",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Import from file",
+    category: "Import",
+    command: "import-html:import-from-file",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+];
diff --git a/lib/commands/view.js b/lib/commands/view.js
new file mode 100644
index 0000000..59a6c65
--- /dev/null
+++ b/lib/commands/view.js
@@ -0,0 +1,75 @@
+"use babel";
+export default [
+  {
+    name: ">Sort by date created",
+    category: "View",
+    command: "view:sort-by-date-created",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Sort by date updated",
+    category: "View",
+    command: "view:sort-by-date-updated",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Sort by title",
+    category: "View",
+    command: "view:sort-by-title",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Sort in ascending",
+    category: "View",
+    command: "view:sort-in-ascending",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Sort in descending",
+    category: "View",
+    command: "view:sort-in-descending",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Toggle distraction free",
+    category: "View",
+    command: "view:toggle-distraction-free",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Toggle preview",
+    category: "View",
+    command: "view:toggle-preview",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Toggle side by side",
+    category: "View",
+    command: "view:toggle-side-by-side",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Toggle sidebar",
+    category: "View",
+    command: "view:toggle-sidebar",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+];
diff --git a/lib/commands/window.js b/lib/commands/window.js
new file mode 100644
index 0000000..3b7bfbe
--- /dev/null
+++ b/lib/commands/window.js
@@ -0,0 +1,67 @@
+"use babel";
+export default [
+  {
+    name: ">Close",
+    category: "Window",
+    command: "window:close",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Decrease font size",
+    category: "Window",
+    command: "window:decrease-font-size",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Increase font size",
+    category: "Window",
+    command: "window:increase-font-size",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Install shell commands",
+    category: "Window",
+    command: "window:install-shell-commands",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">New inkdrop window",
+    category: "Window",
+    command: "window:new-inkdrop-window",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Reload",
+    category: "Window",
+    command: "window:reload",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Toggle dev tools",
+    category: "Window",
+    command: "window:toggle-dev-tools",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+  {
+    name: ">Toggle full screen",
+    category: "Window",
+    command: "window:toggle-full-screen",
+    selector: "body",
+    state: "inprogress",
+    shortcut: [""],
+  },
+];