diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 0a694c6..9734b2f 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -5,6 +5,23 @@
 
 #autogenerated = 1 # remove this line to remove the warning
 
+#env=LIBSEAT_BACKEND,seatd
+env = HYPRLAND_LOG_WLR,1
+#env = WLR_DRM_DEVICES,$HOME/.config/hypr/nvidia:$HOME/.config/hypr/amd
+#env = WLR_DRM_DEVICES,$HOME/.config/hypr/amd:$HOME/.config/hypr/nvidia
+env = WLR_DRM_DEVICES,$HOME/.config/hypr/amd-render:$HOME/.config/hypr/nvidia-render
+#env = LIBVA_DRIVER_NAME,nvidia
+#env = XDG_SESSION_TYPE,wayland
+#env = GBM_BACKEND,nvidia-drm
+#env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+#cursor { no_hardware_cursors = true }
+
+debug:disable_logs = false
+
+debug {
+	disable_logs = false
+}
+
 # See https://wiki.hyprland.org/Configuring/Monitors/
 monitor=,preferred,auto,auto
 
@@ -19,6 +36,7 @@ monitor=,preferred,auto,auto
 exec-once=dbus-update-activation-environment --systemd --all
 exec-once=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME
 exec-once=/usr/lib/polkit-kde-authentication-agent-1
+exec-once=otd-daemon
 
 #exec-once=wlsunset -S 6:00 -s 21:30
 exec-once=swaybg -m fill -i ~/.config/hypr/wallpapers/sunflowers.jpg
@@ -29,10 +47,12 @@ exec-once=udev-block-notify
 #exec-once=~/.config/hypr/scripts/sleep.sh
 exec-once=echo us > /tmp/kb_layout
 #exec-once=hyprctl setcursor Sweet 30
-exec-once=aw-server& sleep 2; awatcher
+exec-once=aw-qt& sleep 2; awatcher
 exec-once = nm-applet --indicator # systray app for Network/Wifi
+exec-once=kdeconnect-indicator
 
-$swaylock = swaylock --screenshots --clock --indicator --effect-blur 2x4 --fade-in 0.2 --ring-color 4e9dc2 --key-hl-color 71b0ce
+#$swaylock = swaylock --screenshots --clock --indicator --effect-blur 6x6 --fade-in 0.2 --ring-color 4e9dc2 --key-hl-color 71b0ce
+$swaylock = hyprlock
 
 exec-once=swayidle -w timeout 300 '$swaylock --grace 2' before-sleep '$swaylock'
 exec-once=/usr/lib/pam_kwallet_init
@@ -41,7 +61,6 @@ env = QT_QPA_PLATFORMTHEME,qt5ct
 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
 env = QT_ENABLE_HIGHDPI_SCALING,1
 env = QT_QPA_PLATFORM,wayland;xcb
-# Cursor size, mainly for high DPI displays
 env = XCURSOR_SIZE,24
 #env = LIBVA_DRIVER_NAME,nvidia
 env = XDG_SESSION_TYPE,wayland
@@ -55,14 +74,18 @@ env = MOZ_ENABLE_WAYLAND,1
 env = XDG_SESSION_DESKTOP,Hyprland
 env = XDG_CURRENT_DESKTOP,Hyprland
 
-# highrr = high refresh rate option
-# 100% scaling
-monitor=HDMI-A-1,highrr,auto,1
-# Integrated monitor is 125%
-monitor=eDP-2,highrr,auto,1.25
+monitor=eDP-1,highrr,0x0,1.25
+#monitor=eDP-2,highrr,0x0,1.25
+monitor=desc:AOC 24G2W1G4 0x0000297D,highrr,auto,1
+#monitor=HDMI-A-1,highrr,2048x0,1
+#monitor=HDMI-A-1,highrr,auto,1
+monitor=,preferred,auto,1
+# TV frame
+#monitor=HDMI-A-1,addreserved,50,50,50,50
+#monitor=HDMI-A-1,preferred,auto,1,transform,2
+#monitor=HDMI-A-1,preferred,auto,1,mirror,eDP-2
 
-# Set workspace 20 as default for secondary monitor
-workspace = 20,monitor:HDMI-A-1,default:true
+workspace = 10,monitor:HDMI-A-1,default:true
 
 xwayland {
     force_zero_scaling = true
@@ -87,6 +110,10 @@ input {
     touchpad {
         natural_scroll = yes
     }
+    touchdevice {
+        output = HDMI-A-1
+        transform = 2
+    }
 
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
@@ -158,7 +185,7 @@ dwindle {
 
 master {
     # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_is_master = false
+    #new_is_master = false
 }
 
 gestures {
@@ -168,9 +195,9 @@ gestures {
 
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
-device:epic-mouse-v1 {
-    sensitivity = -0.5
-}
+#device:epic-mouse-v1 {
+#    sensitivity = -0.5
+#}
 
 misc {
     disable_hyprland_logo=true
@@ -211,7 +238,8 @@ bind = SUPER, P, exec, pkill rofi || $dir/rofi/bin/powermenu
 $mainMod = SUPER
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, T, exec, kitty
+bind = $mainMod, T, exec, warp-terminal #kitty
+bind=$mainMod,K,exec,kitty
 bind=SUPER,B,exec,vivaldi-stable
 bind = $mainMod, Q, killactive,
 bind = super+ctrl, q, exit, 
@@ -229,8 +257,8 @@ bind=SUPER,A,swapactiveworkspaces,current +1
 bindle=, XF86MonBrightnessUp, exec, xbacklight -inc 10
 bindle=, XF86MonBrightnessDown, exec, xbacklight -dec 10
 
-bindle=, XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
-bindle=, XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
+bindle=, XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%;canberra-gtk-play -i audio-volume-change -d "volumeChange"
+bindle=, XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%;canberra-gtk-play -i audio-volume-change -d "volumeChange"
 bindl=, XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
 bindl=, XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
@@ -258,6 +286,19 @@ bind = $mainMod, 8, workspace, 8
 bind = $mainMod, 9, workspace, 9
 bind = $mainMod, 0, workspace, 10
 
+# Switch secondary display with mainMod + alt + [0-9]
+bind = $mainMod+ALT, 1, workspace, 10
+bind = $mainMod+ALT, 2, workspace, 11
+bind = $mainMod+ALT, 3, workspace, 12
+bind = $mainMod+ALT, 4, workspace, 13
+bind = $mainMod+ALT, 5, workspace, 14
+bind = $mainMod+ALT, 6, workspace, 15
+bind = $mainMod+ALT, 7, workspace, 16
+bind = $mainMod+ALT, 8, workspace, 17
+bind = $mainMod+ALT, 9, workspace, 18
+bind = $mainMod+ALT, 0, workspace, 19
+
+
 # Switch workspace with arrow keys
 bind = SUPER+CONTROL, right, workspace, +1
 bind = SUPER+CONTROL, left, workspace, -1
@@ -304,7 +345,7 @@ bind = CTRL+ALT,2,pass,^(com\.obsproject\.Studio)$
 windowrulev2=opacity 0.9,class:Code
 windowrulev2=opacity 0.9,class:Spotify
 
-windowrulev2=workspace 20,class:Code # Open Code on secondary monitor
+windowrulev2=workspace 10,class:Code # Open Code on secondary monitor
 
 windowrulev2 = float,class:^(qt5ct)$
 windowrulev2 = float,class:^(nwg-look)$
@@ -321,6 +362,7 @@ windowrulev2 = float,class:^(blueman-manager)$
 windowrulev2 = float,class:^(nm-applet)$
 windowrulev2 = float,class:^(nm-connection-editor)$
 windowrulev2 = float,class:^(org.kde.polkit-kde-authentication-agent-1)$
+windowrulev2 = tile,class:dev.warp.Warp
 
 # some themeing
 exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
@@ -334,3 +376,9 @@ decoration {
     }
 }
 
+
+#windowrule = nofullscreenrequest,flameshot
+windowrule = float,flameshot
+windowrule = monitor 1,flameshot
+windowrule = move 0 0,flameshot
+windowrule = noanim,flameshot
diff --git a/README.md b/README.md
index 529290b..16297ea 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ I'm using Arch linux.
 - rofi - application launcher, general "chooser" (used for power menu, notification actions, etc)
 - waybar - the top status bar
 - lightly (AUR) - QT theme, set it via `qt5ct`. Adds blur to *most* QT apps, but mainly also improves the general look and feal of QT apps. Some blur is broken on wayland.
-- swaylock-effects-git - lockscreen, adds blur and animations to the lockscreen. If it's broken for you, use normal `swaylock` instead (less styling)
+- hyprlock - Fancy lock screen
 - spicetify - custom spotify theme
 - VSCode - code editor. Current theme/config is not in dotfiles here, but the theme used is Atom One Dark, and the font is Fira Code.
 - dolphin - file browser