diff --git a/.config/hypr/config/environment.lua b/.config/hypr/config/environment.lua
index e882f37..8901229 100644
--- a/.config/hypr/config/environment.lua
+++ b/.config/hypr/config/environment.lua
@@ -1,15 +1,11 @@
------------------
----- PROGRAMS ---
------------------
+------ Programs
 
-terminal = "foot"
-fileManager = "nautilus"
-menu = "rofi -show drun"
-notificationManager = "swaync-client -t"
+Terminal = "foot"
+FileManager = "nautilus"
+Menu = "rofi -show drun"
+NotificationManager = "swaync-client -t"
 
-------------------
----- AUTOSTART ---
-------------------
+------ Autostart
 
 -- Autostart necessary processes (like notifications daemons, status bars, etc.)
 
@@ -19,13 +15,11 @@ hl.on("hyprland.start", function()
     hl.exec_cmd("wl-paste --type text --watch cliphist store")  -- Stores only text data
     hl.exec_cmd("wl-paste --type image --watch cliphist store")  -- Stores only image data
     -- SSH Agent
-    hl.exec_cmd("ssh-agent")  
+    hl.exec_cmd("ssh-agent")
 end)
 
 
---------------------
----- PERMISSIONS ---
---------------------
+------ Permissions
 
 -- Please note permission changes here require a Hyprland restart and are not applied on-the-fly
 -- for security reasons
diff --git a/.config/hypr/config/input.lua b/.config/hypr/config/input.lua
index 070a734..39cf63a 100644
--- a/.config/hypr/config/input.lua
+++ b/.config/hypr/config/input.lua
@@ -44,8 +44,8 @@ MainMod = "SUPER" -- Sets META ("Windows") key as main modifier
 
 -- Main desktop controls
 hl.bind(MainMod .. " + Q"        , hl.dsp.window.close())
-hl.bind(MainMod .. " + R"        , hl.dsp.exec_cmd(menu)) -- Omnibar
-hl.bind(MainMod .. " + D"        , hl.dsp.exec_cmd(menu)) -- Legacy menu shortcut
+hl.bind(MainMod .. " + R"        , hl.dsp.exec_cmd(Menu)) -- Omnibar
+hl.bind(MainMod .. " + D"        , hl.dsp.exec_cmd(Menu)) -- Legacy menu shortcut
 hl.bind(MainMod .. " + I"        , hl.dsp.exec_cmd("hyprlock")) -- Lockscreen
 hl.bind(MainMod .. " + B"        , hl.dsp.exec_cmd("~/.config/hypr/scripts/toggle-waybar.sh")) -- Toggle sidebar
 hl.bind(MainMod .. " + SHIFT + R", hl.dsp.exec_cmd("~/.config/hypr/scripts/reload.sh")) -- Reload desktop
@@ -54,13 +54,13 @@ hl.bind(MainMod .. " + F10"      , hl.dsp.exec_cmd("~/.config/hypr/scripts/sharp
 hl.bind(MainMod .. " + SHIFT + M", hl.dsp.exit()) -- Exit desktop session
 
 -- Shortcuts
-hl.bind(MainMod .. " + RETURN", hl.dsp.exec_cmd(terminal))
-hl.bind(MainMod .. " + X"     , hl.dsp.exec_cmd(terminal)) -- Absolutely not because I dislocated my arm
-hl.bind(MainMod .. " + SPACE" , hl.dsp.exec_cmd(menu))
-hl.bind(MainMod .. " + E"     , hl.dsp.exec_cmd(fileManager))
-hl.bind(MainMod .. " + A"     , hl.dsp.exec_cmd(notificationManager))
+hl.bind(MainMod .. " + RETURN", hl.dsp.exec_cmd(Terminal))
+hl.bind(MainMod .. " + X"     , hl.dsp.exec_cmd(Terminal)) -- Absolutely not because I dislocated my arm
+hl.bind(MainMod .. " + SPACE" , hl.dsp.exec_cmd(Menu))
+hl.bind(MainMod .. " + E"     , hl.dsp.exec_cmd(FileManager))
+hl.bind(MainMod .. " + A"     , hl.dsp.exec_cmd(NotificationManager))
 -- TODO Replace by default editor
-hl.bind("XF86Launch1"         , hl.dsp.exec_cmd(terminal .. " hx ~/.config/hypr/config"))
+hl.bind("XF86Launch1"         , hl.dsp.exec_cmd(Terminal .. " hx ~/.config/hypr/config"))
 
 -- Move focus with mainMod + arrow keys
 hl.bind(MainMod .. " + left" , hl.dsp.focus({ direction = "left" }))
diff --git a/.config/hypr/scripts/change-kb-layout.sh b/.config/hypr/scripts/change-kb-layout.sh
index 5509aa7..49de73b 100755
--- a/.config/hypr/scripts/change-kb-layout.sh
+++ b/.config/hypr/scripts/change-kb-layout.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 status_file="$HOME/.config/hypr/status/kb_layout"
-hyprland_cfg_file="$HOME/.config/hypr/hyprland.conf"
+hyprland_cfg_file="$HOME/.config/hypr/hyprland.lua"
 
 
 fr_to_en() {
@@ -9,7 +9,7 @@ fr_to_en() {
 
     hyprctl notify 1 2000 0 "Keyboard set to QWERTY"
 
-    sed -i 's/kb_layouts\/fr/kb_layouts\/us/g' "$hyprland_cfg_file"
+    sed -i 's/kb_layouts.fr/kb_layouts.us/g' "$hyprland_cfg_file"
 }
 
 en_to_fr() {
@@ -17,7 +17,7 @@ en_to_fr() {
 
     hyprctl notify 1 2000 0 "Keyboard set to AZERTY"
 
-    sed -i 's/kb_layouts\/us/kb_layouts\/fr/g' "$hyprland_cfg_file"
+    sed -i 's/kb_layouts\.us/kb_layouts\.fr/g' "$hyprland_cfg_file"
 }
 
 if ! [ -f "${status_file}" ]; then
@@ -30,4 +30,4 @@ else
     elif [ $(cat "${status_file}") = "en" ]; then
         en_to_fr
     fi
-fi
\ No newline at end of file
+fi