diff --git a/README.md b/README.md
index b7168381..fa19283b 100755
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <p align="center"><a align="center" target="_blank" href="https://vcloudinfo.us12.list-manage.com/subscribe?u=45cab4343ffdbeb9667c28a26&id=e01847e94f"><img src="http://feeds.feedburner.com/RecentCommitsToBearStoneHA.1.gif" alt="Recent Commits to Bear Stone Smart Home" style="border:0"></a></p>
 <div align="center">
   <h4>
@@ -48,7 +48,7 @@ This Repo is designed for Smart Home inspiration.  The configuration, devices, l
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
@@ -543,14 +543,14 @@ DIY Alarm package - /config/packages/alarm.yaml</a><br>
 [Nunet Smart Plug](https://amzn.to/2PDBNNK)
 </td><td align="center">
 
-[Switches Get Stitches](https://www.vcloudinfo.com/p/shop-our-merch.html)
+[Switches Get Stitches](https://amzn.to/2HXSx2M)
 </td><td align="center">
 
 [Etekcity Outlets](http://amzn.to/2efNoBP)</td></tr>
 
 <tr><td align="center"><a href="https://www.amazon.com/Noon-N160US-Smart-Lighting-Starter/dp/B076FJLRNL/ref=as_li_ss_il?ie=UTF8&qid=1527451258&sr=8-1&keywords=noon&linkCode=li2&tag=vmw0a-20&linkId=07f55d3dde28ba1db77510257e4d13e8" target="_blank"><img border="0" src="https://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=B076FJLRNL&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=vmw0a-20" ></a><img src="https://ir-na.amazon-adsystem.com/e/ir?t=vmw0a-20&l=li2&o=1&a=B076FJLRNL" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
 </td><td align="center"><a href="https://www.amazon.com/NUNET-Monitor-Required-Appliances-Functiant/dp/B079H66QW6/ref=as_li_ss_il?ie=UTF8&qid=1544832863&sr=8-3&keywords=nunet+smart+wifi+plug&linkCode=li2&tag=vmw0a-20&linkId=64ae44a0cfc451fb7b64428935c3cbee&language=en_US" target="_blank"><img border="0" src="https://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=B079H66QW6&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=vmw0a-20&language=en_US" ></a><img src="https://ir-na.amazon-adsystem.com/e/ir?t=vmw0a-20&language=en_US&l=li2&o=1&a=B079H66QW6" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
-</td><td align="center"><a href="https://www.vcloudinfo.com/p/shop-our-merch.html" target="_blank"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/youtube/switchesTee_gray.png" height="150" border="0" alt="" style="border:none !important; margin:0px !important;"></a>
+</td><td align="center"><a href="https://amzn.to/2HXSx2M" target="_blank"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/youtube/switchesTee_gray.png" height="150" border="0" alt="" style="border:none !important; margin:0px !important;"></a>
 </td><td align="center"><a href="https://www.amazon.com/gp/product/B00DQELHBS/ref=as_li_ss_il?ie=UTF8&linkCode=li1&tag=vmw0a-20&linkId=2d11a4b4ee3994189b3136c3b5726e37" target="_blank"><img border="0" src="https://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=B00DQELHBS&Format=_SL110_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=vmw0a-20" ></a><img src="https://ir-na.amazon-adsystem.com/e/ir?t=vmw0a-20&l=li1&o=1&a=B00DQELHBS" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" /></td></tr>
 <tr><td colspan="4">
 
diff --git a/_Navigation_NOTICE_.md b/_Navigation_NOTICE_.md
index e66caa10..2f5576d2 100755
--- a/_Navigation_NOTICE_.md
+++ b/_Navigation_NOTICE_.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
diff --git a/config/README.md b/config/README.md
index 8cc0fa2c..80ab2d0b 100755
--- a/config/README.md
+++ b/config/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -47,7 +47,7 @@ This is the main directory of the Repo.  You will find more helpful ReadMe files
     Youtube
   </a>
   <span> | </span>
-  <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+  <a href="https://amzn.to/2HXSx2M">
     Tee Shop
   </a>
 </h4>
diff --git a/config/automation/README.md b/config/automation/README.md
index 53f438d5..0694f8b2 100755
--- a/config/automation/README.md
+++ b/config/automation/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -47,7 +47,7 @@ This is the basic sub-directory in my home assistant repo.  Slowly everything is
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/automation/Speech/README.md b/config/automation/Speech/README.md
index 7a624ce5..5f7ed4f8 100755
--- a/config/automation/Speech/README.md
+++ b/config/automation/Speech/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -47,7 +47,7 @@ You can definately read more about my voice implimentations in my blog posts (li
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/automation/System/README.md b/config/automation/System/README.md
index bf6b160d..23e2dffa 100755
--- a/config/automation/System/README.md
+++ b/config/automation/System/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -47,7 +47,7 @@ This directory is primarily used for automations that are just running in the ba
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/automation/Timed_Triggers/README.md b/config/automation/Timed_Triggers/README.md
index e5ff4a62..1dc0299f 100755
--- a/config/automation/Timed_Triggers/README.md
+++ b/config/automation/Timed_Triggers/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -45,7 +45,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/custom_components/README.md b/config/custom_components/README.md
index c5b11ec0..f7f85e77 100755
--- a/config/custom_components/README.md
+++ b/config/custom_components/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -47,7 +47,7 @@ Custom Components.  Comstimes I use them for temporary fixes to existing compone
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/custom_components/media_player/README.md b/config/custom_components/media_player/README.md
index 5dbdb6d5..a215ea85 100755
--- a/config/custom_components/media_player/README.md
+++ b/config/custom_components/media_player/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -47,7 +47,7 @@ This is a Custom Component by pkozul to allow me to use my Floorplan installatio
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/customize/README.md b/config/customize/README.md
index a8e59dbe..8005ed16 100755
--- a/config/customize/README.md
+++ b/config/customize/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/device_tracker/README.md b/config/device_tracker/README.md
index a8e59dbe..8005ed16 100755
--- a/config/device_tracker/README.md
+++ b/config/device_tracker/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/group/README.md b/config/group/README.md
index a8e59dbe..8005ed16 100755
--- a/config/group/README.md
+++ b/config/group/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/input_boolean/README.md b/config/input_boolean/README.md
index a8e59dbe..8005ed16 100755
--- a/config/input_boolean/README.md
+++ b/config/input_boolean/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/packages/README.md b/config/packages/README.md
index f11505d6..c67d4f57 100755
--- a/config/packages/README.md
+++ b/config/packages/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -47,7 +47,7 @@ I love packages.  This will probably become the most used directory in my repo.
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/packages/triggers/README.md b/config/packages/triggers/README.md
index f11505d6..c67d4f57 100755
--- a/config/packages/triggers/README.md
+++ b/config/packages/triggers/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -47,7 +47,7 @@ I love packages.  This will probably become the most used directory in my repo.
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/scene/README.md b/config/scene/README.md
index a8e59dbe..8005ed16 100755
--- a/config/scene/README.md
+++ b/config/scene/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/script/README.md b/config/script/README.md
index 4c433b9e..fbdd930e 100755
--- a/config/script/README.md
+++ b/config/script/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -50,7 +50,7 @@ You can check out my Video unpacking some of my Speech engine <a href="https://w
     Youtube
   </a>
   <span> | </span>
-  <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+  <a href="https://amzn.to/2HXSx2M">
     Tee Shop
   </a>
 </h4>
diff --git a/config/script/monthly_color_scene.yaml b/config/script/monthly_color_scene.yaml
index f6c41520..c925c23d 100755
--- a/config/script/monthly_color_scene.yaml
+++ b/config/script/monthly_color_scene.yaml
@@ -74,11 +74,5 @@ monthly_color_scene:
           {%- endif -%}_colors
 
 
-# http://www.calendar-365.com/holidays/2018.html
-# 213 Mardi Gras (purple, green, gold )
-# 330 Good Friday
-# 401 Easter
-# 513 Mother's Day (pink, red) - Same as Valentine
-# 617 Fathers day (Orange, Blue)
-# 1122 Thanksgiving
-# 1202 Hanukkah start 8 days.
+# http://www.calendar-365.com/holidays/2019.html
+# Updated for 2019
diff --git a/config/sensor/README.md b/config/sensor/README.md
index a8e59dbe..8005ed16 100755
--- a/config/sensor/README.md
+++ b/config/sensor/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/shell_command/README.md b/config/shell_command/README.md
index a8e59dbe..8005ed16 100755
--- a/config/shell_command/README.md
+++ b/config/shell_command/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/shell_scripts/README.md b/config/shell_scripts/README.md
index a8e59dbe..8005ed16 100755
--- a/config/shell_scripts/README.md
+++ b/config/shell_scripts/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/sounds/README.md b/config/sounds/README.md
index a8e59dbe..8005ed16 100755
--- a/config/sounds/README.md
+++ b/config/sounds/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/sounds/custom/README.md b/config/sounds/custom/README.md
index a8e59dbe..8005ed16 100755
--- a/config/sounds/custom/README.md
+++ b/config/sounds/custom/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/sounds/gf_clock/README.md b/config/sounds/gf_clock/README.md
index a8e59dbe..8005ed16 100755
--- a/config/sounds/gf_clock/README.md
+++ b/config/sounds/gf_clock/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/sounds/speechcons/README.md b/config/sounds/speechcons/README.md
index a8e59dbe..8005ed16 100755
--- a/config/sounds/speechcons/README.md
+++ b/config/sounds/speechcons/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/switch/README.md b/config/switch/README.md
index a8e59dbe..8005ed16 100755
--- a/config/switch/README.md
+++ b/config/switch/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -46,7 +46,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/www/custom_ui/floorplan/README.md b/config/www/custom_ui/floorplan/README.md
index 2467fccd..2493b6ef 100755
--- a/config/www/custom_ui/floorplan/README.md
+++ b/config/www/custom_ui/floorplan/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -47,7 +47,7 @@
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
diff --git a/config/www/custom_ui/floorplan/images/branding/README.md b/config/www/custom_ui/floorplan/images/branding/README.md
index a8e59dbe..767bda88 100755
--- a/config/www/custom_ui/floorplan/images/branding/README.md
+++ b/config/www/custom_ui/floorplan/images/branding/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
   <a name="logo" href="http://www.vCloudInfo.com/tag/iot"><img src="https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/www/custom_ui/floorplan/images/branding/twitter_profile.png" alt="Bear Stone Smart Home" width="200"></a>
   <br>
-  Bear Stone Smart Home Configuration
+  Bear Stone Smart Home Documentation
 </h1>
-<h4 align="center">Be sure to :star: my repo so you can keep up to date on the daily progress!.</h4>
+<h4 align="center">Be sure to :star: my configuration repo so you can keep up to date on any daily progress!</h4>
 <div align="center">
   <h4>
     <a href="https://travis-ci.org/CCOSTAN/Home-AssistantConfig"><img src="https://travis-ci.org/CCOSTAN/Home-AssistantConfig.svg?branch=master"/></a>
@@ -40,13 +40,13 @@
     <span> | </span>
     <a href="https://github.com/CCOSTAN/Home-AssistantConfig#diagram">
       Diagram
-    </a>    
+    </a>
     <span> | </span>
     <a href="https://youtube.com/CCOSTAN">
       Youtube
     </a>
     <span> | </span>
-    <a href="https://www.vcloudinfo.com/p/shop-our-merch.html">
+    <a href="https://amzn.to/2HXSx2M">
       Tee Shop
     </a>
   </h4>
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 0d4f4ba7..898735a3 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