diff --git a/home/system/hyprpanel/default.nix b/home/system/hyprpanel/default.nix
index 9de104e..b9c3973 100644
--- a/home/system/hyprpanel/default.nix
+++ b/home/system/hyprpanel/default.nix
@@ -23,7 +23,6 @@ let
   position = config.var.theme.bar.position;
 
   location = config.var.location;
-  username = config.var.username;
 in {
 
   imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
@@ -69,7 +68,7 @@ in {
       "theme.bar.buttons.workspaces.hover" = "${accent-alt}";
       "theme.bar.buttons.workspaces.active" = "${accent}";
       "theme.bar.buttons.workspaces.available" = "${accent-alt}";
-      "theme.bar.buttons.workspaces.occupied" = "${accent}";
+      "theme.bar.buttons.workspaces.occupied" = "${accent-alt}";
       "theme.bar.margin_top" =
         "${if position == "top" then toString (gaps-in * 2) else "0"}px";
       "theme.bar.margin_bottom" =
@@ -80,7 +79,6 @@ in {
       "theme.bar.transparent" = "${if transparent then "true" else "false"}";
       "bar.workspaces.show_numbered" = false;
       "bar.workspaces.workspaces" = 5;
-      "bar.workspaces.monitorSpecific" = true;
       "bar.workspaces.hideUnoccupied" = false;
       "bar.windowtitle.label" = true;
       "bar.volume.label" = false;
@@ -144,8 +142,8 @@ in {
       "theme.bar.menus.tooltip.text" = "${foreground}";
       "theme.bar.menus.dropdownmenu.background" = "${background-alt}";
       "theme.bar.menus.dropdownmenu.text" = "${foreground}";
-      "theme.bar.background" =
-        "${background + (if transparentButtons then "00" else "")}";
+      "theme.bar.background" = "${background
+        + (if transparentButtons && transparent then "00" else "")}";
       "theme.bar.buttons.style" = "default";
       "theme.bar.buttons.monochrome" = true;
       "theme.bar.buttons.text" = "${foreground}";
@@ -177,6 +175,12 @@ in {
       "bar.customModules.updates.pollingInterval" = 1440000;
       "bar.media.show_active_only" = true;
       "theme.bar.location" = "${position}";
+      "bar.workspaces.numbered_active_indicator" = "color";
+      "bar.workspaces.monitorSpecific" = false;
+      "bar.workspaces.applicationIconEmptyWorkspace" = "";
+      "bar.workspaces.showApplicationIcons" = true;
+      "bar.workspaces.showWsIcons" = true;
+      "theme.bar.dropdownGap" = "4.5em";
     };
   };
 }