diff --git a/modules/lang/scheme/config.el b/modules/lang/scheme/config.el
index 67e5bfd6a..261cfadd8 100644
--- a/modules/lang/scheme/config.el
+++ b/modules/lang/scheme/config.el
@@ -1,16 +1,19 @@
 ;;; lang/scheme/config.el -*- lexical-binding: t; -*-
 
-;;;###package scheme
-(add-hook 'scheme-mode-hook #'rainbow-delimiters-mode)
-
+(use-package! scheme
+  :defer t
+  :hook ((scheme-mode . rainbow-delimiters-mode)
+         (scheme-mode . geiser-mode)))
 
 (use-package! geiser
   :defer t
   :init
   (setq geiser-active-implementations '(guile chicken mit chibi chez))
+  (setq geiser-mode-start-repl-p t)
+  (setq geiser-smart-tab-p t)
   (unless (featurep! :lang racket)
     (push 'racket geiser-active-implementations))
-  (after! scheme  ; built-in
+  (after! scheme                        ; built-in
     (set-repl-handler! 'scheme-mode '+scheme/open-repl)
     (set-eval-handler! 'scheme-mode #'geiser-eval-region)
     (set-lookup-handlers! 'scheme-mode
@@ -22,24 +25,34 @@
       ( "\\* [A-Za-z0-9_-]+ REPL \\*" :quit nil)))
   (map! :localleader
         :map scheme-mode-map
-        "'" #'geiser-mode-switch-to-repl
-        "s" #'geiser-set-scheme
+        "'"  #'geiser-mode-switch-to-repl
+        "\"" #'geiser-connect
+        "["  #'geiser-squarify
+        "\\" #'geiser-insert-lambda
+        "s"  #'geiser-set-scheme
 
         (:prefix ("e" . "eval")
           "b" #'geiser-eval-buffer
           "B" #'geiser-eval-buffer-and-go
-          "e" #'geiser-eval-definition
-          "E" #'geiser-eval-definition-and-go
+          "e" #'geiser-eval-last-sexp
+          "d" #'geiser-eval-definition
+          "D" #'geiser-eval-definition-and-go
           "r" #'geiser-eval-region
           "R" #'geiser-eval-region-and-go)
 
         (:prefix ("h" . "help")
-          "d" 'geiser-autodoc)
-        ;; TODO add more help keybindings
-
+          "d" #'geiser-autodoc
+          "<" #'geiser-xref-callers
+          ">" #'geiser-xref-callees
+          "i" #'geiser-doc-look-up-manual)
+        (:prefix ("m" . "macro")
+          "r" #'geiser-expand-region
+          "d" #'geiser-expand-definition
+          "e" #'geiser-expand-last-sexp)
         (:prefix ("r" . "repl")
           "b" #'geiser-switch-to-repl
           "q" #'geiser-repl-exit
+          "l" #'geiser-load-current-buffer
           "r" #'geiser-restart-repl
           "R" #'geiser-reload
           "c" #'geiser-repl-clear-buffer)))