diff --git a/hosts/vali/temperance/configuration.nix b/hosts/vali/temperance/configuration.nix
index 0419fd1..f90cb6d 100644
--- a/hosts/vali/temperance/configuration.nix
+++ b/hosts/vali/temperance/configuration.nix
@@ -23,10 +23,10 @@
   programs.kdeconnect.enable = true;
   programs.dconf.enable = true;
   # boot.kernelModules = [ "v4l2loopback" ];
-  boot.kernelPackages = pkgs.linuxPackages_zen;
+  boot.kernelPackages = pkgs.linuxPackages_xanmod_stable;
   # boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
   #  services.picom.enable = true;
-  services.emacs.enable = true;
+  #  services.emacs.enable = true;
   modules = {
     other = {
       system = {
@@ -40,6 +40,9 @@
       };
     };
     wms = {
+      x = {
+        i3.enable = false;
+      };
       wayland = {
         enable = true;
         hyprland.enable = true;
diff --git a/modules/gui/schizofox.nix b/modules/gui/schizofox.nix
index 04e8bd8..23d9bd4 100644
--- a/modules/gui/schizofox.nix
+++ b/modules/gui/schizofox.nix
@@ -115,7 +115,6 @@ in {
         misc = {
           drm.enable = true;
           disableWebgl = true;
-          startPageURL = "file://${builtins.readFile ./chevron/index.html}";
         };
       };
     };
diff --git a/modules/gui/stylix.nix b/modules/gui/stylix.nix
index e9c8a47..8dea8ad 100644
--- a/modules/gui/stylix.nix
+++ b/modules/gui/stylix.nix
@@ -24,7 +24,7 @@ in {
           fish.enable = true;
           dunst.enable = false;
           emacs.enable = true;
-          firefox.enable = true;
+          firefox.enable = false;
           kitty.enable = true;
           lazygit.enable = true;
           rofi.enable = true;
diff --git a/modules/wms/default.nix b/modules/wms/default.nix
index c6aa3d6..b918b4a 100644
--- a/modules/wms/default.nix
+++ b/modules/wms/default.nix
@@ -1 +1 @@
-_: {imports = [./wayland];}
+_: {imports = [./wayland ./x];}
diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix
index 18eba75..ee34fcf 100644
--- a/modules/wms/wayland/hypr/land.nix
+++ b/modules/wms/wayland/hypr/land.nix
@@ -59,7 +59,7 @@ in {
             "HDMI-A-2,1920x1080,1920x0,1"
             "HDMI-A-1,1920x1080,3840x0,1"
             # Had the shadow monitor bug, so had to disable all unknown monitors.
-            # "Unknown-1,disable"
+            "Unknown-1,disable"
           ];
           # Workspace config
           workspace = [
@@ -155,7 +155,7 @@ in {
           ];
           # Hyprland anomations, using the above bezier curves
           animations = {
-            enabled = true;
+            enabled = false;
             animation = [
               "windows, 1, 4, dupa, popin"
               "windowsOut, 1, 4, dupa, slide"
@@ -222,6 +222,12 @@ in {
             "$mainMod SHIFT, 8, split-movetoworkspacesilent, 8"
             "$mainMod SHIFT, 9, split-movetoworkspacesilent, 9"
             "$mainMod SHIFT, 0, split-movetoworkspacesilent, 10"
+
+            # Move Windows
+            "$mainMod SHIFT, H, movewindow, left"
+            "$mainMod SHIFT, J, movewindow, down"
+            "$mainMod SHIFT, K, movewindow, up"
+            "$mainMod SHIFT, L, movewindow, right"
             # Screenshotting
             "$mainMod, S, exec, ${pkgs.grimblast}/bin/grimblast copy area"
             # File manager
@@ -300,7 +306,7 @@ in {
             # and run it all again
             "[workspace special:btop;silent;tile] ${foot}/bin/foot ${pkgs.btop}/bin/btop"
 
-            "[workspace special:pipewire silent;tile] ${pkgs.helvum}/bin/helvum"
+            #            "[workspace special:pipewire silent;tile] ${pkgs.helvum}/bin/helvum"
             "[workspace special:pipewire;silent;tile] ${pkgs.pavucontrol}/bin/pavucontrol"
             # "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator"
           ];
diff --git a/modules/wms/x/default.nix b/modules/wms/x/default.nix
index e69de29..ae1557b 100644
--- a/modules/wms/x/default.nix
+++ b/modules/wms/x/default.nix
@@ -0,0 +1,3 @@
+_: {
+  imports = [./i3];
+}
diff --git a/modules/wms/x/i3/default.nix b/modules/wms/x/i3/default.nix
new file mode 100644
index 0000000..7ecc315
--- /dev/null
+++ b/modules/wms/x/i3/default.nix
@@ -0,0 +1,3 @@
+_: {
+  imports = [./i3.nix];
+}
diff --git a/modules/wms/x/i3/i3.nix b/modules/wms/x/i3/i3.nix
new file mode 100644
index 0000000..94315bc
--- /dev/null
+++ b/modules/wms/x/i3/i3.nix
@@ -0,0 +1,40 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
+  username = config.modules.other.system.username;
+  cfg = config.modules.wms.x.i3;
+in {
+  options.modules.wms.x.i3.enable = lib.mkEnableOption "i3";
+
+  config = lib.mkIf cfg.enable {
+    xdg.portal = {
+      enable = true;
+      extraPortals = [
+        pkgs.xdg-desktop-portal-gtk
+      ];
+      config.common.default = "*";
+    };
+    services = {
+      xserver = {
+        enable = true;
+        xkb.layout = "de";
+        desktopManager.xterm.enable = false;
+        windowManager.i3.enable = true;
+        displayManager = {
+          lightdm.enable = true;
+          defaultSession = "none+i3";
+          setupCommands = "${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1";
+        };
+      };
+    };
+    home-manager.users.${username} = {
+      xsession.windowManager.i3 = {
+        #  enable = false;
+        #  package = pkgs.i3-gaps;
+      };
+    };
+  };
+}
diff --git a/options/common/gpu/nvidia.nix b/options/common/gpu/nvidia.nix
index ef0b0dd..21dcdf7 100644
--- a/options/common/gpu/nvidia.nix
+++ b/options/common/gpu/nvidia.nix
@@ -7,7 +7,7 @@
   services.xserver.videoDrivers = ["nvidia"];
   hardware.opengl = {
     enable = true;
-    # package = pkgs-unstable.mesa.drivers;
+    package = pkgs.mesa.drivers;
     driSupport = true;
     driSupport32Bit = true;
   };
@@ -17,7 +17,7 @@
     powerManagement.enable = false;
     powerManagement.finegrained = false;
     nvidiaSettings = false;
-    #package = config.boot.kernelPackages.nvidiaPackages.beta;
+    #  package = config.boot.kernelPackages.nvidiaPackages.stable;
     package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
       version = "555.42.02";
       sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";