diff --git a/README.md b/README.md
index ab02470..a33443b 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,8 @@ pkill waybar && waybar &
 
 ## Future improvements
 
+- Correct laptop detection
+- Optional groups
 - Waybar switch script
 - A defaults system allowing you to easily choose your default programs
 - Nvidia cards handling
diff --git a/config/.config/hypr/config/default/appearance.conf b/config/.config/hypr/config/default/appearance.conf
index 56edd75..e6fa896 100644
--- a/config/.config/hypr/config/default/appearance.conf
+++ b/config/.config/hypr/config/default/appearance.conf
@@ -111,26 +111,26 @@ animations {
     animation = global, 1, 10, default
     animation = border, 1, 4, easeOutQuint
 
-    animation = windows, 1, 3.79, easeOutQuint
+    animation = windows, 1, 3.5, easeOutQuint
     animation = windowsIn, 1, 3.1, easeOutQuint, popin 87%
     animation = windowsOut, 1, 1.49, linear, popin 87%
 
-    animation = fadeIn, 1, 1.73, almostLinear
-    animation = fadeOut, 1, 1.46, almostLinear
-    animation = fade, 1, 3.03, quick
+    animation = fadeIn, 1, 1.73, easeOutQuint
+    animation = fadeOut, 1, 1.46, easeOutQuint
+    animation = fade, 1, 3.03, easeOutQuint
 
-    animation = layers, 1, 3.81, easeOutQuint
-    animation = layersIn, 1, 3, easeOutQuint, popin 85%
-    animation = layersOut, 1, 3, linear, popin
-    # animation = fadeLayersIn, 1, 1.79, almostLinear
-    # animation = fadeLayersOut, 1, 1.39, almostLinear
+    animation = layers, 1, 3, easeOutQuint
+    # animation = layersIn, 1, 2.4, easeOutQuint, popin 85%
+    # animation = layersOut, 1, 2.4, easeOutQuint, popin 85%
+    animation = layersIn, 1, 2.4, easeOutQuint, fade
+    animation = layersOut, 1, 2.4, easeOutQuint, fade
+    animation = fadeLayersIn, 1, 2, easeOutQuint
+    animation = fadeLayersOut, 1, 2, easeOutQuint
 
-    animation = workspaces, 1, 2.2 , easeOutQuint, slidefadevert
-    animation = workspacesIn, 1, 3, easeOutQuint, slide
-    animation = workspacesOut, 1, 3, easeOutQuint, slide
+    animation = workspaces, 1, 2.8 , easeOutQuint, slidefadevert
+    animation = workspacesIn, 1, 2.6, easeOutQuint, slide
+    animation = workspacesOut, 1, 2.6, easeOutQuint, slide
 
-    # animation = workspacesIn, 1, 3, easeOutQuint, slidefade
-    # animation = workspacesOut, 1, 5, easeOutQuint, slidefade
 }
 
 # Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
@@ -145,7 +145,6 @@ animations {
 
 # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {
-    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
     preserve_split = true # You probably want this
 }
 
@@ -159,7 +158,6 @@ misc {
     force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
     disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
     disable_splash_rendering = true # Disable default wallpapers rendering
-    vfr = true # Lower sent frames when idle
 }
 
 
diff --git a/config/.config/hypr/hyprlock.conf b/config/.config/hypr/config/default/hyprlock.conf
similarity index 97%
rename from config/.config/hypr/hyprlock.conf
rename to config/.config/hypr/config/default/hyprlock.conf
index d79c7bc..532a40d 100644
--- a/config/.config/hypr/hyprlock.conf
+++ b/config/.config/hypr/config/default/hyprlock.conf
@@ -24,12 +24,12 @@ general {
 input-field {
     monitor =
     size = 320, 55
-    outline_thickness = -1
+    outline_thickness = 2
     dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
     dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
     dots_center = true
     outer_color = rgba(200, 200, 200, 0.4)
-    inner_color = rgba(100, 114, 125, 1)
+    inner_color = rgba(100, 114, 125, 0)
     font_color = rgb(200, 200, 200)
     fade_on_empty = false
     font_family = DejaVu Sans
diff --git a/config/.config/hypr/config/default/input.conf b/config/.config/hypr/config/default/input.conf
index 0c076c1..6711f60 100644
--- a/config/.config/hypr/config/default/input.conf
+++ b/config/.config/hypr/config/default/input.conf
@@ -41,7 +41,7 @@ $mainMod = SUPER # Sets "Windows" key as main modifier
 bind = $mainMod, Q, killactive,
 bind = $mainMod, R, exec, $menu  # Omnibar
 bind = $mainMod, D, exec, $menu  # Legacy menu shortcut
-bind = $mainMod, L, exec, hyprlock  # Lockscreen
+bind = $mainMod, I, exec, ~/.config/hypr/scripts/lock.sh  # Lockscreen
 bind = $mainMod, B, exec, ~/.config/hypr/scripts/toggle-waybar.sh  # Toggle sidebar
 bind = $mainMod SHIFT, R, exec, ~/.config/hypr/scripts/reload.sh  # Reload desktop
 bind = $mainMod, F11, exec, ~/.config/hypr/scripts/game-mode.sh  # Gamemode
@@ -56,6 +56,12 @@ bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, A, exec, $notificationManager
 bindel = , XF86Launch1, exec, $terminal hx ~/.config/hypr/config # Replace by default editor
 
+# Move focus with mainMod + hjkl (vim keybinds)
+bind = $mainMod, H, movefocus, l
+bind = $mainMod, L, movefocus, r
+bind = $mainMod, K, movefocus, u
+bind = $mainMod, J, movefocus, d
+
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l
 bind = $mainMod, right, movefocus, r
@@ -70,9 +76,9 @@ bind = $mainMod SHIFT, down, movewindow, d
 
 # Layout
 bind = $mainMod, F, fullscreen,
-bind = $mainMod, V, togglesplit, # Horizontal/vertical split
+bindd = $mainMod, V, $d toggle split, layoutmsg, togglesplit # Horizontal/vertical split
 bind = $mainMod, T, togglefloating,
-bind = $mainMod, H, pseudo, # Toggle pseudo-tiling
+bind = $mainMod, Y, pseudo, # Toggle pseudo-tiling
 
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
diff --git a/config/.config/hypr/scripts/lock.sh b/config/.config/hypr/scripts/lock.sh
new file mode 100755
index 0000000..21cf5a5
--- /dev/null
+++ b/config/.config/hypr/scripts/lock.sh
@@ -0,0 +1 @@
+hyprlock --config "$HOME/.config/hypr/config/default/hyprlock.conf"
diff --git a/config/.config/waybar/horizontal/config.jsonc b/config/.config/waybar/horizontal/config.jsonc
index b24f6cd..20b7b8d 100644
--- a/config/.config/waybar/horizontal/config.jsonc
+++ b/config/.config/waybar/horizontal/config.jsonc
@@ -142,11 +142,14 @@
     },
     "custom/battery_percentage": {
         "format": "{}",
-        //"exec": "cat /sys/class/power_supply/BAT*/capacity",
   
-      // Makes battery like if 85% was the maximum capacity (100%).
+        // The first "exec" line makes battery like if 85% was the maximum capacity (100%).
         // Useful for people that limit charge up to a certain percentage but like having real percentage
-        "exec": "echo $(( $(cat /sys/class/power_supply/BAT*/capacity) * 100 / 85 ))%",
+        // The second behaves normally, just comment the one you don't want
+        
+        // "exec": "echo $(( $(cat /sys/class/power_supply/BAT*/capacity) * 100 / 85 ))%",
+        "exec": "echo $(cat /sys/class/power_supply/BAT*/capacity)%",
+
         "interval": 10,
         "tooltip": false
     },
diff --git a/config/.zshrc b/config/.zshrc
index f4c2e6b..df740db 100644
--- a/config/.zshrc
+++ b/config/.zshrc
@@ -86,9 +86,9 @@ alias icat='kitten icat'
 alias power-draw="cat /sys/class/power_supply/BAT1/current_now /sys/class/power_supply/BAT1/voltage_now | xargs | awk '{print \$1*\$2/1e12 \" W\"}\'"
 alias battery='cat /sys/class/power_supply/BAT1/capacity'
 # Override some default commands with more practical alternatives
-alias ls='eza --icons=automatic --tree --level=1 --follow-symlinks --no-quotes'
+alias ls='eza --icons=automatic --tree --level=1 --follow-symlinks --no-quotes --sort=modified'
 alias lsa='ls -a'
-alias lsl='eza --icons=automatic --long --header --group -M'
+alias lsl='eza --icons=automatic --long --header --group -M --sort=modified'
 alias tree='ls --level=3'
 # Keep default commands accessible
 alias lsd='/usr/bin/ls --color'