diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf
index af41e6ed..e193fc14 100644
--- a/hyprland/.config/hypr/hyprland.conf
+++ b/hyprland/.config/hypr/hyprland.conf
@@ -6,17 +6,16 @@ monitor=,preferred,auto,1
 #monitor=,highrr,auto,1     # Use the highest refresh rate
 #monitor=,highres,auto,1    # Use the highest resolution
 
-# 10-bit support
-#monitor=eDP-1,2880x1800@90,0x0,1,bitdepth,10
-
-# Rotating a monitor
-#monitor=,preferred,auto,1,transform,1
-
 # Execute your favorite apps at launch
-# exec-once = waybar & hyprpaper & firefox
+exec-once = swaybg --mode fill --image ~/a.jpg
+exec-once = wpctl set-volume @DEFAULT_AUDIO_SINK@ 20%
+exec-once = sleep 0.5 && yambar
 exec-once = fcitx5                          # Japanese input support
+exec-once = mullvad-vpn
 exec-once = wl-paste -p --watch wl-copy -pc # Disable middle click paste
-exec-once = udiskie &                       # Auto-mount drives
+exec-once = udiskie                         # Auto-mount drives
+exec-once = hyprland-autoname-workspaces --dedup
+exec-once = play ~/start.flac
 
 # Some default env vars.
 env = XCURSOR_SIZE,24
@@ -44,25 +43,18 @@ input {
 }
 
 general {
-    gaps_in = 5
-    gaps_out = 10
     gaps_in = 0
     gaps_out = 0
-    #border_size = 2
-    border_size = 0
+    border_size = 2
     col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
     col.inactive_border = rgba(595959aa)
-
     layout = master
 }
 
 decoration {
-    #rounding = 10
     rounding = 0
-    blur = yes
+    blur = no
     blur_size = 3
-    #blur_size = 4
-    #blur_passes = 2
     blur_passes = 1
     blur_new_optimizations = yes
     drop_shadow = yes
@@ -80,20 +72,20 @@ animations {
     animation = borderangle, 1, 8, default
     animation = fade, 1, 7, default
     animation = workspaces, 1, 6, default
-    animation = specialWorkspace, 1, 6, default, fade
+    animation = specialWorkspace, 1, 6, default
 }
 
 dwindle {
-    pseudotile = yes
     preserve_split = yes
-    #no_gaps_when_only = yes
+    no_gaps_when_only = yes
+    special_scale_factor = 0.95
 }
 
 master {
   new_is_master = yes
   new_on_top = yes
   mfact = 0.65
-  special_scale_factor = 1
+  special_scale_factor = 0.95
   no_gaps_when_only = yes
 }
 
@@ -113,28 +105,30 @@ device:tpps/2-elan-trackpoint {
     accel_profile = flat
 }
 
-bind = SUPER, Return, exec, kitty --single-instance
-bind = SUPER, Tab, workspace, +1
-bind = SUPER_SHIFT, Tab, workspace, -1
+bind = SUPER, Z, exec, rofi -show
+bind = SUPER_SHIFT, Z, workspace, empty
+bind = SUPER_SHIFT, Z, exec, rofi -show
+bind = SUPER_SHIFT, Return, exec, kitty
+bind = SUPER, Tab, workspace, e+1
+bind = SUPER_SHIFT, Tab, workspace, e-1
 bind = SUPER, Q, killactive,
 bind = SUPER, P, exec, grimblast copy area
-bind = SUPER, escape, exit,
+bind = SUPER_ALT, delete, exit
 bind = SUPER, V, togglefloating,
 bind = SUPER, V, centerwindow,
-bind = SUPER, O, exec, killall -SIGUSR1 waybar
-bind = SUPER, Z, exec, rofi -show
+bind = SUPER, O, exec, ~/.config/hypr/toggle-yambar.sh
 bind = SUPER, X, pin
-bind = SUPER, F, fullscreen
-bind = SUPER, Tab, changegroupactive, f
-bind = SUPER_SHIFT, Tab, changegroupactive, b
-bind = SUPER, B, pseudo, # dwindle
-bind = SUPER, C, togglesplit, # dwindle
+bind = SUPER, F, fullscreen, 1
+bind = SUPER_SHIFT, F, fullscreen
+bind = SUPER, bracketright, changegroupactive, f
+bind = SUPER, bracketleft, changegroupactive, b
 bind = SUPER, U, exec, ~/.config/hypr/toggle-layout.sh
 bind = SUPER, S, togglespecialworkspace
 bind = SUPER_SHIFT, S, movetoworkspace, special
 bind = SUPER_SHIFT, S, togglespecialworkspace
 
 bind = SUPER, Return, exec, ~/.config/hypr/swapmaster.sh
+bind = SUPER, backslash, exec, ~/.config/hypr/focusmaster.sh
 bind = SUPER, J, layoutmsg, cyclenext
 bind = SUPER, K, layoutmsg, cycleprev
 bind = SUPER_SHIFT, J, layoutmsg, swapnext
@@ -214,8 +208,10 @@ bindl=, XF86MonBrightnessUp, exec, brightnessctl set +5% && notify-send -t 2000
 
 bind = WIN, F1, exec, ~/.config/hypr/gamemode.sh
 
-#misc {
-  #focus_on_activate = yes
-#}
+misc {
+  disable_hyprland_logo = yes
+}
+
+windowrulev2 = bordercolor rgb(FF0000) rgb(880808),xwayland:1
 
 # vim:syn=bash