diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 831fd0c..294d2c5 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,3 +1,8 @@
+$HYDE_HYPRLAND=set #! Do not remove - HyDE marker to prevent file overwrite
+
+#* You can freely edit this file, but make sure to not remove the above line!
+#* All Files Below are yours to modify!
+
 #!      ░▒▒▒░░░▓▓           ___________
 #!    ░░▒▒▒░░░░░▓▓        //___________/
 #!   ░░▒▒▒░░░░░▓▓     _   _ _    _ _____
@@ -8,17 +13,8 @@
 
 #? Read https://hydeproject.pages.dev/en/configuring/hyprland/ for the full documentation.
 
-source = $HOME/.local/share/hyde/hyprland.conf # HyDE's core configuration // DO NOT TOUCH!!! ( ｡ •̀ ᴖ •́ ｡)
+
 source = ./keybindings.conf # Keyboard shortcuts
 source = ./windowrules.conf # Window rules
 source = ./monitors.conf # Monitor configuration
 source = ./userprefs.conf # Your hyprland configuration // Edit this file to change your Hyprland configuration
-source = ./workflows.conf # workflows configuration overrides everything
-
-# // ██████╗░░█████╗░  ███╗░░██╗░█████╗░████████╗  ███████╗██████╗░██╗████████╗
-# // ██╔══██╗██╔══██╗  ████╗░██║██╔══██╗╚══██╔══╝  ██╔════╝██╔══██╗██║╚══██╔══╝
-# // ██║░░██║██║░░██║  ██╔██╗██║██║░░██║░░░██║░░░  █████╗░░██║░░██║██║░░░██║░░░
-# // ██║░░██║██║░░██║  ██║╚████║██║░░██║░░░██║░░░  ██╔══╝░░██║░░██║██║░░░██║░░░
-# // ██████╔╝╚█████╔╝  ██║░╚███║╚█████╔╝░░░██║░░░  ███████╗██████╔╝██║░░░██║░░░
-# // ╚═════╝░░╚════╝░  ╚═╝░░╚══╝░╚════╝░░░░╚═╝░░░  ╚══════╝╚═════╝░╚═╝░░░╚═╝░░░
-
diff --git a/.config/hypr/hyprlock/theme.conf b/.config/hypr/hyprlock/theme.conf
index 7948f1e..ab4a157 100644
--- a/.config/hypr/hyprlock/theme.conf
+++ b/.config/hypr/hyprlock/theme.conf
@@ -1,138 +1 @@
-# HyDE default layout
-# Wallbash generated layout
-
-# Local Variables
-$fontFamily = JetBrainsMono Nerd Font
-$fn_greet=echo "Good $(date +%H | awk '{if ($1 < 12) print "Morning"; else if ($1 < 18) print "Afternoon"; else print "Evening"}'), ${USER}"
-
-# GENERAL
-general {
-    no_fade_in = false
-    grace = 0
-    disable_loading_bar = true
-}
-
-# BACKGROUND
-background {
-    monitor =
-    path = $BACKGROUND_PATH
-    blur_passes = 2
-}
-
-# TIME
-label {
-  monitor =
-  text = $TIME
-  color = $wallbash_txt1_rgba
-  font_size = 90
-  font_family = $fontFamily
-  position = -30, 0
-  halign = right
-  valign = top
-}
-
-# DATE
-label {
-  monitor =
-  text = cmd[update:43200000] date +"%A, %d %B %Y"
-  color = $wallbash_txt2_rgba
-  font_size = 25
-  font_family = $fontFamily
-  position = -30, -150
-  halign = right
-  valign = top
-}
-
-# USER AVATAR
-image {
-    monitor =
-    path = $MPRIS_IMAGE
-    size = 150 # lesser side if not 1:1 ratio
-    reload_time = 0 # seconds between reloading, 0 to reload with SIGUSR2
-    reload_cmd = # command to get new path. if empty, old path will be used. don't run "follow" commands like tail -F
-    position = 0, 0
-    halign = center
-    valign = center
-}
-
-# INPUT FIELD
-input-field {
-    monitor =
-    size = 200, 50 #!
-    outline_thickness = 3
-    dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
-    dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
-    dots_center = true
-    dots_rounding = -1 # -1 default circle, -2 follow input-field rounding
-    outer_color = $wallbash_pry4_rgba
-    inner_color = $wallbash_pry2_rgba
-    font_color = $wallbash_3xa9_rgba
-    fade_on_empty = true
-    fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
-    placeholder_text = <i>Input Password...</i> # Text rendered in the input box when it's empty.
-    hide_input = false
-    rounding = -1 # -1 means complete rounding (circle/oval)
-    check_color = $wallbash_pry4_rgba
-    fail_color = rgba(FF0000FF) # if authentication failed, changes outer_color and fail message color
-    fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i> # can be set to empty
-    fail_transition = 300 # transition time in ms between normal outer_color and fail_color
-    capslock_color = -1
-    numlock_color = -1
-    bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above)
-    invert_numlock = false # change color if numlock is off
-    swap_font_color = true # see below
-    position = 0, 80
-    halign = center
-    valign = bottom
-}
-
-
-# USER Greeting
-label {
-    monitor =
-    text = cmd[update:60000] $fn_greet
-    color = $text
-    font_size = 20
-    font_family = $fontFamily Bold
-    position = 0, -190
-    halign = center
-    valign = center
-}
-
-# Mpris and SPLASH
-label {
-    monitor =
-    text = cmd[update:1000] $SPLASH_CMD # Outputs the song title when mpris is available, otherwise, it will output the splash command.
-    color = $wallbash_txt2_rgba
-    font_family = $fontFamily
-    font_size = 15
-    position = 0, 0
-    halign = center
-    valign = bottom
-}
-
-
-
-# Battery Status if present
-label {
-    monitor =
-    text = cmd[update:5000] $BATTERY_ICON
-    color = $wallbash_4xa9_rgba
-    font_size = 20
-    font_family = JetBrainsMono Nerd Font
-    position = -1%, 1%
-    halign = right
-    valign = bottom
-}
-
-# Current Keyboard Layout 
-label {
-    monitor =
-    text = $LAYOUT
-    color = $wallbash_4xa9_rgba
-    font_size = 20
-    font_family = $fontFamily
-    position = -2%, 1%
-    halign = right
-    valign = bottom
-}
+source = ./HyDE.conf
\ No newline at end of file
diff --git a/.config/hypr/keybindings.conf b/.config/hypr/keybindings.conf
index 50572f7..c0f063d 100644
--- a/.config/hypr/keybindings.conf
+++ b/.config/hypr/keybindings.conf
@@ -26,7 +26,7 @@ bind = $mainMod+Shift, L, exec, hyprlock # launch lock screen
 bind = $mainMod+Shift, F, exec, $scrPath/windowpin.sh # toggle pin on focused window
 bind = $mainMod, Backspace, exec, $scrPath/logoutlaunch.sh # launch logout menu
 bind = Ctrl+Alt, W, exec, killall waybar || waybar # toggle waybar
-bind = $mainMod+Shift, S, exec, $scrPath/toggle_scale.sh # scale monitor 1 <-> 1.2
+bind = $mainMod+Shift, S, exec, toggle-scale # scale monitor 1 <-> 1.2
 bind = $mainMod, C, exec, hyprpicker -a # launch color picker
 
 # Application shortcuts
diff --git a/.config/hypr/themes/wallbash.conf b/.config/hypr/themes/wallbash.conf
index b864717..0b313f7 100644
--- a/.config/hypr/themes/wallbash.conf
+++ b/.config/hypr/themes/wallbash.conf
@@ -7,22 +7,21 @@
 
 $HYDE_THEME=Code Garden
 $GTK_THEME=Kripton
-$COLOR-SCHEME=prefer-dark
+$COLOR_SCHEME=prefer-dark
 $ICON_THEME=Vivid-Glassy-Dark-Icons
 
 $CURSOR_THEME=Sweet-cursors
-$CURSOR_SIZE=20
+$CURSOR_SIZE=$CURSOR_SIZE
 
 $FONT=Noto_Sans
-$FONT_SIZE=10
-$DOCUMENT_FONT=Cantarell
-$DOCUMENT_FONT_SIZE=10
-$MONOSPACE_FONT=CaskaydiaCove Nerd Font Mono
-$MONOSPACE_FONT_SIZE=9
+$FONT_SIZE=$FONT_SIZE
+$DOCUMENT_FONT=$DOCUMENT_FONT
+$DOCUMENT_FONT_SIZE=$DOCUMENT_FONT_SIZE
+$MONOSPACE_FONT=$MONOSPACE_FONT
+$MONOSPACE_FONT_SIZE=$MONOSPACE_FONT_SIZE
 
-
-$CODE_THEME=Wallbash
-$SDDM_THEME=
+$CODE_THEME=$CODE_THEME  
+$SDDM_THEME=$CODE_THEME
 
 # // ----------------------------
 # README:
diff --git a/.config/zsh/conf.d/hyde/env.zsh b/.config/zsh/conf.d/hyde/env.zsh
index b07dc79..25aa38a 100644
--- a/.config/zsh/conf.d/hyde/env.zsh
+++ b/.config/zsh/conf.d/hyde/env.zsh
@@ -43,6 +43,9 @@ TERMINFO_DIRS="$XDG_DATA_HOME"/terminfo:/usr/share/terminfo
 WGETRC="${XDG_CONFIG_HOME}/wgetrc"
 PYTHON_HISTORY="$XDG_STATE_HOME/python_history"
 
+# HyDEs Compositor Configuration
+export HYPRLAND_CONFIG="${XDG_DATA_HOME:-$HOME/.local/share}/hypr/hyprland.conf"
+
 # Export all variables
 export PATH \
   XDG_CONFIG_HOME XDG_DATA_HOME XDG_DATA_DIRS XDG_STATE_HOME XDG_CACHE_HOME \
diff --git a/.local/lib/hyde/toggle_scale.sh b/.local/bin/toggle-scale
similarity index 99%
rename from .local/lib/hyde/toggle_scale.sh
rename to .local/bin/toggle-scale
index e7eb146..22b6c8c 100755
--- a/.local/lib/hyde/toggle_scale.sh
+++ b/.local/bin/toggle-scale
@@ -8,3 +8,4 @@ if (( $(echo "$CURRENT == 1.20" | bc -l) )); then
 else
     hyprctl keyword monitor "$MONITOR,1920x1080@144,0x0,1.2"
 fi
+