diff --git a/hosts/cobalt/configuration.nix b/hosts/cobalt/configuration.nix
index 12627dd..79d1f95 100644
--- a/hosts/cobalt/configuration.nix
+++ b/hosts/cobalt/configuration.nix
@@ -10,21 +10,6 @@
   networking.networkmanager.enable = true;
 
 
-  #services.displayManager.sddm.enable = true;
-  services.displayManager.defaultSession = "xfce";
-  services.displayManager.sessionPackages = [ pkgs.niri ];
-  #services.sysc-greet.enable = true;
-  programs.niri.package = pkgs.niri;
-
-  services.xserver.desktopManager = {
-    xterm.enable = false;
-    xfce.enable = true;
-  };
-
-  # Desktop stuff specific to this device
-  services.xserver.enable = true;
-  #services.xserver.displayManager.lightdm.enable = true;
-  #services.xserver.desktopManager.pantheon.enable = true;
   services.xserver.xkb = {
     layout = "us";
     variant = "";
diff --git a/hosts/cobalt/default.nix b/hosts/cobalt/default.nix
index c1b5ef5..61dcaa5 100644
--- a/hosts/cobalt/default.nix
+++ b/hosts/cobalt/default.nix
@@ -11,7 +11,8 @@
     ./hardware-configuration.nix
     ./configuration.nix
     ../../modules/nixos/gaming.nix
-    ../../modules/nixos/desktop/niri
+    ../../modules/nixos/desktop/xfce
+    #../../modules/nixos/desktop/niri
   ];
 
   zw.gaming.enable = true;
diff --git a/modules/nixos/desktop/calibre.nix b/modules/nixos/desktop/calibre.nix
index bcc4cea..5fa97d5 100644
--- a/modules/nixos/desktop/calibre.nix
+++ b/modules/nixos/desktop/calibre.nix
@@ -14,7 +14,8 @@
       calibre
     ];
 
-    services.udisks2.enable = true;
+    services.udisks2.enable = true; # Required for eReader Support
   };
   # NOTE: Consider adding https://github.com/nydragon/calibre-plugins
+  # especially for DeDRM
 }
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index 4f29d78..ff03a1c 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -5,6 +5,9 @@
     ./fonts.nix
   ];
 
+  # TODO: Add options for enabling/switching between different Desktop Environments.
+  options = {};
+
   zw.calibre.enable = true;
 
   environment.systemPackages = with pkgs; [
diff --git a/modules/nixos/desktop/niri/default.nix b/modules/nixos/desktop/niri/default.nix
index a91b1f8..e239697 100644
--- a/modules/nixos/desktop/niri/default.nix
+++ b/modules/nixos/desktop/niri/default.nix
@@ -17,6 +17,10 @@
     fastfetch
   ];
 
+  services.displayManager.sessionPackages = [ pkgs.niri ];
+  programs.niri.package = pkgs.niri;
+
+
   # Notification Daemon
   #services.mako.enable = true;
   #services.mako.settings.default-timeout = 3000;
diff --git a/modules/nixos/desktop/xfce/default.nix b/modules/nixos/desktop/xfce/default.nix
new file mode 100644
index 0000000..cae144b
--- /dev/null
+++ b/modules/nixos/desktop/xfce/default.nix
@@ -0,0 +1,9 @@
+{}:
+{
+  services.displayManager.defaultSession = "xfce";
+  services.xserver.desktopManager = {
+    xterm.enable = false;
+    xfce.enable = true;
+  };
+
+}
\ No newline at end of file