diff --git a/doom/config.el b/doom/config.el
index a8ef3f0..bf31512 100644
--- a/doom/config.el
+++ b/doom/config.el
@@ -31,17 +31,15 @@
 ;;   `require' or `use-package'.
 ;; - `map!' for binding new keys
 
-(load! "config/lsp.el")
-(load! "config/org.el")
+;; Load all *.el files in config/
+(let* ((config-dir (concat doom-user-dir "config"))
+       (config-files (directory-files-recursively config-dir "\.el")))
+  (dolist (file config-files)
+    (load! file doom-user-dir)))
 
 ;; Elfeed
 (add-hook! 'elfeed-search-mode-hook #'elfeed-update)
 
-;; Tectonic for LaTeX
-(after! (latex tex)
-  (add-to-list 'TeX-command-list
-               '("Tectonic" "tectonic %s.tex" TeX-run-command nil t)))
-
 ;; Dired config
 (add-hook 'dired-after-readin-hook 'dired-git-info-auto-enable)
 
diff --git a/doom/config/lang/latex.el b/doom/config/lang/latex.el
new file mode 100644
index 0000000..0f2b608
--- /dev/null
+++ b/doom/config/lang/latex.el
@@ -0,0 +1,6 @@
+;;; $DOOMDIR/config/lang/latex.el -*- lexical-binding: t; -*-
+
+;; Add Tectonic as a compiler for LaTeX
+(after! (latex tex)
+  (add-to-list 'TeX-command-list
+               '("Tectonic" "tectonic %s.tex" TeX-run-command nil t)))
diff --git a/doom/config/org.el b/doom/config/lang/org.el
similarity index 100%
rename from doom/config/org.el
rename to doom/config/lang/org.el
diff --git a/doom/config/lsp.el b/doom/config/lang/svelte.el
similarity index 68%
rename from doom/config/lsp.el
rename to doom/config/lang/svelte.el
index c33f69d..3e136c4 100644
--- a/doom/config/lsp.el
+++ b/doom/config/lang/svelte.el
@@ -1,9 +1,5 @@
-;;; $DOOMDIR/config/lsp.el -*- lexical-binding: tl -*-
+;;; $DOOMDIR/config/lang/svelte.el -*- lexical-binding: t; -*-
 
-;; web-mode
-(setq-hook! 'web-mode-hook +format-with-lsp nil)
-
-;; svlete-mode
 (define-derived-mode svelte-mode web-mode "Svelte")
 (add-to-list 'auto-mode-alist '("\\.svelte\\'" . svelte-mode))
 (add-hook 'svelte-mode-hook 'eglot-ensure)
diff --git a/doom/config/lang/web.el b/doom/config/lang/web.el
new file mode 100644
index 0000000..6b3c614
--- /dev/null
+++ b/doom/config/lang/web.el
@@ -0,0 +1,5 @@
+;;; $DOOMDIR/config/lang/web.el -*- lexical-binding: t; -*-
+
+(setq-hook! 'web-mode-hook +format-with-lsp nil)
+
+(add-to-list 'auto-mode-alist '("\\.astro\\'" . web-mode))
diff --git a/doom/init.el b/doom/init.el
index a1fd0af..dcbc9a8 100644
--- a/doom/init.el
+++ b/doom/init.el
@@ -137,7 +137,7 @@
        ;;gdscript          ; the language you waited for
        (go +lsp)           ; the hipster dialect
        ;;(graphql +lsp)    ; Give queries a REST
-       ;;(haskell +lsp)    ; a language that's lazier than I am
+       (haskell +lsp)      ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
        ;;idris             ; a language you can depend on
        json                ; At least it ain't XML