 (def-package! vimrc-mode
   :mode ("\\.vim\\(rc\\)?\\'" . vimrc-mode))
 
+(defvar dedicated-name "*dedicated-term*"
+  "The name of the dedicated terminal buffer")
+
 (set-popup-rule! dedicated-name
   :side 'bottom
   :width 0.45
   :height 0.3
   :ttl nil)
 
+;; Save theme
+(add-hook 'kill-emacs-hook #'my/remember-theme-save)
+
 ;;;; Maps ;;;;
-;; Commands without C-
-(map!
- :map override
- :n ";" 'evil-ex
- :n ":" 'execute-extended-command
- :nv "s" 'evil-substitute)
-
 ;; General
 (map!
  (:desc "Universal Argument" :leader "u" #'universal-argument)
+
+ (:map override
+   :n ";" 'evil-ex
+   :n ":" 'execute-extended-command
+   :nv "s" 'evil-substitute)
 
  ;; Moving around windows
  :n "M-h" 'evil-window-left

 :desc "Previous spelling error" :n "[s" #'evil-prev-flyspell-error
 :desc "Next spelling error"     :n "]s" #'evil-next-flyspell-error)

(map!
 :leader
 :prefix ("h" . "help")

;; Additional files
(load! "+alloy")

;; Doom settings
(setq
 doom-leader-key "SPC"
 doom-localleader-key "SPC SPC"
 doom-theme (my/remember-theme-read 'doom-one)
 doom-font (font-spec :family "Source Code Pro" :size 14))

(def-package! org
  :custom
