diff --git a/.doomrc b/.doomrc
index e01f5c0a6..880fb896b 100644
--- a/.doomrc
+++ b/.doomrc
@@ -19,20 +19,24 @@
 
 (after! doom-cli-make
   ;;; Codeowners
-  (dolist (path (doom-module-load-path (list doom-modules-dir)))
-    ;; I will be the default owner for everything in the repo unless a later
-    ;; match takes precedence.
-    (add-to-list 'doom-make-codeowners "# The default owner(s) unless another takes precedence")
-    (add-to-list 'doom-make-codeowners '("*" . "@doomemacs/maintainers"))
-    ;; Module maintainers (see https://git.doomemacs.org/teams)
-    (save-match-data
-      (add-to-list 'doom-make-codeowners "# Module maintainers")
-      (when (string-match "/modules/\\([^/]+\\)/\\([^/]+\\)/$" path)
-        (push (cons (substring (match-string 0 path) 1)
-                    (format "@doomemacs/%s-%s"
-                            (match-string 1 path)
-                            (match-string 2 path)))
-              doom-make-codeowners)))))
+  ;; I will be the default owner for everything in the repo unless a later match
+  ;; takes precedence.
+  (add-to-list 'doom-make-codeowners "# The default owner(s) unless another takes precedence")
+  (add-to-list 'doom-make-codeowners '("*" . "@doomemacs/maintainers"))
+  ;; Module maintainers (see https://git.doomemacs.org/teams)
+  (add-to-list 'doom-make-codeowners "# Module maintainers")
+  (save-match-data
+    (setq doom-make-codeowners
+          (nreverse
+           (append doom-make-codeowners
+                   (cl-sort
+                    (cl-loop for path in (doom-module-load-path (list doom-modules-dir))
+                             if (string-match "/modules/\\([^/]+\\)/\\([^/]+\\)$" path)
+                             collect (cons (substring (match-string 0 path) 1)
+                                           (format "@doomemacs/%s-%s"
+                                                   (match-string 1 path)
+                                                   (match-string 2 path))))
+                    #'string-lessp :key #'car))))))
 
 ;;; Helpers
 (defun ci-check-module-scope (scope _plist)
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b8dd1121d..396ad8f44 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,160 +2,165 @@
 # Each line is a file pattern followed by one or more owners.
 # This file was generated by 'doom make codeowners', do not edit it by hand.
 
-# The default owner(s) unless another takes precedence
-* @doomemacs/maintainers
-
 # Module maintainers
-modules/app/calendar/            @doomemacs/app-calendar
-modules/app/emms/                @doomemacs/app-emms
-modules/app/everywhere/          @doomemacs/app-everywhere
-modules/app/irc/                 @doomemacs/app-irc
-modules/app/rss/                 @doomemacs/app-rss
-modules/checkers/grammar/        @doomemacs/checkers-grammar
-modules/checkers/spell/          @doomemacs/checkers-spell
-modules/checkers/syntax/         @doomemacs/checkers-syntax
-modules/completion/company/      @doomemacs/completion-company
-modules/completion/helm/         @doomemacs/completion-helm
-modules/completion/ido/          @doomemacs/completion-ido
-modules/completion/ivy/          @doomemacs/completion-ivy
-modules/completion/vertico/      @doomemacs/completion-vertico
-modules/config/default/          @doomemacs/config-default
-modules/config/literate/         @doomemacs/config-literate
-modules/editor/evil/             @doomemacs/editor-evil
-modules/editor/file-templates/   @doomemacs/editor-file-templates
-modules/editor/fold/             @doomemacs/editor-fold
-modules/editor/format/           @doomemacs/editor-format
-modules/editor/god/              @doomemacs/editor-god
-modules/editor/lispy/            @doomemacs/editor-lispy
-modules/editor/multiple-cursors/ @doomemacs/editor-multiple-cursors
-modules/editor/objed/            @doomemacs/editor-objed
-modules/editor/parinfer/         @doomemacs/editor-parinfer
-modules/editor/rotate-text/      @doomemacs/editor-rotate-text
-modules/editor/snippets/         @doomemacs/editor-snippets
-modules/editor/word-wrap/        @doomemacs/editor-word-wrap
-modules/emacs/dired/             @doomemacs/emacs-dired
-modules/emacs/electric/          @doomemacs/emacs-electric
-modules/emacs/ibuffer/           @doomemacs/emacs-ibuffer
-modules/emacs/tramp/             @doomemacs/emacs-tramp
-modules/emacs/undo/              @doomemacs/emacs-undo
-modules/emacs/vc/                @doomemacs/emacs-vc
-modules/email/mu4e/              @doomemacs/email-mu4e
-modules/email/notmuch/           @doomemacs/email-notmuch
-modules/email/wanderlust/        @doomemacs/email-wanderlust
-modules/input/bidi/              @doomemacs/input-bidi
-modules/input/chinese/           @doomemacs/input-chinese
-modules/input/japanese/          @doomemacs/input-japanese
-modules/input/layout/            @doomemacs/input-layout
-modules/lang/agda/               @doomemacs/lang-agda
-modules/lang/beancount/          @doomemacs/lang-beancount
-modules/lang/cc/                 @doomemacs/lang-cc
-modules/lang/clojure/            @doomemacs/lang-clojure
-modules/lang/common-lisp/        @doomemacs/lang-common-lisp
-modules/lang/coq/                @doomemacs/lang-coq
-modules/lang/crystal/            @doomemacs/lang-crystal
-modules/lang/csharp/             @doomemacs/lang-csharp
-modules/lang/dart/               @doomemacs/lang-dart
-modules/lang/data/               @doomemacs/lang-data
-modules/lang/dhall/              @doomemacs/lang-dhall
-modules/lang/elixir/             @doomemacs/lang-elixir
-modules/lang/elm/                @doomemacs/lang-elm
-modules/lang/emacs-lisp/         @doomemacs/lang-emacs-lisp
-modules/lang/erlang/             @doomemacs/lang-erlang
-modules/lang/ess/                @doomemacs/lang-ess
-modules/lang/factor/             @doomemacs/lang-factor
-modules/lang/faust/              @doomemacs/lang-faust
-modules/lang/fortran/            @doomemacs/lang-fortran
-modules/lang/fsharp/             @doomemacs/lang-fsharp
-modules/lang/fstar/              @doomemacs/lang-fstar
-modules/lang/gdscript/           @doomemacs/lang-gdscript
-modules/lang/go/                 @doomemacs/lang-go
-modules/lang/graphql/            @doomemacs/lang-graphql
-modules/lang/haskell/            @doomemacs/lang-haskell
-modules/lang/hy/                 @doomemacs/lang-hy
-modules/lang/idris/              @doomemacs/lang-idris
-modules/lang/java/               @doomemacs/lang-java
-modules/lang/javascript/         @doomemacs/lang-javascript
-modules/lang/json/               @doomemacs/lang-json
-modules/lang/julia/              @doomemacs/lang-julia
-modules/lang/kotlin/             @doomemacs/lang-kotlin
-modules/lang/latex/              @doomemacs/lang-latex
-modules/lang/lean/               @doomemacs/lang-lean
-modules/lang/ledger/             @doomemacs/lang-ledger
-modules/lang/lua/                @doomemacs/lang-lua
-modules/lang/markdown/           @doomemacs/lang-markdown
-modules/lang/nim/                @doomemacs/lang-nim
-modules/lang/nix/                @doomemacs/lang-nix
-modules/lang/ocaml/              @doomemacs/lang-ocaml
-modules/lang/org/                @doomemacs/lang-org
-modules/lang/php/                @doomemacs/lang-php
-modules/lang/plantuml/           @doomemacs/lang-plantuml
-modules/lang/purescript/         @doomemacs/lang-purescript
-modules/lang/python/             @doomemacs/lang-python
-modules/lang/qt/                 @doomemacs/lang-qt
-modules/lang/racket/             @doomemacs/lang-racket
-modules/lang/raku/               @doomemacs/lang-raku
-modules/lang/rest/               @doomemacs/lang-rest
-modules/lang/rst/                @doomemacs/lang-rst
-modules/lang/ruby/               @doomemacs/lang-ruby
-modules/lang/rust/               @doomemacs/lang-rust
-modules/lang/scala/              @doomemacs/lang-scala
-modules/lang/scheme/             @doomemacs/lang-scheme
-modules/lang/sh/                 @doomemacs/lang-sh
-modules/lang/sml/                @doomemacs/lang-sml
-modules/lang/solidity/           @doomemacs/lang-solidity
-modules/lang/swift/              @doomemacs/lang-swift
-modules/lang/terra/              @doomemacs/lang-terra
-modules/lang/web/                @doomemacs/lang-web
-modules/lang/yaml/               @doomemacs/lang-yaml
-modules/lang/zig/                @doomemacs/lang-zig
-modules/os/macos/                @doomemacs/os-macos
-modules/os/tty/                  @doomemacs/os-tty
-modules/term/eshell/             @doomemacs/term-eshell
-modules/term/shell/              @doomemacs/term-shell
-modules/term/term/               @doomemacs/term-term
-modules/term/vterm/              @doomemacs/term-vterm
-modules/tools/ansible/           @doomemacs/tools-ansible
-modules/tools/biblio/            @doomemacs/tools-biblio
-modules/tools/debugger/          @doomemacs/tools-debugger
-modules/tools/direnv/            @doomemacs/tools-direnv
-modules/tools/docker/            @doomemacs/tools-docker
-modules/tools/editorconfig/      @doomemacs/tools-editorconfig
-modules/tools/ein/               @doomemacs/tools-ein
-modules/tools/eval/              @doomemacs/tools-eval
-modules/tools/gist/              @doomemacs/tools-gist
-modules/tools/lookup/            @doomemacs/tools-lookup
-modules/tools/lsp/               @doomemacs/tools-lsp
-modules/tools/magit/             @doomemacs/tools-magit
-modules/tools/make/              @doomemacs/tools-make
-modules/tools/pass/              @doomemacs/tools-pass
-modules/tools/pdf/               @doomemacs/tools-pdf
-modules/tools/prodigy/           @doomemacs/tools-prodigy
-modules/tools/terraform/         @doomemacs/tools-terraform
-modules/tools/tmux/              @doomemacs/tools-tmux
-modules/tools/tree-sitter/       @doomemacs/tools-tree-sitter
-modules/tools/upload/            @doomemacs/tools-upload
-modules/ui/deft/                 @doomemacs/ui-deft
-modules/ui/doom/                 @doomemacs/ui-doom
-modules/ui/doom-dashboard/       @doomemacs/ui-doom-dashboard
-modules/ui/doom-quit/            @doomemacs/ui-doom-quit
-modules/ui/emoji/                @doomemacs/ui-emoji
-modules/ui/hl-todo/              @doomemacs/ui-hl-todo
-modules/ui/hydra/                @doomemacs/ui-hydra
-modules/ui/indent-guides/        @doomemacs/ui-indent-guides
-modules/ui/ligatures/            @doomemacs/ui-ligatures
-modules/ui/minimap/              @doomemacs/ui-minimap
-modules/ui/modeline/             @doomemacs/ui-modeline
-modules/ui/nav-flash/            @doomemacs/ui-nav-flash
-modules/ui/neotree/              @doomemacs/ui-neotree
-modules/ui/ophints/              @doomemacs/ui-ophints
-modules/ui/popup/                @doomemacs/ui-popup
-modules/ui/tabs/                 @doomemacs/ui-tabs
-modules/ui/treemacs/             @doomemacs/ui-treemacs
-modules/ui/unicode/              @doomemacs/ui-unicode
-modules/ui/vc-gutter/            @doomemacs/ui-vc-gutter
-modules/ui/vi-tilde-fringe/      @doomemacs/ui-vi-tilde-fringe
-modules/ui/window-select/        @doomemacs/ui-window-select
-modules/ui/workspaces/           @doomemacs/ui-workspaces
-modules/ui/zen/                  @doomemacs/ui-zen
+*                                   @doomemacs/maintainers
+
+# The default owner(s) unless another takes precedence
+modules/app/calendar                @doomemacs/app-calendar
+modules/app/emms                    @doomemacs/app-emms
+modules/app/everywhere              @doomemacs/app-everywhere
+modules/app/irc                     @doomemacs/app-irc
+modules/app/rss                     @doomemacs/app-rss
+modules/checkers/grammar            @doomemacs/checkers-grammar
+modules/checkers/spell              @doomemacs/checkers-spell
+modules/checkers/syntax             @doomemacs/checkers-syntax
+modules/completion/company          @doomemacs/completion-company
+modules/completion/corfu            @doomemacs/completion-corfu
+modules/completion/helm             @doomemacs/completion-helm
+modules/completion/ido              @doomemacs/completion-ido
+modules/completion/ivy              @doomemacs/completion-ivy
+modules/completion/vertico          @doomemacs/completion-vertico
+modules/config/default              @doomemacs/config-default
+modules/config/literate             @doomemacs/config-literate
+modules/config/use-package          @doomemacs/config-use-package
+modules/core/cli                    @doomemacs/core-cli
+modules/core/defaults               @doomemacs/core-defaults
+modules/editor/evil                 @doomemacs/editor-evil
+modules/editor/file-templates       @doomemacs/editor-file-templates
+modules/editor/fold                 @doomemacs/editor-fold
+modules/editor/format               @doomemacs/editor-format
+modules/editor/god                  @doomemacs/editor-god
+modules/editor/lispy                @doomemacs/editor-lispy
+modules/editor/multiple-cursors     @doomemacs/editor-multiple-cursors
+modules/editor/objed                @doomemacs/editor-objed
+modules/editor/parinfer             @doomemacs/editor-parinfer
+modules/editor/rotate-text          @doomemacs/editor-rotate-text
+modules/editor/snippets             @doomemacs/editor-snippets
+modules/editor/word-wrap            @doomemacs/editor-word-wrap
+modules/emacs/dired                 @doomemacs/emacs-dired
+modules/emacs/electric              @doomemacs/emacs-electric
+modules/emacs/ibuffer               @doomemacs/emacs-ibuffer
+modules/emacs/tramp                 @doomemacs/emacs-tramp
+modules/emacs/undo                  @doomemacs/emacs-undo
+modules/emacs/vc                    @doomemacs/emacs-vc
+modules/email/mu4e                  @doomemacs/email-mu4e
+modules/email/notmuch               @doomemacs/email-notmuch
+modules/email/wanderlust            @doomemacs/email-wanderlust
+modules/input/bidi                  @doomemacs/input-bidi
+modules/input/chinese               @doomemacs/input-chinese
+modules/input/japanese              @doomemacs/input-japanese
+modules/input/layout                @doomemacs/input-layout
+modules/lang/agda                   @doomemacs/lang-agda
+modules/lang/beancount              @doomemacs/lang-beancount
+modules/lang/cc                     @doomemacs/lang-cc
+modules/lang/clojure                @doomemacs/lang-clojure
+modules/lang/common-lisp            @doomemacs/lang-common-lisp
+modules/lang/coq                    @doomemacs/lang-coq
+modules/lang/crystal                @doomemacs/lang-crystal
+modules/lang/csharp                 @doomemacs/lang-csharp
+modules/lang/dart                   @doomemacs/lang-dart
+modules/lang/data                   @doomemacs/lang-data
+modules/lang/dhall                  @doomemacs/lang-dhall
+modules/lang/elixir                 @doomemacs/lang-elixir
+modules/lang/elm                    @doomemacs/lang-elm
+modules/lang/emacs-lisp             @doomemacs/lang-emacs-lisp
+modules/lang/erlang                 @doomemacs/lang-erlang
+modules/lang/ess                    @doomemacs/lang-ess
+modules/lang/factor                 @doomemacs/lang-factor
+modules/lang/faust                  @doomemacs/lang-faust
+modules/lang/fortran                @doomemacs/lang-fortran
+modules/lang/fsharp                 @doomemacs/lang-fsharp
+modules/lang/fstar                  @doomemacs/lang-fstar
+modules/lang/gdscript               @doomemacs/lang-gdscript
+modules/lang/go                     @doomemacs/lang-go
+modules/lang/graphql                @doomemacs/lang-graphql
+modules/lang/haskell                @doomemacs/lang-haskell
+modules/lang/hy                     @doomemacs/lang-hy
+modules/lang/idris                  @doomemacs/lang-idris
+modules/lang/janet                  @doomemacs/lang-janet
+modules/lang/java                   @doomemacs/lang-java
+modules/lang/javascript             @doomemacs/lang-javascript
+modules/lang/json                   @doomemacs/lang-json
+modules/lang/julia                  @doomemacs/lang-julia
+modules/lang/kotlin                 @doomemacs/lang-kotlin
+modules/lang/latex                  @doomemacs/lang-latex
+modules/lang/lean                   @doomemacs/lang-lean
+modules/lang/ledger                 @doomemacs/lang-ledger
+modules/lang/lua                    @doomemacs/lang-lua
+modules/lang/markdown               @doomemacs/lang-markdown
+modules/lang/nim                    @doomemacs/lang-nim
+modules/lang/nix                    @doomemacs/lang-nix
+modules/lang/ocaml                  @doomemacs/lang-ocaml
+modules/lang/org                    @doomemacs/lang-org
+modules/lang/php                    @doomemacs/lang-php
+modules/lang/plantuml               @doomemacs/lang-plantuml
+modules/lang/purescript             @doomemacs/lang-purescript
+modules/lang/python                 @doomemacs/lang-python
+modules/lang/qt                     @doomemacs/lang-qt
+modules/lang/racket                 @doomemacs/lang-racket
+modules/lang/raku                   @doomemacs/lang-raku
+modules/lang/rest                   @doomemacs/lang-rest
+modules/lang/rst                    @doomemacs/lang-rst
+modules/lang/ruby                   @doomemacs/lang-ruby
+modules/lang/rust                   @doomemacs/lang-rust
+modules/lang/scala                  @doomemacs/lang-scala
+modules/lang/scheme                 @doomemacs/lang-scheme
+modules/lang/sh                     @doomemacs/lang-sh
+modules/lang/sml                    @doomemacs/lang-sml
+modules/lang/solidity               @doomemacs/lang-solidity
+modules/lang/swift                  @doomemacs/lang-swift
+modules/lang/terra                  @doomemacs/lang-terra
+modules/lang/web                    @doomemacs/lang-web
+modules/lang/yaml                   @doomemacs/lang-yaml
+modules/lang/zig                    @doomemacs/lang-zig
+modules/os/macos                    @doomemacs/os-macos
+modules/os/tty                      @doomemacs/os-tty
+modules/term/eshell                 @doomemacs/term-eshell
+modules/term/shell                  @doomemacs/term-shell
+modules/term/term                   @doomemacs/term-term
+modules/term/vterm                  @doomemacs/term-vterm
+modules/tools/ansible               @doomemacs/tools-ansible
+modules/tools/biblio                @doomemacs/tools-biblio
+modules/tools/collab                @doomemacs/tools-collab
+modules/tools/debugger              @doomemacs/tools-debugger
+modules/tools/direnv                @doomemacs/tools-direnv
+modules/tools/docker                @doomemacs/tools-docker
+modules/tools/editorconfig          @doomemacs/tools-editorconfig
+modules/tools/ein                   @doomemacs/tools-ein
+modules/tools/eval                  @doomemacs/tools-eval
+modules/tools/lookup                @doomemacs/tools-lookup
+modules/tools/lsp                   @doomemacs/tools-lsp
+modules/tools/magit                 @doomemacs/tools-magit
+modules/tools/make                  @doomemacs/tools-make
+modules/tools/pass                  @doomemacs/tools-pass
+modules/tools/pdf                   @doomemacs/tools-pdf
+modules/tools/prodigy               @doomemacs/tools-prodigy
+modules/tools/terraform             @doomemacs/tools-terraform
+modules/tools/tmux                  @doomemacs/tools-tmux
+modules/tools/tree-sitter           @doomemacs/tools-tree-sitter
+modules/tools/upload                @doomemacs/tools-upload
+modules/ui/deft                     @doomemacs/ui-deft
+modules/ui/doom                     @doomemacs/ui-doom
+modules/ui/doom-dashboard           @doomemacs/ui-doom-dashboard
+modules/ui/doom-quit                @doomemacs/ui-doom-quit
+modules/ui/emoji                    @doomemacs/ui-emoji
+modules/ui/hl-todo                  @doomemacs/ui-hl-todo
+modules/ui/hydra                    @doomemacs/ui-hydra
+modules/ui/indent-guides            @doomemacs/ui-indent-guides
+modules/ui/ligatures                @doomemacs/ui-ligatures
+modules/ui/minimap                  @doomemacs/ui-minimap
+modules/ui/modeline                 @doomemacs/ui-modeline
+modules/ui/nav-flash                @doomemacs/ui-nav-flash
+modules/ui/neotree                  @doomemacs/ui-neotree
+modules/ui/ophints                  @doomemacs/ui-ophints
+modules/ui/popup                    @doomemacs/ui-popup
+modules/ui/tabs                     @doomemacs/ui-tabs
+modules/ui/treemacs                 @doomemacs/ui-treemacs
+modules/ui/unicode                  @doomemacs/ui-unicode
+modules/ui/vc-gutter                @doomemacs/ui-vc-gutter
+modules/ui/vi-tilde-fringe          @doomemacs/ui-vi-tilde-fringe
+modules/ui/window-select            @doomemacs/ui-window-select
+modules/ui/workspaces               @doomemacs/ui-workspaces
+modules/ui/zen                      @doomemacs/ui-zen
 
 # End of CODEOWNERS
\ No newline at end of file