diff --git a/core/core.el b/core/core.el
index c800d94c3..ee9e0b9a6 100644
--- a/core/core.el
+++ b/core/core.el
@@ -59,11 +59,6 @@ Use this for files that change often, like cache files.")
 (defvar doom-autoload-file (concat doom-local-dir "autoloads.el")
   "Where `doom//reload-autoloads' will generate its autoloads file.")
 
-(defgroup doom nil
-  "DOOM Emacs, an Emacs configuration for a stubborn, shell-dwelling and
-melodramatic ex-vimmer disappointed with the text-editor status quo."
-  :group 'emacs)
-
 
 ;;;
 ;; UTF-8 as the default coding system
diff --git a/modules/app/regex/autoload/regex.el b/modules/app/regex/autoload/regex.el
index 87178f29a..881200fd6 100644
--- a/modules/app/regex/autoload/regex.el
+++ b/modules/app/regex/autoload/regex.el
@@ -11,17 +11,17 @@
 (defface +regex-match-0-face
   `((t (:foreground "Black" :background ,(doom-color 'magenta) :bold t)))
   "TODO"
-  :group 'doom)
+  :group 'faces)
 
 (defface +regex-match-1-face
   `((t (:foreground "Black" :background ,(doom-color 'blue) :bold t)))
   "TODO"
-  :group 'doom)
+  :group 'faces)
 
 (defface +regex-match-2-face
   `((t (:foreground "Black" :background ,(doom-color 'green) :bold t)))
   "TODO"
-  :group 'doom)
+  :group 'faces)
 
 (defvar +regex-faces
   '(+regex-match-0-face +regex-match-1-face +regex-match-2-face)
diff --git a/modules/feature/workspaces/autoload/workspaces.el b/modules/feature/workspaces/autoload/workspaces.el
index 94022d99f..fda46bd91 100644
--- a/modules/feature/workspaces/autoload/workspaces.el
+++ b/modules/feature/workspaces/autoload/workspaces.el
@@ -6,11 +6,11 @@
 ;;
 (defface +workspace-tab-selected-face '((t (:inherit 'highlight)))
   "The face for selected tabs displayed by `+workspace/display'"
-  :group 'doom)
+  :group 'persp-mode)
 
 (defface +workspace-tab-face '((t (:inherit 'default)))
   "The face for selected tabs displayed by `+workspace/display'"
-  :group 'doom)
+  :group 'persp-mode)
 
 
 ;;
diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el
index 35e1abc6d..1532b9197 100644
--- a/modules/ui/doom-modeline/config.el
+++ b/modules/ui/doom-modeline/config.el
@@ -80,8 +80,8 @@ file-name => comint.el")
 ;;
 
 (defgroup +doom-modeline nil
-  ""
-  :group 'doom)
+  "TODO"
+  :group 'faces)
 
 (defface doom-modeline-buffer-path
   '((t (:inherit (mode-line-emphasis bold))))
diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el
index 045edfdb8..a21e0d856 100644
--- a/modules/ui/doom/config.el
+++ b/modules/ui/doom/config.el
@@ -41,7 +41,7 @@
       (((background light))
        (:inherit font-lock-comment-face :background ,(doom-color 'base3))))
     "Face to hightlight `hideshow' overlays."
-    :group 'doom)
+    :group 'doom-themes)
 
   ;; Nicer code-folding overlays (with fringe indicators)
   (defun +doom-set-up-overlay (ov)