diff --git a/01_Docs/DHT22.pdf b/01_Docs/DHT22.pdf
new file mode 100644
index 0000000..55bd82d
Binary files /dev/null and b/01_Docs/DHT22.pdf differ
diff --git a/01_Docs/SKU-44682-datasheet.pdf b/01_Docs/SKU-44682-datasheet.pdf
new file mode 100644
index 0000000..3738f6a
Binary files /dev/null and b/01_Docs/SKU-44682-datasheet.pdf differ
diff --git a/01_Docs/ds18b20.pdf b/01_Docs/ds18b20.pdf
new file mode 100644
index 0000000..52dc259
Binary files /dev/null and b/01_Docs/ds18b20.pdf differ
diff --git a/02_Software/esphome-bohemahouse.yaml b/02_Software/esphome-bohemahouse-32.yaml
similarity index 74%
rename from 02_Software/esphome-bohemahouse.yaml
rename to 02_Software/esphome-bohemahouse-32.yaml
index 9b6e4e2..e0cd1cf 100644
--- a/02_Software/esphome-bohemahouse.yaml
+++ b/02_Software/esphome-bohemahouse-32.yaml
@@ -144,10 +144,13 @@ one_wire:
     id: one_wire_gpio_1
     pin: GPIO23
 
+# Sensor usage
 sensor:
+  # DS18B20 1st sensor
   - platform: dallas_temp
     name: Temperature
     id: sensor_dallas_temp_1
+    index: 0
     one_wire_id: one_wire_gpio_1
     update_interval: 10s
     resolution: 12
@@ -156,38 +159,71 @@ sensor:
     internal: true
     on_value:
       then:
-        # Topic 1: Raw temperature value
         - mqtt.publish:
-            topic: !lambda |-
-              return id(custom_prefix) + "/barrel_1/sensor/temperature/state";
-            payload: !lambda 'return String(x).c_str();'
-
-        # Topic 2: Temperature + 5 degrees
-        - mqtt.publish:
-            topic: !lambda |-
-              return id(custom_prefix) + "/barrel_2/sensor/temperature/state";
-            payload: !lambda 'return String(x + 1.0).c_str();'
-
-        # Topic 3: Temperature - 5 degrees
-        - mqtt.publish:
-            topic: !lambda |-
-              return id(custom_prefix) + "/barrel_3/sensor/temperature/state";
-            payload: !lambda 'return String(x + 2.0).c_str();'
-
-        # Topic 4: Custom offset (+2.5 degrees)
-        - mqtt.publish:
-            topic: !lambda |-
-              return id(custom_prefix) + "/barrel_4/sensor/temperature/state";
-            payload: !lambda 'return String(x + 3.0).c_str();'
+            topic: !lambda return id(custom_prefix) + "/sensor/barrel/1/temperature/state";
+            payload: !lambda return String(x).c_str();
         - script.execute:
             id: set_led_state
-            state_name: "MQTT_SUCCESS"
+            state_name: MQTT_SUCCESS
+            
+  # DS18B20 2nd sensor
+  - platform: dallas_temp
+    name: Temperature
+    id: sensor_dallas_temp_2
+    index: 1
+    one_wire_id: one_wire_gpio_1
+    update_interval: 10s
+    resolution: 12
+    unit_of_measurement: °C
+    accuracy_decimals: 1
+    internal: true
+    on_value:
+      then:
+        - mqtt.publish:
+            topic: !lambda return id(custom_prefix) + "/sensor/barrel/2/temperature/state";
+            payload: !lambda return String(x + 1.0).c_str();
+        - script.execute:
+            id: set_led_state
+            state_name: MQTT_SUCCESS
 
-# Factory Reset — hold BOOT button 10 seconds
+  # DHT22
+  - platform: dht
+    id: sensor_dht_1
+    pin: GPIO22
+    humidity:
+      name: Room Humidity
+      id: sensor_dht_1_humidity
+      internal: true
+      on_value:
+        then:
+          - mqtt.publish:
+              topic: !lambda |-
+                return id(custom_prefix) + "/sensor/room/1/humidity/state";
+              payload: !lambda 'return String(x).c_str();'
+          - script.execute:
+              id: set_led_state
+              state_name: MQTT_SUCCESS
+    temperature:
+      name: Room Temperature
+      id: sensor_dht_1_temperature
+      internal: true
+      on_value:
+        then:
+          - mqtt.publish:
+              topic: !lambda |-
+                return id(custom_prefix) + "/sensor/room/1/temperature/state";
+              payload: !lambda 'return String(x).c_str();'
+          - script.execute:
+              id: set_led_state
+              state_name: MQTT_SUCCESS
+    update_interval: 15s
+
+# Factory Reset — hold BOOT button 10 seconds              
 binary_sensor:
   - platform: gpio
     name: GPIO Binary Sensor
     id: boot_button
+    internal: true
     pin:
       number: GPIO0
       mode:
@@ -204,10 +240,11 @@ button:
   - platform: factory_reset
     name: Factory Reset
     id: button_factory_reset
+    internal: true
 
 text_sensor:
   - platform: wifi_info
     ip_address:
-      name: "Device IP Address"
+      name: "Device IP Address"          
     mac_address: 
-      name: "Device Unique MAC Address"
+      name: "Device Unique MAC Address"
\ No newline at end of file