diff --git a/home.nix b/home.nix
index 4c0ad77..dd0c7ba 100644
--- a/home.nix
+++ b/home.nix
@@ -10,7 +10,7 @@ in
     ./sway.nix
     ./terminal.nix
     ./vim.nix
-  ]
+  ];
 
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
diff --git a/programs.nix b/programs.nix
index ae51b73..daeb86d 100644
--- a/programs.nix
+++ b/programs.nix
@@ -28,8 +28,8 @@
     mako # notification system developed by swaywm maintainer
 
     # steam deck touch compability in non-steam games
-    caribou
-    evtest # for input key testing
+    #caribou
+    #evtest # for input key testing
 
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the
@@ -38,4 +38,4 @@
     (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
 
   ];
-}
\ No newline at end of file
+}
diff --git a/sway.nix b/sway.nix
index 0236cb9..e117f89 100644
--- a/sway.nix
+++ b/sway.nix
@@ -1,4 +1,18 @@
 { config, pkgs, lib, ... }:
+
+let
+# Define variables for your workspaces and displays
+  display1 = "card1-eDP-1";
+  touchDisplay = "10248:4117:FTS3528:00_2808:1015";
+  workspace1 = "1:Web";
+  workspace2 = "2:App";
+  workspace3 = "3:Chat";
+  workspace4 = "4:Read";
+  workspace5 = "5:Code";
+  workspace6 = "6:Password";
+  workspace7 = "7:Shell";
+  workspace8 = "8:Media";
+in
 {
 
   # Enable Sway window manager
@@ -11,17 +25,6 @@
       terminal = "alacritty";
       menu = "bemenu-run";
 
-      # Define variables for your workspaces and displays
-      display1 = "card1-eDP-1";
-      workspace1 = "1:Web";
-      workspace2 = "2:App";
-      workspace3 = "3:Chat";
-      workspace4 = "4:Read";
-      workspace5 = "5:Code";
-      workspace6 = "6:Password";
-      workspace7 = "7:Shell";
-      workspace8 = "8:Media";
-
       # Autostart applications
       startup = [
         { command = "swaymsg workspace ${workspace7}; exec nvim"; }
@@ -36,16 +39,16 @@
         # Start sway-session.target
         { command = "systemctl --user start sway-session.target";}
         # Switch to the desired workspaces on each output
-        { command = "swaymsg focus output ${display1}; swaymsg workspace ${workspace1}"; }
-        { command = "swaymsg focus output ${display2}; swaymsg workspace ${workspace3}"; }
+        #{ command = "swaymsg focus output ${display1}; swaymsg workspace ${workspace1}"; }
+        #{ command = "swaymsg focus output ${display2}; swaymsg workspace ${workspace3}"; }
       ];
 
       # Keyboard layout
       input = {
         # Enable touch screen
         "10248:4117:FTS3528:00_2808:1015" = {
-          send_events = "enabled";
-          tap_enabled = true;
+          #send_events = "enabled";
+          #tap_enabled = "true";
           map_to_output = "${display1}";
         };
 
@@ -57,11 +60,11 @@
         # Configure Steam Controller pointer
         "10462:4613:Valve_Software_Steam_Controller" = {
           # For the pointer device
-          accel_speed = 0.0;
-          natural_scroll = false;
-          left_handed = false;
+          #accel_speed = "0.0";
+          natural_scroll = "false";
+          left_handed = "false";
           scroll_method = "two_finger";
-          middle_emulation = true;
+          middle_emulation = "true";
         };
 
         # Configure Steam Controller keyboard
@@ -72,16 +75,16 @@
         # Set German layout for all keyboards
         "type:keyboard" = {
           xkb_layout = "de";
-          repeat_delay = 600;
-          repeat_rate = 25;
+          repeat_delay = "600";
+          repeat_rate = "25";
         };
 
         # For all pointers
         "type:pointer" = {
-          accel_speed = 0.0;
-          natural_scroll = false;
-          left_handed = false;
-          middle_emulation = true;
+         # accel_speed = "0.0";
+          natural_scroll = "false";
+          left_handed = "false";
+          middle_emulation = "true";
         };
         
         "*" = {
@@ -176,4 +179,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}