diff --git a/config/.HA_VERSION b/config/.HA_VERSION
index 4d184a62..4dbf5f58 100755
--- a/config/.HA_VERSION
+++ b/config/.HA_VERSION
@@ -1 +1 @@
-0.94.0
\ No newline at end of file
+0.94.1
\ No newline at end of file
diff --git a/config/automation/Timed_Triggers/0830.yaml b/config/automation/Timed_Triggers/0830.yaml
index fe8632df..aac471ac 100755
--- a/config/automation/Timed_Triggers/0830.yaml
+++ b/config/automation/Timed_Triggers/0830.yaml
@@ -29,5 +29,4 @@
        {{ is_state('group.garage_doors', 'open') }}
     - delay: 00:03:00
     - service: light.turn_off
-      entity_id:
-        - group.all_lights
+      entity_id: all
diff --git a/config/automation/Timed_Triggers/sunrise_turn_off.yaml b/config/automation/Timed_Triggers/sunrise_turn_off.yaml
index e6aeb73f..95b9e1c0 100755
--- a/config/automation/Timed_Triggers/sunrise_turn_off.yaml
+++ b/config/automation/Timed_Triggers/sunrise_turn_off.yaml
@@ -40,7 +40,9 @@
         - group.exterior_lights
         - group.outdoor_front_lights
         - group.outdoor_pool_lights
-        - group.all_lights
+
+    - service: light.turn_off
+      entity_id: all
 
     - wait_template: >-
        {{ states.sun.sun.state == 'above_horizon' }}
diff --git a/config/automation/flash_all.yaml b/config/automation/flash_all.yaml
index b381ef6d..9c51d5ce 100755
--- a/config/automation/flash_all.yaml
+++ b/config/automation/flash_all.yaml
@@ -12,8 +12,7 @@
 
   action:
     - service: light.turn_on
-      entity_id:
-        - group.all_lights
+      entity_id: all
       data:
         flash: long
 
diff --git a/config/packages/triggers/self_destruct.yaml b/config/packages/triggers/self_destruct.yaml
index e77be3c3..6c98fc7a 100755
--- a/config/packages/triggers/self_destruct.yaml
+++ b/config/packages/triggers/self_destruct.yaml
@@ -7,7 +7,7 @@ homeassistant:
     input_boolean.self_destruct:
       friendly_name: 'Self Destruct'
       icon: mdi:skull
-      
+
       hidden: False
 #-------------------------------------------
 input_boolean:
@@ -51,16 +51,15 @@ automation:
           "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/speechcons/self_destruct.mp3"
         media_content_type: audio/mp4
     - service: light.turn_on
-      entity_id:
-        - group.all_lights
+      entity_id: all
       data:
         flash: long
     - service: switch.turn_off
-      entity_id:
-        - group.all_switches
+      entity_id: all
+
     - service: light.turn_off
-      entity_id:
-        - group.all_lights
+      entity_id: all
+      
     - service: input_boolean.turn_off
       entity_id:
         - input_boolean.self_destruct
diff --git a/config/script/emergency.yaml b/config/script/emergency.yaml
index ce489e8c..0c9879d4 100755
--- a/config/script/emergency.yaml
+++ b/config/script/emergency.yaml
@@ -16,8 +16,7 @@ emergency:
         color_name: 'red'
       # Flash All LIGHTS
     - service: light.turn_on
-      entity_id:
-        - group.all_lights
+      entity_id: all
       data:
         flash: long
       # Rachio is already inergrated Natively with Protects to run SPRINKLERS with smoke conditions..
@@ -26,8 +25,7 @@ emergency:
 
       # Turn on All LIGHTS 100% Brightness
     - service: light.turn_on
-      entity_id:
-        - group.all_lights
+      entity_id: all
       data:
         brightness: 255