diff --git a/src/modules/backlight.cpp b/src/modules/backlight.cpp
index 367d6434..24e08d54 100644
--- a/src/modules/backlight.cpp
+++ b/src/modules/backlight.cpp
@@ -55,24 +55,10 @@ auto waybar::modules::Backlight::update() -> void {
         }
       }
 
-      std::string desc =
-          fmt::format(fmt::runtime(current_format), fmt::arg("percent", percent),
-                      fmt::arg("percent_exp", percent_exp), fmt::arg("icon", getIcon(percent)),
-                      fmt::arg("icon_exp", getIcon(percent_exp)));
-      label_.set_markup(desc);
-      if (tooltipEnabled()) {
-        std::string tooltip_format;
-        if (config_["tooltip-format"].isString()) {
-          tooltip_format = config_["tooltip-format"].asString();
-        }
-        if (!tooltip_format.empty()) {
-          label_.set_tooltip_markup(fmt::format(fmt::runtime(tooltip_format),
-                                                fmt::arg("percent", percent),
-                                                fmt::arg("icon", getIcon(percent))));
-        } else {
-          label_.set_tooltip_markup(desc);
-        }
-      }
+      updateLabelAndTooltip(current_format, current_format, fmt::arg("percent", percent),
+                            fmt::arg("percent_exp", percent_exp),
+                            fmt::arg("icon", getIcon(percent)),
+                            fmt::arg("icon_exp", getIcon(percent_exp)));
     } else {
       event_box_.hide();
     }
diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 2fa4ded0..cec8beb8 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -767,7 +767,7 @@ auto waybar::modules::Battery::update() -> void {
     } else if (config_["tooltip-format"].isString()) {
       tooltip_format = config_["tooltip-format"].asString();
     }
-    label_.set_tooltip_markup(
+    setTooltipMarkup(
         fmt::format(fmt::runtime(tooltip_format), fmt::arg("timeTo", tooltip_text_default),
                     fmt::arg("power", power), fmt::arg("capacity", capacity),
                     fmt::arg("time", time_remaining_formatted), fmt::arg("cycles", cycles),
@@ -790,7 +790,7 @@ auto waybar::modules::Battery::update() -> void {
   } else {
     event_box_.show();
     auto icons = std::vector<std::string>{status + "-" + state, status, state};
-    label_.set_markup(fmt::format(
+    setLabelMarkup(fmt::format(
         fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
         fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("time", time_remaining_formatted),
         fmt::arg("cycles", cycles), fmt::arg("health", fmt::format("{:.3}", health))));
diff --git a/src/modules/bluetooth.cpp b/src/modules/bluetooth.cpp
index c59af3b5..d2afd897 100644
--- a/src/modules/bluetooth.cpp
+++ b/src/modules/bluetooth.cpp
@@ -222,7 +222,7 @@ auto waybar::modules::Bluetooth::update() -> void {
     event_box_.hide();
   } else {
     event_box_.show();
-    label_.set_markup(fmt::format(
+    setLabelMarkup(fmt::format(
         fmt::runtime(format_), fmt::arg("status", state_),
         fmt::arg("num_connections", connected_devices_.size()),
         fmt::arg("controller_address", cur_controller_ ? cur_controller_->address : "null"),
@@ -267,7 +267,7 @@ auto waybar::modules::Bluetooth::update() -> void {
         device_enumerate_.erase(0, 1);
       }
     }
-    label_.set_tooltip_markup(fmt::format(
+    setTooltipMarkup(fmt::format(
         fmt::runtime(tooltip_format), fmt::arg("status", state_),
         fmt::arg("num_connections", connected_devices_.size()),
         fmt::arg("controller_address", cur_controller_ ? cur_controller_->address : "null"),
diff --git a/src/modules/gps.cpp b/src/modules/gps.cpp
index a7bab659..285a6938 100644
--- a/src/modules/gps.cpp
+++ b/src/modules/gps.cpp
@@ -141,7 +141,7 @@ auto waybar::modules::Gps::update() -> void {
   // Show the module
   if (!event_box_.get_visible()) event_box_.set_visible(true);
 
-  std::string tooltip_format;
+  std::string tooltip_state;
 
   if (!alt_) {
     auto state = getFixModeName();
@@ -155,57 +155,27 @@ auto waybar::modules::Gps::update() -> void {
     } else {
       default_format_ = DEFAULT_FORMAT;
     }
-    if (config_["tooltip-format-" + state].isString()) {
-      tooltip_format = config_["tooltip-format-" + state].asString();
-    }
     if (!label_.get_style_context()->has_class(state)) {
       label_.get_style_context()->add_class(state);
     }
     format_ = default_format_;
     state_ = state;
+    tooltip_state = state;
   }
 
   auto format = format_;
 
-  fmt::dynamic_format_arg_store<fmt::format_context> store;
-  store.push_back(fmt::arg("mode", getFixModeString()));
-  store.push_back(fmt::arg("status", getFixStatusString()));
-
-  store.push_back(fmt::arg("latitude", gps_data_.fix.latitude));
-  store.push_back(fmt::arg("latitude_error", gps_data_.fix.epy));
-
-  store.push_back(fmt::arg("longitude", gps_data_.fix.longitude));
-  store.push_back(fmt::arg("longitude_error", gps_data_.fix.epx));
-
-  store.push_back(fmt::arg("altitude_hae", gps_data_.fix.altHAE));
-  store.push_back(fmt::arg("altitude_msl", gps_data_.fix.altMSL));
-  store.push_back(fmt::arg("altitude_error", gps_data_.fix.epv));
-
-  store.push_back(fmt::arg("speed", gps_data_.fix.speed));
-  store.push_back(fmt::arg("speed_error", gps_data_.fix.eps));
-
-  store.push_back(fmt::arg("climb", gps_data_.fix.climb));
-  store.push_back(fmt::arg("climb_error", gps_data_.fix.epc));
-
-  store.push_back(fmt::arg("satellites_used", gps_data_.satellites_used));
-  store.push_back(fmt::arg("satellites_visible", gps_data_.satellites_visible));
-
-  auto text = fmt::vformat(format, store);
-
-  if (tooltipEnabled()) {
-    if (tooltip_format.empty() && config_["tooltip-format"].isString()) {
-      tooltip_format = config_["tooltip-format"].asString();
-    }
-    if (!tooltip_format.empty()) {
-      auto tooltip_text = fmt::vformat(tooltip_format, store);
-      if (label_.get_tooltip_text() != tooltip_text) {
-        label_.set_tooltip_markup(tooltip_text);
-      }
-    } else if (label_.get_tooltip_text() != text) {
-      label_.set_tooltip_markup(text);
-    }
-  }
-  label_.set_markup(text);
+  updateLabelAndTooltipForState(
+      tooltip_state, format, format, fmt::arg("mode", getFixModeString()),
+      fmt::arg("status", getFixStatusString()), fmt::arg("latitude", gps_data_.fix.latitude),
+      fmt::arg("latitude_error", gps_data_.fix.epy), fmt::arg("longitude", gps_data_.fix.longitude),
+      fmt::arg("longitude_error", gps_data_.fix.epx),
+      fmt::arg("altitude_hae", gps_data_.fix.altHAE),
+      fmt::arg("altitude_msl", gps_data_.fix.altMSL), fmt::arg("altitude_error", gps_data_.fix.epv),
+      fmt::arg("speed", gps_data_.fix.speed), fmt::arg("speed_error", gps_data_.fix.eps),
+      fmt::arg("climb", gps_data_.fix.climb), fmt::arg("climb_error", gps_data_.fix.epc),
+      fmt::arg("satellites_used", gps_data_.satellites_used),
+      fmt::arg("satellites_visible", gps_data_.satellites_visible));
   // Call parent update
   ALabel::update();
 }