diff --git a/configuration.nix b/configuration.nix
index 1da9118..516d52c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -41,7 +41,7 @@
   };
 
   services.xserver.xkb = {
-    options = "caps:swapescape";
+    options = "caps:escape,compose:102,shift:both_capslock,eurosign:e";
     layout = "us";
     variant = "altgr-intl";
     };
diff --git a/workstation.nix b/workstation.nix
index db69bfc..cc1590d 100644
--- a/workstation.nix
+++ b/workstation.nix
@@ -38,14 +38,15 @@
 #    SUBVOLUME = /home;
 #    ALLOW_USERS = [ "vi" ];
 #  };
-  programs.xwayland.enable = true;
+#  programs.xwayland.enable = true;
   services.xserver.enable = true;
 #  services.xserver.displayManager.gdm.enable = true;
-#  services.xserver.displayManager.defaultSession = "sway";
+  services.xserver.displayManager.defaultSession = "none+i3";
   services.xserver.displayManager.autoLogin.user = "vi";
-#  services.xserver.displayManager.autoLogin.enable = true;
+  services.xserver.displayManager.autoLogin.enable = true;
   services.xserver.displayManager.lightdm.enable = true;
   services.xserver.windowManager.i3.enable = true;
+  services.xserver.windowManager.i3.package = pkgs.i3-rounded;
 
   services.udisks2.enable = true;
   services.printing.enable = true;
@@ -64,7 +65,7 @@
     nerdfonts
   ];
 
-  programs.sway.enable = true;
+  #programs.sway.enable = true;
 
   services.gnome.gnome-keyring.enable = true;
   services.pipewire.enable = true;
@@ -74,7 +75,7 @@
 
   powerManagement.enable = true;
   environment.systemPackages = with pkgs; [
-    swayfx
+  #  swayfx
     wget
     vim
     wev