 explicitly specified that a variable should be set before a package is loaded,
 you should place your code here."
 
-  ;; (setq ns-use-srgb-colorspace nil) ;; needed?
-
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  ;; Key bindings
+
+  ;; Mouse navigation
   (global-set-key [mouse-8] 'switch-to-prev-buffer)
   (global-set-key [mouse-9] 'switch-to-next-buffer)
 
+  ;; org-journal - create a new journal entry - `, j' in org-journal mode
+  (spacemacs/set-leader-keys "oj" 'org-journal-new-entry)
+
+  ;; Toggle workspaces forward/backwards
+  (spacemacs/set-leader-keys "ow" 'eyebrowse-next-window-config)
+  (spacemacs/set-leader-keys "oW" 'eyebrowse-last-window-config)
+
+  ;; Revert buffer - loads in .dir-locals.el changes
+  (spacemacs/set-leader-keys "oR" 'revert-buffer)
+
+  ;; Keycast mode - show key bindings and commands in mode line
+  (spacemacs/set-leader-keys "ok" 'keycast-mode)
+
+  ;; Replace Emacs Tabs key bindings with Workspace key bindings
+  (with-eval-after-load 'evil-maps
+    (when (featurep 'tab-bar)
+      (define-key evil-normal-state-map "gt" nil)
+      (define-key evil-normal-state-map "gT" nil)))
+
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  ;; Override Spacemacs defaults
+  ;;
+  ;; Set new location for file bookmarks, SPC f b
+  ;; Default: ~/.emacs.d/.cache/bookmarks
+  (setq bookmark-default-file "~/.spacemacs.d/bookmarks")
+  ;;
+  ;; Set new location for recent save files
+  ;; Default: ~/.emacs.d/.cache/recentf
+  (setq recentf-save-file  "~/.spacemacs.d/recentf")
+  ;;
+  ;; native line numbers taking up lots of space?
+  (setq-default display-line-numbers-width nil)
+
+  ;; replace / search with helm-swoop in Evil normal state
+  ;;(evil-global-set-key 'normal "/" 'helm-swoop)
+
+  (setq evil-want-fine-undo t)
+
+  (setq evil-symbol-word-search t)
+
+  (setq history-delete-duplicates t)
+
+  (setq extended-command-history (delq nil (delete-dups extended-command-history)))
+
+  ;; Use helm-project-do-ag directly when pressing SPC / without preselecting the symbol under the cursor.
+  ;; (evil-leader/set-key "/" 'spacemacs/helm-project-do-ag)
+
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; LSP
+  ;;
   (setq lsp-ui-sideline-enable nil)
   (setq lsp-modeline-diagnostics-scope :workspace)
 
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; Helm
-  (setq history-delete-duplicates t)
-  (setq extended-command-history
-        (delq nil (delete-dups extended-command-history)))
-
-  (setq evil-want-fine-undo t)
-  (setq vc-follow-symlinks t) ;; automatically follow symlink to version-controlled file (ex. this file)
-
-  ;; Make Spacemacs use helm-project-do-ag directly when pressing SPC / without preselecting the symbol under the cursor.
-  (evil-leader/set-key "/" 'spacemacs/helm-project-do-ag)
-  ;; (setq helm-ag-base-command "rg --vimgrep --no-heading --line-number --smart-case")
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; PlantUML
-
-  ;; To download the latest version of PlantUML straight into plantuml-jar-path: `M-x plantuml-download-jar<RET>`
+  ;;
+  ;; NOTE: To download the latest version of PlantUML straight into
+  ;;       configured =plantuml-jar-path=:
+  ;;
+  ;;           M-x plantuml-download-jar<RET>
+  ;;
   (setq plantuml-jar-path (expand-file-name "~/.local/lib/plantuml/libexec/plantuml.jar")
         org-plantuml-jar-path plantuml-jar-path
         plantuml-default-exec-mode 'jar)
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; nREPL
-  ;; Connecting to a reomote nREPL server
-  (setq nrepl-use-ssh-fallback-for-remote-hosts t)
-
-  (defun portal.api/open ()
-    (interactive)
-    (cider-nrepl-sync-request:eval
-      "(require 'portal.api) (portal.api/tap) (portal.api/open)"))
-
-  (defun portal.api/clear ()
-    (interactive)
-    (cider-nrepl-sync-request:eval "(portal.api/clear)"))
-
-  (defun portal.api/close ()
-    (interactive)
-    (cider-nrepl-sync-request:eval "(portal.api/close)"))
 
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; Keycast - show Emacs commands in mode line

          org-roam-db-location (concat org-roam-directory "/db/org-roam.db")

          org-enable-github-support t      ;; [[https://github.com/larstvei/ox-gfm]]
          org-enable-hugo-support t        ;; [[https://develop.spacemacs.org/layers/+emacs/org/README.html#hugo-support]]
          org-enable-bootstrap-support nil
          org-enable-org-brain-support nil ;; [[https://kungsgeten.github.io/org-brain.html]]
          org-enable-reveal-js-support nil ;; [[https://github.com/yjwen/org-reveal/]]

          org-enable-valign t
          valign-fancy-bar t

          org-want-todo-bindings nil

          org-enable-org-journal-support nil
          org-journal-dir "~/journal/"

  (if (version<= "27.1" emacs-version)
      (global-so-long-mode 1))

  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;; Doom theme settings
  (setq doom-gruvbox-light-variant "hard")

  (defun practicalli/setup-custom-doom-modeline ()
    (doom-modeline-set-modeline 'practicalli-modeline 'default))

  (with-eval-after-load 'doom-modeline
    (doom-modeline-def-modeline
      'practicalli-modeline
      '(workspace-name window-number modals persp-name buffer-info matches remote-host vcs)
      '(misc-info repl lsp))
    (practicalli/setup-custom-doom-modeline))

  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;; Version Control configuration - Git, etc

  ;; Always follow symlinks for files under version control
  (setq vc-follow-symlinks t)

  ;; diff-hl - diff hightlights in right gutter as you type
  (diff-hl-flydiff-mode)

  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;; Magit & Forge

  (setq magit-repository-directories
        '(("~/.emacs.d" . 0)
          ("~/src" . 3)))

  ;; Configure number of topics show, open and closed
  ;; use negative number to toggle the view of closed topics
  ;; using `SPC SPC forge-toggle-closed-visibility'
  (setq  forge-topic-list-limit '(100 . -10))
  ;; set closed to 0 to never show closed issues
  ;; (setq  forge-topic-list-limit '(100 . 0))

  ;; GitHub user and organization accounts owned
  ;; used by @ c f  to create a fork
  (setq forge-owned-accounts
