diff --git a/packages/humidifier_scripts.yaml b/packages/humidifier_scripts.yaml
index 4c60e353771734900a264589ccc7368cf50e16fb..62284684625f6dac890fe0884d235861e0d49784 100644
--- a/packages/humidifier_scripts.yaml
+++ b/packages/humidifier_scripts.yaml
@@ -4,14 +4,14 @@ script:
       - lambda: |-
           if (
             !id(humidifier).state && 
-            id(bme280_humidity).state < atoi(id(humidity_min).state.c_str()) + atoi(id(humidity_hysteresis).state.c_str())
+            id(bme280_humidity).state < atoi(id(humidifier_min).state.c_str())
           ) {
             ESP_LOGI("humidifier", "Humidity Low, enabling Humidifier");
             id(humidifier).turn_on();
 
           } else if (
             id(humidifier).state && 
-            id(bme280_humidity).state >= atoi(id(humidity_max).state.c_str()) - atoi(id(humidity_hysteresis).state.c_str())
+            id(bme280_humidity).state >= atoi(id(humidifier_max).state.c_str())
           ) {
             ESP_LOGI("humidifier", "Humidity High, disabling Humidifier");
             id(humidifier).turn_off();
diff --git a/packages/humidifier_settings.yaml b/packages/humidifier_settings.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..93c4363dbca1f3716da4c5a556bebcfc218fdbf7
--- /dev/null
+++ b/packages/humidifier_settings.yaml
@@ -0,0 +1,25 @@
+sensor:
+  - platform: template
+    name: "humidifier_max"
+    lambda: return atoi(id(humidifier_max).state.c_str());
+    internal: true
+  - platform: template
+    name: "humidifier_min"
+    lambda: return atoi(id(humidifier_min).state.c_str());
+    internal: true
+
+select:
+  - platform: template
+    id: humidifier_max
+    name: "Humidifier: Humidity Off"
+    options: ["40", "45", "50", "55", "60", "65", "70", "75", "80", "85"]
+    initial_option: "75"
+    optimistic: true
+    restore_value: true
+  - platform: template
+    id: humidifier_min
+    name: "Humidifier: Humidity On"
+    options: ["30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80"]
+    initial_option: "60"
+    optimistic: true
+    restore_value: true
diff --git a/propbox.yaml b/propbox.yaml
index 4258e32839f5d8454d2feb7d00a5ff4c022b0338..ffd9b47e11b0398b987ccc56cc6334c6a18592be 100644
--- a/propbox.yaml
+++ b/propbox.yaml
@@ -11,16 +11,17 @@ substitutions:
   humidifier_script: "humidifier_control"
 
 packages:
-  base:               !include packages/base.yaml
-  esp32:              !include packages/esp32.yaml
-  time:               !include packages/time_schedule.yaml
-  air_bme280:         !include packages/air_bme280.yaml
-  water_ds18b20:      !include packages/water_ds18b20.yaml
-  yyac32:             !include packages/yyac3s.yaml
-  fan_settings:       !include packages/fan_settings.yaml
-  fan_power:          !include packages/fan_power.yaml
-  fan_scripts:        !include packages/fan_scripts.yaml
-  light_power:        !include packages/light_power.yaml
-  light_settings:     !include packages/light_settings.yaml
-  humidifier:         !include packages/humidifier.yaml
-  humidifier_scripts: !include packages/humidifier_scripts.yaml
+  base:                 !include packages/base.yaml
+  esp32:                !include packages/esp32.yaml
+  time:                 !include packages/time_schedule.yaml
+  air_bme280:           !include packages/air_bme280.yaml
+  water_ds18b20:        !include packages/water_ds18b20.yaml
+  yyac32:               !include packages/yyac3s.yaml
+  fan_settings:         !include packages/fan_settings.yaml
+  fan_power:            !include packages/fan_power.yaml
+  fan_scripts:          !include packages/fan_scripts.yaml
+  light_power:          !include packages/light_power.yaml
+  light_settings:       !include packages/light_settings.yaml
+  humidifier:           !include packages/humidifier.yaml
+  humidifier_scripts:   !include packages/humidifier_scripts.yaml
+  humidifier_settings:  !include packages/humidifier_settings.yaml