diff --git a/include/modules/temperature.hpp b/include/modules/temperature.hpp
index 5440df77b..918281be5 100644
--- a/include/modules/temperature.hpp
+++ b/include/modules/temperature.hpp
@@ -18,6 +18,7 @@ class Temperature : public ALabel {
  private:
   float getTemperature();
   bool isCritical(uint16_t);
+  bool isWarning(uint16_t);
 
   std::string file_path_;
   util::SleeperThread thread_;
diff --git a/man/waybar-temperature.5.scd b/man/waybar-temperature.5.scd
index 541bf3af6..bf41ecc87 100644
--- a/man/waybar-temperature.5.scd
+++ b/man/waybar-temperature.5.scd
@@ -31,6 +31,10 @@ Addressed by *temperature*
 	typeof: string ++
 	The temperature filename of your *hwmon-path-abs*, e.g. *temp1_input*
 
+*warning-threshold*: ++
+	typeof: integer ++
+	The threshold before it is considered warning (Celsius).
+
 *critical-threshold*: ++
 	typeof: integer ++
 	The threshold before it is considered critical (Celsius).
@@ -40,6 +44,10 @@ Addressed by *temperature*
 	default: 10 ++
 	The interval in which the information gets polled.
 
+*format-warning*: ++
+	typeof: string ++
+	The format to use when temperature is considered warning
+
 *format-critical*: ++
 	typeof: string ++
 	The format to use when temperature is considered critical
diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp
index 302877639..356536f94 100644
--- a/src/modules/temperature.cpp
+++ b/src/modules/temperature.cpp
@@ -69,12 +69,17 @@ auto waybar::modules::Temperature::update() -> void {
   uint16_t temperature_f = std::round(temperature * 1.8 + 32);
   uint16_t temperature_k = std::round(temperature + 273.15);
   auto critical = isCritical(temperature_c);
+  auto warning = isWarning(temperature_c);
   auto format = format_;
   if (critical) {
     format = config_["format-critical"].isString() ? config_["format-critical"].asString() : format;
     label_.get_style_context()->add_class("critical");
-  } else {
+  } else if (warning) {
+    format = config_["format-warning"].isString() ? config_["format-warning"].asString() : format;
+    label_.get_style_context()->add_class("warning");
+  } else        {
     label_.get_style_context()->remove_class("critical");
+    label_.get_style_context()->remove_class("warning");
   }
 
   if (format.empty()) {
@@ -135,7 +140,12 @@ float waybar::modules::Temperature::getTemperature() {
 #endif
 }
 
+bool waybar::modules::Temperature::isWarning(uint16_t temperature_c) {
+  return config_["warning-threshold"].isInt() &&
+         temperature_c >= config_["warning-threshold"].asInt();
+}
+
 bool waybar::modules::Temperature::isCritical(uint16_t temperature_c) {
   return config_["critical-threshold"].isInt() &&
          temperature_c >= config_["critical-threshold"].asInt();
-}
+}
\ No newline at end of file