diff --git a/config/automation/Timed_Triggers/sunset_turn_on.yaml b/config/automation/Timed_Triggers/sunset_turn_on.yaml
index 3055c4da..1cfeb1d3 100755
--- a/config/automation/Timed_Triggers/sunset_turn_on.yaml
+++ b/config/automation/Timed_Triggers/sunset_turn_on.yaml
@@ -14,7 +14,7 @@
 
   condition:
     - condition: template
-      value_template: "{{ states('sensor.grid_status') == 'True' }}"
+      value_template: "{{ states('binary_sensor.grid_status') == 'on' }}"
 
   action:
     - delay: '00:{{ (range(1, 20)|random|int) }}:00'
diff --git a/config/configuration.yaml b/config/configuration.yaml
index 53ebd8b5..10854de1 100755
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -77,7 +77,6 @@ http:
   # login_attempts_threshold: 5
 
 frontend:
-  javascript_version: latest
 
 panel_custom:
   - name: floorplan
@@ -88,14 +87,6 @@ panel_custom:
       hide_app_toolbar:
       config: /local/custom_ui/floorplan/floorplan.yaml
 
-  - name: clock
-    sidebar_title: Alarm Clock
-    sidebar_icon: mdi:alarm
-    url_path: clock
-    config:
-      hide_app_toolbar:
-      config: /local/custom_ui/floorplan/floorclock.yaml
-
 discovery:
 
 updater:
@@ -187,7 +178,7 @@ tts:
     voice: Joanna
     cache: True
 
-wink:
+# wink:
 homekit: !include homekit.yaml
 group: !include_dir_merge_named group
 device_tracker: !include_dir_merge_list device_tracker
diff --git a/config/packages/powerwall.yaml b/config/packages/powerwall.yaml
index 745d3b38..6dc80618 100755
--- a/config/packages/powerwall.yaml
+++ b/config/packages/powerwall.yaml
@@ -3,62 +3,10 @@
 # # @CCOSTAN
 # Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
 # Read more about this on https://www.vcloudinfo.com
+# Tesla Powerwall added via UI Integration
+# Tesla Powerwall Monitoring #272
 ######################################################################################################
 
-sensor:
-  - platform: rest
-    resource: https://192.168.10.90/api/system_status/grid_status
-    verify_ssl: false
-    method: GET
-    name: Grid Status
-    scan_interval: 60
-    value_template: "{{ value_json.grid_status == 'SystemGridConnected' }}"
-
-  - platform: rest
-    name: House now
-    resource: https://192.168.10.90/api/meters/aggregates
-    method: GET
-    verify_ssl: false
-    value_template: '{{ value_json.load.instant_power / 1000 | round(2) }}'
-    unit_of_measurement: kWh
-    device_class: power
-
-  - platform: rest
-    name: Grid now
-    resource: https://192.168.10.90/api/meters/aggregates
-    method: GET
-    verify_ssl: false
-    value_template: '{{ value_json.site.instant_power / 1000 | round(2) }}'
-    unit_of_measurement: kWh
-    device_class: power
-
-  - platform: rest
-    name: Solar now
-    resource: https://192.168.10.90/api/meters/aggregates
-    method: GET
-    verify_ssl: false
-    value_template: '{{ value_json.solar.instant_power / 1000 | round(2) }}'
-    unit_of_measurement: kWh
-    device_class: power
-
-  - platform: rest
-    name: PowerWall Battery now
-    resource: https://192.168.10.90/api/meters/aggregates
-    method: GET
-    verify_ssl: false
-    value_template: '{{ value_json.battery.instant_power / 1000 | round(2) }}'
-    unit_of_measurement: kWh
-    device_class: power
-
-  - platform: rest
-    name: PowerWall Battery Capacity
-    resource: https://192.168.10.90/api/system_status/soe
-    method: GET
-    verify_ssl: false
-    value_template: '{{ (value_json.percentage | float | round(0)) }}'
-    unit_of_measurement: '%'
-    scan_interval: 300
-    device_class: battery
 
 #-------------------------------------------
 # Located in the Grafana package.  Tweets out Solar Production Daily!
@@ -68,18 +16,18 @@ automation:
     id: 56a32121-5725-4510-a1fa-10f69a5c82ef
     trigger:
       - platform: state
-        entity_id: sensor.grid_status
+        entity_id: binary_sensor.grid_status
     condition:
       condition: or
       conditions:
         - condition: template
-          value_template: "{{ states('sensor.grid_status') == 'True' }}"
+          value_template: "{{ states('binary_sensor.grid_status') == 'on' }}"
         - condition: template
-          value_template: "{{ states('sensor.grid_status') == 'False' }}"
+          value_template: "{{ states('binary_sensor.grid_status') == 'off' }}"
     action:
       - service: script.notify_engine
         data_template:
-          title: "Electrical Grid Status {{ (trigger.to_state.state)|replace('True', 'up')|replace('False', 'down') }}."
+          title: "Electrical Grid Status {{ (trigger.to_state.state)|replace('on', 'up')|replace('off', 'down') }}."
           value1: "Please verify with the Tesla App."
           who: 'parents'
           apns_id: 'information'
@@ -90,7 +38,7 @@ automation:
     id: 37288a96-5f49-46c2-85c8-7e8794d23612
     trigger:
       - platform: state
-        entity_id: sensor.grid_status
+        entity_id: binary_sensor.grid_status
         from: 'True'
         to: 'False'
 
@@ -134,7 +82,7 @@ automation:
 
     trigger:
       - platform: state
-        entity_id: sensor.grid_status
+        entity_id: binary_sensor.grid_status
         from: 'True'
         to: 'False'
         for:
@@ -142,7 +90,7 @@ automation:
 
     condition:
       - condition: template
-        value_template: "{{ states('sensor.grid_status') == 'False' }}"
+        value_template: "{{ states('binary_sensor.grid_status') == 'off' }}"
 
     action:
       - service: climate.turn_off
@@ -163,7 +111,7 @@ automation:
 
     trigger:
       - platform: state
-        entity_id: sensor.grid_status
+        entity_id: binary_sensor.grid_status
         from: 'False'
         to: 'True'
         for:
@@ -171,7 +119,7 @@ automation:
 
     condition:
       - condition: template
-        value_template: "{{ states('sensor.grid_status') == 'True' }}"
+        value_template: "{{ states('binary_sensor.grid_status') == 'on' }}"
       - condition: or
         conditions:
           - condition: state
diff --git a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png
index 97d7d62e..1e5dfeb4 100644
Binary files a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png and b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png differ