diff --git a/home/gabriel/features/desktop/hyprland/default.nix b/home/gabriel/features/desktop/hyprland/default.nix
index 7b206951..912a2adb 100644
--- a/home/gabriel/features/desktop/hyprland/default.nix
+++ b/home/gabriel/features/desktop/hyprland/default.nix
@@ -97,7 +97,7 @@ in {
         "noborder, ${kdeconnect-pointer}"
         "suppressevent fullscreen, ${kdeconnect-pointer}"
       ] ++ (lib.mapAttrsToList (name: colors:
-        "bordercolor ${rgba colors.primary "aa"} ${rgba colors.surface "aa"}, title:^(\\[${name}\\])"
+        "bordercolor ${rgba colors.primary "aa"} ${rgba colors.primary_container "aa"}, title:^(\\[${name}\\])"
       ) remoteColorschemes);
       layerrule = [
         "animation fade,hyprpicker"
diff --git a/home/gabriel/features/desktop/hyprland/hyprbars.nix b/home/gabriel/features/desktop/hyprland/hyprbars.nix
index 354467d1..596bd728 100644
--- a/home/gabriel/features/desktop/hyprland/hyprbars.nix
+++ b/home/gabriel/features/desktop/hyprland/hyprbars.nix
@@ -62,8 +62,8 @@ in {
         "plugin:hyprbars:bar_color ${rgba config.colorscheme.colors.primary "ee"}, focus:1"
         "plugin:hyprbars:title_color ${rgb config.colorscheme.colors.on_primary}, focus:1"
       ] ++ (lib.flatten (lib.mapAttrsToList (name: colors: [
-        "plugin:hyprbars:bar_color ${rgba colors.surface "dd"}, title:^(\\[${name}\\])"
-        "plugin:hyprbars:title_color ${rgb colors.primary}, title:^(\\[${name}\\])"
+        "plugin:hyprbars:bar_color ${rgba colors.primary_container "dd"}, title:^(\\[${name}\\])"
+        "plugin:hyprbars:title_color ${rgb colors.on_primary_container}, title:^(\\[${name}\\])"
 
         "plugin:hyprbars:bar_color ${rgba colors.primary "ee"}, title:^(\\[${name}\\]), focus:1"
         "plugin:hyprbars:title_color ${rgb colors.on_primary}, title:^(\\[${name}\\]), focus:1"