diff --git a/home-modules/bar/hyprpanel.nix b/home-modules/bar/hyprpanel.nix
index 0b1c241..c2de86c 100644
--- a/home-modules/bar/hyprpanel.nix
+++ b/home-modules/bar/hyprpanel.nix
@@ -12,7 +12,7 @@
         /* 'icon-size': 1.2em */
       ));
       @include styleModule('cmodule-caldav_event', (
-        'text-color': ${secondary.base},
+        'text-color': ${accent.base},
       ));
     '';
     "hyprpanel/modules.json".text = builtins.toJSON {
@@ -24,7 +24,7 @@
           hideOnEmpty = true;
           actions.onLeftClick = "menu:calendar";
       };
-      "custom/caldav_event" = {
+      "custom/caldav_evnet" = {
           execute = "caldav_event";
           executeOnAction = "";
           label = "{}";
@@ -37,21 +37,20 @@
   programs.hyprpanel = {
     enable = true;
     package = pkgs.unstable.hyprpanel;
-    settings = with rice.color; let
+    settings = with rice.color;  let
       t = builtins.toString (builtins.ceil (rice.transparency * 100));
     in {
       "bar.layouts" = {
         "*" = {
           "left" = [
             "volume"
-            (pkgs.lib.mkIf (hyper.host == "NxXPS") "battery")
             # "microphone"
-            "cpu"
-            "cputemp"
-            "ram"
+            # "cpu"
+            # "cputemp"
+            # "ram"
+            (pkgs.lib.mkIf (hyper.host == "NxXPS") "battery")
             # "bluetooth"
             "network"
-            "netstat"
             "windowtitle"
           ];
           "middle" = [ "workspaces" ];
@@ -68,21 +67,11 @@
 
       "bar.bluetooth.label" = true;
 
-      "bar.customModules.submap.enabledIcon" = "";
+      "bar.customModules.submap.enabledIcon" = "[󰧹]";
       "bar.customModules.submap.showSubmapName" = false;
-      "bar.customModules.submap.label" = true;
+      "bar.customModules.submap.label" = false;
       "bar.customModules.submap.icon" = true;
       "bar.customModules.submap.disabledIcon" = "";
-      "bar.customModules.submap.enabledText" = "[SUBMAP]";
-      "bar.customModules.submap.disabledText" = "";
-
-      "bar.media.show_active_only" = true;
-      "bar.media.truncation_size" = 20;
-
-      "bar.windowtitle.class_name" = false;
-      "bar.windowtitle.label" = true;
-      "bar.windowtitle.custom_title" = false;
-      "bar.windowtitle.truncation_size" = 40;
 
       "bar.workspaces.applicationIconEmptyWorkspace" = "";
       "bar.workspaces.applicationIconOncePerWorkspace" = false;
@@ -107,10 +96,10 @@
       "theme.bar.buttons.padding_x" = "0.5rem";
 
       "theme.bar.buttons.battery.background" = background; 
-      "theme.bar.buttons.battery.border" = accent.base; # not seen
+      "theme.bar.buttons.battery.border" = accent.base;
       "theme.bar.buttons.battery.icon_background" = background;
-      "theme.bar.buttons.battery.icon" = secondary.base;
-      "theme.bar.buttons.battery.text" = secondary.base;
+      "theme.bar.buttons.battery.icon" = accent.base;
+      "theme.bar.buttons.battery.text" = accent.base;
 
       "theme.bar.buttons.bluetooth.background" = background; 
       "theme.bar.buttons.bluetooth.border" = accent.base;
@@ -266,15 +255,15 @@
       "theme.bar.buttons.windowtitle.text" = secondary.base;
 
       "theme.bar.buttons.workspaces.active" = accent.bright;
-      "theme.bar.buttons.workspaces.available" = weird.dark; # not seen
+      "theme.bar.buttons.workspaces.available" = accent.base;
       "theme.bar.buttons.workspaces.background" = background; 
-      "theme.bar.buttons.workspaces.border" = accent.base; # not seen
+      "theme.bar.buttons.workspaces.border" = accent.base;
       "theme.bar.buttons.workspaces.hover" = foreground;
-      "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color" = accent.base; # not seen
+      "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color" = accent.base;
       "theme.bar.buttons.workspaces.numbered_active_highlight_padding" = "0.2em";
       "theme.bar.buttons.workspaces.numbered_active_underline_color" = accent.bright;
       "theme.bar.buttons.workspaces.numbered_inactive_padding" = "0.2em";
-      "theme.bar.buttons.workspaces.occupied" = accent.base;
+      "theme.bar.buttons.workspaces.occupied" = secondary.base;
       "theme.bar.buttons.workspaces.pill.width" = "4em";
       "theme.bar.buttons.workspaces.smartHighlight" = true;
       "theme.bar.buttons.y_margins" = "0em";
@@ -505,7 +494,7 @@
       "theme.notification.close_button.label" = accent.base;
       "theme.notification.label" = accent.base;
       "theme.notification.labelicon" = accent.base;
-      "theme.notification.opacity" = 1;
+      "theme.notification.opacity" = 1.0;
       "theme.notification.text" = foreground;
       "theme.notification.time" = accent.base;