diff --git a/automation/Timed_Triggers/sunset_turn_on.yaml b/automation/Timed_Triggers/sunset_turn_on.yaml
index ded38b4f..df92f299 100755
--- a/automation/Timed_Triggers/sunset_turn_on.yaml
+++ b/automation/Timed_Triggers/sunset_turn_on.yaml
@@ -20,10 +20,10 @@
           "Since it gets dark around sunset, I turn on the landscaping lights.",
           "Since it is sunset, I will turn on the exterior lights."
           ] | random + [
-          "#Sunset",
-          "#HomeAutomation",
-          "AccentLighting",
-          "(http://www.vmwareinfo.com/2017/08/diy-outdoor-smart-home-led-strips.html)"
+          " #Sunset",
+          " #HomeAutomation",
+          " #AccentLighting",
+          " (http://www.vmwareinfo.com/2017/08/diy-outdoor-smart-home-led-strips.html)"
           ] | random }}
     - delay: '00:{{ (range(1, 20)|random|int) }}:00'
     - service: script.speech_engine
diff --git a/script/tweet.yaml b/script/tweet.yaml
index 40d0e738..57f98808 100755
--- a/script/tweet.yaml
+++ b/script/tweet.yaml
@@ -1,5 +1,6 @@
 ######################################################################################################
 ###Script to send notifications to Twitter as @BearStoneHA.
+## Publish on Facebook as well - https://www.facebook.com/BearStoneHA/
 ## Enhancements by @dale3h
 ######################################################################################################
 
@@ -10,9 +11,12 @@ tweet_engine:
         message: >-
           {{ tweet }} #IOT #SmartHome
 
+
+
     - service: ifttt.trigger
       data_template:
         event: >-
           facebook_tweet
-        value1: >-
-          {{ tweet }}
+        value1: >
+          {% set facebook_tweet = tweet %}
+          {{ facebook_tweet }} #IOT #SmartHome