diff --git a/user-modules/desktop/default.nix b/user-modules/desktop/default.nix
index 9945b8f..082a006 100644
--- a/user-modules/desktop/default.nix
+++ b/user-modules/desktop/default.nix
@@ -1,5 +1,8 @@
 { ... }:
 
 {
-  imports = [ ./custom/default.nix ];
+  imports = [
+    ./custom/default.nix
+    ./theming/default.nix
+  ];
 }
diff --git a/user-modules/theming/default.nix b/user-modules/desktop/theming/default.nix
similarity index 99%
rename from user-modules/theming/default.nix
rename to user-modules/desktop/theming/default.nix
index b0a77b9..5ee18d2 100644
--- a/user-modules/theming/default.nix
+++ b/user-modules/desktop/theming/default.nix
@@ -99,13 +99,13 @@ in
     ./themes/nord.nix
   ];
 
-  options.modules.theming.enable = mkEnableOption "theming";
-
-  options.theming =
+  options.desktop.theming =
     let
       colors = config.theming.schemeColors;
     in
     {
+      enable = mkEnableOption "theming";
+
       darkMode = mkOption {
         type = types.bool;
         default = false;
diff --git a/user-modules/theming/fonts/cozette-vector.nix b/user-modules/desktop/theming/fonts/cozette-vector.nix
similarity index 100%
rename from user-modules/theming/fonts/cozette-vector.nix
rename to user-modules/desktop/theming/fonts/cozette-vector.nix
diff --git a/user-modules/theming/fonts/cozette.nix b/user-modules/desktop/theming/fonts/cozette.nix
similarity index 100%
rename from user-modules/theming/fonts/cozette.nix
rename to user-modules/desktop/theming/fonts/cozette.nix
diff --git a/user-modules/theming/fonts/dejavu-sans.nix b/user-modules/desktop/theming/fonts/dejavu-sans.nix
similarity index 100%
rename from user-modules/theming/fonts/dejavu-sans.nix
rename to user-modules/desktop/theming/fonts/dejavu-sans.nix
diff --git a/user-modules/theming/fonts/dejavu-serif.nix b/user-modules/desktop/theming/fonts/dejavu-serif.nix
similarity index 100%
rename from user-modules/theming/fonts/dejavu-serif.nix
rename to user-modules/desktop/theming/fonts/dejavu-serif.nix
diff --git a/user-modules/theming/fonts/dina.nix b/user-modules/desktop/theming/fonts/dina.nix
similarity index 100%
rename from user-modules/theming/fonts/dina.nix
rename to user-modules/desktop/theming/fonts/dina.nix
diff --git a/user-modules/theming/fonts/fira-code.nix b/user-modules/desktop/theming/fonts/fira-code.nix
similarity index 100%
rename from user-modules/theming/fonts/fira-code.nix
rename to user-modules/desktop/theming/fonts/fira-code.nix
diff --git a/user-modules/theming/fonts/nerd-fonts-symbols.nix b/user-modules/desktop/theming/fonts/nerd-fonts-symbols.nix
similarity index 100%
rename from user-modules/theming/fonts/nerd-fonts-symbols.nix
rename to user-modules/desktop/theming/fonts/nerd-fonts-symbols.nix
diff --git a/user-modules/theming/fonts/noto-color-emoji.nix b/user-modules/desktop/theming/fonts/noto-color-emoji.nix
similarity index 100%
rename from user-modules/theming/fonts/noto-color-emoji.nix
rename to user-modules/desktop/theming/fonts/noto-color-emoji.nix
diff --git a/user-modules/theming/fonts/wqy-bitmapsong.nix b/user-modules/desktop/theming/fonts/wqy-bitmapsong.nix
similarity index 100%
rename from user-modules/theming/fonts/wqy-bitmapsong.nix
rename to user-modules/desktop/theming/fonts/wqy-bitmapsong.nix
diff --git a/user-modules/theming/fonts/wqy-microhei-mono.nix b/user-modules/desktop/theming/fonts/wqy-microhei-mono.nix
similarity index 100%
rename from user-modules/theming/fonts/wqy-microhei-mono.nix
rename to user-modules/desktop/theming/fonts/wqy-microhei-mono.nix
diff --git a/user-modules/theming/fonts/wqy-microhei.nix b/user-modules/desktop/theming/fonts/wqy-microhei.nix
similarity index 100%
rename from user-modules/theming/fonts/wqy-microhei.nix
rename to user-modules/desktop/theming/fonts/wqy-microhei.nix
diff --git a/user-modules/theming/fonts/wqy-zenhei-mono.nix b/user-modules/desktop/theming/fonts/wqy-zenhei-mono.nix
similarity index 100%
rename from user-modules/theming/fonts/wqy-zenhei-mono.nix
rename to user-modules/desktop/theming/fonts/wqy-zenhei-mono.nix
diff --git a/user-modules/theming/fonts/wqy-zenhei-sharp.nix b/user-modules/desktop/theming/fonts/wqy-zenhei-sharp.nix
similarity index 100%
rename from user-modules/theming/fonts/wqy-zenhei-sharp.nix
rename to user-modules/desktop/theming/fonts/wqy-zenhei-sharp.nix
diff --git a/user-modules/theming/fonts/wqy-zenhei.nix b/user-modules/desktop/theming/fonts/wqy-zenhei.nix
similarity index 100%
rename from user-modules/theming/fonts/wqy-zenhei.nix
rename to user-modules/desktop/theming/fonts/wqy-zenhei.nix
diff --git a/user-modules/theming/themes/catppuccin.nix b/user-modules/desktop/theming/themes/catppuccin.nix
similarity index 100%
rename from user-modules/theming/themes/catppuccin.nix
rename to user-modules/desktop/theming/themes/catppuccin.nix
diff --git a/user-modules/theming/themes/gruvbox.nix b/user-modules/desktop/theming/themes/gruvbox.nix
similarity index 100%
rename from user-modules/theming/themes/gruvbox.nix
rename to user-modules/desktop/theming/themes/gruvbox.nix
diff --git a/user-modules/theming/themes/nord.nix b/user-modules/desktop/theming/themes/nord.nix
similarity index 100%
rename from user-modules/theming/themes/nord.nix
rename to user-modules/desktop/theming/themes/nord.nix
diff --git a/user-modules/theming/themes/oxocarbon.nix b/user-modules/desktop/theming/themes/oxocarbon.nix
similarity index 100%
rename from user-modules/theming/themes/oxocarbon.nix
rename to user-modules/desktop/theming/themes/oxocarbon.nix
diff --git a/user-modules/theming/themes/papercolor.nix b/user-modules/desktop/theming/themes/papercolor.nix
similarity index 100%
rename from user-modules/theming/themes/papercolor.nix
rename to user-modules/desktop/theming/themes/papercolor.nix
diff --git a/user-modules/theming/themes/sakura.nix b/user-modules/desktop/theming/themes/sakura.nix
similarity index 100%
rename from user-modules/theming/themes/sakura.nix
rename to user-modules/desktop/theming/themes/sakura.nix
diff --git a/users/jan.nix b/users/jan.nix
index 371b534..350dadd 100644
--- a/users/jan.nix
+++ b/users/jan.nix
@@ -24,22 +24,21 @@
       ente-auth
     ];
 
-    # TODO: Move to gpg module
-    # programs.gpg = {
-    #   enable = true;
-    #   mutableKeys = true;
-    #   mutableTrust = true;
-    # };
-    # services.gpg-agent = {
-    #   enable = true;
-    #   enableSshSupport = true;
-    # };
+    # Desktop environments
+    desktops =
+      let
+      in
+      {
+        "River Dark" = {
+          type = "custom";
+          theming = { };
+          config = { };
+          extraConfig = { };
+        };
+      };
 
     # Enabled modules
     modules = {
-      # Theming
-      theming.enable = true;
-
       # Window manager
       river.enable = true;
       waylock.enable = true;
@@ -120,11 +119,13 @@
     };
 
     # Theme configuration
-    theming =
+    desktop.theming =
       let
         fontpkgs = config.theming.fonts.pkgs;
       in
       {
+        enable = true;
+
         # Fonts
         fonts.serif = fontpkgs."DejaVu Serif";
         fonts.sansSerif = fontpkgs."DejaVu Sans";