diff --git a/config/automation/System/door_chime.yaml b/config/automation/System/door_chime.yaml
index 66a12e6d..5644dd50 100755
--- a/config/automation/System/door_chime.yaml
+++ b/config/automation/System/door_chime.yaml
@@ -26,7 +26,7 @@
           {% if states.group.bed.state == 'off' %}
           media_player.livingroomCC
           {% else %}
-          media_player.alarm_clock, media_player.bedroom_alarm_panel
+          media_player.bedroom_alarm_panel
           {% endif %}
         media_content_id: >
           {% if trigger.to_state.state == 'on' %}
diff --git a/config/customize/scripts.yaml b/config/customize/scripts.yaml
index 8944d889..4f0d39fe 100755
--- a/config/customize/scripts.yaml
+++ b/config/customize/scripts.yaml
@@ -1,89 +1,116 @@
-###################################
-##  Scripts Section
-###################################
-
 script.amp_settings:
-  friendly_name: 'AMP Settings'
-  
+  friendly_name: 'Amp Settings'
   hidden: True
+  homebridge_hidden: true
+
+
+
 
 script.dog_bark:
   friendly_name: 'Dog Bark'
-  
   hidden: True
+  homebridge_hidden: true
+
+
 
-script.flash_notify:
-  friendly_name: 'Flash Notify'
-  
-  hidden: True
 
 script.emergency:
   friendly_name: 'Emergency'
-  
   hidden: True
+  homebridge_hidden: true
+
+
+
+
+script.flash_notify:
+  friendly_name: 'Flash Notify'
+  hidden: True
+  homebridge_hidden: true
+
+
 
 
 script.front_house_motion:
   friendly_name: 'Front House Motion'
-  
-  hidden: True
-
-
-
-
-script.notify_engine:
-  friendly_name: 'Ifttt Notify'
-  
   hidden: True
+  homebridge_hidden: true
 
 
 
 
 script.interior_off:
   friendly_name: 'Interior Off'
-  
   hidden: False
+  homebridge_hidden: true
 
 
 
 
 script.monthly_color_scene:
   friendly_name: 'Monthly Front House Scene'
-  
   hidden: False
+  homebridge_hidden: true
+
+
+
+
+script.notify_engine:
+  friendly_name: 'Ifttt Notify'
+  hidden: True
+  homebridge_hidden: true
 
 
 
 
 script.skybell_pressed:
   friendly_name: 'Skybell Pressed'
-  
   hidden: True
+  homebridge_hidden: true
+
+
+
+
+script.speech_engine:
+  friendly_name: 'Voice Notify'
+  hidden: True
+  homebridge_hidden: true
+
+
+
+
+script.speech_processing:
+  friendly_name: 'Voice Processing'
+  hidden: True
+  homebridge_hidden: true
 
 
 
 
 script.switch_turn_off_all:
   friendly_name: 'Switch Turn Off All'
-  
   hidden: False
+  homebridge_hidden: true
 
-script.speechcon:
-  friendly_name: 'Speechcon'
-  
-  hidden: True
 
-script.speech_processing:
-  friendly_name: 'Voice Processing'
-  
-  hidden: True
 
-script.speech_engine:
-  friendly_name: 'Voice Notify'
-  
-  hidden: True
 
 script.tweet_engine:
   friendly_name: 'Tweet Notify'
-  
   hidden: True
+  homebridge_hidden: true
+
+
+
+
+script.tweet_engine_image:
+  friendly_name: 'Tweet Engine Image'
+  hidden: True
+  homebridge_hidden: true
+
+
+
+
+script.tweet_engine_setup:
+  friendly_name: 'Tweet Engine Setup'
+  hidden: True
+  homebridge_hidden: true
diff --git a/config/shell_scripts/Jinja Code.py b/config/shell_scripts/Jinja Code.py
index cd06a957..df194f1a 100755
--- a/config/shell_scripts/Jinja Code.py	
+++ b/config/shell_scripts/Jinja Code.py	
@@ -13,7 +13,6 @@ Create fast Customize for groups, sensors, covers etc...  Just change that first
 {% endif %}
 {{- state.entity_id }}:
   friendly_name: '{{ state.attributes.friendly_name|replace("_"," ",)|title() if state.attributes.friendly_name is defined else state.name|replace("_"," ",)|title() }}'
-  emulated_hue_hidden: {{state.attributes.emulated_hue_hidden if state.attributes.emulated_hue_hidden is defined else 'False' }}
   hidden: {{state.attributes.hidden if state.attributes.hidden is defined else "False"}}
   homebridge_hidden: {{state.attributes.homebridge_hidden if state.attributes.homebridge_hidden is defined else "true"}}
   {{'icon: '+ state.attributes.icon if state.attributes.icon is defined}}
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 e6ddaec5..27a9952c 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