diff --git a/users/kaitotlex/de/sway/default.nix b/users/kaitotlex/de/sway/default.nix
index c538bd3..6c64300 100644
--- a/users/kaitotlex/de/sway/default.nix
+++ b/users/kaitotlex/de/sway/default.nix
@@ -75,6 +75,9 @@
           tap_button_map lrm  # tap with 1 finger = left click, 2 fingers = right click, 3 fingers = middle click
           dwt enabled         # disable (touchpad) while typing
       }
+      bindsym XF86KbdBrightnessDown exec brightnessctl -d asus::kbd_backlight s 1- 
+      bindsym XF86KbdBrightnessUp exec brightnessctl -d asus::kbd_backlight s +1
+      bindsym XF86Tools exec suspend exec brightnessctl s 0
     '';
   };
 
diff --git a/users/kaitotlex/home.nix b/users/kaitotlex/home.nix
index d312f6e..e838316 100644
--- a/users/kaitotlex/home.nix
+++ b/users/kaitotlex/home.nix
@@ -58,12 +58,9 @@
     nwg-displays
     dolphin
     xfce.thunar
-<<<<<<< HEAD
-=======
     tailwindcss
 
     nodejs_22
->>>>>>> refs/remotes/origin/main
     clang
     macchanger
     ani-cli