diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org
index 673c96b2..72721c9c 100644
--- a/config/emacs/emacs.org
+++ b/config/emacs/emacs.org
@@ -426,55 +426,55 @@ Should make startup faster, taken from doom-emacs
       :keymaps `(normal insert visual emacs)
       :prefix "SPC"
       :global-prefix "C-SPC")
-    (defmacro sakomacs/leader-keys
+    (sakomacs/leader-keys
      ;; code
-     "c" `(:ignore c :which-key "code")
-     "cc" `(compile :which-key "compile")
-     "cC" `(recompile :which-key "compile")
-     "cX" `(lsp-treeemacs-errors-list :which-ley "list errors")
+     "c" '(:ignore c :which-key "code")
+     "cc" '(compile :which-key "compile")
+     "cC" '(recompile :which-key "compile")
+     "cX" '(lsp-treeemacs-errors-list :which-ley "list errors")
      ;; toggles
-     "t" `(:ignore t :which-key "toggles")
-     "tt" `(counsel-load-theme :which-key "choose theme")
-     "ts" `(hydra-text-scale/body :which-key "scale text")
+     "t" '(:ignore t :which-key "toggles")
+     "tt" '(counsel-load-theme :which-key "choose theme")
+     "ts" '(hydra-text-scale/body :which-key "scale text")
      ;; search
-     "s" `(:ignore s :which-key "search")
-     "sb" `(swiper :which-key "search buffer")
+     "s" '(:ignore s :which-key "search")
+     "sb" '(swiper :which-key "search buffer")
      ;; insert
-     "i" `(:ignore i :which-key "insert")
-     "ie" `(emoji-search :which-key "Emoji")
+     "i" '(:ignore i :which-key "insert")
+     "ie" '(emoji-search :which-key "Emoji")
      ;; project
-     "p" `(:ignore p :which-key "projects")
-     "pp" `(projectile-switch-project :which-key "open project")
-     "pk" `(projectile-kill-buffers :which-key "close project")
-     "pa" `(projectile-add-known-project :which-key "add project")
-     "pR" `(projectile-run-project :which-key "run project")
-     "pt" `(magit-todos-list :which-key "list project todos")
-     "ps" `(projectile-save-project-buffers :which-key "save project")
-     "po" `(projectile-find-other-file :which-key "find other file")
-     "pg" `(projectile-configure-project :which-key "configure project")
-     "pc" `(projectile-compile-project :which-key "compile project")
+     "p" '(:ignore p :which-key "projects")
+     "pp" '(projectile-switch-project :which-key "open project")
+     "pk" '(projectile-kill-buffers :which-key "close project")
+     "pa" '(projectile-add-known-project :which-key "add project")
+     "pR" '(projectile-run-project :which-key "run project")
+     "pt" '(magit-todos-list :which-key "list project todos")
+     "ps" '(projectile-save-project-buffers :which-key "save project")
+     "po" '(projectile-find-other-file :which-key "find other file")
+     "pg" '(projectile-configure-project :which-key "configure project")
+     "pc" '(projectile-compile-project :which-key "compile project")
      ;; open
-     "o" `(:ignore o :which-key "open")
-     "op" `(treemacs :which-key "treemacs")
-     "oP" `(treemacs-find-file :which-key "treemacs find file")
-     "oe" `(eshell :which-key "eshell")
-     "or" `(elfeed :which-key "rss")
+     "o" '(:ignore o :which-key "open")
+     "op" '(treemacs :which-key "treemacs")
+     "oP" '(treemacs-find-file :which-key "treemacs find file")
+     "oe" '(eshell :which-key "eshell")
+     "or" '(elfeed :which-key "rss")
      ;; notes
-     "n" `(:ignore o :which-key "notes")
-     "na" `(org-agenda :which-key "agenda")
+     "n" '(:ignore o :which-key "notes")
+     "na" '(org-agenda :which-key "agenda")
      ;; quit
-     "q" `(:ignore q :which-key "quit")
-     "qq" `(delete-frame :which-key "close emacs")
-     "qK" `(kill-emacs :which-key "quit emacs")
+     "q" '(:ignore q :which-key "quit")
+     "qq" '(delete-frame :which-key "close emacs")
+     "qK" '(kill-emacs :which-key "quit emacs")
      ;; git
-     "g" `(:ignore g :which-key "git")
-     "gs" `(magit-status :which-key "status")
-     "gc" `(:ignore gc :which-key "create")
-     "gcr" `(magit-init :which-key "init repo")
-     "gcR" `(magit-clone :which-key "clone repo")
-     "gcc" `(magit-commit-create :which-key "commit")
-     "gci" `(forge-create-issue :which-key "issue")
-     "gcp" `(forge-create-pullreq :which-key "pull request"))) 
+     "g" '(:ignore g :which-key "git")
+     "gs" '(magit-status :which-key "status")
+     "gc" '(:ignore gc :which-key "create")
+     "gcr" '(magit-init :which-key "init repo")
+     "gcR" '(magit-clone :which-key "clone repo")
+     "gcc" '(magit-commit-create :which-key "commit")
+     "gci" '(forge-create-issue :which-key "issue")
+     "gcp" '(forge-create-pullreq :which-key "pull request"))) 
 #+end_src 
 ** Dashboard
 #+begin_src emacs-lisp
diff --git a/config/emacs/init.el b/config/emacs/init.el
index 9306c86a..cbcde3a6 100644
--- a/config/emacs/init.el
+++ b/config/emacs/init.el
@@ -353,55 +353,55 @@ kept-old-versions 5)
     :keymaps `(normal insert visual emacs)
     :prefix "SPC"
     :global-prefix "C-SPC")
-  (defmacro sakomacs/leader-keys
+  (sakomacs/leader-keys
    ;; code
-   "c" `(:ignore c :which-key "code")
-   "cc" `(compile :which-key "compile")
-   "cC" `(recompile :which-key "compile")
-   "cX" `(lsp-treeemacs-errors-list :which-ley "list errors")
+   "c" '(:ignore c :which-key "code")
+   "cc" '(compile :which-key "compile")
+   "cC" '(recompile :which-key "compile")
+   "cX" '(lsp-treeemacs-errors-list :which-ley "list errors")
    ;; toggles
-   "t" `(:ignore t :which-key "toggles")
-   "tt" `(counsel-load-theme :which-key "choose theme")
-   "ts" `(hydra-text-scale/body :which-key "scale text")
+   "t" '(:ignore t :which-key "toggles")
+   "tt" '(counsel-load-theme :which-key "choose theme")
+   "ts" '(hydra-text-scale/body :which-key "scale text")
    ;; search
-   "s" `(:ignore s :which-key "search")
-   "sb" `(swiper :which-key "search buffer")
+   "s" '(:ignore s :which-key "search")
+   "sb" '(swiper :which-key "search buffer")
    ;; insert
-   "i" `(:ignore i :which-key "insert")
-   "ie" `(emoji-search :which-key "Emoji")
+   "i" '(:ignore i :which-key "insert")
+   "ie" '(emoji-search :which-key "Emoji")
    ;; project
-   "p" `(:ignore p :which-key "projects")
-   "pp" `(projectile-switch-project :which-key "open project")
-   "pk" `(projectile-kill-buffers :which-key "close project")
-   "pa" `(projectile-add-known-project :which-key "add project")
-   "pR" `(projectile-run-project :which-key "run project")
-   "pt" `(magit-todos-list :which-key "list project todos")
-   "ps" `(projectile-save-project-buffers :which-key "save project")
-   "po" `(projectile-find-other-file :which-key "find other file")
-   "pg" `(projectile-configure-project :which-key "configure project")
-   "pc" `(projectile-compile-project :which-key "compile project")
+   "p" '(:ignore p :which-key "projects")
+   "pp" '(projectile-switch-project :which-key "open project")
+   "pk" '(projectile-kill-buffers :which-key "close project")
+   "pa" '(projectile-add-known-project :which-key "add project")
+   "pR" '(projectile-run-project :which-key "run project")
+   "pt" '(magit-todos-list :which-key "list project todos")
+   "ps" '(projectile-save-project-buffers :which-key "save project")
+   "po" '(projectile-find-other-file :which-key "find other file")
+   "pg" '(projectile-configure-project :which-key "configure project")
+   "pc" '(projectile-compile-project :which-key "compile project")
    ;; open
-   "o" `(:ignore o :which-key "open")
-   "op" `(treemacs :which-key "treemacs")
-   "oP" `(treemacs-find-file :which-key "treemacs find file")
-   "oe" `(eshell :which-key "eshell")
-   "or" `(elfeed :which-key "rss")
+   "o" '(:ignore o :which-key "open")
+   "op" '(treemacs :which-key "treemacs")
+   "oP" '(treemacs-find-file :which-key "treemacs find file")
+   "oe" '(eshell :which-key "eshell")
+   "or" '(elfeed :which-key "rss")
    ;; notes
-   "n" `(:ignore o :which-key "notes")
-   "na" `(org-agenda :which-key "agenda")
+   "n" '(:ignore o :which-key "notes")
+   "na" '(org-agenda :which-key "agenda")
    ;; quit
-   "q" `(:ignore q :which-key "quit")
-   "qq" `(delete-frame :which-key "close emacs")
-   "qK" `(kill-emacs :which-key "quit emacs")
+   "q" '(:ignore q :which-key "quit")
+   "qq" '(delete-frame :which-key "close emacs")
+   "qK" '(kill-emacs :which-key "quit emacs")
    ;; git
-   "g" `(:ignore g :which-key "git")
-   "gs" `(magit-status :which-key "status")
-   "gc" `(:ignore gc :which-key "create")
-   "gcr" `(magit-init :which-key "init repo")
-   "gcR" `(magit-clone :which-key "clone repo")
-   "gcc" `(magit-commit-create :which-key "commit")
-   "gci" `(forge-create-issue :which-key "issue")
-   "gcp" `(forge-create-pullreq :which-key "pull request")))
+   "g" '(:ignore g :which-key "git")
+   "gs" '(magit-status :which-key "status")
+   "gc" '(:ignore gc :which-key "create")
+   "gcr" '(magit-init :which-key "init repo")
+   "gcR" '(magit-clone :which-key "clone repo")
+   "gcc" '(magit-commit-create :which-key "commit")
+   "gci" '(forge-create-issue :which-key "issue")
+   "gcp" '(forge-create-pullreq :which-key "pull request")))
 
 (use-package dashboard
   :init