diff --git a/bedroom_lilygo_t7v13.yaml b/bedroom_lilygo_t7v13.yaml
index 4209c6b..8ae2eaa 100644
--- a/bedroom_lilygo_t7v13.yaml
+++ b/bedroom_lilygo_t7v13.yaml
@@ -1,5 +1,5 @@
 substitutions:
-  device_name: bedroom_tkm_lily2
+  device_name: esphome_87_47
   device_ip: 192.168.87.47
 
 esphome:
diff --git a/bedroom_lilygo_t7v15_2.yaml b/bedroom_lilygo_t7v15_2.yaml
new file mode 100644
index 0000000..fe557c4
--- /dev/null
+++ b/bedroom_lilygo_t7v15_2.yaml
@@ -0,0 +1,87 @@
+substitutions:
+  device_name: esphome_87_48
+  device_ip: 192.168.87.48
+
+esphome:
+  name: ${device_name}
+  platform: ESP32
+  board: esp32dev
+  on_boot:
+    - priority: 900 #900 tried down to 500
+      then:
+        - lambda: |-
+            id(wake_up_reason) = log(esp_sleep_get_ext1_wakeup_status())/log(2);
+  # on_shutdown:
+  #   then:
+  #       - lambda: |-
+  #           esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+  #           gpio_pullup_dis(GPIO_NUM_33);
+  #           gpio_pulldown_en(GPIO_NUM_33);
+  #           gpio_pullup_dis(GPIO_NUM_34);
+  #           gpio_pulldown_en(GPIO_NUM_34);
+  #           gpio_pullup_dis(GPIO_NUM_35);
+  #           gpio_pulldown_en(GPIO_NUM_35);
+
+<<: !include standard_wifi.yaml
+logger:
+    level: INFO
+api:
+ota:
+<<: !include standard_mqtt_deepsleep.yaml
+deep_sleep:
+        run_duration: 20s
+        sleep_duration: 8h #40s #24h
+        esp32_ext1_wakeup: 
+                pins: 
+                  - 33 #middle button
+                  - 34 #T button
+                  - 35 #L button
+                mode: ANY_HIGH
+        id: deep_sleep_1
+
+globals:
+        - id: wake_up_reason
+          type: int
+          restore_value: no
+          initial_value: '0'
+sensor:
+  - platform: template
+    name: "Remote Control Wake Reason"
+    accuracy_decimals: 0
+    lambda: |-
+            return id(wake_up_reason);
+  - platform: adc
+    pin: GPIO39
+    attenuation: 11db
+    name: "Battery Voltage"
+    update_interval: 10s
+    filters:
+      - multiply: 0.83 #(3.24/3.90) per measurements            
+
+binary_sensor:
+  - platform: gpio
+    pin: 
+        number: GPIO33
+        mode: INPUT_PULLUP
+    filters:
+      - delayed_on: 100ms ### <---- debounce time, was 100ms
+      # - delayed_off: 10s ### <---- delay to capture state change on wake up         
+    name: "TKM Test 33 middle button"
+    id: tkm_test_33
+  - platform: gpio
+    pin: 
+        number: GPIO34
+        mode: INPUT_PULLUP
+    filters:
+      - delayed_on: 100ms ### <---- debounce time, was 100ms
+      # - delayed_off: 10s ### <---- delay to capture state change on wake up             
+    name: "TKM Test 34 T button"
+    id: tkm_test_34
+  - platform: gpio
+    pin: 
+        number: GPIO35
+        mode: INPUT_PULLUP
+    filters:
+      - delayed_on: 100ms ### <---- debounce time, was 100ms
+    name: "TKM Test 35 L button"
+    id: tkm_test35
\ No newline at end of file
diff --git a/bedroom_tkm_lily3/partitions.csv b/bedroom_tkm_lily3/partitions.csv
new file mode 100644
index 0000000..f846601
--- /dev/null
+++ b/bedroom_tkm_lily3/partitions.csv
@@ -0,0 +1,6 @@
+nvs,      data, nvs,     0x009000, 0x005000,
+otadata,  data, ota,     0x00e000, 0x002000,
+app0,     app,  ota_0,   0x010000, 0x1C0000,
+app1,     app,  ota_1,   0x1D0000, 0x1C0000,
+eeprom,   data, 0x99,    0x390000, 0x001000,
+spiffs,   data, spiffs,  0x391000, 0x00F000
diff --git a/chip_list_esp32.txt b/chip_list_esp32.txt
index 4735fdc..88817ef 100644
--- a/chip_list_esp32.txt
+++ b/chip_list_esp32.txt
@@ -6,3 +6,4 @@ sonoffmini_1        192.168.87.41   ESP8266/esp01_1m
 bedroom_tkm_lily1   192.168.87.44   esp32dev                                            ESP32 LilyGo T7 V1.5, with USB and battery
 sonoffmini_45       192.168.87.45   ESP8266/esp01_1m                                    Sonoff Mini - Now on Lorrie's nightstand
 bedroom_tkm_lily2   192.168.87.47   esp32dev                                            ESP32 LilyGo T7 V1.3, with USB and battery
+bedroom_tkm_lily1   192.168.87.48   esp32dev                                            ESP32 LilyGo T7 V1.5, with USB and battery
diff --git a/esphome_87_47/partitions.csv b/esphome_87_47/partitions.csv
new file mode 100644
index 0000000..f846601
--- /dev/null
+++ b/esphome_87_47/partitions.csv
@@ -0,0 +1,6 @@
+nvs,      data, nvs,     0x009000, 0x005000,
+otadata,  data, ota,     0x00e000, 0x002000,
+app0,     app,  ota_0,   0x010000, 0x1C0000,
+app1,     app,  ota_1,   0x1D0000, 0x1C0000,
+eeprom,   data, 0x99,    0x390000, 0x001000,
+spiffs,   data, spiffs,  0x391000, 0x00F000
diff --git a/esphome_87_48/partitions.csv b/esphome_87_48/partitions.csv
new file mode 100644
index 0000000..f846601
--- /dev/null
+++ b/esphome_87_48/partitions.csv
@@ -0,0 +1,6 @@
+nvs,      data, nvs,     0x009000, 0x005000,
+otadata,  data, ota,     0x00e000, 0x002000,
+app0,     app,  ota_0,   0x010000, 0x1C0000,
+app1,     app,  ota_1,   0x1D0000, 0x1C0000,
+eeprom,   data, 0x99,    0x390000, 0x001000,
+spiffs,   data, spiffs,  0x391000, 0x00F000