diff --git a/boneio-24x16_switches_v0_5-v0_6.yaml b/boneio-24x16_switches_v0_5-v0_6.yaml
index c88f262..c54c0fc 100644
--- a/boneio-24x16_switches_v0_5-v0_6.yaml
+++ b/boneio-24x16_switches_v0_5-v0_6.yaml
@@ -23,13 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-24x16_switches_v0_5-v0_6.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-24x16_switches_v0_5-v0_6.yaml@latest
   import_full_config: true
 
 packages:
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_5-v0_6/display.yaml',
@@ -40,7 +40,6 @@ packages:
         'devices_v0_5-v0_6/pcf_with_mcp.yaml',
         'boards/24x16_output.yaml',
         # 'devices_v0_5-v0_6/one_wire.yaml',
-        # 'devices_v0_5-v0_6/uart.yaml',
       ]
 
 logger:
@@ -576,3 +575,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin3_1
+#   rx_pin: GPIO3
+#   tx_pin: GPIO1
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/boneio-24x16_switches_v0_7.yaml b/boneio-24x16_switches_v0_7.yaml
index a14a464..2d7f2b3 100644
--- a/boneio-24x16_switches_v0_7.yaml
+++ b/boneio-24x16_switches_v0_7.yaml
@@ -23,13 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-24x16_switches_v0_7.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-24x16_switches_v0_7.yaml@latest
   import_full_config: true
 
 packages:
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_7/display.yaml',
@@ -39,7 +39,6 @@ packages:
         'devices_v0_7/pcf_with_mcp.yaml',
         'boards/24x16_output.yaml',
         # 'devices_v0_7/one_wire.yaml',
-        # 'devices_v0_7/uart.yaml',
       ]
 
 logger:
@@ -572,3 +571,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin14_15
+#   rx_pin: GPIO14
+#   tx_pin: GPIO15
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/boneio-32x10_lights_v0_5-v0_6.yaml b/boneio-32x10_lights_v0_5-v0_6.yaml
index 5117c4a..cbc462a 100644
--- a/boneio-32x10_lights_v0_5-v0_6.yaml
+++ b/boneio-32x10_lights_v0_5-v0_6.yaml
@@ -23,13 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-32x10_lights_v0_5-v0_6.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-32x10_lights_v0_5-v0_6.yaml@latest
   import_full_config: true
 
 packages:
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_5-v0_6/display.yaml',
@@ -40,7 +40,6 @@ packages:
         'devices_v0_5-v0_6/pcf.yaml',
         'boards/32x10_output.yaml',
         # 'devices_v0_5-v0_6/one_wire.yaml',
-        # 'devices_v0_5-v0_6/uart.yaml',
       ]
 
 logger:
@@ -633,3 +632,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin3_1
+#   rx_pin: GPIO3
+#   tx_pin: GPIO1
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/boneio-32x10_lights_v0_7.yaml b/boneio-32x10_lights_v0_7.yaml
index 672ccce..c2d4b54 100644
--- a/boneio-32x10_lights_v0_7.yaml
+++ b/boneio-32x10_lights_v0_7.yaml
@@ -23,31 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-32x10_lights_v0_7.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-32x10_lights_v0_7.yaml@latest
   import_full_config: true
 
-modbus:
-  send_wait_time: 200ms
-  uart_id: uart_pin14_15
-  id: mod_bus
-
-modbus_controller:
-  - id: sofarsolar
-    address: 0x09
-    modbus_id: mod_bus
-    setup_priority: -10
-    update_interval: 15s
-
 packages:
-  # extra_boneio_package:
-  #   url: github://boneIO-eu/esphome-packages
-  #   file: sofar-inverter-ktl.yaml
-  #   vars:
-  #     sofar_modbus_id: sofarsolar
-
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_7/display.yaml',
@@ -57,7 +39,6 @@ packages:
         'devices_v0_7/pcf.yaml',
         'boards/32x10_output.yaml',
         # 'devices_v0_7/one_wire.yaml',
-        'devices_v0_7/uart.yaml',
       ]
 
 logger:
@@ -647,3 +628,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin14_15
+#   rx_pin: GPIO14
+#   tx_pin: GPIO15
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/boneio-32x10_switches_v0_5-v0_6.yaml b/boneio-32x10_switches_v0_5-v0_6.yaml
index 3b9cb2c..f78cc7d 100644
--- a/boneio-32x10_switches_v0_5-v0_6.yaml
+++ b/boneio-32x10_switches_v0_5-v0_6.yaml
@@ -23,13 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-32x10_switches_v0_5-v0_6.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-32x10_switches_v0_5-v0_6.yaml@latest
   import_full_config: true
 
 packages:
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_5-v0_6/display.yaml',
@@ -40,7 +40,6 @@ packages:
         'devices_v0_5-v0_6/pcf.yaml',
         'boards/32x10_output.yaml',
         # 'devices_v0_5-v0_6/one_wire.yaml',
-        # 'devices_v0_5-v0_6/uart.yaml',
       ]
 
 logger:
@@ -632,3 +631,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin3_1
+#   rx_pin: GPIO3
+#   tx_pin: GPIO1
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/boneio-32x10_switches_v0_7.yaml b/boneio-32x10_switches_v0_7.yaml
index 67dfa82..147c831 100644
--- a/boneio-32x10_switches_v0_7.yaml
+++ b/boneio-32x10_switches_v0_7.yaml
@@ -23,13 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-32x10_switches_v0_7.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-32x10_switches_v0_7.yaml@latest
   import_full_config: true
 
 packages:
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_7/display.yaml',
@@ -39,7 +39,6 @@ packages:
         'devices_v0_7/pcf.yaml',
         'boards/32x10_output.yaml',
         # 'devices_v0_7/one_wire.yaml',
-        # 'devices_v0_7/uart.yaml',
       ]
 
 logger:
@@ -628,3 +627,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin14_15
+#   rx_pin: GPIO14
+#   tx_pin: GPIO15
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/boneio-cover_mix_lights_v0_5-v0_6.yaml b/boneio-cover_mix_lights_v0_5-v0_6.yaml
index 5a041b0..d5e0fb9 100644
--- a/boneio-cover_mix_lights_v0_5-v0_6.yaml
+++ b/boneio-cover_mix_lights_v0_5-v0_6.yaml
@@ -23,13 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-cover_mix_lights_v0_5-v0_6.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-cover_mix_lights_v0_5-v0_6.yaml@latest
   import_full_config: true
 
 packages:
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_5-v0_6/display.yaml',
@@ -40,7 +40,6 @@ packages:
         'devices_v0_5-v0_6/pcf.yaml',
         'boards/8_covers_16_output.yaml',
         # 'devices_v0_5-v0_6/one_wire.yaml',
-        # 'devices_v0_5-v0_6/uart.yaml',
       ]
 
 logger:
@@ -737,3 +736,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin3_1
+#   rx_pin: GPIO3
+#   tx_pin: GPIO1
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/boneio-cover_mix_lights_v0_7.yaml b/boneio-cover_mix_lights_v0_7.yaml
index b7924b5..6f65b34 100644
--- a/boneio-cover_mix_lights_v0_7.yaml
+++ b/boneio-cover_mix_lights_v0_7.yaml
@@ -23,13 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-cover_mix_lights_v0_7.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-cover_mix_lights_v0_7.yaml@latest
   import_full_config: true
 
 packages:
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_7/display.yaml',
@@ -39,7 +39,6 @@ packages:
         'devices_v0_7/pcf.yaml',
         'boards/8_covers_16_output.yaml',
         # 'devices_v0_7/one_wire.yaml',
-        # 'devices_v0_7/uart.yaml',
       ]
 
 logger:
@@ -733,3 +732,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin14_15
+#   rx_pin: GPIO14
+#   tx_pin: GPIO15
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/boneio-cover_mix_switches_v0_5-v0_6.yaml b/boneio-cover_mix_switches_v0_5-v0_6.yaml
index d07f610..6c2f67d 100644
--- a/boneio-cover_mix_switches_v0_5-v0_6.yaml
+++ b/boneio-cover_mix_switches_v0_5-v0_6.yaml
@@ -23,13 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-cover_mix_switches_v0_5-v0_6.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-cover_mix_switches_v0_5-v0_6.yaml@latest
   import_full_config: true
 
 packages:
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_5-v0_6/display.yaml',
@@ -40,7 +40,6 @@ packages:
         'devices_v0_5-v0_6/pcf.yaml',
         'boards/8_covers_16_output.yaml',
         # 'devices_v0_7/one_wire.yaml',
-        # 'devices_v0_7/uart.yaml',
       ]
 
 logger:
@@ -736,3 +735,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin3_1
+#   rx_pin: GPIO3
+#   tx_pin: GPIO1
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/boneio-cover_mix_switches_v0_7.yaml b/boneio-cover_mix_switches_v0_7.yaml
index 6aa78dd..4580931 100644
--- a/boneio-cover_mix_switches_v0_7.yaml
+++ b/boneio-cover_mix_switches_v0_7.yaml
@@ -23,13 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-cover_mix_switches_v0_7.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-cover_mix_switches_v0_7.yaml@latest
   import_full_config: true
 
 packages:
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_7/display.yaml',
@@ -39,7 +39,6 @@ packages:
         'devices_v0_7/pcf.yaml',
         'boards/8_covers_16_output.yaml',
         # 'devices_v0_7/one_wire.yaml',
-        # 'devices_v0_7/uart.yaml',
       ]
 
 logger:
@@ -733,3 +732,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin14_15
+#   rx_pin: GPIO14
+#   tx_pin: GPIO15
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/boneio-cover_v0_5-v0_6.yaml b/boneio-cover_v0_5-v0_6.yaml
index 0520176..0275eab 100644
--- a/boneio-cover_v0_5-v0_6.yaml
+++ b/boneio-cover_v0_5-v0_6.yaml
@@ -23,13 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-cover_v0_5-v0_6.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-cover_v0_5-v0_6.yaml@latest
   import_full_config: true
 
 packages:
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_5-v0_6/display.yaml',
@@ -40,7 +40,6 @@ packages:
         'devices_v0_5-v0_6/pcf.yaml',
         'boards/16_cover_pcf.yaml',
         # 'devices_v0_5-v0_6/one_wire.yaml',
-        # 'devices_v0_5-v0_6/uart.yaml',
       ]
 
 logger:
@@ -839,3 +838,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin3_1
+#   rx_pin: GPIO3
+#   tx_pin: GPIO1
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/boneio-cover_v0_7.yaml b/boneio-cover_v0_7.yaml
index 6771bd3..042fa18 100644
--- a/boneio-cover_v0_7.yaml
+++ b/boneio-cover_v0_7.yaml
@@ -23,13 +23,13 @@ ethernet:
   power_pin: GPIO16
 
 dashboard_import:
-  package_import_url: github://boneIO-eu/esphome/boneio-cover_v0_7.yaml@v1.0.5
+  package_import_url: github://boneIO-eu/esphome/boneio-cover_v0_7.yaml@latest
   import_full_config: true
 
 packages:
   internals_packages:
     url: https://github.com/boneIO-eu/esphome
-    ref: v1.0.5
+    ref: v1.0.15
     files: [
         'devices/buzzer.yaml',
         'devices_v0_7/display.yaml',
@@ -39,7 +39,6 @@ packages:
         'devices_v0_7/pcf.yaml',
         'boards/16_cover_pcf.yaml',
         # 'devices_v0_7/one_wire.yaml',
-        # 'devices_v0_7/uart.yaml',
       ]
 
 logger:
@@ -835,3 +834,25 @@ binary_sensor:
       mode:
         input: true
       inverted: true
+######################
+### MODBUS SECTION ###
+######################
+# UNCOMMENT BELOW TO USE MODBUS
+# uart:
+#   id: uart_pin14_15
+#   rx_pin: GPIO14
+#   tx_pin: GPIO15
+#   baud_rate: 9600
+#   stop_bits: 1
+
+# modbus:
+#   send_wait_time: 200ms
+#   uart_id: uart_pin14_15
+#   id: boneio_modbus
+
+# modbus_controller:
+#   - id: YOURDEVICE ID
+#     address: 0x09
+#     modbus_id: mod_bus
+#     setup_priority: -10
+#     update_interval: 60s
diff --git a/devices_v0_5-v0_6/uart.yaml b/devices_v0_5-v0_6/uart.yaml
deleted file mode 100644
index 8ec25b7..0000000
--- a/devices_v0_5-v0_6/uart.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-uart:
-  id: uart_pin3_1
-  rx_pin: GPIO3
-  tx_pin: GPIO1
-  baud_rate: 9600
-  stop_bits: 1
diff --git a/devices_v0_7/one_wire.yaml b/devices_v0_7/one_wire.yaml
index 9aff7a6..538b634 100644
--- a/devices_v0_7/one_wire.yaml
+++ b/devices_v0_7/one_wire.yaml
@@ -1,6 +1,5 @@
 dallas:
-- pin: GPIO32
-
+  - pin: GPIO32
 # sensor:
 #   - platform: dallas
 #     address: 0x283c01d607d4df28
diff --git a/devices_v0_7/uart.yaml b/devices_v0_7/uart.yaml
deleted file mode 100644
index 1added4..0000000
--- a/devices_v0_7/uart.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-uart:
-  id: uart_pin14_15
-  rx_pin: GPIO14
-  tx_pin: GPIO15
-  baud_rate: 9600
-  stop_bits: 1