diff --git a/hypr-configs/dotfiles/hypr/configs/autostart.conf b/hypr-configs/dotfiles/hypr/configs/autostart.conf
index 13ee62c..aa858ff 100644
--- a/hypr-configs/dotfiles/hypr/configs/autostart.conf
+++ b/hypr-configs/dotfiles/hypr/configs/autostart.conf
@@ -3,16 +3,16 @@
 # -----------------------------------------------------
 
 exec-once = dbus-update-activation-environment --all &
-exec-once = $SCRIPT_PATH/startup/pipewire.sh &
-exec-once = $SCRIPT_PATH/startup/keyring.sh &
+exec-once = $script_dir/startup/pipewire.sh &
+exec-once = $script_dir/startup/keyring.sh &
 exec-once = wl-paste --watch cliphist store &
 
-exec-once = $SCRIPT_PATH/startup/dunst.sh &
+exec-once = $script_dir/startup/dunst.sh &
 # exec-once = ~/.config/hypr/scripts/wallpaper/wallpaper-daemon.sh &
 exec-once = hyprpaper &
-exec-once = $SCRIPT_PATH/startup/swayosd.sh &
+exec-once = $script_dir/startup/swayosd.sh &
 # exec-once = ~/.config/hypr/scripts/waybar/start.sh &
-exec-once = $EWW_SCRIPT_PATH/eww/start.sh &
+exec-once = $eww_script_dir/eww/start.sh &
 
 # exec-once = avizo-service &
 # exec-once = eww daemon && eww open bar
diff --git a/hypr-configs/dotfiles/hypr/configs/keybinds.conf b/hypr-configs/dotfiles/hypr/configs/keybinds.conf
index b1791e0..795ed80 100644
--- a/hypr-configs/dotfiles/hypr/configs/keybinds.conf
+++ b/hypr-configs/dotfiles/hypr/configs/keybinds.conf
@@ -1,50 +1,50 @@
 # Windows and session
-bind = $mainMod, H, togglefloating,
-bind = $mainMod, C, killactive,
-bind = $mainMod, P, pseudo,
-bind = $mainMod, D, togglesplit,
-bind = $mainMod, F, fullscreen, 1
+bind = $main_mod, H, togglefloating,
+bind = $main_mod, C, killactive,
+bind = $main_mod, P, pseudo,
+bind = $main_mod, D, togglesplit,
+bind = $main_mod, F, fullscreen, 1
 bind =, F11, fullscreen,
-binde = $mainMod SHIFT, right, resizeactive, 100 0
-binde = $mainMod SHIFT, left, resizeactive, -100 0
-binde = $mainMod SHIFT, up, resizeactive, 0 -100
-binde = $mainMod SHIFT, down, resizeactive, 0 100
-bind = $mainMod ALT, left, movewindow, l
-bind = $mainMod ALT, right, movewindow, r
-bind = $mainMod ALT, up, movewindow, u
-bind = $mainMod ALT, down, movewindow, d
+binde = $main_mod SHIFT, right, resizeactive, 100 0
+binde = $main_mod SHIFT, left, resizeactive, -100 0
+binde = $main_mod SHIFT, up, resizeactive, 0 -100
+binde = $main_mod SHIFT, down, resizeactive, 0 100
+bind = $main_mod ALT, left, movewindow, l
+bind = $main_mod ALT, right, movewindow, r
+bind = $main_mod ALT, up, movewindow, u
+bind = $main_mod ALT, down, movewindow, d
 
 # Monitor
-bind = $mainMod, TAB, focusmonitor, +1
-bind = $mainMod SHIFT, TAB, focusmonitor, -1
+bind = $main_mod, TAB, focusmonitor, +1
+bind = $main_mod SHIFT, TAB, focusmonitor, -1
 
 # Apps
-bind = $mainMod, M, exec, $locker
-bind = $mainMod, R, exec, $rofi_menu
-bind = $mainMod, A, exec, $nekoray
-bind = $mainMod, T, exec, $pavucontrol
-bind = $mainMod, X, exec, $rofi_screenshot
-bind = $mainMod, L, exec, $rofi_powermenu
-bind = $mainMod, V, exec, $rofi_clipboard
-bind = $mainMod, U, exec, $rofi_wallpaper
-bind = $mainMod, K, exec, $waybar_toggle
-bind = $mainMod, Q, exec, $terminal
-bind = $mainMod, W, exec, $zterminal
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, N, exec, $network_manager
-bind = $mainMod, J, exec, $pkg_manager
-bind = $mainMod, B, exec, $bluetooth-manager
+bind = $main_mod, M, exec, $locker
+bind = $main_mod, R, exec, $rofi_menu
+bind = $main_mod, A, exec, $nekoray
+bind = $main_mod, T, exec, $pavucontrol
+bind = $main_mod, X, exec, $rofi_screenshot
+bind = $main_mod, L, exec, $rofi_powermenu
+bind = $main_mod, V, exec, $rofi_clipboard
+bind = $main_mod, U, exec, $rofi_wallpaper
+bind = $main_mod, K, exec, $waybar_toggle
+bind = $main_mod, Q, exec, $terminal
+bind = $main_mod, W, exec, $zterminal
+bind = $main_mod, E, exec, $fileManager
+bind = $main_mod, N, exec, $network_manager
+bind = $main_mod, J, exec, $pkg_manager
+bind = $main_mod, B, exec, $bluetooth-manager
 
 # EWw
-bind = $mainMod, Z, exec, $eww_toggle_panel
+bind = $main_mod, Z, exec, $eww_toggle_panel
 
 # Screenshot
-bind = $mainMod, PRINT, exec, $screenshot -m window
+bind = $main_mod, PRINT, exec, $screenshot -m window
 bind =, PRINT, exec, $screenshot -m output
 
 # Wallpaper
-bind = $mainMod, Y, exec, $random_wallpaper
-bind = $mainMod, I, exec, $kill_wallpaper_daemon
+bind = $main_mod, Y, exec, $random_wallpaper
+bind = $main_mod, I, exec, $kill_wallpaper_daemon
 
 # Audio control
 binde=, XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise
@@ -61,51 +61,51 @@ binde=, XF86MonBrightnessUp, exec, brightnessctl set 10%+
 binde=, XF86MonBrightnessDown, exec, brightnessctl set 10%-
 
 # Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
+bind = $main_mod, left, movefocus, l
+bind = $main_mod, right, movefocus, r
+bind = $main_mod, up, movefocus, u
+bind = $main_mod, down, movefocus, d
 
 # Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
+bind = $main_mod, 1, workspace, 1
+bind = $main_mod, 2, workspace, 2
+bind = $main_mod, 3, workspace, 3
+bind = $main_mod, 4, workspace, 4
+bind = $main_mod, 5, workspace, 5
+bind = $main_mod, 6, workspace, 6
+bind = $main_mod, 7, workspace, 7
+bind = $main_mod, 8, workspace, 8
+bind = $main_mod, 9, workspace, 9
+bind = $main_mod, 0, workspace, 10
 
 # Move workspaces with arrow
-bind = $mainMod CTRL, right, workspace, +1
-bind = $mainMod CTRL, left, workspace, -1
+bind = $main_mod CTRL, right, workspace, +1
+bind = $main_mod CTRL, left, workspace, -1
 bind = CTRL ALT, right, workspace, +2
 bind = CTRL ALT, left, workspace, -2
 bind = ALT SHIFT, right, movetoworkspace, +1
 bind = ALT SHIFT, left, movetoworkspace, -1
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
+bind = $main_mod SHIFT, 1, movetoworkspace, 1
+bind = $main_mod SHIFT, 2, movetoworkspace, 2
+bind = $main_mod SHIFT, 3, movetoworkspace, 3
+bind = $main_mod SHIFT, 4, movetoworkspace, 4
+bind = $main_mod SHIFT, 5, movetoworkspace, 5
+bind = $main_mod SHIFT, 6, movetoworkspace, 6
+bind = $main_mod SHIFT, 7, movetoworkspace, 7
+bind = $main_mod SHIFT, 8, movetoworkspace, 8
+bind = $main_mod SHIFT, 9, movetoworkspace, 9
+bind = $main_mod SHIFT, 0, movetoworkspace, 10
 
 # Example special workspace (scratchpad)
-bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+bind = $main_mod, S, togglespecialworkspace, magic
+bind = $main_mod SHIFT, S, movetoworkspace, special:magic
 
 # Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
+bind = $main_mod, mouse_down, workspace, e+1
+bind = $main_mod, mouse_up, workspace, e-1
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
+bindm = $main_mod, mouse:272, movewindow
+bindm = $main_mod, mouse:273, resizewindow
diff --git a/hypr-configs/dotfiles/hypr/configs/startup.conf b/hypr-configs/dotfiles/hypr/configs/startup.conf
index a23adf3..4fd226a 100644
--- a/hypr-configs/dotfiles/hypr/configs/startup.conf
+++ b/hypr-configs/dotfiles/hypr/configs/startup.conf
@@ -2,5 +2,5 @@
 # Startup
 # -----------------------------------------------------
 
-exec-once=[workspace 3 silent] nekoray
-exec-once=[workspace 3 silent] $alacritty_terminal -e btop
\ No newline at end of file
+exec-once=[workspace 3 silent] $terminal -e btop
+exec-once=[workspace 3 silent] nekoray
\ No newline at end of file
diff --git a/hypr-configs/dotfiles/hypr/hyprland.conf b/hypr-configs/dotfiles/hypr/hyprland.conf
index 786a4fd..7d2030c 100644
--- a/hypr-configs/dotfiles/hypr/hyprland.conf
+++ b/hypr-configs/dotfiles/hypr/hyprland.conf
@@ -11,30 +11,25 @@
 # Environments
 # -----------------------------------------------------
 
-$CURSOR_SIZE = 24
+$mouse_cursor_size = 24
 
-env = HYPRCURSOR_THEME,Bibata-Modern-Ice
-env = XCURSOR_THEME,Bibata-Modern-Ice
-env = HYPRCURSOR_SIZE,$CURSOR_SIZE
-env = XCURSOR_SIZE,$CURSOR_SIZE
-
-env = QT_QPA_PLATFORM,wayland
-env = QT_QPA_PLATFORMTHEME,qt6ct
-# env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-# env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = QT_STYLE_OVERRIDE,kvantum
+env = HYPRCURSOR_THEME, Bibata-Modern-Ice
+env = XCURSOR_THEME, Bibata-Modern-Ice
+env = HYPRCURSOR_SIZE, $mouse_cursor_size
+env = XCURSOR_SIZE, $mouse_cursor_size
 
+env = QT_QPA_PLATFORM, wayland
+env = QT_QPA_PLATFORMTHEME, qt6ct
+env = QT_STYLE_OVERRIDE, kvantum
 exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
 
-# env = WLR_DRM_NO_ATOMIC,1
 env = XDG_DATA_DIRS, $HOME/.nix-profile/share:/usr/share/:$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/var/lib/flatpak/exports/share
 
-$SCRIPT_PATH = ~/.config/hypr/scripts
-$EWW_SCRIPT_PATH = ~/.config/eww/scripts
+$main_mod = SUPER
 
-$eww_toggle_panel = $EWW_SCRIPT_PATH/eww/toggle-panel.sh
-
-$mainMod = SUPER
+$script_dir = ~/.config/hypr/scripts
+$eww_script_dir = ~/.config/eww/scripts
+$eww_toggle_panel = $eww_script_dir/eww/toggle-panel.sh
 
 $alacritty_terminal = alacritty
 $kitty_terminal = kitty
@@ -48,18 +43,18 @@ $bluetooth-manager = blueman-manager
 $pkg_manager = octoxbps
 $locker = hyprlock
 
-$screenshot = $SCRIPT_PATH/hyprshot.sh
-$pavucontrol = $SCRIPT_PATH/pavucontrol-launch.sh
-$nekoray = $SCRIPT_PATH/nekoray-launch.sh
-$network_manager = $SCRIPT_PATH/nmtui-launch.sh
-$random_wallpaper = $SCRIPT_PATH/wallpaper/wallpaper-daemon.sh
-$kill_wallpaper_daemon = $SCRIPT_PATH/wallpaper/kill-daemon.sh
-$waybar_toggle = $SCRIPT_PATH/waybar/toggle.sh
-$rofi_menu = $SCRIPT_PATH/rofi-launch.sh d
-$rofi_powermenu = $SCRIPT_PATH/rofi-launch.sh p
-$rofi_screenshot = $SCRIPT_PATH/rofi-launch.sh s
-$rofi_clipboard = $SCRIPT_PATH/rofi-launch.sh c
-$rofi_wallpaper = $SCRIPT_PATH/rofi-launch.sh w
+$screenshot = $script_dir/hyprshot.sh
+$pavucontrol = $script_dir/pavucontrol-launch.sh
+$nekoray = $script_dir/nekoray-launch.sh
+$network_manager = $script_dir/nmtui-launch.sh
+$random_wallpaper = $script_dir/wallpaper/wallpaper-daemon.sh
+$kill_wallpaper_daemon = $script_dir/wallpaper/kill-daemon.sh
+$waybar_toggle = $script_dir/waybar/toggle.sh
+$rofi_menu = $script_dir/rofi-launch.sh d
+$rofi_powermenu = $script_dir/rofi-launch.sh p
+$rofi_screenshot = $script_dir/rofi-launch.sh s
+$rofi_clipboard = $script_dir/rofi-launch.sh c
+$rofi_wallpaper = $script_dir/rofi-launch.sh w
 
 
 # -----------------------------------------------------