diff --git a/home/jonas/static/doom-config/config.el b/home/jonas/static/doom-config/config.el
index aed0f4c..074d332 100644
--- a/home/jonas/static/doom-config/config.el
+++ b/home/jonas/static/doom-config/config.el
@@ -76,3 +76,8 @@
 ;; they are implemented.
 (after! treemacs
   (setq treemacs-position 'right))
+
+(package! conventional-commit
+  :recipe (:fetcher github :repo "akirak/conventional-commit.el"))
+
+(add-hook 'git-commit-mode-hook 'conventional-commit-setup)
diff --git a/home/jonas/static/doom-config/init.el b/home/jonas/static/doom-config/init.el
index 4431404..c6d7d68 100644
--- a/home/jonas/static/doom-config/init.el
+++ b/home/jonas/static/doom-config/init.el
@@ -49,9 +49,9 @@
        ;;unicode           ; extended unicode support for various languages
        (vc-gutter +pretty) ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
-       ;;window-select     ; visually switch windows
+       window-select     ; visually switch windows
        workspaces        ; tab emulation, persistence & separate workspaces
-       ;;zen               ; distraction-free coding or writing
+       zen               ; distraction-free coding or writing
 
        :editor
        (evil +everywhere); come to the dark side, we have cookies
diff --git a/home/jonas/static/doom-config/packages.el b/home/jonas/static/doom-config/packages.el
index a809bf9..295cf57 100644
--- a/home/jonas/static/doom-config/packages.el
+++ b/home/jonas/static/doom-config/packages.el
@@ -47,4 +47,7 @@
 ;; ...or multiple packages
 ;; (unpin! pinned-package another-pinned-package)
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
-;; (unpin! t)
\ No newline at end of file
+;; (unpin! t)
+
+(package! conventional-commit
+  :recipe (:fetcher github :repo "akirak/conventional-commit.el"))