diff --git a/README.md b/README.md
index 31640c1..d11ee93 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
 <div align="center">
 
+# MAINTENANCE MODE!
+### ZaneyOS is currently being updated and fixed. This is a volatile time to install or update. If you have problems reach out on Discord.
+
 ## ZaneyOS 🟰 Best ❄️ NixOS Configs
 
 ZaneyOS is a simple way of reproducing my configuration on any NixOS system. This includes the wallpaper, scripts, applications, config files, and more.
diff --git a/config/home/hyprland.nix b/config/home/hyprland.nix
index f57484a..a42b46a 100644
--- a/config/home/hyprland.nix
+++ b/config/home/hyprland.nix
@@ -8,7 +8,8 @@ let
     wallpaperDir borderAnim
     theKBDLayout terminal
     theSecondKBDLayout
-    theKBDVariant sdl-videodriver;
+    theKBDVariant sdl-videodriver
+    extraMonitorSettings;
 in with lib; {
   wayland.windowManager.hyprland = {
     enable = true;
@@ -21,10 +22,7 @@ in with lib; {
       modifier = "SUPER";
     in concatStrings [ ''
       monitor=,preferred,auto,1
-      monitor=DP-1,2560x1440@165,0x0,1
-      monitor=HDMI-A-1,preferred,auto,1,transform,3
-      windowrule = fullscreen, ^(wlogout)$
-      windowrule = animation fade,^(wlogout)$
+      ${extraMonitorSettings}
       general {
         gaps_in = 6
         gaps_out = 8
diff --git a/config/home/waybar.nix b/config/home/waybar.nix
index 8513fb7..dba7d32 100644
--- a/config/home/waybar.nix
+++ b/config/home/waybar.nix
@@ -3,7 +3,7 @@
 let
   palette = config.colorScheme.palette;
   betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
-  inherit (import ../../options.nix) slickbar bar-number simplebar clock24h;
+  inherit (import ../../options.nix) bar-number clock24h waybarAnim;
 in with lib; {
   # Configure & Theme Waybar
   programs.waybar = {
@@ -15,7 +15,7 @@ in with lib; {
 
       modules-center = [ "hyprland/workspaces" ] ;
       modules-left = [ "custom/startmenu" "hyprland/window" "pulseaudio" "cpu" "memory"];
-      modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "clock"  "tray" ];
+      modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "clock" "tray" ];
 
       "hyprland/workspaces" = {
       	format = if bar-number == true then "{name}" else "{icon}";
@@ -28,8 +28,8 @@ in with lib; {
       	on-scroll-down = "hyprctl dispatch workspace e-1";
       };
       "clock" = {
-	format = if clock24h == true then ''{: %H:%M}'' 
-	else ''{: %I:%M %p}'';
+	format = if clock24h == true then '' {:L%H:%M}'' 
+	else '' {:L%I:%M %p}'';
       	tooltip = true;
 	tooltip-format = "<big>{:%A, %d.%B %Y }</big><tt><small>{calendar}</small></tt>";
       };
@@ -148,63 +148,21 @@ in with lib; {
     	font-weight: bold;
       }
       window#waybar {
-	${if slickbar == true || simplebar == true then ''
-	  background-color: rgba(26,27,38,0);
-	  border-bottom: 1px solid rgba(26,27,38,0);
-	  border-radius: 0px;
-	  color: #${palette.base0F};
-	'' else ''
-	  background-color: #${palette.base00};
-	  border-bottom: 1px solid #${palette.base00};
-	  border-radius: 0px;
-	  color: #${palette.base0F};
-	''}
+	background-color: #${palette.base00};
+	border-bottom: 1px solid rgba(26,27,38,0);
+	border-radius: 0px;
+	color: #${palette.base0F};
       }
       #workspaces {
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  margin: 5px;
-	  padding: 0px 1px;
-	  border-radius: 15px;
-	  border: 0px;
-	  font-style: normal;
-	  color: #${palette.base00};
-	'' else if simplebar == true then ''
-	  color: #${palette.base00};
-          background: transparent;   
-	  margin: 4px;
-	  border-radius: 0px;
-	  border: 0px;
-	  font-style: normal;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 0px 1px;
-	  border-radius: 10px;
-	  border: 0px;
-	  font-style: normal;
-	  color: #${palette.base00};
-	''}
+	background: #${palette.base01};
+	margin: 2px;
+	padding: 0px 1px;
+	border-radius: 15px;
+	border: 0px;
+	font-style: normal;
+	color: #${palette.base00};
       }
       #workspaces button {
-	${if slickbar == true then ''
-	  padding: 0px 5px;
-	  margin: 4px 3px;
-	  border-radius: 15px;
-	  border: 0px;
-	  color: #${palette.base00};
-	  background: linear-gradient(45deg, #${palette.base0C}, #${palette.base0D}, #${palette.base0E});
-	  opacity: 0.5;
-	  transition: ${betterTransition};
-	'' else if simplebar == true then ''
-	  color: #${palette.base03};
-          background: #${palette.base00};   
-	  margin: 4px 3px;
-	  opacity: 1;
-	  border: 0px;
-	  border-radius: 15px;
-	  transition: ${betterTransition};
-	'' else ''
 	  padding: 0px 5px;
 	  margin: 4px 3px;
 	  border-radius: 10px;
@@ -212,34 +170,14 @@ in with lib; {
 	  color: #${palette.base00};
           background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
           background-size: 300% 300%;
-          animation: gradient_horizontal 15s ease infinite;
+          ${if waybarAnim == true then ''
+            animation: gradient_horizontal 15s ease infinite;
+          '' else '' 
+          ''}
 	  opacity: 0.5;
           transition: ${betterTransition};
-	''}
       }
       #workspaces button.active {
-	${if slickbar == true then ''
-	  padding: 0px 5px;
-	  margin: 4px 3px;
-	  border-radius: 15px;
-	  border: 0px;
-	  color: #${palette.base00};
-	  background: linear-gradient(45deg, #${palette.base0D}, #${palette.base0E});
-	  opacity: 1.0;
-	  min-width: 40px;
-	  transition: ${betterTransition};
-	'' else if simplebar == true then ''
-	  color: #${palette.base00};
-          background: linear-gradient(118deg, #${palette.base0D} 5%, #${palette.base0F} 5%, #${palette.base0F} 20%, #${palette.base0D} 20%, #${palette.base0D} 40%, #${palette.base0F} 40%, #${palette.base0F} 60%, #${palette.base0D} 60%, #${palette.base0D} 80%, #${palette.base0F} 80%, #${palette.base0F} 95%, #${palette.base0D} 95%);   
-          background-size: 300% 300%;
-          animation: swiping 15s linear infinite;
-	  border-radius: 15px;
-	  margin: 4px 3px;
-	  opacity: 1.0;
-	  border: 0px;
-	  min-width: 45px;
-	  transition: ${betterTransition};
-	'' else ''
 	  padding: 0px 5px;
 	  margin: 4px 3px;
 	  border-radius: 10px;
@@ -247,33 +185,25 @@ in with lib; {
 	  color: #${palette.base00};
           background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
           background-size: 300% 300%;
-          animation: gradient_horizontal 15s ease infinite;
+          ${if waybarAnim == true then ''
+            animation: gradient_horizontal 15s ease infinite;
+          '' else '' 
+          ''}
           transition: ${betterTransition};
 	  opacity: 1.0;
 	  min-width: 40px;
-	''}
       }
       #workspaces button:hover {
-	${if slickbar == true then ''
-	  border-radius: 15px;
-	  color: #${palette.base00};
-	  background: linear-gradient(45deg, #${palette.base0D}, #${palette.base0E});
-	  opacity: 0.8;
-	  transition: ${betterTransition};
-	'' else if simplebar == true then ''
-	  color: #${palette.base05};
-	  border: 0px;
-	  border-radius: 15px;
-	  transition: ${betterTransition};
-	'' else ''
 	  border-radius: 10px;
 	  color: #${palette.base00};
           background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
           background-size: 300% 300%;
-          animation: gradient_horizontal 15s ease infinite;
+          ${if waybarAnim == true then ''
+            animation: gradient_horizontal 15s ease infinite;
+          '' else '' 
+          ''}
 	  opacity: 0.8;
           transition: ${betterTransition};
-	''}
       }
       @keyframes gradient_horizontal {
 	0% {
@@ -303,291 +233,119 @@ in with lib; {
 	color: #${palette.base07};
       }
       #window {
-	${if slickbar == true then ''
-	  color: #${palette.base05};
-	  background: #${palette.base00};
-	  border-radius: 50px 15px 50px 15px;
-	  margin: 5px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  color: #${palette.base03};
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  border-radius: 15px;
-	  padding: 0px 10px;
-	'' else ''
 	  margin: 4px;
 	  padding: 2px 10px;
 	  color: #${palette.base05};
 	  background: #${palette.base01};
 	  border-radius: 10px;
-	''}
       }
       #memory {
    	color: #${palette.base0F};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 50px 15px 50px 15px;
-	  margin: 5px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  padding: 0px 10px;
-	  border-radius: 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 2px 10px;
-	  border-radius: 10px;
-	''}
+	background: #${palette.base01};
+	margin: 4px;
+	padding: 2px 10px;
+	border-radius: 10px;
       }
       #clock {
-    	color: #${palette.base0B};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 15px 50px 15px 50px;
-	  margin: 5px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  padding: 0px 10px;
-	  border-radius: 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 2px 10px;
-	  border-radius: 10px;
-	''}
+    	color: #${palette.base01};
+        background: linear-gradient(45deg, #${palette.base0C}, #${palette.base0F}, #${palette.base0B}, #${palette.base08});
+        background-size: 300% 300%;
+        ${if waybarAnim == true then ''
+          animation: gradient_horizontal 15s ease infinite;
+        '' else '' 
+        ''}
+	margin: 4px;
+	padding: 2px 10px;
+	border-radius: 10px;
       }
       #cpu {
     	color: #${palette.base07};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 50px 15px 50px 15px;
-	  margin: 5px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  padding: 0px 10px;
-	  border-radius: 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 2px 10px;
-	  border-radius: 10px;
-	''}
+	background: #${palette.base01};
+	margin: 4px;
+	padding: 2px 10px;
+	border-radius: 10px;
       }
       #disk {
     	color: #${palette.base03};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 15px 50px 15px 50px;
-	  margin: 5px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  padding: 0px 10px;
-	  border-radius: 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 2px 10px;
-	  border-radius: 10px;
-	''}
+	background: #${palette.base01};
+	margin: 4px;
+	padding: 2px 10px;
+	border-radius: 10px;
       }
       #battery {
     	color: #${palette.base08};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 15px 50px 15px 50px;
-	  margin: 5px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  padding: 0px 10px;
-	  border-radius: 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 2px 10px;
-	  border-radius: 10px;
-	''}
+	background: #${palette.base01};
+	margin: 4px;
+	padding: 2px 10px;
+	border-radius: 10px;
       }
       #network {
     	color: #${palette.base09};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 50px 15px 50px 15px;
-	  margin: 5px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  padding: 0px 10px;
-	  border-radius: 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 2px 10px;
-	  border-radius: 10px;
-	''}
+	background: #${palette.base01};
+	margin: 4px;
+	padding: 2px 10px;
+	border-radius: 10px;
       }
       #custom-hyprbindings {
     	color: #${palette.base0E};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 15px 50px 15px 50px;
-	  margin: 5px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  padding: 0px 10px;
-	  border-radius: 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 2px 10px;
-	  border-radius: 10px;
-	''}
+	background: #${palette.base01};
+	margin: 4px;
+	padding: 2px 10px;
+	border-radius: 10px;
       }
       #tray {
     	color: #${palette.base05};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 15px 0px 0px 50px;
-	  margin: 5px 0px 5px 5px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  padding: 0px 10px;
-	  border-radius: 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 2px 10px;
-	  border-radius: 10px;
-	''}
+	background: #${palette.base01};
+	margin: 4px;
+	padding: 2px 10px;
+	border-radius: 10px;
       }
       #pulseaudio {
     	color: #${palette.base0D};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 50px 15px 50px 15px;
-	  margin: 5px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  padding: 0px 10px;
-	  border-radius: 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 2px 10px;
-	  border-radius: 10px;
-	''}
+	background: #${palette.base01};
+	margin: 4px;
+	padding: 2px 10px;
+	border-radius: 10px;
       }
       #custom-notification {
     	color: #${palette.base0C};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 15px 50px 15px 50px;
-	  margin: 5px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  padding: 0px 10px;
-	  border-radius: 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 2px 10px;
-	  border-radius: 10px;
-	''}
+	background: #${palette.base01};
+	margin: 4px;
+	padding: 2px 10px;
+	border-radius: 10px;
       }
       #custom-themeselector {
     	color: #${palette.base0D};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 0px 50px 15px 0px;
-	  margin: 5px 0px;
-	  padding: 2px 15px 2px 5px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px 6px 0px;
-	  padding: 0px 10px 0px 5px;
-	  border-radius: 0px 15px 15px 0px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px 0px;
-	  padding: 2px 10px 2px 5px;
-	  border-radius: 0px 10px 10px 0px;
-	''}
+	background: #${palette.base01};
+	margin: 4px 0px;
+	padding: 2px 10px 2px 5px;
+	border-radius: 0px 10px 10px 0px;
       }
       #custom-startmenu {
-    	color: #${palette.base03};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 0px 15px 50px 0px;
-	  margin: 5px 5px 5px 0px;
-	  padding: 2px 20px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 4px;
-	  padding: 0px 8px 0px 10px;
-	  border-radius: 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px;
-	  padding: 2px 10px;
-	  border-radius: 10px;
-	''}
+    	color: #${palette.base00};
+        background: linear-gradient(45deg, #${palette.base09}, #${palette.base03}, #${palette.base0C}, #${palette.base07});
+        background-size: 300% 300%;
+        ${if waybarAnim == true then ''
+          animation: gradient_horizontal 15s ease infinite;
+        '' else '' 
+        ''}
+	margin: 4px;
+	padding: 2px 10px;
+	border-radius: 10px;
       }
       #idle_inhibitor {
     	color: #${palette.base09};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 0px;
-	  margin: 5px 0px;
-	  padding: 2px 14px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 0px;
-	  padding: 0px 14px;
-	  border-radius: 0px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px 0px;
-	  padding: 2px 14px;
-	  border-radius: 0px;
-	''}
+	background: #${palette.base01};
+	margin: 4px 0px;
+	padding: 2px 14px;
+	border-radius: 0px;
       }
       #custom-exit {
     	color: #${palette.base0E};
-	${if slickbar == true then ''
-	  background: #${palette.base00};
-	  border-radius: 15px 0px 0px 50px;
-	  margin: 5px 0px;
-	  padding: 2px 5px 2px 15px;
-	'' else if simplebar == true then ''
-	  background: #${palette.base00};
-	  margin: 6px 0px 6px 4px;
-	  padding: 0px 5px 0px 10px;
-	  border-radius: 15px 0px 0px 15px;
-	'' else ''
-	  background: #${palette.base01};
-	  margin: 4px 0px;
-	  padding: 2px 5px 2px 10px;
-	  border-radius: 10px 0px 0px 10px;
-        ''}
+	background: #${palette.base01};
+	border-radius: 10px 0px 0px 10px;
+	margin: 4px 0px;
+	padding: 2px 5px 2px 15px;
       } ''
     ];
   };
diff --git a/hardware.nix b/hardware.nix
index fa32280..decd5e5 100644
--- a/hardware.nix
+++ b/hardware.nix
@@ -18,6 +18,16 @@
       fsType = "ext4";
     };
 
+  fileSystems."/home/zaney/Documents" =
+    { device = "/dev/disk/by-uuid/35f6d96f-0837-4868-8ce5-8e1df5e3b2f3";
+      fsType = "ext4";
+    };
+
+  fileSystems."/home/zaney/Videos" =
+    { device = "/dev/disk/by-uuid/cbe1beaf-6c7f-4251-ad5c-2897aecc367d";
+      fsType = "ext4";
+    };
+
   boot.initrd.luks.devices."luks-cdf913d6-7149-4a8f-9461-61c394b2f5af".device = "/dev/disk/by-uuid/cdf913d6-7149-4a8f-9461-61c394b2f5af";
 
   fileSystems."/boot" =
@@ -26,7 +36,7 @@
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/b87d97d1-d06c-46da-9e3f-343715c29286"; }
+    [ { device = "/dev/disk/by-uuid/8160cef0-c5eb-4caa-9ef5-56a5b4eb51b8"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/install-zaneyos.sh b/install-zaneyos.sh
index 7620438..3b92e25 100755
--- a/install-zaneyos.sh
+++ b/install-zaneyos.sh
@@ -80,7 +80,7 @@ else
     done
   fi
 fi
-sed -i "/^\s*username[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$userName\"/" ./options.nix
+sed -i "/^\s*setUsername[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$userName\"/" ./options.nix
 
 echo "-----"
 
@@ -88,7 +88,7 @@ read -p "Enter Your New Hostname: [ hyprnix ] " hostName
 if [ -z "$hostName" ]; then
   hostName="hyprnix"
 fi
-sed -i "/^\s*hostname[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$hostName\"/" ./options.nix
+sed -i "/^\s*setHostname[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$hostName\"/" ./options.nix
 
 echo "-----"
 
diff --git a/options.nix b/options.nix
index 7f3eb44..8b85e57 100644
--- a/options.nix
+++ b/options.nix
@@ -3,32 +3,37 @@
 # https://gitlab.com/Zaney/zaneyos/-/wikis/Setting-Options
 
 let
-  # THINGS YOU NEED TO CHANGE
-  username = "zaney";
-  hostname = "hyprnix";
-  userHome = "/home/${username}";
-  flakeDir = "${userHome}/zaneyos";
-  waybarStyle = "simplebar"; # simplebar, slickbar, or default
+  setUsername = "zaney";
+  setHostname = "hyprnix";
 in {
-  # User Variables
-  username = "zaney";
-  hostname = "hyprnix";
+  # No Change Needed Below
+  username = "${setUsername}";
+  hostname = "${setHostname}";
+  userHome = "/home/${setUsername}";
+  flakeDir = "/home/${setUsername}/zaneyos";
+  wallpaperGit = "https://gitlab.com/Zaney/my-wallpapers.git"; # Can be changed IF you know what your doing
+  wallpaperDir = "/home/${setUsername}/Pictures/Wallpapers";
+  screenshotDir = "/home/${setUsername}/Pictures/Screenshots";
+  flakePrev = "/home/${setUsername}/.zaneyos-previous";
+  flakeBackup = "/home/${setUsername}/.zaneyos-backup";
+
+  # Git Configuration ( For Pulling Software Repos )
   gitUsername = "Tyler Kelley";
   gitEmail = "tylerzanekelley@gmail.com";
+
+  # Base16 Theme
   theme = "atelier-cave";
-  slickbar = if waybarStyle == "slickbar" then true else false;
-  simplebar = if waybarStyle == "simplebar" then true else false;
+
+  # Hyprland Settings
+  borderAnim = true; # Enable / Disable Hyprland Border Animation
+  extraMonitorSettings = "
+    monitor=DP-1,2560x1440@165,0x0,1
+    monitor=HDMI-A-1,preferred,auto,1,transform,3
+  ";
+
+  # Waybar Settings
+  waybarAnim = true; # Enable / Disable Waybar Animation CSS
   bar-number = true; # Enable / Disable Workspace Numbers In Waybar
-  borderAnim = true;
-  browser = "firefox";
-  wallpaperGit = "https://gitlab.com/Zaney/my-wallpapers.git"; # This will give you my wallpapers
-  # ^ (use as is or replace with your own repo - removing will break the wallsetter script) 
-  wallpaperDir = "${userHome}/Pictures/Wallpapers";
-  screenshotDir = "${userHome}/Pictures/Screenshots";
-  flakeDir = "${flakeDir}";
-  flakePrev = "${userHome}/.zaneyos-previous";
-  flakeBackup = "${userHome}/.zaneyos-backup";
-  terminal = "kitty"; # This sets the terminal that is used by the hyprland terminal keybinding
 
   # System Settings
   clock24h = false;
@@ -43,12 +48,10 @@ in {
   sdl-videodriver = "x11"; # Either x11 or wayland ONLY. Games might require x11 set here
   # For Hybrid Systems intel-nvidia
   # Should Be Used As gpuType
-  cpuType = "intel";
+  cpuType = "amd";
   gpuType = "amd";
 
-  # Nvidia Hybrid Devices
-  # ONLY NEEDED FOR HYBRID
-  # SYSTEMS! 
+  # Nvidia Hybrid Devices ONLY NEEDED FOR HYBRID SYSTEMS! 
   intel-bus-id = "PCI:1:0:0";
   nvidia-bus-id = "PCI:0:2:0";
 
@@ -64,19 +67,20 @@ in {
   # Enable Printer & Scanner Support
   printer = false;
 
-  # Enable Flatpak & Larger Programs
+  # Program Options
+  browser = "firefox"; # Install & Set Default Browser
+  terminal = "kitty";  # Set Default System Terminal
   distrobox = false;
   flatpak = false;
-  kdenlive = false;
+  kdenlive = true;
   blender = false;
-  enableZeroAD = false;
+  enableZeroAD = true;
 
   # Enable Support For
   # Logitech Devices
   logitech = true;
 
-  # Enable Terminals
-  # If You Disable All You Get Kitty
+  # Enable Terminals ( If You Disable All You Get Kitty )
   wezterm = false;
   alacritty = false;
   kitty = true;