diff --git a/modules/desktop-environment/audio.nix b/modules/de/audio.nix
similarity index 100%
rename from modules/desktop-environment/audio.nix
rename to modules/de/audio.nix
diff --git a/modules/desktop-environment/default.nix b/modules/de/default.nix
similarity index 96%
rename from modules/desktop-environment/default.nix
rename to modules/de/default.nix
index 11b2941..3370088 100644
--- a/modules/desktop-environment/default.nix
+++ b/modules/de/default.nix
@@ -3,7 +3,6 @@
     ./audio.nix
     ./eduroam.nix
     ./home
-    ./media
     ./dm.nix
     ./tlp.nix
     ./locale.nix
diff --git a/modules/desktop-environment/dm.nix b/modules/de/dm.nix
similarity index 100%
rename from modules/desktop-environment/dm.nix
rename to modules/de/dm.nix
diff --git a/modules/desktop-environment/eduroam.nix b/modules/de/eduroam.nix
similarity index 100%
rename from modules/desktop-environment/eduroam.nix
rename to modules/de/eduroam.nix
diff --git a/modules/desktop-environment/home/browser.nix b/modules/de/home/browser.nix
similarity index 100%
rename from modules/desktop-environment/home/browser.nix
rename to modules/de/home/browser.nix
diff --git a/modules/desktop-environment/home/default.nix b/modules/de/home/default.nix
similarity index 100%
rename from modules/desktop-environment/home/default.nix
rename to modules/de/home/default.nix
diff --git a/modules/desktop-environment/home/eww/configDir/bottomBar/bottomBar.yuck b/modules/de/home/eww/configDir/bottomBar/bottomBar.yuck
similarity index 100%
rename from modules/desktop-environment/home/eww/configDir/bottomBar/bottomBar.yuck
rename to modules/de/home/eww/configDir/bottomBar/bottomBar.yuck
diff --git a/modules/desktop-environment/home/eww/configDir/bottomBar/traveldings.yuck b/modules/de/home/eww/configDir/bottomBar/traveldings.yuck
similarity index 100%
rename from modules/desktop-environment/home/eww/configDir/bottomBar/traveldings.yuck
rename to modules/de/home/eww/configDir/bottomBar/traveldings.yuck
diff --git a/modules/desktop-environment/home/eww/configDir/bottomBar/workspaces.yuck b/modules/de/home/eww/configDir/bottomBar/workspaces.yuck
similarity index 100%
rename from modules/desktop-environment/home/eww/configDir/bottomBar/workspaces.yuck
rename to modules/de/home/eww/configDir/bottomBar/workspaces.yuck
diff --git a/modules/desktop-environment/home/eww/configDir/eww.css b/modules/de/home/eww/configDir/eww.css
similarity index 100%
rename from modules/desktop-environment/home/eww/configDir/eww.css
rename to modules/de/home/eww/configDir/eww.css
diff --git a/modules/desktop-environment/home/eww/configDir/eww.yuck b/modules/de/home/eww/configDir/eww.yuck
similarity index 100%
rename from modules/desktop-environment/home/eww/configDir/eww.yuck
rename to modules/de/home/eww/configDir/eww.yuck
diff --git a/modules/desktop-environment/home/eww/configDir/scripts/bat.nu b/modules/de/home/eww/configDir/scripts/bat.nu
similarity index 100%
rename from modules/desktop-environment/home/eww/configDir/scripts/bat.nu
rename to modules/de/home/eww/configDir/scripts/bat.nu
diff --git a/modules/desktop-environment/home/eww/configDir/scripts/iceTacho.nu b/modules/de/home/eww/configDir/scripts/iceTacho.nu
similarity index 100%
rename from modules/desktop-environment/home/eww/configDir/scripts/iceTacho.nu
rename to modules/de/home/eww/configDir/scripts/iceTacho.nu
diff --git a/modules/desktop-environment/home/eww/configDir/topBar/sysinfo.yuck b/modules/de/home/eww/configDir/topBar/sysinfo.yuck
similarity index 100%
rename from modules/desktop-environment/home/eww/configDir/topBar/sysinfo.yuck
rename to modules/de/home/eww/configDir/topBar/sysinfo.yuck
diff --git a/modules/desktop-environment/home/eww/configDir/topBar/time.yuck b/modules/de/home/eww/configDir/topBar/time.yuck
similarity index 100%
rename from modules/desktop-environment/home/eww/configDir/topBar/time.yuck
rename to modules/de/home/eww/configDir/topBar/time.yuck
diff --git a/modules/desktop-environment/home/eww/configDir/topBar/topBar.yuck b/modules/de/home/eww/configDir/topBar/topBar.yuck
similarity index 100%
rename from modules/desktop-environment/home/eww/configDir/topBar/topBar.yuck
rename to modules/de/home/eww/configDir/topBar/topBar.yuck
diff --git a/modules/desktop-environment/home/eww/configDir/util.yuck b/modules/de/home/eww/configDir/util.yuck
similarity index 100%
rename from modules/desktop-environment/home/eww/configDir/util.yuck
rename to modules/de/home/eww/configDir/util.yuck
diff --git a/modules/desktop-environment/home/eww/default.nix b/modules/de/home/eww/default.nix
similarity index 100%
rename from modules/desktop-environment/home/eww/default.nix
rename to modules/de/home/eww/default.nix
diff --git a/modules/desktop-environment/home/layaway.nix b/modules/de/home/layaway.nix
similarity index 100%
rename from modules/desktop-environment/home/layaway.nix
rename to modules/de/home/layaway.nix
diff --git a/modules/desktop-environment/home/niri/binds.nix b/modules/de/home/niri/binds.nix
similarity index 100%
rename from modules/desktop-environment/home/niri/binds.nix
rename to modules/de/home/niri/binds.nix
diff --git a/modules/desktop-environment/home/niri/default.nix b/modules/de/home/niri/default.nix
similarity index 100%
rename from modules/desktop-environment/home/niri/default.nix
rename to modules/de/home/niri/default.nix
diff --git a/modules/desktop-environment/home/niri/input.nix b/modules/de/home/niri/input.nix
similarity index 100%
rename from modules/desktop-environment/home/niri/input.nix
rename to modules/de/home/niri/input.nix
diff --git a/modules/desktop-environment/home/niri/privacy.nix b/modules/de/home/niri/privacy.nix
similarity index 100%
rename from modules/desktop-environment/home/niri/privacy.nix
rename to modules/de/home/niri/privacy.nix
diff --git a/modules/desktop-environment/home/niri/quirks.nix b/modules/de/home/niri/quirks.nix
similarity index 100%
rename from modules/desktop-environment/home/niri/quirks.nix
rename to modules/de/home/niri/quirks.nix
diff --git a/modules/desktop-environment/home/niri/screenshot.nix b/modules/de/home/niri/screenshot.nix
similarity index 100%
rename from modules/desktop-environment/home/niri/screenshot.nix
rename to modules/de/home/niri/screenshot.nix
diff --git a/modules/desktop-environment/home/niri/style.nix b/modules/de/home/niri/style.nix
similarity index 100%
rename from modules/desktop-environment/home/niri/style.nix
rename to modules/de/home/niri/style.nix
diff --git a/modules/desktop-environment/home/niri/xwayland-sat.nix b/modules/de/home/niri/xwayland-sat.nix
similarity index 100%
rename from modules/desktop-environment/home/niri/xwayland-sat.nix
rename to modules/de/home/niri/xwayland-sat.nix
diff --git a/modules/desktop-environment/home/notifications.nix b/modules/de/home/notifications.nix
similarity index 100%
rename from modules/desktop-environment/home/notifications.nix
rename to modules/de/home/notifications.nix
diff --git a/modules/desktop-environment/home/swayidle.nix b/modules/de/home/swayidle.nix
similarity index 100%
rename from modules/desktop-environment/home/swayidle.nix
rename to modules/de/home/swayidle.nix
diff --git a/modules/desktop-environment/home/terminal.nix b/modules/de/home/terminal.nix
similarity index 100%
rename from modules/desktop-environment/home/terminal.nix
rename to modules/de/home/terminal.nix
diff --git a/modules/desktop-environment/locale.nix b/modules/de/locale.nix
similarity index 100%
rename from modules/desktop-environment/locale.nix
rename to modules/de/locale.nix
diff --git a/modules/desktop-environment/printing.nix b/modules/de/printing.nix
similarity index 100%
rename from modules/desktop-environment/printing.nix
rename to modules/de/printing.nix
diff --git a/modules/desktop-environment/themeing.nix b/modules/de/themeing.nix
similarity index 78%
rename from modules/desktop-environment/themeing.nix
rename to modules/de/themeing.nix
index 9b9a414..3cc2047 100644
--- a/modules/desktop-environment/themeing.nix
+++ b/modules/de/themeing.nix
@@ -38,18 +38,17 @@
       dunst.enable = false;
       wofi.enable = false;
     };
-  };
-
-  gtk = {
-    enable = true;
-    cursorTheme = {
-      package = pkgs.phinger-cursors;
-      name = "phinger-cursors";
-      size = 30;
-    };
-    iconTheme = {
-      package = pkgs.gruvbox-dark-icons-gtk;
-      name = "gruvbox-dark-icons";
+    gtk = {
+      enable = true;
+      cursorTheme = {
+        package = pkgs.phinger-cursors;
+        name = "phinger-cursors";
+        size = 30;
+      };
+      iconTheme = {
+        package = pkgs.gruvbox-dark-icons-gtk;
+        name = "gruvbox-dark-icons";
+      };
     };
   };
 }
diff --git a/modules/desktop-environment/tlp.nix b/modules/de/tlp.nix
similarity index 100%
rename from modules/desktop-environment/tlp.nix
rename to modules/de/tlp.nix
diff --git a/modules/default.nix b/modules/default.nix
index afe2abc..2abba8e 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,8 +4,9 @@
     ./desktop
     ./hardware
     ./firewall.nix
-    ./desktop-environment
+    ./de
     ./input
+    ./media
     ./graphics.nix
   ];
 }
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index a069ad7..7213f3b 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -7,10 +7,8 @@
 with lib; {
   imports = [
     ./gaming.nix
-    # TODO: more fine grained choices, not every setup needs fspy or rawtherapee
     ./syncthing.nix
     ./kdeconnect.nix
-    ./themeing.nix
     ./networking.nix
     ./social.nix
   ];
diff --git a/modules/desktop-environment/media/default.nix b/modules/media/default.nix
similarity index 100%
rename from modules/desktop-environment/media/default.nix
rename to modules/media/default.nix
diff --git a/modules/desktop-environment/media/fonts.nix b/modules/media/fonts.nix
similarity index 100%
rename from modules/desktop-environment/media/fonts.nix
rename to modules/media/fonts.nix
diff --git a/modules/desktop-environment/media/obs.nix b/modules/media/obs.nix
similarity index 100%
rename from modules/desktop-environment/media/obs.nix
rename to modules/media/obs.nix
diff --git a/modules/desktop-environment/media/typst.nix b/modules/media/typst.nix
similarity index 100%
rename from modules/desktop-environment/media/typst.nix
rename to modules/media/typst.nix