diff --git a/modules/default.nix b/modules/default.nix
index c63ed12..8281df8 100755
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -7,11 +7,11 @@
 {
   imports = with inputs; [
     ./essentials
-    (import ./options.nix { inherit inputs; })
+    (import ./options.nix { inherit lib inputs; }) # Options
 
     # Flake modules
     home-manager.nixosModules.home-manager # home-manager module
-    nix-index-database.nixosModules.nix-index
+    nix-index-database.nixosModules.nix-index # nix-index module
   ];
 
   # defines global user
@@ -36,26 +36,4 @@
       };
     };
   };
-
-  # Options
-  # options = {
-  #   device = {
-  #     type = lib.mkOption {
-  #       type = lib.types.enum [
-  #         "minimal"
-  #         "primary"
-  #         "server"
-  #         "vds"
-  #         "wsl"
-  #       ];
-  #       default = "minimal";
-  #       description = "Type of device for this host.";
-  #     };
-  #     username = lib.mkOption {
-  #       type = lib.types.str;
-  #       default = "${inputs.zeroq.devices.admin}";
-  #       description = "Username for host";
-  #     };
-  #   };
-  # };
 }
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 3a65182..e5904b3 100755
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,4 +1,3 @@
-# Setup DE, xserver and bootloader
 { inputs, ... }@flakeContext:
 {
   config,
@@ -8,13 +7,8 @@
 }:
 {
   imports = [
-    ./environment/kde.nix
-    #./environment/gnome.nix
-    #./environment/xfce.nix
-    #./environment/deepin.nix
-
-    ./environment/theming.nix
-
+    ./environment
+    ./theming.nix
     inputs.grub2-themes.nixosModules.default # grub2 themes module
   ];
 
@@ -77,24 +71,7 @@
       cups-pdf.enable = true;
     };
   };
-  environment.sessionVariables = {
-    NIXOS_OZONE_WL = "1";
-  };
-
-  #   environment = {
-  #     systemPackages = with pkgs; [
-  #     ];
-  #   };
-  #   systemd.services.xiccd = { # Color Profiler bus for x11
-  #     enable = false;
-  #     description = "Xiccd Screen Color Profiler";
-  #     serviceConfig = {
-  #       ExecStart = "${pkgs.xiccd}/bin/xiccd";
-  #       ExecStop = "pkill xiccd";
-  #       Restart = "always";
-  #     };
-  #     wantedBy = [ "dbus.service" ];
-  #     after = [ "dbus.service" ];
-  #     partOf = [ "dbus.service" ];
-  #   };
+  # environment.sessionVariables = {
+  #   NIXOS_OZONE_WL = "1";
+  # };
 }
diff --git a/modules/desktop/environment/default.nix b/modules/desktop/environment/default.nix
new file mode 100644
index 0000000..704b983
--- /dev/null
+++ b/modules/desktop/environment/default.nix
@@ -0,0 +1,11 @@
+{
+  ...
+}:
+{
+  imports = [
+    ./kde.nix
+    #./gnome.nix
+    #./xfce.nix
+    #./deepin.nix
+  ];
+}
diff --git a/modules/desktop/environment/theming.nix b/modules/desktop/theming.nix
similarity index 97%
rename from modules/desktop/environment/theming.nix
rename to modules/desktop/theming.nix
index e466df2..357fd17 100755
--- a/modules/desktop/environment/theming.nix
+++ b/modules/desktop/theming.nix
@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:
diff --git a/modules/options.nix b/modules/options.nix
index 10fd575..102acfd 100644
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -1,5 +1,5 @@
 {
-  config,
+  inputs,
   lib,
   ...
 }:
@@ -20,7 +20,7 @@
       username = lib.mkOption {
         type = lib.types.str;
         default = "${inputs.zeroq.devices.admin}";
-        description = "Username for host";
+        description = "Username for host.";
       };
     };
   };