diff --git a/config/home/default.nix b/config/home/default.nix
index e34bec5..f150e03 100644
--- a/config/home/default.nix
+++ b/config/home/default.nix
@@ -13,8 +13,7 @@
     ./packages.nix
     ./rofi.nix
     ./starship.nix
-    ./style1-waybar.nix
-    ./style2-waybar.nix
+    ./waybar.nix
     ./swappy.nix
     ./swaylock.nix
     ./swaync.nix
diff --git a/config/home/style1-waybar.nix b/config/home/style1-waybar.nix
deleted file mode 100644
index 264b410..0000000
--- a/config/home/style1-waybar.nix
+++ /dev/null
@@ -1,284 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-let
-  palette = config.colorScheme.palette;
-  inherit (import ../../options.nix) waybarStyle;
-in
-lib.mkIf ("${waybarStyle}" == "style1") {
-  # Configure & Theme Waybar
-  programs.waybar = {
-    enable = true;
-    package = pkgs.waybar;
-    settings = [{
-      layer = "top";
-      position = "top";
-
-      modules-left = [ "hyprland/window" "custom/startmenu" ];
-      modules-center = [ "network" "pulseaudio" "cpu" "hyprland/workspaces" "memory" "disk" "clock" ];
-      modules-right = [ "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "tray" ];
-      "hyprland/workspaces" = {
-      	format = "{icon}";
-      	format-icons = {
-          default = " ";
-          active = " ";
-          urgent = " ";
-      	};
-      	on-scroll-up = "hyprctl dispatch workspace e+1";
-      	on-scroll-down = "hyprctl dispatch workspace e-1";
-      };
-      "clock" = {
-        format = "{: %I:%M %p}";
-      	tooltip = false;
-      };
-      "hyprland/window" = {
-      	max-length = 25;
-      	separate-outputs = false;
-      };
-      "memory" = {
-      	interval = 5;
-      	format = " {}%";
-        tooltip = true;
-      };
-      "cpu" = {
-      	interval = 5;
-      	format = " {usage:2}%";
-        tooltip = true;
-      };
-      "disk" = {
-        format = " {free}";
-        tooltip = true;
-      };
-      "network" = {
-        format-icons = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"];
-        format-ethernet = " {bandwidthDownOctets}";
-        format-wifi = "{icon} {signalStrength}%";
-        format-disconnected = "󰤮";
-        tooltip = false;
-      };
-      "tray" = {
-        spacing = 12;
-      };
-      "pulseaudio" = {
-        format = "{icon} {volume}% {format_source}";
-        format-bluetooth = "{volume}% {icon} {format_source}";
-        format-bluetooth-muted = " {icon} {format_source}";
-        format-muted = " {format_source}";
-        format-source = " {volume}%";
-        format-source-muted = "";
-        format-icons = {
-          headphone = "";
-          hands-free = "";
-          headset = "";
-          phone = "";
-          portable = "";
-          car = "";
-          default = ["" "" ""];
-        };
-        on-click = "pavucontrol";
-      };
-      "custom/themeselector" = {
-        tooltip = false;
-        format = "";
-        # exec = "theme-selector";
-        on-click = "sleep 0.1 && theme-selector";
-      };
-      "custom/startmenu" = {
-        tooltip = false;
-        format = " ";
-        # exec = "rofi -show drun";
-        on-click = "sleep 0.1 && rofi-launcher";
-      };
-      "idle_inhibitor" = {
-        format = "{icon}";
-        format-icons = {
-            activated = "";
-            deactivated = "";
-        };
-        tooltip = "true";
-      };
-      "custom/notification" = {
-        tooltip = false;
-        format = "{icon} {}";
-        format-icons = {
-          notification = "<span foreground='red'><sup></sup></span>";
-          none = "";
-          dnd-notification = "<span foreground='red'><sup></sup></span>";
-          dnd-none = "";
-          inhibited-notification = "<span foreground='red'><sup></sup></span>";
-          inhibited-none = "";
-          dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
-          dnd-inhibited-none = "";
-       	};
-        return-type = "json";
-        exec-if = "which swaync-client";
-        exec = "swaync-client -swb";
-        on-click = "task-waybar";
-        escape = true;
-      };
-      "battery" = {
-        states = {
-          warning = 30;
-          critical = 15;
-        };
-        format = "{icon} {capacity}%";
-        format-charging = "󰂄 {capacity}%";
-        format-plugged = "󱘖 {capacity}%";
-        format-icons = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
-        on-click = "";
-        tooltip = false;
-      };
-    }];
-    style = ''
-	* {
-		font-size: 16px;
-		font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
-    		font-weight: bold;
-	}
-	window#waybar {
-		    background-color: rgba(26,27,38,0);
-    		border-bottom: 1px solid rgba(26,27,38,0);
-    		border-radius: 0px;
-		    color: #${palette.base0F};
-	}
-	#workspaces {
-		    background: linear-gradient(180deg, #${palette.base00}, #${palette.base01});
-    		margin: 5px;
-    		padding: 0px 1px;
-    		border-radius: 15px;
-    		border: 0px;
-    		font-style: normal;
-    		color: #${palette.base00};
-	}
-	#workspaces button {
-    		padding: 0px 5px;
-    		margin: 4px 3px;
-    		border-radius: 15px;
-    		border: 0px;
-    		color: #${palette.base00};
-    		background-color: #${palette.base00};
-    		opacity: 1.0;
-    		transition: all 0.3s ease-in-out;
-	}
-	#workspaces button.active {
-    		color: #${palette.base00};
-    		background: #${palette.base04};
-    		border-radius: 15px;
-    		min-width: 40px;
-    		transition: all 0.3s ease-in-out;
-    		opacity: 1.0;
-	}
-	#workspaces button:hover {
-    		color: #${palette.base00};
-    		background: #${palette.base04};
-    		border-radius: 15px;
-    		opacity: 1.0;
-	}
-	tooltip {
-  		background: #${palette.base00};
-  		border: 1px solid #${palette.base04};
-  		border-radius: 10px;
-	}
-	tooltip label {
-  		color: #${palette.base07};
-	}
-	#window {
-    		color: #${palette.base05};
-    		background: #${palette.base00};
-    		border-radius: 0px 15px 50px 0px;
-    		margin: 5px 5px 5px 0px;
-    		padding: 2px 20px;
-	}
-	#memory {
-    		color: #${palette.base0F};
-    		background: #${palette.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
-	}
-	#clock {
-    		color: #${palette.base0B};
-    		background: #${palette.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
-	}
-	#idle_inhibitor {
-    		color: #${palette.base0A};
-    		background: #${palette.base00};
-    		border-radius: 50px 15px 50px 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
-	}
-	#cpu {
-    		color: #${palette.base07};
-    		background: #${palette.base00};
-    		border-radius: 50px 15px 50px 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
-	}
-	#disk {
-    		color: #${palette.base03};
-    		background: #${palette.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
-	}
-	#battery {
-    		color: #${palette.base08};
-    		background: #${palette.base00};
-    		border-radius: 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
-	}
-	#network {
-    		color: #${palette.base09};
-    		background: #${palette.base00};
-    		border-radius: 50px 15px 50px 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
-	}
-	#tray {
-    		color: #${palette.base05};
-    		background: #${palette.base00};
-    		border-radius: 15px 0px 0px 50px;
-    		margin: 5px 0px 5px 5px;
-    		padding: 2px 20px;
-	}
-	#pulseaudio {
-    		color: #${palette.base0D};
-    		background: #${palette.base00};
-    		border-radius: 50px 15px 50px 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
-	}
-	#custom-notification {
-    		color: #${palette.base0C};
-    		background: #${palette.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
-	}
-    #custom-themeselector {
-    		color: #${palette.base0D};
-    		background: #${palette.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
-    }
-	#custom-startmenu {
-    		color: #${palette.base03};
-    		background: #${palette.base00};
-    		border-radius: 50px 15px 50px 15px;
-    		margin: 5px;
-    		padding: 2px 20px;
-	}
-	#idle_inhibitor {
-    		color: #${palette.base09};
-    		background: #${palette.base00};
-    		border-radius: 15px 50px 15px 50px;
-    		margin: 5px;
-    		padding: 2px 20px;
-	}
-    '';
-  };
-}
diff --git a/config/home/style2-waybar.nix b/config/home/style2-waybar.nix
deleted file mode 100644
index ed275c7..0000000
--- a/config/home/style2-waybar.nix
+++ /dev/null
@@ -1,284 +0,0 @@
-{ pkgs, config, lib, waybarStyle, ... }:
-
-let
-  palette = config.colorScheme.palette;
-  inherit (import ../../options.nix) waybarStyle;
-in
-lib.mkIf ("${waybarStyle}" == "style2") {
-  # Configure & Theme Waybar
-  programs.waybar = {
-    enable = true;
-    package = pkgs.waybar;
-    settings = [{
-      layer = "top";
-      position = "top";
-
-      modules-left = [ "custom/startmenu" "hyprland/window" ];
-      modules-center = [ "network" "pulseaudio" "cpu" "hyprland/workspaces" "memory" "disk" "clock" ];
-      modules-right = [ "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "tray" ];
-      "hyprland/workspaces" = {
-      	format = "{icon}";
-      	format-icons = {
-          default = " ";
-          active = " ";
-          urgent = " ";
-      	};
-      	on-scroll-up = "hyprctl dispatch workspace e+1";
-      	on-scroll-down = "hyprctl dispatch workspace e-1";
-      };
-      "clock" = {
-        format = "{: %I:%M %p}";
-      	tooltip = false;
-      };
-      "hyprland/window" = {
-      	max-length = 25;
-      	separate-outputs = false;
-      };
-      "memory" = {
-      	interval = 5;
-      	format = " {}%";
-        tooltip = true;
-      };
-      "cpu" = {
-      	interval = 5;
-      	format = " {usage:2}%";
-        tooltip = true;
-      };
-      "disk" = {
-        format = " {free}";
-        tooltip = true;
-      };
-      "network" = {
-        format-icons = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"];
-        format-ethernet = " {bandwidthDownOctets}";
-        format-wifi = "{icon} {signalStrength}%";
-        format-disconnected = "󰤮";
-        tooltip = false;
-      };
-      "tray" = {
-        spacing = 12;
-      };
-      "pulseaudio" = {
-        format = "{icon} {volume}% {format_source}";
-        format-bluetooth = "{volume}% {icon} {format_source}";
-        format-bluetooth-muted = " {icon} {format_source}";
-        format-muted = " {format_source}";
-        format-source = " {volume}%";
-        format-source-muted = "";
-        format-icons = {
-          headphone = "";
-          hands-free = "";
-          headset = "";
-          phone = "";
-          portable = "";
-          car = "";
-          default = ["" "" ""];
-        };
-        on-click = "pavucontrol";
-      };
-      "custom/themeselector" = {
-        tooltip = false;
-        format = "";
-        # exec = "theme-selector";
-        on-click = "sleep 0.1 && theme-selector";
-      };
-      "custom/startmenu" = {
-        tooltip = false;
-        format = " ";
-        # exec = "rofi -show drun";
-        on-click = "sleep 0.1 && rofi-launcher";
-      };
-      "idle_inhibitor" = {
-        format = "{icon}";
-        format-icons = {
-            activated = " ";
-            deactivated = " ";
-        };
-        tooltip = "true";
-      };
-      "custom/notification" = {
-        tooltip = false;
-        format = "{icon} {}";
-        format-icons = {
-          notification = "<span foreground='red'><sup></sup></span>";
-          none = "";
-          dnd-notification = "<span foreground='red'><sup></sup></span>";
-          dnd-none = "";
-          inhibited-notification = "<span foreground='red'><sup></sup></span>";
-          inhibited-none = "";
-          dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
-          dnd-inhibited-none = "";
-       	};
-        return-type = "json";
-        exec-if = "which swaync-client";
-        exec = "swaync-client -swb";
-        on-click = "task-waybar";
-        escape = true;
-      };
-      "battery" = {
-        states = {
-          warning = 30;
-          critical = 15;
-        };
-        format = "{icon} {capacity}%";
-        format-charging = "󰂄 {capacity}%";
-        format-plugged = "󱘖 {capacity}%";
-        format-icons = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
-        on-click = "";
-        tooltip = false;
-      };
-    }];
-    style = ''
-	* {
-		font-size: 16px;
-		font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
-    		font-weight: bold;
-	}
-	window#waybar {
-		    background-color: #${palette.base00};
-    		border-bottom: 1px solid #${palette.base00};
-    		border-radius: 0px;
-		    color: #${palette.base0F};
-	}
-	#workspaces {
-		    background: #${palette.base01};
-    		margin: 4px;
-    		padding: 0px 1px;
-    		border-radius: 10px;
-    		border: 0px;
-    		font-style: normal;
-    		color: #${palette.base00};
-	}
-	#workspaces button {
-    		padding: 0px 5px;
-    		margin: 4px 3px;
-    		border-radius: 10px;
-    		border: 0px;
-    		color: #${palette.base00};
-		    background: linear-gradient(45deg, #${palette.base06}, #${palette.base0E});
-    		opacity: 0.5;
-    		transition: all 0.3s ease-in-out;
-	}
-	#workspaces button.active {
-    		color: #${palette.base00};
-		    background: linear-gradient(45deg, #${palette.base06}, #${palette.base0E});
-    		border-radius: 10px;
-    		min-width: 40px;
-    		transition: all 0.3s ease-in-out;
-    		opacity: 1.0;
-	}
-	#workspaces button:hover {
-    		color: #${palette.base00};
-		    background: linear-gradient(45deg, #${palette.base06}, #${palette.base0E});
-    		border-radius: 10px;
-    		opacity: 0.8;
-	}
-	tooltip {
-  		background: #${palette.base00};
-  		border: 1px solid #${palette.base04};
-  		border-radius: 10px;
-	}
-	tooltip label {
-  		color: #${palette.base07};
-	}
-	#window {
-    		color: #${palette.base05};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-	}
-	#memory {
-    		color: #${palette.base0F};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-	}
-	#clock {
-    		color: #${palette.base0B};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-	}
-	#idle_inhibitor {
-    		color: #${palette.base0A};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-	}
-	#cpu {
-    		color: #${palette.base07};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-	}
-	#disk {
-    		color: #${palette.base03};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-	}
-	#battery {
-    		color: #${palette.base08};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-	}
-	#network {
-    		color: #${palette.base09};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-	}
-	#tray {
-    		color: #${palette.base05};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-	}
-	#pulseaudio {
-    		color: #${palette.base0D};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-	}
-	#custom-notification {
-    		color: #${palette.base0C};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-	}
-    #custom-themeselector {
-    		color: #${palette.base0D};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px;
-    }
-	#custom-startmenu {
-    		color: #${palette.base03};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px 2px 13px;
-	}
-	#idle_inhibitor {
-    		color: #${palette.base09};
-    		background: #${palette.base01};
-    		border-radius: 10px;
-    		margin: 4px;
-    		padding: 2px 10px 2px 13px;
-	}
-    '';
-  };
-}
diff --git a/config/home/waybar.nix b/config/home/waybar.nix
new file mode 100644
index 0000000..4c9a41c
--- /dev/null
+++ b/config/home/waybar.nix
@@ -0,0 +1,432 @@
+{ pkgs, config, lib, ... }:
+
+let
+  palette = config.colorScheme.palette;
+  inherit (import ../../options.nix) slickbar;
+in with lib; {
+  # Configure & Theme Waybar
+  programs.waybar = {
+    enable = true;
+    package = pkgs.waybar;
+    settings = [{
+      layer = "top";
+      position = "top";
+
+      modules-left = [ "custom/startmenu" "hyprland/window" ];
+      modules-center = [ "network" "pulseaudio" "cpu" "hyprland/workspaces" "memory" "disk" "clock" ];
+      modules-right = [ "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "tray" ];
+      "hyprland/workspaces" = {
+      	format = "{icon}";
+      	format-icons = {
+          default = " ";
+          active = " ";
+          urgent = " ";
+      	};
+      	on-scroll-up = "hyprctl dispatch workspace e+1";
+      	on-scroll-down = "hyprctl dispatch workspace e-1";
+      };
+      "clock" = {
+        format = "{: %I:%M %p}";
+      	tooltip = false;
+      };
+      "hyprland/window" = {
+      	max-length = 25;
+      	separate-outputs = false;
+      };
+      "memory" = {
+      	interval = 5;
+      	format = " {}%";
+        tooltip = true;
+      };
+      "cpu" = {
+      	interval = 5;
+      	format = " {usage:2}%";
+        tooltip = true;
+      };
+      "disk" = {
+        format = " {free}";
+        tooltip = true;
+      };
+      "network" = {
+        format-icons = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"];
+        format-ethernet = " {bandwidthDownOctets}";
+        format-wifi = "{icon} {signalStrength}%";
+        format-disconnected = "󰤮";
+        tooltip = false;
+      };
+      "tray" = {
+        spacing = 12;
+      };
+      "pulseaudio" = {
+        format = "{icon} {volume}% {format_source}";
+        format-bluetooth = "{volume}% {icon} {format_source}";
+        format-bluetooth-muted = " {icon} {format_source}";
+        format-muted = " {format_source}";
+        format-source = " {volume}%";
+        format-source-muted = "";
+        format-icons = {
+          headphone = "";
+          hands-free = "";
+          headset = "";
+          phone = "";
+          portable = "";
+          car = "";
+          default = ["" "" ""];
+        };
+        on-click = "pavucontrol";
+      };
+      "custom/themeselector" = {
+        tooltip = false;
+        format = "";
+        # exec = "theme-selector";
+        on-click = "sleep 0.1 && theme-selector";
+      };
+      "custom/startmenu" = {
+        tooltip = false;
+        format = " ";
+        # exec = "rofi -show drun";
+        on-click = "rofi-launcher";
+      };
+      "idle_inhibitor" = {
+        format = "{icon}";
+        format-icons = {
+            activated = " ";
+            deactivated = " ";
+        };
+        tooltip = "true";
+      };
+      "custom/notification" = {
+        tooltip = false;
+        format = "{icon} {}";
+        format-icons = {
+          notification = "<span foreground='red'><sup></sup></span>";
+          none = "";
+          dnd-notification = "<span foreground='red'><sup></sup></span>";
+          dnd-none = "";
+          inhibited-notification = "<span foreground='red'><sup></sup></span>";
+          inhibited-none = "";
+          dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
+          dnd-inhibited-none = "";
+       	};
+        return-type = "json";
+        exec-if = "which swaync-client";
+        exec = "swaync-client -swb";
+        on-click = "task-waybar";
+        escape = true;
+      };
+      "battery" = {
+        states = {
+          warning = 30;
+          critical = 15;
+        };
+        format = "{icon} {capacity}%";
+        format-charging = "󰂄 {capacity}%";
+        format-plugged = "󱘖 {capacity}%";
+        format-icons = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+        on-click = "";
+        tooltip = false;
+      };
+    }];
+    style = concatStrings [''
+      * {
+	font-size: 16px;
+	font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
+    	font-weight: bold;
+      }
+      window#waybar {
+	${if slickbar == 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};
+	''}
+      }
+      #workspaces {
+	${if slickbar == true then ''
+	  background: linear-gradient(180deg, #${palette.base00}, #${palette.base01});
+	  margin: 5px;
+	  padding: 0px 1px;
+	  border-radius: 15px;
+	  border: 0px;
+	  font-style: normal;
+	  color: #${palette.base00};
+	'' else ''
+	  background: linear-gradient(45deg, #${palette.base01}, #${palette.base01});
+	  margin: 4px;
+	  padding: 0px 1px;
+	  border-radius: 10px;
+	  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.base0D}, #${palette.base0E});
+	  opacity: 0.5;
+	  transition: all 0.3s ease-in-out;
+	'' else ''
+	  padding: 0px 5px;
+	  margin: 4px 3px;
+	  border-radius: 10px;
+	  border: 0px;
+	  color: #${palette.base00};
+	  background: linear-gradient(45deg, #${palette.base06}, #${palette.base0E});
+	  opacity: 0.5;
+	  transition: all 0.3s ease-in-out;
+	''}
+      }
+      #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: all 0.3s ease-in-out;
+	'' else ''
+	  padding: 0px 5px;
+	  margin: 4px 3px;
+	  border-radius: 10px;
+	  border: 0px;
+	  color: #${palette.base00};
+	  background: linear-gradient(45deg, #${palette.base06}, #${palette.base0E});
+	  opacity: 1.0;
+	  min-width: 40px;
+	  transition: all 0.3s ease-in-out;
+	''}
+      }
+      #workspaces button:hover {
+	${if slickbar == true then ''
+	  border-radius: 15px;
+	  color: #${palette.base00};
+	  background: linear-gradient(45deg, #${palette.base0D}, #${palette.base0E});
+	  opacity: 1.0;
+	'' else ''
+	  border-radius: 10px;
+	  color: #${palette.base00};
+	  background: linear-gradient(45deg, #${palette.base06}, #${palette.base0E});
+	  opacity: 1.0;
+	''}
+      }
+      tooltip {
+	background: #${palette.base00};
+	border: 1px solid #${palette.base0E};
+	border-radius: 10px;
+      }
+      tooltip label {
+	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 ''
+	  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: 15px 50px 15px 50px;
+	  margin: 5px;
+	  padding: 2px 20px;
+	'' else ''
+	  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 ''
+	  background: #${palette.base01};
+	  margin: 4px;
+	  padding: 2px 10px;
+	  border-radius: 10px;
+	''}
+      }
+      #idle_inhibitor {
+    	color: #${palette.base0A};
+	${if slickbar == true then ''
+	  background: #${palette.base00};
+	  border-radius: 50px 15px 50px 15px;
+	  margin: 5px;
+	  padding: 2px 20px;
+	'' else ''
+	  background: #${palette.base01};
+	  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 ''
+	  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 ''
+	  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 ''
+	  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 ''
+	  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 ''
+	  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 ''
+	  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 ''
+	  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: 15px 50px 15px 50px;
+	  margin: 5px;
+	  padding: 2px 20px;
+	'' else ''
+	  background: #${palette.base01};
+	  margin: 4px;
+	  padding: 2px 10px;
+	  border-radius: 10px;
+	''}
+      }
+      #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 ''
+	  background: #${palette.base01};
+	  margin: 4px;
+	  padding: 2px 10px;
+	  border-radius: 10px;
+	''}
+      }
+      #idle_inhibitor {
+    	color: #${palette.base09};
+	${if slickbar == true then ''
+	  background: #${palette.base00};
+	  border-radius: 15px 50px 15px 50px;
+	  margin: 5px;
+	  padding: 2px 20px;
+	'' else ''
+	  background: #${palette.base01};
+	  margin: 4px;
+	  padding: 2px 10px;
+	  border-radius: 10px;
+	''}
+      } ''
+    ];
+  };
+}
diff --git a/options.nix b/options.nix
index b417e7a..c6c6f08 100644
--- a/options.nix
+++ b/options.nix
@@ -10,8 +10,8 @@ in {
   gitUsername = "Tyler Kelley";
   gitEmail = "tylerzanekelley@gmail.com";
   theme = "gigavolt";
-  waybarStyle = "style2"; # can be style1-2
-  borderAnim = true; # anything other than on disables anim borders in Hyprland
+  slickbar = true;
+  borderAnim = true;
   browser = "firefox";
   wallpaperGit = "https://gitlab.com/Zaney/my-wallpapers.git";
   wallpaperDir = "${userHome}/Pictures/Wallpapers";