diff --git a/config/automation/Speech/home_stats.yaml b/config/automation/Speech/home_stats.yaml
index d639e295..1fc466ca 100755
--- a/config/automation/Speech/home_stats.yaml
+++ b/config/automation/Speech/home_stats.yaml
@@ -19,7 +19,7 @@
   action:
 
     - wait_template: >-
-       {{ is_state('group.garage_doors', 'closed') }}
+       {{ is_state('group.garadget', 'closed') }}
       timeout: 00:05:30
 
     - service: script.speech_engine
diff --git a/config/automation/Timed_Triggers/0830.yaml b/config/automation/Timed_Triggers/0830.yaml
index aac471ac..1ff6aa14 100755
--- a/config/automation/Timed_Triggers/0830.yaml
+++ b/config/automation/Timed_Triggers/0830.yaml
@@ -26,7 +26,7 @@
         - fri
   action:
     - wait_template: >-
-       {{ is_state('group.garage_doors', 'open') }}
+       {{ is_state('group.garadget', 'open') }}
     - delay: 00:03:00
     - service: light.turn_off
       entity_id: all
diff --git a/config/automation/Timed_Triggers/sunset_turn_on.yaml b/config/automation/Timed_Triggers/sunset_turn_on.yaml
index 0d5e1975..7d865b32 100755
--- a/config/automation/Timed_Triggers/sunset_turn_on.yaml
+++ b/config/automation/Timed_Triggers/sunset_turn_on.yaml
@@ -79,7 +79,7 @@
       entity_id:
        - group.living_room_accents
     - wait_template: >-
-       {{ is_state('group.garage_doors', 'closed') }}
+       {{ is_state('group.garadget', 'closed') }}
     - wait_template: >-
        {{ is_state('group.entry_points', 'off') }}
     - service: script.speech_engine
diff --git a/config/automation/guard_dog.yaml b/config/automation/guard_dog.yaml
index 78563fc7..1d3ea476 100755
--- a/config/automation/guard_dog.yaml
+++ b/config/automation/guard_dog.yaml
@@ -15,7 +15,7 @@
 
   condition:
     - condition: state
-      entity_id: group.all_covers
+      entity_id: group.garage_doors
       state: 'closed'
 
   action:
diff --git a/config/automation/late_night_outside_helper.yaml b/config/automation/late_night_outside_helper.yaml
index f18257c5..0a98c655 100755
--- a/config/automation/late_night_outside_helper.yaml
+++ b/config/automation/late_night_outside_helper.yaml
@@ -6,7 +6,7 @@
 - alias: 'Late Night Helper outside'
   trigger:
     - platform: state
-      entity_id: group.all_covers
+      entity_id: group.garage_doors
     - platform: state
       entity_id: sun.sun
       to: 'below_horizon'
@@ -25,7 +25,7 @@
         - group.living_room_accents
       data_template:
         color_name: >
-          {% if states.group.entry_points.state == 'on' or states.group.all_covers.state != 'closed' -%}
+          {% if states.group.entry_points.state == 'on' or states.group.garage_doors.state != 'closed' -%}
           red
           {% else %}
           gold
@@ -44,14 +44,14 @@
         - switch.front_door_outlet
         - switch.foyer_outlet
     - wait_template: >-
-        {{ states.group.garage_doors.state == 'closed' }}
+        {{ states.group.garadget.state == 'closed' }}
     - service: script.monthly_color_scene
     - service: light.turn_on
       entity_id:
         - group.living_room_accents
       data_template:
         color_name: >
-          {% if states.group.entry_points.state == 'on' or states.group.all_covers.state != 'closed' -%}
+          {% if states.group.entry_points.state == 'on' or states.group.garage_doors.state != 'closed' -%}
           red
           {% else %}
           gold
diff --git a/config/configuration.yaml b/config/configuration.yaml
index 537f7076..290baa13 100755
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -165,7 +165,7 @@ logbook:
       - automation.detect_lights_and_adjust_the_brightness_when_turned_on_based_on_time
       - automation.cuckoo_clock
       - binary_sensor.office_motion
-      - group.garage_doors
+      - group.garadget
       - media_player.LivingRoomCC
       - py.warnings
       - sensor.last_boot
diff --git a/config/customize/groups.yaml b/config/customize/groups.yaml
index cf0034e8..80fba061 100755
--- a/config/customize/groups.yaml
+++ b/config/customize/groups.yaml
@@ -5,7 +5,7 @@ group.all_automations:
   homebridge_hidden: true
 
 
-group.all_covers:
+group.garage_doors:
   friendly_name: 'All Covers'
   
   hidden: True
@@ -102,7 +102,7 @@ group.foyer_lights:
 
 
 
-group.garage_doors:
+group.garadget:
   friendly_name: 'Garage Doors'
   
   hidden: False
diff --git a/config/packages/alarm.yaml b/config/packages/alarm.yaml
index 2bf08b0b..66bb32a1 100755
--- a/config/packages/alarm.yaml
+++ b/config/packages/alarm.yaml
@@ -273,7 +273,7 @@ automation:
         entity_id:
           - group.entry_points
       - platform: state
-        entity_id: group.all_covers
+        entity_id: group.garage_doors
 
     condition:
       condition: and
@@ -291,7 +291,7 @@ automation:
           - group.living_room_accents
         data_template:
           color_name: >
-            {% if states.group.entry_points.state == 'on' or states.group.all_covers.state != 'closed' -%}
+            {% if states.group.entry_points.state == 'on' or states.group.garage_doors.state != 'closed' -%}
             red
             {% else %}
             gold
diff --git a/config/packages/garadget.yaml b/config/packages/garadget.yaml
index e445a64b..788906e8 100755
--- a/config/packages/garadget.yaml
+++ b/config/packages/garadget.yaml
@@ -74,8 +74,8 @@ sensor:
     value_template: '{{ value_json.bright }}'
 
 group:
-  garage_doors:
-    name: Garage doors
+  garadget:
+    name: Garadget Sensors
     entities:
       - cover.large_garage
       - sensor.large_garage_status
@@ -89,6 +89,11 @@ group:
       - sensor.small_garage_wifi_signal_strength
       - sensor.small_garage_reflection_rate
       - sensor.small_garage_brightness
+  garage_doors:
+    name: Garage Doors
+    entities:
+      - cover.large_garage
+      - cover.small_garage
 
 automation:
   - alias: 'Update Garage Brightness'
diff --git a/config/templates/speech/briefing.yaml b/config/templates/speech/briefing.yaml
index 1f8dc405..d92de043 100755
--- a/config/templates/speech/briefing.yaml
+++ b/config/templates/speech/briefing.yaml
@@ -92,7 +92,7 @@
   {%- endmacro -%}
 
   {%- macro garage_check() -%}
-  {% if states.group.garage_doors.state !='closed' -%}
+  {% if states.group.garadget.state !='closed' -%}
       The
       {%- for state in states.cover -%}
       {%- endfor %}
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 0b93a8be..178a6adc 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 23d541ea..962f49e2 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