diff --git a/hm_modules/picom.nix b/hm_modules/picom.nix
index f7e3764..b7c3f59 100644
--- a/hm_modules/picom.nix
+++ b/hm_modules/picom.nix
@@ -3,7 +3,7 @@
     enable = true;
 
     # blur = true;
-    experimentalBackends = true;
+    # experimentalBackends = true;
     fade = false;
     shadow = true;
     vSync = true;
diff --git a/hm_modules/sxhkd.nix b/hm_modules/sxhkd.nix
index c2d4247..1b36946 100644
--- a/hm_modules/sxhkd.nix
+++ b/hm_modules/sxhkd.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
   imports = [
-    ./nautilus.nix
+    # ./nautilus.nix
     # ./thunar.nix
   ];
   home.packages = with pkgs; [
@@ -19,7 +19,7 @@
     let
       primaryTerminal = "kitty";
       secondaryTerminal = "terminator";
-      fileManager = "nautilus";
+      fileManager = "thunar";
       emojiChooser = "rofimoji --skin-tone light -a copy";
       yad = "${pkgs.yad}/bin/yad";
       notify = "${pkgs.libnotify}/bin/notify-send";
diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix
index 2db4bb4..a87a690 100644
--- a/odin/common_configuration.nix
+++ b/odin/common_configuration.nix
@@ -63,12 +63,12 @@ with lib; {
   services.xserver = {
     enable = true;
     # Enable the GNOME 3 Desktop Environment.
-    desktopManager.gnome.enable = true;
+    # desktopManager.gnome.enable = true;
     # desktopManager.plasma5 = {
     #   enable = true;
     #   runUsingSystemd = true;
     # };
-    # windowManager.bspwm.enable = true;
+    windowManager.bspwm.enable = true;
 
 
     # Configure keymap in X11
diff --git a/odin/configuration-intel.nix b/odin/configuration-intel.nix
index b9303f4..16fd7de 100644
--- a/odin/configuration-intel.nix
+++ b/odin/configuration-intel.nix
@@ -16,7 +16,12 @@
     libvdpau-va-gl
   ];
 
-  services.xserver.displayManager.gdm.enable = true;
+  # services.xserver.displayManager.gdm.enable = true;
+  services.xserver.displayManager.sddm = {
+    enable = true;
+    autoNumlock = true;
+    theme = "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
+  };
 
   # This runs only Intel and nvidia does not drain power.
   ##### disable nvidia for a very nice battery life.
diff --git a/odin/configuration-nvidia.nix b/odin/configuration-nvidia.nix
index 67e5a13..fc8083a 100644
--- a/odin/configuration-nvidia.nix
+++ b/odin/configuration-nvidia.nix
@@ -1,7 +1,7 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{
+{ pkgs, ... }: {
   boot.initrd.kernelModules = [ "i915" ];
   # boot.kernelPackages = pkgs.linuxPackages;
 
@@ -13,7 +13,7 @@
     # };
   };
 
-  services.displayManager.sddm = {
+  services.xserver.displayManager.sddm = {
     enable = true;
     autoNumlock = true;
     theme = "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
diff --git a/odin/hm.nix b/odin/hm.nix
index 6f33fb7..b0ed749 100644
--- a/odin/hm.nix
+++ b/odin/hm.nix
@@ -114,11 +114,11 @@
     ../hm_modules/alacritty.nix
     ../hm_modules/autorandr.nix
     ../hm_modules/blender.nix
-    # ../hm_modules/bspwm.nix
+    ../hm_modules/bspwm.nix
     ../hm_modules/cava.nix
     ../hm_modules/easyeffects.nix
     # ../hm_modules/dunst.nix
-    ../hm_modules/gnome_shell.nix
+    # ../hm_modules/gnome_shell.nix
     # ../hm_modules/grobi.nix
     ../hm_modules/gtk_theme.nix
     ../hm_modules/heif.nix
@@ -143,7 +143,7 @@
     # ../hm_modules/onedrive.nix
     ../hm_modules/pass.nix
     ../hm_modules/picom.nix
-    # ../hm_modules/polybar.nix
+    ../hm_modules/polybar.nix
     # ../hm_modules/pro_audio.nix
     # ../hm_modules/pycharm.nix
     ../hm_modules/rofi.nix
@@ -152,11 +152,11 @@
     ../hm_modules/sxhkd.nix
     ../hm_modules/syncthing.nix
     ../hm_modules/terminator.nix
-    # ../hm_modules/thunar.nix
-    # ../hm_modules/twmn.nix
+    ../hm_modules/thunar.nix
+    ../hm_modules/twmn.nix
     ../hm_modules/update_background.nix
     ../hm_modules/webapp.nix
-    # ../hm_modules/xidlehook.nix
+    ../hm_modules/xidlehook.nix
     ../hm_modules/zathura.nix
   ];
 
diff --git a/thor/configuration.nix b/thor/configuration.nix
index ebe572e..5ee67dc 100644
--- a/thor/configuration.nix
+++ b/thor/configuration.nix
@@ -162,17 +162,17 @@ with lib; {
     xserver = {
       enable = true;
       desktopManager = {
-        gnome.enable = true;
+        # gnome.enable = true;
         # cinnamon.enable = true;
         # plasma5 = { enable = true; runUsingSystemd = true; useQtScaling = true; };
       };
       windowManager.bspwm = { enable = true; };
-      displayManager.gdm = { enable = true; };
-      # displayManager.sddm = {
-      #   enable = true;
-      #   theme =
-      #     "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
-      # };
+      # displayManager.gdm = { enable = true; };
+      displayManager.sddm = {
+        enable = true;
+        theme =
+          "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
+      };
 
       videoDrivers = [ "nvidia" ];
       layout = "us,it";
diff --git a/thor/hm.nix b/thor/hm.nix
index 33e7106..86861c8 100644
--- a/thor/hm.nix
+++ b/thor/hm.nix
@@ -96,11 +96,11 @@
     ../hm_modules/alacritty.nix
     ../hm_modules/autorandr.nix
     ../hm_modules/blender.nix
-    # ../hm_modules/bspwm.nix
+    ../hm_modules/bspwm.nix
     ../hm_modules/cava.nix
     ../hm_modules/easyeffects.nix
     # ../hm_modules/dunst.nix
-    ../hm_modules/gnome_shell.nix
+    # ../hm_modules/gnome_shell.nix
     # ../hm_modules/grobi.nix
     ../hm_modules/gtk_theme.nix
     ../hm_modules/heif.nix
@@ -115,7 +115,7 @@
     ../hm_modules/mangohud.nix
     ../hm_modules/megasync.nix
     ../hm_modules/mpv.nix
-    ../hm_modules/nautilus.nix
+    # ../hm_modules/nautilus.nix
     ../hm_modules/nix-index.nix
     ../hm_modules/noti.nix
     ../hm_modules/nushell.nix
@@ -124,7 +124,7 @@
     # ../hm_modules/onedrive.nix
     ../hm_modules/pass.nix
     ../hm_modules/picom.nix
-    # ../hm_modules/polybar.nix
+    ../hm_modules/polybar.nix
     ../hm_modules/pro_audio.nix
     ../hm_modules/rofi.nix
     # ../hm_modules/screen_locker.nix
@@ -132,11 +132,11 @@
     ../hm_modules/sxhkd.nix
     ../hm_modules/syncthing.nix
     ../hm_modules/terminator.nix
-    # ../hm_modules/thunar.nix
-    # ../hm_modules/twmn.nix
+    ../hm_modules/thunar.nix
+    ../hm_modules/twmn.nix
     ../hm_modules/update_background.nix
     ../hm_modules/webapp.nix
-    # ../hm_modules/xidlehook.nix
+    ../hm_modules/xidlehook.nix
     ../hm_modules/zathura.nix
   ];