diff --git a/config/packages/neato.yaml b/config/packages/neato.yaml
index 1ee78e1b..54cd130b 100755
--- a/config/packages/neato.yaml
+++ b/config/packages/neato.yaml
@@ -8,7 +8,7 @@
 #     "*.*_sleep_hours":
 #       unit_of_measurement: hours
 #       icon: mdi:sleep
-#       
+#
 #       hidden: False
 #-------------------------------------------
 neato:
@@ -37,12 +37,16 @@ automation:
         value_template: "{{ states.vacuum.carloneato.attributes.battery_level |int < 20 }}"
 
     action:
-      - service: script.tweet_engine
+      - service: script.tweet_engine_image
         data_template:
           tweet: >
             {{ [
             "#Neato returning to base. Vacuumed up a TON. (http://amzn.to/2CKHZya)",
             "Everyday I have the Neato Botvac go out and clean the house on its own.",
-            "Since we have a cat that sheds all day, we have @Neato go out daily to clean.",
-            "Time to recharge the @Neato Vacuum."
+            "Since we have a cat that sheds all day, we have Neato Vacuum go out daily to clean.",
+            "Time to recharge the Neato Vacuum."
             ] | random + " Battery Level:{{states.vacuum.carloneato.attributes.battery_level }} #Robots"}}
+          image: >-
+            {{ [
+            "/config/www/custom_ui/floorplan/images/branding/neato.png"
+            ] | random }}
diff --git a/config/packages/nest_protects.yaml b/config/packages/nest_protects.yaml
index df65020a..1eeac954 100755
--- a/config/packages/nest_protects.yaml
+++ b/config/packages/nest_protects.yaml
@@ -16,7 +16,13 @@ homeassistant:
     "sensor.*_color_status":
       hidden: True
       homebridge_hidden: true
-
+    "sensor.*_smoke_status":
+      hidden: True
+      homebridge_hidden: true
+    "sensor.*_security_state":
+      hidden: True
+      homebridge_hidden: true
+      
   customize:
 
     binary_sensor.hallway_nest_protect_kids_hallway_online:
diff --git a/config/www/custom_ui/floorplan/images/branding/Bear Stones.png b/config/www/custom_ui/floorplan/images/branding/Bear Stones.png
new file mode 100755
index 00000000..23a79702
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/branding/Bear Stones.png differ
diff --git a/config/www/custom_ui/floorplan/images/branding/neato.png b/config/www/custom_ui/floorplan/images/branding/neato.png
new file mode 100755
index 00000000..32f4e20d
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/branding/neato.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 79984173..09074ae6 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