diff --git a/config/packages/alexa_media_player.yaml b/config/packages/alexa_media_player.yaml
index 1b9ef851..568759f7 100755
--- a/config/packages/alexa_media_player.yaml
+++ b/config/packages/alexa_media_player.yaml
@@ -8,19 +8,6 @@ sensor:
   - platform: template
     sensors:
         last_alexa:
-          entity_id:
-            - media_player.bedroom
-            - media_player.carlos_2nd_echo
-            - media_player.front_room_flex
-            - media_player.justin_room
-            - media_player.kitchen
-            - media_player.living_room
-            - media_player.master_bathroom
-            - media_player.master_bedroom
-            - media_player.office
-            - media_player.paige_room
-            - media_player.tap
-            - media_player.upstairs
           value_template: >
             {{ states.media_player | selectattr('attributes.last_called','eq',True) | map(attribute='entity_id') | first }}
 
diff --git a/config/packages/battery_levels.yaml b/config/packages/battery_levels.yaml
index 21e1a3e1..9ed7c0b4 100755
--- a/config/packages/battery_levels.yaml
+++ b/config/packages/battery_levels.yaml
@@ -17,7 +17,6 @@ sensor:
     sensors:
       low_battery:
         friendly_name: 'Low Battery'
-        entity_id: []
         value_template: >
           {%- set threshold = 15 -%}
           {%- set domains = ['light', 'switch', 'sensor', 'zwave', 'lock', 'binary_sensor'] -%}
diff --git a/config/packages/time_date_sensors.yaml b/config/packages/time_date_sensors.yaml
index 44c1c6e5..e8e73eee 100755
--- a/config/packages/time_date_sensors.yaml
+++ b/config/packages/time_date_sensors.yaml
@@ -14,7 +14,6 @@ sensor:
     sensors:
       floorplan_date:
         friendly_name: 'Date'
-        entity_id: []
         value_template: >-
           {{now().strftime("%A")}}, {{now().strftime("%B")}} {{now().strftime("%d")}}
 
@@ -23,12 +22,10 @@ sensor:
     sensors:
       floorplan_time:
         friendly_name: 'Time'
-        entity_id: []
         value_template: >-
           {{now().strftime("%-I")}}:{{now().strftime("%M")}} {{now().strftime("%p")}}
       clock_time:
         friendly_name: 'Clock Time'
-        entity_id: []
         value_template: >-
           {{now().strftime("%-I")}}:{{now().strftime("%M")}}
 
@@ -37,16 +34,13 @@ sensor:
     sensors:
       clock_am_pm:
         friendly_name: 'AM/PM'
-        entity_id: []
         value_template: >-
           {{now().strftime("%p")}}
       clock_day:
         friendly_name: 'Day'
-        entity_id: []
         value_template: >-
           {{now().strftime("%A")}}
       clock_date:
         friendly_name: 'Clock Date'
-        entity_id: []
         value_template: >-
           {{now().strftime("%B")}} {{now().strftime("%d")}} {{now().year}}
diff --git a/config/packages/twitter.yaml b/config/packages/twitter.yaml
index 370b94de..c93ce16d 100755
--- a/config/packages/twitter.yaml
+++ b/config/packages/twitter.yaml
@@ -126,42 +126,35 @@ sensor:
     sensors:
       sensor_count:
         friendly_name: 'Number of Sensors'
-        entity_id: []
         value_template: >-
           {{ states.sensor | list | count }}
 
       automation_count:
         friendly_name: 'Number of Automations'
-        entity_id: []
         value_template: >-
           {{ states.automation| list | count }}
 
       script_count:
         friendly_name: 'Number of Scripts'
-        entity_id: []
         value_template: >
           {{ states.script | list | count }}
 
       binary_sensor_count:
         friendly_name: 'Number of Binary Sensors'
-        entity_id: []
         value_template: >-
           {{ states.binary_sensor | list | count }}
 
       tracker_count:
         friendly_name: 'Number of Devices'
-        entity_id: []
         value_template: >-
           {{ states.device_tracker| list | count }}
       lights_count:
         friendly_name: 'Number of Lights'
-        entity_id: []
         value_template: >
           {{ states.light | list | count }}
 
       protect_count:
         friendly_name: 'Number of Smoke Detectors'
-        entity_id: []
         value_template: >
           {% if states('group.protects') == 'on' %}
           {% for e in states.group.protects.attributes.entity_id if states(e) == 'on'  %}
@@ -174,7 +167,6 @@ sensor:
           {% endif %}
       camera_count:
         friendly_name: 'Number of online Cameras'
-        entity_id: []
         value_template: >
           {{ states.camera | list | count }}
 
@@ -312,7 +304,7 @@ automation:
       - platform: time_pattern
         hours: '/22'
         minutes: 45
-        
+
     condition:
       - condition: numeric_state
         entity_id: automation.random_youtube_videos_ccostan
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 991c3f6b..9a702ab4 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
diff --git a/config/www/custom_ui/floorplan/images/branding/solar_readings.png b/config/www/custom_ui/floorplan/images/branding/solar_readings.png
index 51e55ba0..b641b9a0 100644
Binary files a/config/www/custom_ui/floorplan/images/branding/solar_readings.png and b/config/www/custom_ui/floorplan/images/branding/solar_readings.png differ