diff --git a/.config/hypr/.gitignore b/.config/hypr/.gitignore
index 8be2a5f..544bbe4 100644
--- a/.config/hypr/.gitignore
+++ b/.config/hypr/.gitignore
@@ -1,2 +1,3 @@
-conf.d/custom.conf
+conf.d/override.conf
+conf.d/vars.conf
 hyprpaper.conf
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 2cc3706..928a112 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -8,8 +8,9 @@
 # For a full list, see the wiki (basic and advanced configuring)
 #
 
+source=~/.config/hypr/conf.d/vars.conf
+
 monitor=,preferred,auto,1
-workspace=DP-1,1
 
 input {
     kb_file=
@@ -96,7 +97,7 @@ bind=SUPERSHIFT,Q,killactive,
 bind=SUPERSHIFT,E,exit,
 bind=SUPERSHIFT,Space,togglefloating,
 bind=SUPERSHIFT,c,exec,pkill waybar && waybar -c ~/.config/waybar/hyprland
-bind=CTRLALT,l,exec,swaylock -e -F -f -i ~/Pictures/orion-nebula-5120x2880-hubble-space-telescope-nasa-hd-5k-1933.jpg
+bind=CTRLALT,l,exec,swaylock -e -F -f -i $lockBG
 bind=SUPER,D,exec,wofi --show drun --allow-images -G -i --define=drun-print_command=true | sed -e 's/%[A-Za-z0-9]*/ /g' | xargs hyprctl dispatch exec
 bind=,Print,exec,grim -g "$(slurp)" - | swappy -f -
 bind=SUPER,P,pseudo,
@@ -158,14 +159,14 @@ bind=SUPERSHIFT,Down,movewindow,d
 
 
 # ----------------------- STARTUP -------------------- #
-exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once=foot -s
-exec-once=mako
-exec-once=waybar -c ~/.config/waybar/hyprland
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once = foot -s
+exec-once = mako
+exec-once = waybar -c ~/.config/waybar/hyprland
 exec-once = wl-paste --type text --watch cliphist store #Stores only text data
 exec-once = wl-paste --type image --watch cliphist store #Stores only image data
 exec-once = lxqt-policykit-agent
 exec-once = hyprpaper
 
-source=~/.config/hypr/conf.d/custom.conf
+source = ~/.config/hypr/conf.d/override.conf
diff --git a/.config/hypr/hyprpaper.conf.example b/.config/hypr/hyprpaper.conf.example
new file mode 100644
index 0000000..02d0dae
--- /dev/null
+++ b/.config/hypr/hyprpaper.conf.example
@@ -0,0 +1,3 @@
+preload = ~/Pictures/orion-nebula-5120x2880-hubble-space-telescope-nasa-hd-5k-1933.jpg
+
+wallpaper=,~/Pictures/orion-nebula-5120x2880-hubble-space-telescope-nasa-hd-5k-1933.jpg