diff --git a/flake.nix b/flake.nix
index 37de60d..aa38d84 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,12 +51,8 @@
         (rust-overlay.overlay)
         (final: prev: { inherit (tex2nix.packages.${system}) tex2nix; })
         (final: prev: {
-          # cocktail-bar-cli = final.callPackage ./custom/cocktail-bar-cli { };
           update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; };
-          lockscreen = final.callPackage ./custom/lockscreen {
-            palette = final.rice.colorPalette;
-            font = final.rice.font.normal;
-          };
+          lockscreen = final.callPackage ./custom/lockscreen { palette = final.rice.colorPalette; font = final.rice.font.normal; };
         })
         (final: prev: { unstable = unstablePkgs; })
       ];
@@ -70,13 +66,7 @@
       };
       pkgs = import nixpkgs nixpkgsSettings;
       unstablePkgs = import unstable nixpkgsSettings;
-
-      homeManagerSettings = {
-        home-manager = {
-          useGlobalPkgs = true;
-          useUserPackages = true;
-        };
-      };
+      homeManagerSettings = { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; };
 
       odinBaseModules = [
         { nixpkgs = nixpkgsSettings; }
@@ -95,14 +85,14 @@
         ./thor/configuration.nix
       ];
 
-      odinStable = extraModules: nixpkgs.lib.nixosSystem {
-        inherit system;
-        modules = odinBaseModules ++ [
-          home-manager.nixosModules.home-manager
-          homeManagerSettings
-          { home-manager.users.bertof = import ./home_manager/odin.nix; }
-        ] ++ extraModules;
-      };
+      # odinStable = extraModules: nixpkgs.lib.nixosSystem {
+      #   inherit system;
+      #   modules = odinBaseModules ++ [
+      #     home-manager.nixosModules.home-manager
+      #     homeManagerSettings
+      #     { home-manager.users.bertof = import ./home_manager/odin.nix; }
+      #   ] ++ extraModules;
+      # };
 
       odinUnstable = extraModules: unstable.lib.nixosSystem {
         inherit system;
@@ -113,14 +103,14 @@
         ] ++ extraModules;
       };
 
-      thorStable = extraModules: nixpkgs.lib.nixosSystem {
-        inherit system;
-        modules = thorBaseModules ++ [
-          home-manager.nixosModules.home-manager
-          homeManagerSettings
-          { home-manager.users.bertof = import ./home_manager/thor.nix; }
-        ] ++ extraModules;
-      };
+      # thorStable = extraModules: nixpkgs.lib.nixosSystem {
+      #   inherit system;
+      #   modules = thorBaseModules ++ [
+      #     home-manager.nixosModules.home-manager
+      #     homeManagerSettings
+      #     { home-manager.users.bertof = import ./home_manager/thor.nix; }
+      #   ] ++ extraModules;
+      # };
 
       thorUnstable = extraModules: unstable.lib.nixosSystem {
         inherit system;
@@ -137,18 +127,18 @@
 
       nixosConfigurations = rec {
 
-        thor = thor-stable;
+        thor = thor-unstable;
 
-        thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ];
+        # thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ];
         thor-unstable = thorUnstable [ ./nixos_modules/pro_audio.nix ];
         thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ];
 
-        odin = odin-intel-stable;
+        odin = odin-intel-unstable;
 
         odin-intel-unstable = odinUnstable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ];
         odin-nvidia-unstable = odinUnstable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ];
-        odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ];
-        odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ];
+        # odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ];
+        # odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ];
       };
     };
 }
diff --git a/home_manager/basic_env.nix b/home_manager/basic_env.nix
index bf266a4..93e29a9 100644
--- a/home_manager/basic_env.nix
+++ b/home_manager/basic_env.nix
@@ -2,10 +2,6 @@
 {
   home = {
     language.base = "it_IT.UTF-8";
-    keyboard = {
-      layout = "it";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
-    };
     packages = with pkgs; [
       file
       htop
diff --git a/home_manager/modules/gtk_theme.nix b/home_manager/modules/gtk_theme.nix
index 63a607d..1146acf 100644
--- a/home_manager/modules/gtk_theme.nix
+++ b/home_manager/modules/gtk_theme.nix
@@ -18,11 +18,13 @@
     platformTheme = "gtk";
   };
 
-  xsession = {
+  home = {
     pointerCursor = {
       package = pkgs.qogir-icon-theme;
       name = "Qogir";
-      size = 24;
+      # size = 64;
+      x11.enable = true;
+      gtk.enable = true;
     };
   };
 }
diff --git a/home_manager/thor.nix b/home_manager/thor.nix
index d300ba5..5fcace7 100644
--- a/home_manager/thor.nix
+++ b/home_manager/thor.nix
@@ -3,7 +3,7 @@
   home = {
     language.base = "it_IT.UTF-8";
     keyboard = {
-      layout = "it";
+      layout = "en";
       options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
     };
     packages = with pkgs; [
diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix
index 86eb3e3..ba6ffc5 100644
--- a/odin/common_configuration.nix
+++ b/odin/common_configuration.nix
@@ -72,7 +72,7 @@
     extraLayouts = {
       eng = { languages = [ "eng" ]; description = "English layout for external keyboard"; };
     };
-    xkbOptions = "eurosign:e;";
+    xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl";
     libinput.enable = true;
   };
 
diff --git a/thor/configuration.nix b/thor/configuration.nix
index bfd4ffb..33e4d4f 100644
--- a/thor/configuration.nix
+++ b/thor/configuration.nix
@@ -138,7 +138,7 @@
       displayManager.sddm.enable = true;
       layout = "us";
       videoDrivers = [ "nvidia" ];
-      xkbOptions = "eurosign:e";
+      xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl";
     };
     # gnome.gnome-remote-desktop.enable = true;
     zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };