diff --git a/.emacs.d/lisp/init-scheme.el b/.emacs.d/lisp/init-scheme.el
index de3b11a8..6632afa7 100644
--- a/.emacs.d/lisp/init-scheme.el
+++ b/.emacs.d/lisp/init-scheme.el
@@ -29,6 +29,16 @@
         ;; geiser-repl-save-debugging-history-p t
         geiser-repl-history-size 5000)
   (add-hook 'geiser-repl-mode-hook 'lispyville-mode)
-  (add-hook 'geiser-repl-mode-hook 'rainbow-delimiters-mode))
+  (add-hook 'geiser-repl-mode-hook 'rainbow-delimiters-mode)
+
+  ;; Fontify debug buffer:
+  (add-hook 'geiser-debug-mode-hook 'scheme-mode) ; TODO: Does not work?
+
+  (define-key geiser-repl-mode-map (kbd "C-c m") 'switch-to-geiser-module)
+  (define-key geiser-repl-mode-map (kbd "C-c C-m") nil)
+  ;; Bind same macro expansion keys in the REPL:
+  (define-key geiser-repl-mode-map (kbd "C-c C-m C-e") 'geiser-expand-last-sexp)
+  (define-key geiser-repl-mode-map (kbd "C-c C-m C-x") 'geiser-expand-definition)
+  (define-key geiser-repl-mode-map (kbd "C-c C-m C-r") 'geiser-expand-region))
 
 (provide 'init-scheme)