diff --git a/modules/home/caem/development/emacs/emacs.d/modes/init.el b/modules/home/caem/development/emacs/emacs.d/modes/init.el
index e937d28..65d36c7 100644
--- a/modules/home/caem/development/emacs/emacs.d/modes/init.el
+++ b/modules/home/caem/development/emacs/emacs.d/modes/init.el
@@ -1,4 +1,6 @@
+;; Global configuration for all modes
 (setq-default indent-tabs-mode nil)
 
+;; Load each enabled mode
 (rei/load "nix-mode.el")
-(rei/load "guile-mode.el")
+(rei/load "scheme-mode.el")
diff --git a/modules/home/caem/development/emacs/emacs.d/modes/scheme-mode.el b/modules/home/caem/development/emacs/emacs.d/modes/scheme-mode.el
new file mode 100644
index 0000000..7b5f929
--- /dev/null
+++ b/modules/home/caem/development/emacs/emacs.d/modes/scheme-mode.el
@@ -0,0 +1,13 @@
+(add-hook 'scheme-mode-hook
+	  (lambda ()
+	    (setq indent-tabs-mode nil)
+	    (setq tab-wdith 2)))
+
+(use-package paredit
+  :ensure t
+  :hook
+  ((scheme-mode . enable-paredit-mode)
+   (geiser-mode . enable-paredit-mode))
+  :config
+  (show-paren-mode 1)
+  (setq show-paren-style 'parenthesis))