diff --git a/.obsidian/app.json b/.obsidian/app.json
index a8b56c1a..c5d1ae3d 100755
--- a/.obsidian/app.json
+++ b/.obsidian/app.json
@@ -14,5 +14,6 @@
   "newFileLocation": "current",
   "readableLineLength": true,
   "strictLineBreaks": true,
-  "defaultViewMode": "preview"
+  "defaultViewMode": "preview",
+  "livePreview": false
 }
\ No newline at end of file
diff --git a/.obsidian/hotkeys.json b/.obsidian/hotkeys.json
index bf364fbe..0d92d78c 100755
--- a/.obsidian/hotkeys.json
+++ b/.obsidian/hotkeys.json
@@ -8,14 +8,6 @@
       "key": "N"
     }
   ],
-  "obsidian-zotero-desktop-connector:zdc-exp-Create Literature Note": [
-    {
-      "modifiers": [
-        "Alt"
-      ],
-      "key": "L"
-    }
-  ],
   "templater-obsidian:1000. Templates/Heilmeier Catechism.md": [
     {
       "modifiers": [
@@ -24,32 +16,6 @@
       "key": "H"
     }
   ],
-  "editor:toggle-numbered-list": [
-    {
-      "modifiers": [
-        "Mod",
-        "Shift"
-      ],
-      "key": "1"
-    }
-  ],
-  "editor:toggle-bullet-list": [
-    {
-      "modifiers": [
-        "Mod",
-        "Shift"
-      ],
-      "key": "8"
-    }
-  ],
-  "obsidian-git:push": [
-    {
-      "modifiers": [
-        "Alt"
-      ],
-      "key": "P"
-    }
-  ],
   "templater-obsidian:1000s Templates/Daily Note Template.md": [
     {
       "modifiers": [
@@ -58,139 +24,9 @@
       "key": "D"
     }
   ],
-  "highlightr-plugin:unhighlight": [
-    {
-      "modifiers": [
-        "Alt",
-        "Mod"
-      ],
-      "key": "H"
-    },
-    {
-      "modifiers": [],
-      "key": "F9"
-    }
-  ],
-  "highlightr-plugin:Pink": [
-    {
-      "modifiers": [],
-      "key": "F6"
-    }
-  ],
-  "highlightr-plugin:Green": [
-    {
-      "modifiers": [],
-      "key": "F8"
-    }
-  ],
-  "highlightr-plugin:Yellow": [
-    {
-      "modifiers": [],
-      "key": "F4"
-    },
-    {
-      "modifiers": [
-        "Mod",
-        "Shift"
-      ],
-      "key": "H"
-    }
-  ],
-  "highlightr-plugin:Cyan": [
-    {
-      "modifiers": [],
-      "key": "F5"
-    }
-  ],
-  "highlightr-plugin:Orange": [
-    {
-      "modifiers": [],
-      "key": "F7"
-    }
-  ],
-  "highlightr-plugin:Red": [
-    {
-      "modifiers": [],
-      "key": "F3"
-    }
-  ],
-  "highlightr-plugin:Blue": [
-    {
-      "modifiers": [],
-      "key": "F10"
-    }
-  ],
-  "highlightr-plugin:Grey": [
-    {
-      "modifiers": [],
-      "key": "F11"
-    }
-  ],
-  "highlightr-plugin:Purple": [
-    {
-      "modifiers": [],
-      "key": "F12"
-    }
-  ],
-  "editor:focus-left": [
-    {
-      "modifiers": [
-        "Mod"
-      ],
-      "key": "H"
-    }
-  ],
-  "editor:focus-right": [
-    {
-      "modifiers": [
-        "Mod"
-      ],
-      "key": "L"
-    }
-  ],
-  "editor:focus-bottom": [
-    {
-      "modifiers": [
-        "Mod"
-      ],
-      "key": "J"
-    }
-  ],
-  "editor:focus-top": [
-    {
-      "modifiers": [
-        "Mod"
-      ],
-      "key": "K"
-    }
-  ],
   "editor:open-search-replace": [],
   "editor:insert-link": [],
   "editor:toggle-checklist-status": [],
-  "editor:toggle-strikethrough": [
-    {
-      "modifiers": [
-        "Mod"
-      ],
-      "key": "-"
-    }
-  ],
-  "obsidian-footnotes:insert-autonumbered-footnote": [
-    {
-      "modifiers": [
-        "Mod"
-      ],
-      "key": "0"
-    }
-  ],
-  "obsidian-pandoc-reference-list:focus-reference-list-view": [
-    {
-      "modifiers": [
-        "Alt"
-      ],
-      "key": "R"
-    }
-  ],
   "templater-obsidian:replace-in-file-templater": [],
   "obsidian-enhancing-export:obsidian-enhancing-export:export": [
     {
@@ -201,31 +37,6 @@
       "key": "E"
     }
   ],
-  "workspace:export-pdf": [
-    {
-      "modifiers": [
-        "Alt",
-        "Mod"
-      ],
-      "key": "P"
-    }
-  ],
-  "templater-obsidian:1000s Templates/This Past Week Template.md": [
-    {
-      "modifiers": [
-        "Alt"
-      ],
-      "key": "W"
-    }
-  ],
-  "obsidian-tasks-plugin:edit-task": [
-    {
-      "modifiers": [
-        "Alt"
-      ],
-      "key": "T"
-    }
-  ],
   "templater-obsidian:insert-1000s Templates/Daily Note Template.md": [
     {
       "modifiers": [
@@ -234,14 +45,6 @@
       "key": "D"
     }
   ],
-  "window:reset-zoom": [
-    {
-      "modifiers": [
-        "Alt"
-      ],
-      "key": "Z"
-    }
-  ],
   "templater-obsidian:insert-1000s Templates/This Past Week Template.md": [
     {
       "modifiers": [
@@ -258,31 +61,6 @@
       "key": "D"
     }
   ],
-  "templater-obsidian:1000s Templates/Daily Note Template 2.0.md": [
-    {
-      "modifiers": [
-        "Alt"
-      ],
-      "key": "D"
-    }
-  ],
-  "editor:toggle-source": [
-    {
-      "modifiers": [
-        "Mod"
-      ],
-      "key": " "
-    }
-  ],
-  "workspace:close-others": [
-    {
-      "modifiers": [
-        "Alt",
-        "Mod"
-      ],
-      "key": "K"
-    }
-  ],
   "editor:delete-paragraph": [],
   "workspace:goto-tab-1": [],
   "workspace:goto-tab-2": [],
@@ -292,20 +70,37 @@
   "workspace:goto-tab-6": [],
   "workspace:goto-tab-7": [],
   "workspace:goto-tab-8": [],
-  "editor:insert-mathblock": [
+  "markdown:add-metadata-property": [],
+  "obsidian-citation-plugin:insert-citation": [],
+  "obsidian-citation-plugin:open-literature-note": [],
+  "obsidian-citation-plugin:update-bib-data": [],
+  "file-explorer:new-file": [],
+  "file-explorer:new-file-in-new-pane": [],
+  "editor:follow-link": [],
+  "workspace:goto-last-tab": [],
+  "workspace:next-tab": [
     {
       "modifiers": [
-        "Mod"
+        "Ctrl"
       ],
-      "key": "M"
+      "key": "Tab"
     }
   ],
-  "editor:insert-table": [
+  "workspace:previous-tab": [
     {
       "modifiers": [
-        "Mod"
+        "Ctrl",
+        "Shift"
       ],
-      "key": "T"
+      "key": "Tab"
+    }
+  ],
+  "spacekeys:leader": [
+    {
+      "modifiers": [
+        "Shift"
+      ],
+      "key": " "
     }
   ]
 }
\ No newline at end of file
diff --git a/.obsidian/plugins/spacekeys/data.json b/.obsidian/plugins/spacekeys/data.json
index ba24e35e..1c8bef32 100644
--- a/.obsidian/plugins/spacekeys/data.json
+++ b/.obsidian/plugins/spacekeys/data.json
@@ -1,6 +1,6 @@
 {
   "keymapFile": {
-    "path": null,
+    "path": "spacemacs.md",
     "format": "auto",
     "extend": false
   },
diff --git a/spacemacs.md b/spacemacs.md
index 141c8017..170b3002 100644
--- a/spacemacs.md
+++ b/spacemacs.md
@@ -2,135 +2,207 @@ Example Spacekeys keymap file emulating Spacemacs.
 
 ```yaml
 items:
-
-  # SPC: command-palette:open
-  SPC: obsidian-better-command-palette:open-better-commmand-palette
-  TAB: workspace:previous-tab
+  SPC: command-palette:open
+  TAB: editor:focus
   /: global-search:open
-  1: workspace:goto-tab-1
-  2: workspace:goto-tab-2
-  3: workspace:goto-tab-3
-  4: workspace:goto-tab-4
-  5: workspace:goto-tab-5
-  6: workspace:goto-tab-6
-  7: workspace:goto-tab-7
-  8: workspace:goto-tab-8
-  9: workspace:goto-last-tab
-
-  b:
-    description: Buffers
-    items:
-      d: workspace:close
-      n: workspace:next-tab
-      p: workspace:previous-tab
-      # This is a sub-menu in Spacemacs
-      N: file-explorer:new-file-in-current-tab
-      u: workspace:undo-close-pane
-      # Not sure if there's a good builtin equivalent to this
-      # Shows open buffers and recent files
-      b: obsidian-better-command-palette:open-better-commmand-palette-file-search
-
-  f:
-    description: Files
-    items:
-      D: app:delete-file
-      # Similar to bb
-      f: obsidian-better-command-palette:open-better-commmand-palette-file-search
-      o: open-with-default-app:open
-      R: workspace:edit-file-title
-      s: editor:save-file
-      t: file-explorer:open
-      T: file-explorer:reveal-active-file
-
-  i:
-    description: Insert
-    items:
-      l: editor:insert-link
-      w: editor:insert-wikilink
-
-  m:
-    # Generally "Major mode" in Spacemacs, in this case Markdown
-    description: Markdown
-    items:
-    
-      c:
-        description: Command
-        items:
-          e: workspace:export-pdf
-          p: markdown:toggle-preview
-          P: editor:toggle-source
-
-      i:
-        description: Insert
-        items:
-          l: editor:insert-link
-          w: editor:insert-wikilink
-          T: editor:insert-table
-
-      # This is a menu with one item in Markdown mode
-      l: editor:toggle-bullet-list
-
-      t:
-        description: Table
-        items:
-          b: editor:table-col-left
-          f: editor:table-col-right
-          p: editor:table-row-up
-          n: editor:table-row-down
-          c: editor:table-col-after
-          r: editor:table-row-after
-          C: editor:table-col-delete
-          R: editor:table-row-delete
-
-      x:
-        description: Text
-        items:
-          b: editor:toggle-bold
-          i: editor:toggle-italics
-          c: editor:toggle-code
-          p: editor:insert-codeblock
-          q: editor:toggle-blockquote
-          s: editor:toggle-strikethrough
-
-  p:
-    # Treat Spacemacs Projectile project <-> Obsidian vault
-    description: Projects
-    items:
-      t: file-explorer:open
-      # These are the same?
-      p: app:open-vault
-      l: app:open-vault
-        # Is this the same as org tags or different?
-      g: obsidian-better-command-palette:open-better-commmand-palette-tag-search
-      f: obsidian-better-command-palette:open-better-commmand-palette-file-search
-
-  s:
-    description: Search
-    items:
-      p: global-search:open
-
-  t:
-    description: Toggles
-    items:
+  ",": editor:context-menu
+  "?": switcher:open
+  P: app:go-back
+  N: app:go-forward
 
   w:
-    description: Windows
+    description: Workspace
     items:
       TAB: editor:focus
-      d: workspace:close-window
+      d: workspace:close
+      f: file-explorer:open
       h: editor:focus-left
       l: editor:focus-right
       k: editor:focus-top
       j: editor:focus-bottom
+      n: workspace:next-tab
+      N: workspace:new-tab
+      o: outline:open
+      p: workspace:previous-tab
+      P: workspace:toggle-pin
       s: workspace:split-horizontal
+      S: workspace:toggle-stacked-tabs
+      t: tag-pane:open
+      u: workspace:undo-close-pane
       v: workspace:split-vertical
+      L: app:toggle-left-sidebar
+      r: app:toggle-right-sidebar
+      R: app:toggle-ribbon
+      w: workspace:open-in-new-window
+      W: workspace:move-to-new-window
+
+      x:
+        description: Close
+        items:
+          g: workspace:close-tab-group
+          G: workspace:close-others-tab-group
+          t: workspace:close
+          T: workspace:close-others
+          w: workspace:close-window
+
+       # workspace:goto-tab-1
+       # workspace:goto-tab-2
+       # workspace:goto-tab-3
+       # workspace:goto-tab-4
+       # workspace:goto-tab-5
+       # workspace:goto-tab-6
+       # workspace:goto-tab-7
+       # workspace:goto-tab-8
+       # workspace:goto-last-tab
+
+       # workspace:show-trash
+
+  f:
+    description: File
+    items:
+      a: markdown:add-alias
+      c: workspace:copy-path
+      C: workspace:copy-url
+      d: app:delete-file
+      m: file-explorer:move-file
+      o: open-with-default-app:open
+      O: open-with-default-app:show
+      r: editor:open-search-replace
+      R: workspace:edit-file-title
+      s: editor:save-file
+      t: file-explorer:reveal-active-file
+      T: tag-pane:open
+      u: outline:open-for-current
+      /: editor:open-search
+
+      n:
+        description: New
+        items:
+          c: file-explorer:duplicate-file
+          n: file-explorer:new-file
+          N: file-explorer:new-file-in-current-tab
+          r: file-explorer:new-file-in-new-pane
+
+
+      p:
+        description: Properties
+        items:
+          a: markdown:add-metadata-property
+          e: markdown:edit-metadata-property
+          c: markdown:clear-metadata-properties
 
   x:
     description: Text
     items:
+      b: editor:toggle-bold
+      c: editor:toggle-code
+      C: editor:toggle-comments
+      d: editor:delete-paragraph
+      F: editor:clear-formatting
+      i: editor:toggle-italics
+      p: editor:insert-codeblock
+      q: editor:toggle-blockquote
+      s: editor:toggle-strikethrough
+      l: editor:toggle-bullet-list
+      H: editor:toggle-highlight
+      M: editor:toggle-inline-math
 
-  T:
-    description: UI Toggles / Themes
+      # editor:set-heading
+      # editor:set-heading-0
+      # editor:set-heading-1
+      # editor:set-heading-2
+      # editor:set-heading-3
+      # editor:set-heading-4
+      # editor:set-heading-5
+      # editor:set-heading-6
+      # editor:rename-heading
+
+      # editor:swap-line-down
+      # editor:swap-line-up
+
+      # editor:toggle-bullet-list
+      # editor:toggle-checklist-status
+      # editor:toggle-numbered-list
+      # editor:cycle-list-checklist
+
+  i:
+    description: Insert
     items:
-      s: theme:switch
+      a: editor:attach-file
+      c: editor:insert-codeblock
+      C: editor:insert-callout
+      e: editor:insert-embed
+      l: editor:insert-link
+      L: editor:insert-wikilink
+      m: editor:insert-mathblock
+      r: editor:insert-horizontal-rule
+      T: editor:insert-tag
+
+      t:
+        description: Template
+        items:
+          t: insert-template
+          d: insert-current-date
+          T: insert-current-time
+
+  t:
+    description: Table
+    items:
+      h: editor:table-col-left
+      l: editor:table-col-right
+      k: editor:table-row-up
+      j: editor:table-row-down
+      c: editor:table-col-after
+      C: editor:table-col-before
+      r: editor:table-row-after
+      R: editor:table-row-before
+      v: editor:table-row-copy
+      V: editor:table-col-copy
+      i: editor:insert-table
+
+      d:
+        description: Delete
+        items:
+          c: editor:table-col-delete
+          r: editor:table-row-delete
+
+      a:
+        description: Align
+        items:
+          c: editor:table-col-align-center
+          l: editor:table-col-align-left
+          r: editor:table-col-align-right
+
+  v:
+    description: View
+    items:
+      p: editor:toggle-source
+      r: markdown:toggle-preview
+      s: editor:toggle-spellcheck
+      T: window:toggle-always-on-top
+
+      # window:reset-zoom
+      # window:zoom-in
+      # window:zoom-out
+
+  # "Workspaces" core plugin
+  l:
+    description: Layout
+    items:
+      l: workspaces:save-and-load
+      L: workspaces:load
+      o: workspaces:open-modal
+      s: workspaces:save
+
+# editor:toggle-fold-properties
+# editor:toggle-fold
+# editor:unfold-all
+# editor:fold-all
+# editor:fold-less
+# editor:fold-more
+
+# editor:follow-link
+# editor:open-link-in-new-leaf
+# editor:open-link-in-new-split
+# editor:open-link-in-new-window
 ```