diff --git a/init.el b/init.el
index 02012abb0..598d27c03 100644
--- a/init.el
+++ b/init.el
@@ -28,68 +28,50 @@
 ;;
 ;;; License: MIT
 
-(load (concat user-emacs-directory "core/core"))
+(load (concat user-emacs-directory "core/core") nil t)
 
-(doom core-ui            ; draw me like one of your French editors
-      core-popup         ; taming sudden and inevitable windows
-      core-os            ; os-specific configs
-      core-modeline      ; a self-contained mode-line config for masochists
-      core-evil          ; vim in emacs; come to the dark side, we have cookies
-      core-editor        ; fill the editor-shaped hole in the emacs OS
-      core-docs          ; highway to code documentation
-      core-company       ; auto-completion, for the lazy typist
-      core-yasnippet     ; snippets, for the lazier typist
-      core-autoinsert    ; file templates, for the laziest typist
-      core-flycheck      ; get tazed for every semicolon you forget
-      core-project       ; for project navigation aficionados
-      core-vcs           ; remember remember, that commit in November
-      core-ivy           ; a search engine for life and love
-      core-workgroups    ; cure Emacs alzheimers + tab emulation
-      core-eval          ; run code, run + REPL support
-      core-scratch       ; a perdier scratch buffer
+(doom! :emacs
+       dired
+       eshell
+       org         ; for organized fearless leader
 
-      ;;; Dev environments
-      module-asm         ; assembly for fun
-      module-cc          ; C/C++/Obj-C madness
-      module-crystal     ; ruby at the speed of c
-      module-csharp      ; unity, .NET, and mono shenanigans
-      module-css         ; #big-bang::before { content: ""; }
-      module-data        ; config/data formats
-      module-elisp       ; drown in parentheses
-      module-eshell      ; so I can have a sane shell, even in Windows
-      module-go          ; the hipster dialect
-      module-haskell     ; a language that's lazier than I am
-      module-java        ; the poster child for carpal tunnel syndrome
-      module-js          ; all(hope(abandon(ye(who(enter(here))))))
-      module-julia       ; a better, faster MATLAB
-      module-latex       ; write papers in Emacs
-      module-lua         ; one-based indices? one-based indices
-      module-octave      ; math isn't a choice, it's a way of life
-      module-php         ; make php less awful to work with
-      module-processing  ; for prototyping
-      module-python      ; beautiful is better than ugly
-      module-rest        ; emacs as a service
-      module-ruby        ; 1.step do {|i| p "Ruby is #{i&1==0?'love':'life'}"}
-      module-rust        ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
-      module-scala       ; java, but good
-      module-sh          ; she sells Z-shells by the C XOR
-      module-swift       ; who asked for emoji variables?
-      module-text        ; writing docs for people to ignore
-      module-web         ; The end is always near </html>
-
-      ;;; Org
-      module-org         ; for organized fearless leader
-
-      ;;; Custom/experimental modules
-      custom-db          ; emacs as a db browser/client
-      custom-debug       ; nigh-universal debugging
-      custom-demo        ; allow me to demonstrate...
-      custom-screeps     ; The programmer MMO
-      custom-tags        ; if you liked it you should've generated a tag for it
-      custom-tmux        ; close the rift between GUI & terminal
-      custom-write       ; Emacs as a word processor
-
-      ;;; Personal settings
-      my-commands
-      my-bindings)
+       :apps
+       crm
+       email
+       finance
+       present
+       rss
+       stream      ;
+       twitter
+       write
 
+       :lang
+       asm         ; assembly for fun
+       cc          ; C/C++/Obj-C madness
+       crystal     ; ruby at the speed of c
+       csharp      ; unity, .NET, and mono shenanigans
+       css         ; #big-bang::before { content: ""; }
+       data        ; config/data formats
+       emacs-lisp  ; drown in parentheses
+       go          ; the hipster dialect
+       haskell     ; a language that's lazier than I am
+       java        ; the poster child for carpal tunnel syndrome
+       javascript  ; all(hope(abandon(ye(who(enter(here))))))
+       julia       ; a better, faster MATLAB
+       latex       ; write papers in Emacs
+       lua         ; one-based indices? one-based indices
+       octave      ; math isn't a choice, it's a way of life
+       php         ; make php less awful to work with
+       processing  ; for prototyping
+       python      ; beautiful is better than ugly
+       rest        ; emacs as a service
+       ruby        ; 1.step do {|i| p "Ruby is #{i&1==0?'love':'life'}"}
+       rust        ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       scala       ; java, but good
+       sh          ; she sells (ba|z)sh shells on the C xor
+       swift       ; who asked for emoji variables?
+       text        ; writing docs for people to ignore
+       typescript  ; javascript, but better
+       web         ; The end is always near </html>
+       vim
+       )