diff --git a/man/waybar-hyprland-submap.5.scd b/man/waybar-hyprland-submap.5.scd
index 3f8d6280..0dc0b11a 100644
--- a/man/waybar-hyprland-submap.5.scd
+++ b/man/waybar-hyprland-submap.5.scd
@@ -80,3 +80,4 @@ Addressed by *hyprland/submap*
 # STYLE
 
 - *#submap*
+- *#submap.<name>*
diff --git a/src/modules/hyprland/submap.cpp b/src/modules/hyprland/submap.cpp
index d1d9a116..ce27fc9a 100644
--- a/src/modules/hyprland/submap.cpp
+++ b/src/modules/hyprland/submap.cpp
@@ -54,8 +54,16 @@ void Submap::onEvent(const std::string& ev) {
   auto submapName = ev.substr(ev.find_last_of('>') + 1);
   submapName = waybar::util::sanitize_string(submapName);
 
+  if (!submap_.empty()){
+    label_.get_style_context()->remove_class(submap_);
+  }
+
   submap_ = submapName;
 
+  label_.get_style_context()->add_class(submap_);
+
+
+
   spdlog::debug("hyprland submap onevent with {}", submap_);
 
   dp.emit();