 
       ;;; <leader> q --- quit/restart
       (:prefix-map ("q" . "quit/restart")
+        :desc "Restart emacs server"         "d" #'+default/restart-server
+        :desc "Delete frame"                 "f" #'delete-frame
+        :desc "Clear current frame"          "F" #'doom/kill-all-buffers
+        :desc "Kill Emacs (and daemon)"      "K" #'save-buffers-kill-emacs
         :desc "Quit Emacs"                   "q" #'kill-emacs
         :desc "Save and quit Emacs"          "Q" #'save-buffers-kill-terminal
-        (:when (featurep! :ui workspaces)
-          :desc "Quit Emacs & forget session"  "X" #'+workspace/kill-session-and-quit)
+        :desc "Quick save current session"   "s" #'doom/quicksave-session
+        :desc "Restore last session"         "l" #'doom/quickload-session
+        :desc "Save session to file"         "S" #'doom/save-session
+        :desc "Restore session from file"    "L" #'doom/load-session
         :desc "Restart & restore Emacs"      "r" #'doom/restart-and-restore
         :desc "Restart Emacs"                "R" #'doom/restart)
 

      (:prefix ("l" . "<localleader>")) ; bound locally
      (:prefix ("!" . "checkers"))      ; bound by flycheck

      ;;; <leader> f --- file
      (:prefix-map ("f" . "file")
        :desc "Open project editorconfig"   "."   #'editorconfig-find-current-editorconfig
        :desc "Find other file"             "a"   #'projectile-find-other-file
        :desc "Browse private config"       "c"   #'doom/open-private-config
        :desc "Find file in private config" "C"   #'doom/find-file-in-private-config
        :desc "Find directory"              "d"   #'dired
        :desc "Find file in emacs.d"        "e"   #'+default/find-in-emacsd
        :desc "Browse emacs.d"              "E"   #'+default/browse-emacsd
        :desc "Find file from here"         "f"   (if (fboundp 'counsel-file-jump) #'counsel-file-jump #'find-file)
        :desc "Find file in other project"  "F"   #'doom/browse-in-other-project
        :desc "Delete this file"            "K"   #'doom/delete-this-file
        :desc "Move this file"              "m"   #'doom/move-this-file
        :desc "Find file in project"        "p"   #'projectile-find-file
        :desc "Find file in other project"  "P"   #'doom/find-file-in-other-project
        :desc "Recent files"                "r"   #'recentf-open-files
        :desc "Recent project files"        "R"   #'projectile-recentf
        :desc "Sudo this file"              "s"   #'doom/sudo-this-file
        :desc "Sudo find file"              "S"   #'doom/sudo-find-file
        :desc "Yank filename"               "y"   #'+default/yank-buffer-filename
        :desc "Open scratch buffer"         "x"   #'doom/open-scratch-buffer
        :desc "Open project scratch buffer" "X"   #'doom/switch-to-scratch-buffer)

      ;;; <leader> r --- remote
      (:when (featurep! :tools upload)

        :desc "Create Temp Template"  "c" #'aya-create
        :desc "Use Temp Template"     "e" #'aya-expand)

      ;;; <leader> t --- toggle
      (:prefix-map ("t" . "toggle")
        :desc "Big mode"                     "b" #'doom-big-font-mode
        :desc "Flymake"                      "f" #'flymake-mode
        :desc "Frame fullscreen"             "F" #'toggle-frame-fullscreen
        :desc "Indent style"                 "I" #'doom/toggle-indent-style
        :desc "Line numbers"                 "l" #'doom/toggle-line-numbers
        :desc "Word-wrap mode"               "w" #'+word-wrap-mode
        (:when (featurep! :tools flycheck)
          :desc "Flycheck"                   "f" #'flycheck-mode)
        (:when (featurep! :ui indent-guides)
          :desc "Indent guides"              "i" #'highlight-indent-guides-mode)
        (:when (featurep! :lang org +present)
          :desc "org-tree-slide mode"        "p" #'+org-present/start)
        :desc "Read-only mode"               "r" #'read-only-mode
        (:when (featurep! :tools flyspell)
          :desc "Flyspell"                   "s" #'flyspell-mode)
        (:when (featurep! :lang org +pomodoro)
          :desc "Pomodoro timer"             "t" #'org-pomodoro)
        (:when (featurep! :ui zen)
          :desc "Zen mode"                   "z" #'writeroom-mode))

      ;;; <leader> v --- versioning
      (:prefix-map ("v" . "versioning")
