diff --git a/init.el b/init.el
index 6ca1c2d..60cef64 100644
--- a/init.el
+++ b/init.el
@@ -76,21 +76,28 @@
        (tty +osc)
 
        :lang
-       data              
-       emacs-lisp        
-       (json +tree-sitter)
-       (latex +fold)     
-       (markdown +tree-sitter)
-       (nix +tree-sitter)
-       (org +pandoc +present +roam2 +pomodoro)
+       ;;; Programming languages
+       ;; Systems/low level languages
        (rust +lsp +tree-sitter)
-       (sh +fish)
-       (yaml +tree-sittter)
-       (scheme +chez)
-       (haskell +lsp +tree-sitter)
-       plantuml
-       (kotlin +lsp)
+       ;; JVM
        (java +lsp)
+       (kotlin +lsp)
+       ;; Web
+       ;; Other High Level
+       (haskell +lsp +tree-sitter)
+       emacs-lisp
+       (scheme +chez)
+       (sh +fish)
+       ;; Configuration/Data
+       (nix +tree-sitter)
+       data
+       (yaml +tree-sittter)
+       (json +tree-sitter)
+       ;; Markup
+       (latex +fold)
+       (markdown +tree-sitter)
+       (org +pandoc +present +roam2 +pomodoro)
+       plantuml
 
        :email
        (mu4e +org)