diff --git a/base.yaml b/base.yaml
index f8623a33bf25e074ce2e2ed3f1367317dc2bd59c..30d668566eea57900371c1c5b3a732920cb47836 100644
--- a/base.yaml
+++ b/base.yaml
@@ -12,6 +12,7 @@ esphome:
 
 substitutions:
   domain: !secret domain
+  timezone: !secret timezone
 
 preferences:
   flash_write_interval: 0s
@@ -43,7 +44,25 @@ web_server:
   # include_internal: true
 
 prometheus:
-  # include_internal: true
+  include_internal: true
+  filters:
+    map:
+      - Wifi Signal -> RSSI
+      - wifi_signal -> rssi
+      - Device Uptime -> Uptime
+      - device_uptime -> uptime
+      - "Status: Light -> Light"
+      - status_light -> light
+      - "Status: Fan -> Fan"
+      - status_fan -> fan
+      - "Sensor: Temperature -> Temperature"
+      - sensor_temperature -> temperature
+      - "Sensor: Humidity -> Humidity"
+      - sensor_humidity -> humidity
+      - "Sensor: Pressure -> Pressure"
+      - sensor_pressure -> pressure
+      - "Sensor: Water Temperature -> Temperature Water"
+      - sensor_water_temperature -> temperature_water
 
 sensor:
   - platform: wifi_signal
diff --git a/propbox.yaml b/propbox.yaml
index f5fb5ff590a0828a3ce8172fc5a99248a2d40098..58edc5ebbf3a55fae0c454ccb5ef222630183ea1 100644
--- a/propbox.yaml
+++ b/propbox.yaml
@@ -55,8 +55,8 @@ sensor:
           - script.execute: fan_control
     pressure:
       id: pressure
-      accuracy_decimals: 2
       name: "Sensor: Pressure"
+      accuracy_decimals: 2
 
   - platform: dallas
     index: 0
@@ -64,37 +64,34 @@ sensor:
     name: "Sensor: Water Temperature"
     accuracy_decimals: 2
 
-  # requires: https://github.com/esphome/feature-requests/issues/1746
-  # - platform: template
-  #   id: sensor_temperature_max
-  #   name: "temperature_max"
-  #   lambda: return atoi(id(temperature_max).state.c_str());
-  #   internal: true
-  # - platform: template
-  #   id: sensor_temperature_hysteresis
-  #   name: "temperature_max"
-  #   lambda: return atoi(id(temperature_hysteresis).state.c_str());
-  #   internal: true
-  # - platform: template
-  #   id: sensor_temperature_min
-  #   name: "temperature_max"
-  #   lambda: return atoi(id(temperature_min).state.c_str());
-  #   internal: true
-  # - platform: template
-  #   id: sensor_humidity_max
-  #   name: "humidity_max"
-  #   lambda: return atoi(id(humidity_max).state.c_str());
-  #   internal: true
-  # - platform: template
-  #   id: sensor_humidity_hysteresis
-  #   name: "humidity_max"
-  #   lambda: return atoi(id(humidity_hysteresis).state.c_str());
-  #   internal: true
-  # - platform: template
-  #   id: sensor_humidity_min
-  #   name: "humidity_max"
-  #   lambda: return atoi(id(humidity_min).state.c_str());
-  #   internal: true
+  - platform: template
+    name: "schedule"
+    lambda: return id(schedule).active_index();
+    internal: true
+  - platform: template
+    name: "temperature_max"
+    lambda: return atoi(id(temperature_max).state.c_str());
+    internal: true
+  - platform: template
+    name: "temperature_hysteresis"
+    lambda: return atoi(id(temperature_hysteresis).state.c_str());
+    internal: true
+  - platform: template
+    name: "temperature_min"
+    lambda: return atoi(id(temperature_min).state.c_str());
+    internal: true
+  - platform: template
+    name: "humidity_max"
+    lambda: return atoi(id(humidity_max).state.c_str());
+    internal: true
+  - platform: template
+    name: "humidity_hysteresis"
+    lambda: return atoi(id(humidity_hysteresis).state.c_str());
+    internal: true
+  - platform: template
+    name: "humidity_min"
+    lambda: return atoi(id(humidity_min).state.c_str());
+    internal: true
 
 select:
   - platform: template
@@ -107,7 +104,7 @@ select:
   - platform: template
     id: temperature_max
     name: "Fan: Temperature On"
-    options: ["21", "22", "23", "24", "25", "26", "27", "28", "29"]
+    options: ["21", "22", "23", "24", "25", "26", "27", "28", "29", "30"]
     initial_option: "27"
     optimistic: true
     restore_value: true
@@ -115,7 +112,7 @@ select:
     id: temperature_hysteresis
     name: "Fan: Temperature Hysteresis"
     options: ["1", "2", "3", "4", "5"]
-    initial_option: "2"
+    initial_option: "1"
     optimistic: true
     restore_value: true
   - platform: template
@@ -128,14 +125,14 @@ select:
   - platform: template
     id: humidity_max
     name: "Fan: Humidity On"
-    options: ["40", "45", "50", "55", "60", "65", "70", "75"]
+    options: ["40", "45", "50", "55", "60", "65", "70", "75", "80"]
     initial_option: "70"
     optimistic: true
     restore_value: true
   - platform: template
     id: humidity_hysteresis
     name: "Fan: Humidity Hysteresis"
-    options: ["5", "10", "15"]
+    options: ["1", "2", "3", "4", "5", "10", "15"]
     initial_option: "5"
     optimistic: true
     restore_value: true
@@ -176,7 +173,7 @@ interval:
 time:
   - platform: sntp
     id: sntp_time
-    timezone: $timezone
+    timezone: ${timezone}
     update_interval: 1h
     on_time:
       - cron: ${schedule_grow_on}