diff --git a/.config/hypr/configs/binds.conf b/.config/hypr/configs/binds.conf
index 8b38d6e8..803099fa 100644
--- a/.config/hypr/configs/binds.conf
+++ b/.config/hypr/configs/binds.conf
@@ -1,182 +1,182 @@
 # Mouse binds
-bindm = SUPER,mouse:272,movewindow
-bindm = SUPER,mouse:273,resizewindow
+bindm = SUPER, mouse:272, movewindow
+bindm = SUPER, mouse:273, resizewindow
 
 # Basic keybinds
-bind = SUPER,Q,killactive,
-bind = SUPERCTRL,R,exec, pkill waybar || waybar
-bind = SUPERCTRL,M,exit
-bind = SUPER,A,exec, hyprctl dispatch togglefloating && hyprctl dispatch centerwindow 1
-bind = SUPER,P,pseudo
-bind = SUPER,F,fullscreen,0
-bind = SUPER,Z,exec,pypr zoom
+bind = SUPER, Q, killactive,
+bind = SUPERCTRL, R, exec, pkill waybar || waybar
+bind = SUPERCTRL, M, exit
+bind = SUPER, A, exec, hyprctl dispatch togglefloating && hyprctl dispatch centerwindow 1
+bind = SUPER, P, pseudo
+bind = SUPER, F, fullscreen, 0
+bind = SUPER, Z, exec, pypr zoom
 
 ## Applications
-bind = SUPER,W,exec,~/.config/hypr/scripts/custom_app_launch librewolf
-bind = SUPER,O,exec,~/.config/hypr/scripts/custom_app_launch obsidian
-bind = SUPERSHIFT,O,exec,~/.config/hypr/scripts/custom_app_launch office
-bind = SUPERSHIFT,E,exec, ~/.config/hypr/scripts/custom_app_launch nemo
-bind = SUPER,RETURN,exec,kitty
-bind = SUPERSHIFT,RETURN,exec,~/.config/hypr/scripts/custom_app_launch kitty
-bind = SUPER,BackSpace,exec,~/.config/hypr/scripts/custom_app_launch nvim
-bind = SUPERSHIFT,BackSpace,exec,~/.config/hypr/scripts/custom_app_launch neovide
+bind = SUPER, W, exec, ~/.config/hypr/scripts/custom_app_launch librewolf
+bind = SUPER, O, exec, ~/.config/hypr/scripts/custom_app_launch obsidian
+bind = SUPERSHIFT, O, exec, ~/.config/hypr/scripts/custom_app_launch office
+bind = SUPERSHIFT, E,exec, ~/.config/hypr/scripts/custom_app_launch nemo
+bind = SUPER, RETURN, exec, kitty
+bind = SUPERSHIFT, RETURN, exec, ~/.config/hypr/scripts/custom_app_launch kitty
+bind = SUPER, BACKSPACE, exec, ~/.config/hypr/scripts/custom_app_launch nvim
+bind = SUPERSHIFT, BACKSPACE, exec, ~/.config/hypr/scripts/custom_app_launch neovide
 
 # Launchers
 bind = SUPER, 23, exec, rofi -show drun -theme ~/.config/rofi/style.rasi # tab
 
 # Scratchpads
-bind = SUPER,V,exec,pypr toggle volume
+bind = SUPER, V, exec, pypr toggle volume
 bind = SUPER, 51, exec, pypr toggle terminal && hyprctl dispatch bringactivetotop ## Backslash
 bind = SUPER, B, exec, pypr toggle btop && hyprctl dispatch bringactivetotop
 bind = SUPERSHIFT, G, exec, pypr toggle gpt && hyprctl dispatch bringactivetotop
 bind = SUPERSHIFT, B, exec, pypr toggle bluetooth && hyprctl dispatch bringactivetotop
 # bind=SUPERSHIFT, S, exec, pypr toggle localsend && hyprctl dispatch bringactivetotop
-bind = SUPER,E,exec,pypr toggle yazi && hyprctl dispatch bringactivetotop
-bind = SUPER,D,exec,pypr toggle dots && hyprctl dispatch bringactivetotop
+bind = SUPER, E, exec, pypr toggle yazi && hyprctl dispatch bringactivetotop
+bind = SUPER, D, exec, pypr toggle dots && hyprctl dispatch bringactivetotop
 
 # Screenshotting
-bind = SHIFT,Insert,exec, hyprshot -m output -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png
-bind = SUPERSHIFT,Insert,exec, hyprshot -m window -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png
-bind = CTRL,Insert,exec, hyprshot -m region -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png
-bind = ALT,Insert,exec, ~/.config/hypr/scripts/rofi/screenshots_selection
+bind = SHIFT, INSERT, exec, hyprshot -m output -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png
+bind = SUPERSHIFT, INSERT, exec, hyprshot -m window -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png
+bind = CTRL, INSERT, exec, hyprshot -m region -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png
+bind = ALT, INSERT, exec, ~/.config/hypr/scripts/rofi/screenshots_selection
 
 # Clipboard
-bind = SUPER,y,exec, cliphist list | rofi -dmenu -theme ~/.config/rofi/style.rasi | cliphist decode | wl-copy
+bind = SUPER, Y, exec, cliphist list | rofi -dmenu -theme ~/.config/rofi/style.rasi | cliphist decode | wl-copy
 
 # Logout menu
-bind = SUPER, escape, exec, wleave
+bind = SUPER, ESCAPE, exec, wleave
 
 # Color picker
-bind = SUPER,Insert,exec, ~/.config/hypr/scripts/color_picker
+bind = SUPER, INSERT, exec, ~/.config/hypr/scripts/color_picker
 
 # Wallpaper
-bind = SUPERSHIFT,w,exec, ~/.config/hypr/scripts/wallpaper select
-bind = SUPERCTRL,w,exec, ~/.config/hypr/scripts/wallpaper random
+bind = SUPERSHIFT, W, exec, ~/.config/hypr/scripts/wallpaper select
+bind = SUPERCTRL, W, exec, ~/.config/hypr/scripts/wallpaper random
 
 # Keybindings Cheatsheet
-bind = SUPER,i,exec, ~/.config/hypr/scripts/rofi/keybindings
+bind = SUPER, I, exec, ~/.config/hypr/scripts/rofi/keybindings
 
 # Recording
-bind = SUPERSHIFT,r,exec, ~/.config/hypr/scripts/rofi/recording
+bind = SUPERSHIFT, R, exec, ~/.config/hypr/scripts/rofi/recording
 
 ## Windows
 ## Focusing on windows
-bind = SUPER,left,movefocus,l
-bind = SUPER,right,movefocus,r
-bind = SUPER,up,movefocus,u
-bind = SUPER,down,movefocus,d
+bind = SUPER, LEFT, movefocus, l
+bind = SUPER, RIGHT, movefocus, r
+bind = SUPER, UP, movefocus, u
+bind = SUPER, DOWN, movefocus, d
 # Vim-keybinds
-bind = SUPER,h,movefocus,l
-bind = SUPER,l,movefocus,r
-bind = SUPER,k,movefocus,u
-bind = SUPER,j,movefocus,d
+bind = SUPER, H, movefocus, l
+bind = SUPER, L, movefocus, r
+bind = SUPER, K, movefocus, u
+bind = SUPER, J, movefocus, d
 
 ## Moving windows
-bind = SUPERSHIFT,left,movewindow,l
-bind = SUPERSHIFT,right,movewindow,r
-bind = SUPERSHIFT,up,movewindow,u
-bind = SUPERSHIFT,down,movewindow,d
+bind = SUPERSHIFT, LEFT, movewindow, l
+bind = SUPERSHIFT, RIGHT, movewindow, r
+bind = SUPERSHIFT, UP, movewindow, u
+bind = SUPERSHIFT, DOWN, movewindow, d
 # Vim-keybinds
-bind = SUPERSHIFT,h,movewindow,l
-bind = SUPERSHIFT,l,movewindow,r
-bind = SUPERSHIFT,k,movewindow,u
-bind = SUPERSHIFT,j,movewindow,d
+bind = SUPERSHIFT, H, movewindow, l
+bind = SUPERSHIFT, L, movewindow, r
+bind = SUPERSHIFT, K, movewindow, u
+bind = SUPERSHIFT, J, movewindow, d
 
 ## Workspaces
 # Focusing other workspaces
-bind = SUPER,1,exec,hyprsome workspace 1
-bind = SUPER,2,exec,hyprsome workspace 2
-bind = SUPER,3,exec,hyprsome workspace 3
-bind = SUPER,4,exec,hyprsome workspace 4
-bind = SUPER,5,exec,hyprsome workspace 5
-bind = SUPER,6,exec,hyprsome workspace 6
-bind = SUPER,7,exec,hyprsome workspace 7
-bind = SUPER,8,exec,hyprsome workspace 8
-bind = SUPER,9,exec,hyprsome workspace 9
-bind = SUPER,0,exec,hyprsome workspace 10
+bind = SUPER, 1, exec, hyprsome workspace 1
+bind = SUPER, 2, exec, hyprsome workspace 2
+bind = SUPER, 3, exec, hyprsome workspace 3
+bind = SUPER, 4, exec, hyprsome workspace 4
+bind = SUPER, 5, exec, hyprsome workspace 5
+bind = SUPER, 6, exec, hyprsome workspace 6
+bind = SUPER, 7, exec, hyprsome workspace 7
+bind = SUPER, 8, exec, hyprsome workspace 8
+bind = SUPER, 9, exec, hyprsome workspace 9
+bind = SUPER, 0, exec, hyprsome workspace 10
 
 # Moving windows to other workspaces
-bind = SUPERSHIFT,1,exec,hyprsome movefocus 1
-bind = SUPERSHIFT,2,exec,hyprsome movefocus 2
-bind = SUPERSHIFT,3,exec,hyprsome movefocus 3
-bind = SUPERSHIFT,4,exec,hyprsome movefocus 4
-bind = SUPERSHIFT,5,exec,hyprsome movefocus 5
-bind = SUPERSHIFT,6,exec,hyprsome movefocus 6
-bind = SUPERSHIFT,7,exec,hyprsome movefocus 7
-bind = SUPERSHIFT,8,exec,hyprsome movefocus 8
-bind = SUPERSHIFT,9,exec,hyprsome movefocus 9
-bind = SUPERSHIFT,0,exec,hyprsome movefocus 10
+bind = SUPERSHIFT, 1, exec, hyprsome movefocus 1
+bind = SUPERSHIFT, 2, exec, hyprsome movefocus 2
+bind = SUPERSHIFT, 3, exec, hyprsome movefocus 3
+bind = SUPERSHIFT, 4, exec, hyprsome movefocus 4
+bind = SUPERSHIFT, 5, exec, hyprsome movefocus 5
+bind = SUPERSHIFT, 6, exec, hyprsome movefocus 6
+bind = SUPERSHIFT, 7, exec, hyprsome movefocus 7
+bind = SUPERSHIFT, 8, exec, hyprsome movefocus 8
+bind = SUPERSHIFT, 9, exec, hyprsome movefocus 9
+bind = SUPERSHIFT, 0, exec, hyprsome movefocus 10
 
 # Moving windows to other workspaces (silent)
-bind = SUPERALT,1,exec,hyprsome movetoworkspacesilent 1
-bind = SUPERALT,2,exec,hyprsome movetoworkspacesilent 2
-bind = SUPERALT,3,exec,hyprsome movetoworkspacesilent 3
-bind = SUPERALT,4,exec,hyprsome movetoworkspacesilent 4
-bind = SUPERALT,5,exec,hyprsome movetoworkspacesilent 5
-bind = SUPERALT,6,exec,hyprsome movetoworkspacesilent 6
-bind = SUPERALT,7,exec,hyprsome movetoworkspacesilent 7
-bind = SUPERALT,8,exec,hyprsome movetoworkspacesilent 8
-bind = SUPERALT,9,exec,hyprsome movetoworkspacesilent 9
-bind = SUPERALT,0,exec,hyprsome movetoworkspacesilent 10
+bind = SUPERALT, 1, exec, hyprsome movetoworkspacesilent 1
+bind = SUPERALT, 2, exec, hyprsome movetoworkspacesilent 2
+bind = SUPERALT, 3, exec, hyprsome movetoworkspacesilent 3
+bind = SUPERALT, 4, exec, hyprsome movetoworkspacesilent 4
+bind = SUPERALT, 5, exec, hyprsome movetoworkspacesilent 5
+bind = SUPERALT, 6, exec, hyprsome movetoworkspacesilent 6
+bind = SUPERALT, 7, exec, hyprsome movetoworkspacesilent 7
+bind = SUPERALT, 8, exec, hyprsome movetoworkspacesilent 8
+bind = SUPERALT, 9, exec, hyprsome movetoworkspacesilent 9
+bind = SUPERALT, 0, exec, hyprsome movetoworkspacesilent 10
 
 # Moving to other wokspace with mouse control
-bind = SUPER,mouse_down,workspace,m-1
-bind = SUPER,mouse_up,workspace,m+1
+bind = SUPER, mouse_down, workspace,m-1
+bind = SUPER, mouse_up, workspace,m+1
 
 # Moving to other wokspace with keyboard
-bind = SUPERCTRL,LEFT,workspace,m-1
-bind = SUPERCTRL,RIGHT,workspace,m+1
+bind = SUPERCTRL, LEFT, workspace,m-1
+bind = SUPERCTRL, RIGHT, workspace,m+1
 
-bind = SUPERCTRL,h,workspace,m-1
-bind = SUPERCTRL,l,workspace,m+1
+bind = SUPERCTRL, H, workspace,m-1
+bind = SUPERCTRL, L, workspace,m+1
 
 # Center a window
-bind = SUPER,c,exec,hyprctl dispatch centerwindow 1
+bind = SUPER, C, exec, hyprctl dispatch centerwindow 1
 
 # Group control
-bind = SUPERSHIFT,51,exec,pypr expose
-bind = SUPERSHIFT,48,togglespecialworkspace, minimized
-bind = SUPER,48,exec,pypr toggle_minimized
-bind =SUPER,S, togglesplit
-bind = SUPER,G,togglegroup
-bind = ALT,tab,changegroupactive
+bind = SUPERSHIFT, 51, exec, pypr expose # Backslash
+bind = SUPERSHIFT, 48, togglespecialworkspace, minimized # Single quote
+bind = SUPER, 48, exec, pypr toggle_minimized # Single quote
+bind = SUPER, S, togglesplit
+bind = SUPER, G, togglegroup
+bind = ALT, TAB, changegroupactive
 
 # Submap for resizing windows
-bind = SUPER,R,submap,resize
+bind = SUPER, R, submap, resize
 submap = resize
 
-binde = ,right,resizeactive,40 0
-binde = ,left,resizeactive,-40 0
-binde = ,up,resizeactive,0 -40
-binde = ,down,resizeactive,0 40
+binde = , RIGHT, resizeactive, 40 0
+binde = , LEFT, resizeactive, -40 0
+binde = , UP, resizeactive, 0 -40
+binde = , DOWN, resizeactive, 0 40
 
-binde = ,l,resizeactive,40 0
-binde = ,h,resizeactive,-40 0
-binde = ,k,resizeactive,0 -40
-binde = ,j,resizeactive,0 40
+binde = , L, resizeactive, 40 0
+binde = , H, resizeactive, -40 0
+binde = , K, resizeactive, 0 -40
+binde = , J, resizeactive, 0 40
 
-bind = ,escape,submap,reset 
+bind = , escape, submap, reset 
 
 submap = reset
 
 ## Audio
-bind = SUPERCTRL,V,exec,restartAudio
-bind = ,XF86AudioPlay,exec,playerctl play-pause
-bindl = SUPERCTRL,mouse:274,exec,playerctl play-pause
-bind = ,XF86AudioPrev,exec,playerctl previous
-bindl = SUPERCTRL,mouse_up,exec,playerctl previous
-bind = ,XF86AudioNext,exec,playerctl next
-bindl = SUPERCTRL,mouse_down,exec,playerctl next
+bind = SUPERCTRL, V, exec, restartAudio
+bind = ,XF86AudioPlay, exec, playerctl play-pause
+bindl = SUPERCTRL, mouse:274, exec,playerctl play-pause
+bind = ,XF86AudioPrev, exec, playerctl previous
+bindl = SUPERCTRL, mouse_up, exec, playerctl previous
+bind = ,XF86AudioNext, exec, playerctl next
+bindl = SUPERCTRL, mouse_down, exec, playerctl next
 
-bindl = ,XF86AudioMedia,exec,playerctl play-pause
-bindl = ,XF86AudioStop,exec,playerctl stop
+bindl = , XF86AudioMedia, exec, playerctl play-pause
+bindl = , XF86AudioStop, exec, playerctl stop
 
-bindle = ,XF86AudioRaiseVolume,exec,swayosd --output-volume raise
-bindle = ,XF86AudioLowerVolume,exec,swayosd --output-volume lower
+bindle = , XF86AudioRaiseVolume, exec, swayosd --output-volume raise
+bindle = , XF86AudioLowerVolume, exec, swayosd --output-volume lower
 
-bindle = ,XF86AudioMute,exec,swayosd --output-volume mute-toggle
-bindle = ,XF86AudioMicMute,exec,exec swayosd --input-volume mute-toggle
+bindle = , XF86AudioMute, exec, swayosd --output-volume mute-toggle
+bindle = , XF86AudioMicMute, exec, exec swayosd --input-volume mute-toggle
 
 
 # Disable anim, blur, etc
-bind = SUPER,F1,exec,~/.config/hypr/scripts/performance
+bind = SUPER, F1, exec, ~/.config/hypr/scripts/performance
diff --git a/.config/hypr/configs/monitors.conf b/.config/hypr/configs/monitors.conf
index e8bcb885..a71c5305 100644
--- a/.config/hypr/configs/monitors.conf
+++ b/.config/hypr/configs/monitors.conf
@@ -1,6 +1,6 @@
 # Generated by nwg-displays on 2023-09-04 at 18:08:34. Do not edit manually.
 
-monitor = HDMI-A-1,1920x1080@74.973,2560x300,1.0
-monitor = HDMI-A-1,transform,3
-monitor = DP-3,2560x1080@74.990997,0x0,1.0
-monitor = DP-1,2560x1080@74.991,0x1080,1.0
+monitor = HDMI-A-1, 1920x1080@74.973, 2560x300, 1.0
+monitor = HDMI-A-1, transform, 3
+monitor = DP-3, 2560x1080@74.990997, 0x0, 1.0
+monitor = DP-1, 2560x1080@74.991, 0x1080, 1.0
diff --git a/.config/hypr/configs/workspaces.conf b/.config/hypr/configs/workspaces.conf
index f6f06ef1..e6c07d42 100644
--- a/.config/hypr/configs/workspaces.conf
+++ b/.config/hypr/configs/workspaces.conf
@@ -1,32 +1,32 @@
 # Generated by nwg-displays on 2023-09-04 at 18:08:34. Do not edit manually.
 
-workspace = DP-1,1
-workspace = DP-1,2
-workspace = DP-1,3
-workspace = DP-1,4
-workspace = DP-1,5
-workspace = DP-1,6
-workspace = DP-1,7
-workspace = DP-1,8
-workspace = DP-1,9
-workspace = DP-1,10
-workspace = DP-3,11
-workspace = DP-3,12
-workspace = DP-3,13
-workspace = DP-3,14
-workspace = DP-3,15
-workspace = DP-3,16
-workspace = DP-3,17
-workspace = DP-3,18
-workspace = DP-3,19
-workspace = DP-3,20
-workspace = HDMI-A-1,21
-workspace = HDMI-A-1,22
-workspace = HDMI-A-1,23
-workspace = HDMI-A-1,24
-workspace = HDMI-A-1,25
-workspace = HDMI-A-1,26
-workspace = HDMI-A-1,27
-workspace = HDMI-A-1,28
-workspace = HDMI-A-1,29
-workspace = HDMI-A-1,30
+workspace = DP-1, 1
+workspace = DP-1, 2
+workspace = DP-1, 3
+workspace = DP-1, 4
+workspace = DP-1, 5
+workspace = DP-1, 6
+workspace = DP-1, 7
+workspace = DP-1, 8
+workspace = DP-1, 9
+workspace = DP-1, 10
+workspace = DP-3, 11
+workspace = DP-3, 12
+workspace = DP-3, 13
+workspace = DP-3, 14
+workspace = DP-3, 15
+workspace = DP-3, 16
+workspace = DP-3, 17
+workspace = DP-3, 18
+workspace = DP-3, 19
+workspace = DP-3, 20
+workspace = HDMI-A-1, 21
+workspace = HDMI-A-1, 22
+workspace = HDMI-A-1, 23
+workspace = HDMI-A-1, 24
+workspace = HDMI-A-1, 25
+workspace = HDMI-A-1, 26
+workspace = HDMI-A-1, 27
+workspace = HDMI-A-1, 28
+workspace = HDMI-A-1, 29
+workspace = HDMI-A-1, 30
diff --git a/.config/hypr/themes/luna/luna.conf b/.config/hypr/themes/luna/luna.conf
index ab6960e9..6c77e861 100644
--- a/.config/hypr/themes/luna/luna.conf
+++ b/.config/hypr/themes/luna/luna.conf
@@ -1,7 +1,7 @@
 # Mouse and keyboard Config
 input {
-    kb_layout = us,es
-    kb_options = compose:rctrl,level3:ralt_switch,grp:win_space_toggle
+    kb_layout = us, es
+    kb_options = compose:rctrl, level3:ralt_switch, grp:win_space_toggle
 
     follow_mouse = 1
     numlock_by_default = true
@@ -13,20 +13,6 @@ input {
     }
 }
 
-device:sonix-usb-device {
-    kb_layout = es,us
-    kb_options = compose:rctrl,level3:ralt_switch,grp:win_space_toggle
-
-    numlock_by_default = true
-}
-
-device:evision-usb-device {
-    kb_layout = us,es
-    kb_options = compose:rctrl,level3:ralt_switch,grp:win_space_toggle
-
-    numlock_by_default = true
-}
-
 misc {
     always_follow_on_dnd = true
     disable_hyprland_logo = true
diff --git a/.config/hypr/themes/luna/rules.conf b/.config/hypr/themes/luna/rules.conf
index 98be6e1f..5f5433a7 100644
--- a/.config/hypr/themes/luna/rules.conf
+++ b/.config/hypr/themes/luna/rules.conf
@@ -1,18 +1,18 @@
 ## Base Rules
 $center-float-large = class:^(center-float-large)$|^(Geeqie)$|^(.*celluloid.*)$
-windowrulev2 = float,$center-float-large
-windowrulev2 = size 70% 70%,$center-float-large
-windowrulev2 = center 1,$center-float-large
+windowrulev2 = float, $center-float-large
+windowrulev2 = size 70% 70%, $center-float-large
+windowrulev2 = center 1, $center-float-large
 
 $center-float = class:^(center-float)$|^(.*file-roller.*)$
-windowrulev2 = float,$center-float
-windowrulev2 = size 50% 50%,$center-float
-windowrulev2 = center 1,$center-float
+windowrulev2 = float, $center-float
+windowrulev2 = size 50% 50%, $center-float
+windowrulev2 = center 1, $center-float
 
 $center-float-mini = class:^(center-float-mini)$|^(.*galculator.*)$|^(.*ytdlp-gui.*)$
-windowrulev2 = float,$center-float-mini
-windowrulev2 = size 30% 40%,$center-float-mini
-windowrulev2 = center 1,$center-float-mini
+windowrulev2 = float, $center-float-mini
+windowrulev2 = size 30% 40%, $center-float-mini
+windowrulev2 = center 1, $center-float-mini
 
 
 ## Float Rules
@@ -21,39 +21,39 @@ windowrule = float, xfce-polkit|wleave|title:Open File|title:Open Folder|title:b
 
 ## Workspace Rules
 # System
-windowrulev2 = workspace 9,class:^(.*virt-manager.*)$|(.*PikaBackup.*)$
-windowrulev2 = workspace 19,class:^(.*GParted.*)$|(.*clamtk.*)$|(.*gnome.Logs.*)$
+windowrulev2 = workspace 9, class:^(.*virt-manager.*)$|(.*PikaBackup.*)$
+windowrulev2 = workspace 19, class:^(.*GParted.*)$|(.*clamtk.*)$|(.*gnome.Logs.*)$
 
 # Games
-windowrulev2 = workspace 8,class:^(.*steam_app.*)$
-windowrulev2 = workspace 18,class:^(steam)$|(.*atlauncher.*)$|(.*heroic.*)$
-windowrulev2 = workspace 8,class:^(.*Ryujinx.*)$|(.*cemu.*)$|(.*dolphin.*)$|(.*RetroArch.*)$|(.*xemu.*)$|(.*duckstation.*)$|(.*rpcs3.*)$
+windowrulev2 = workspace 8, class:^(.*steam_app.*)$
+windowrulev2 = workspace 18, class:^(steam)$|(.*atlauncher.*)$|(.*heroic.*)$
+windowrulev2 = workspace 8, class:^(.*Ryujinx.*)$|(.*cemu.*)$|(.*dolphin.*)$|(.*RetroArch.*)$|(.*xemu.*)$|(.*duckstation.*)$|(.*rpcs3.*)$
 
 # Media
-windowrulev2 = workspace 23 silent,class:^(.*thunderbird.*)$
-windowrulev2 = workspace 21,silent,class:^(.*Spotify.*)$
-windowrulev2 = workspace 22 silent,class:^(.*discord.*)$
-windowrulev2 = workspace 17,class:^(.*obsproject.*)$
-windowrulev2 = workspace 16,class:^(.*easyeffects.*)$|^(.*qpwgraph.*)$
-windowrulev2 = workspace 6,class:^(.*vital.*)$|(.*fl64.*)$
-windowrulev2 = workspace 5,class:^(.*pinta.*)$|(.*krita.*)$|(.*blender.*)$|(.*Upscayl.*)$
+windowrulev2 = workspace 23 silent, class:^(.*thunderbird.*)$
+windowrulev2 = workspace 21 silent, class:^(.*Spotify.*)$
+windowrulev2 = workspace 22 silent, class:^(.*discord.*)$
+windowrulev2 = workspace 17, class:^(.*obsproject.*)$
+windowrulev2 = workspace 16, class:^(.*easyeffects.*)$|^(.*qpwgraph.*)$
+windowrulev2 = workspace 6, class:^(.*vital.*)$|(.*fl64.*)$
+windowrulev2 = workspace 5, class:^(.*pinta.*)$|(.*krita.*)$|(.*blender.*)$|(.*Upscayl.*)$
 
 # Productivity/Dev
-windowrulev2 = workspace 10,class:^(.*obsidian.*)$
-windowrulev2 = workspace 2,class:^(.*Code.*)$
+windowrulev2 = workspace 10, class:^(.*obsidian.*)$
+windowrulev2 = workspace 2, class:^(.*Code.*)$
 
 
 ## Scratchpads
 $scratchpad = class:^(scratchpad)$
-windowrulev2 = float,$scratchpad
-windowrulev2 = center 1,$scratchpad
-windowrulev2 = size 70% 70%,$scratchpad
-windowrulev2 = workspace special:scratchpad silent,$scratchpad
+windowrulev2 = float, $scratchpad
+windowrulev2 = center 1, $scratchpad
+windowrulev2 = size 70% 70%, $scratchpad
+windowrulev2 = workspace special:scratchpad silent, $scratchpad
 
 $sideScratchpad = class:^(.*pavucontrol.*)$|(.*blueman-manager.*)$ #|^(.*localsend.*)$
-windowrulev2 = workspace special:sideScratchpad silent,$sideScratchpad
-windowrulev2 = size 30% 90%,$sideScratchpad
-windowrulev2 = float,$sideScratchpad
+windowrulev2 = workspace special:sideScratchpad silent, $sideScratchpad
+windowrulev2 = size 30% 90%, $sideScratchpad
+windowrulev2 = float, $sideScratchpad
 
 
 ## Specific App Rules
@@ -69,11 +69,11 @@ windowrulev2 = size 35% 90%, $zathura
 windowrulev2 = center 1, $zathura
 
 $scrcpy = class:^(.*scrcpy.*)$
-windowrulev2 = center 1,$scrcpy
-windowrulev2 = float,$scrcpy
+windowrulev2 = center 1, $scrcpy
+windowrulev2 = float, $scrcpy
 
 windowrulev2 = noinitialfocus, class:(.*Spotify.*)
 
-windowrulev2 = idleinhibit always,class:^(.*steam_app.*)$
-windowrulev2 = idleinhibit fullscreen,class:^(.*celluloid.*)$
-windowrulev2 = idleinhibit fullscreen,class:^(.*LibreWolf.*)$
+windowrulev2 = idleinhibit always, class:^(.*steam_app.*)$
+windowrulev2 = idleinhibit fullscreen, class:^(.*celluloid.*)$
+windowrulev2 = idleinhibit fullscreen, class:^(.*LibreWolf.*)$
diff --git a/.config/hypr/themes/luna/theme.conf b/.config/hypr/themes/luna/theme.conf
index 1c363f1a..afe557ef 100644
--- a/.config/hypr/themes/luna/theme.conf
+++ b/.config/hypr/themes/luna/theme.conf
@@ -43,13 +43,13 @@ animations {
     bezier = overshot,0.13,0.99,0.29,1.1
     bezier = liner, 1, 1, 1, 1
 
-    animation = windows,1,6,wind,popin
-    animation = windowsIn, 1,6, overshot, popin
-    animation = windowsOut, 1,5, overshot, popin
-    animation = windowsMove,1,5,overshot,slide
-    animation = fadeIn,1,10,default
-    animation = fadeOut,1,10,default
-    animation = workspaces,1,6,overshot,slide
+    animation = windows, 1, 6, wind,popin
+    animation = windowsIn, 1, 6, overshot, popin
+    animation = windowsOut, 1, 5, overshot, popin
+    animation = windowsMove, 1, 5, overshot, slide
+    animation = fadeIn, 1, 10, default
+    animation = fadeOut, 1, 10, default
+    animation = workspaces, 1,6, overshot, slide
     animation = border, 1, 1, liner
     animation = borderangle, 1, 30, liner, loop
 }