diff --git a/configuration.yaml b/configuration.yaml
index b7306f97..8ce57143 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -90,7 +90,7 @@ mqtt:
   password: !secret MQTT_password
 
 zwave:
- usb_path: /dev/ttyACM0
+ usb_path: /dev/zwave
  config_path: /srv/hass/hass_venv/lib/python3.4/site-packages/libopenzwave-0.3.1-py3.4-linux-armv7l.egg/config
 
 nest:
diff --git a/customize/sensors.yaml b/customize/sensors.yaml
index 7b0be871..3dfebaae 100755
--- a/customize/sensors.yaml
+++ b/customize/sensors.yaml
@@ -54,6 +54,13 @@ sensor.dark_sky_cloud_coverage:
   icon: mdi:weather-partlycloudy
 
 
+sensor.dark_sky_daily_max_precip_intensity:
+  friendly_name: 'Dark Sky Daily Max Precip Intensity'
+  emulated_hue: False
+  hidden: False
+  icon: mdi:thermometer
+
+
 sensor.dark_sky_humidity:
   friendly_name: 'Outdoor Humidity'
   emulated_hue: False
@@ -82,6 +89,13 @@ sensor.dark_sky_temperature:
   icon: mdi:thermometer
 
 
+sensor.dark_sky_wind_speed:
+  friendly_name: 'Dark Sky Wind Speed'
+  emulated_hue: False
+  hidden: False
+  icon: mdi:weather-windy
+
+
 sensor.date:
   friendly_name: 'Date'
   emulated_hue: False
@@ -166,95 +180,69 @@ sensor.external_ip:
 
 
 
-sensor.large_garage:
-  friendly_name: 'Large Garage'
+sensor.hue_hub_1:
+  friendly_name: 'Hue Hub 1'
   emulated_hue: False
   hidden: False
-  icon: mdi:car-connected
+  icon: mdi:router-wireless
 
 
-sensor.large_garage_reflection_rate:
-  friendly_name: 'Reflection Rate'
+sensor.hue_hub_2:
+  friendly_name: 'Hue Hub 2'
   emulated_hue: False
   hidden: False
+  icon: mdi:router-wireless
 
 
-
-sensor.large_garage_status:
-  friendly_name: 'State Of The Door'
+sensor.ifttt_rachio_watering_time:
+  friendly_name: 'Ifttt Rachio Watering Time'
   emulated_hue: False
   hidden: False
 
 
 
-sensor.large_garage_time_in_state:
-  friendly_name: 'Time In State'
+sensor.ipchange:
+  friendly_name: 'Ipchange'
   emulated_hue: False
-  hidden: False
-  icon: mdi:timer-sand
+  hidden: True
 
 
-sensor.large_garage_wifi_signal_strength:
-  friendly_name: 'Wifi Strength'
-  emulated_hue: False
-  hidden: False
-  icon: mdi:wifi
-
 
-sensor.small_garage:
-  friendly_name: 'Small Garage'
+sensor.large_garage:
+  friendly_name: 'Large Garage'
   emulated_hue: False
   hidden: False
   icon: mdi:car-connected
 
 
-sensor.small_garage_reflection_rate:
+sensor.large_garage_reflection_rate:
   friendly_name: 'Reflection Rate'
   emulated_hue: False
   hidden: False
 
 
 
-sensor.small_garage_status:
+sensor.large_garage_status:
   friendly_name: 'State Of The Door'
   emulated_hue: False
   hidden: False
 
 
 
-sensor.small_garage_time_in_state:
+sensor.large_garage_time_in_state:
   friendly_name: 'Time In State'
   emulated_hue: False
   hidden: False
   icon: mdi:timer-sand
 
 
-sensor.small_garage_wifi_signal_strength:
+sensor.large_garage_wifi_signal_strength:
   friendly_name: 'Wifi Strength'
   emulated_hue: False
   hidden: False
   icon: mdi:wifi
 
 
-sensor.hue_hub_1:
-  friendly_name: 'Hue Hub 1'
-  emulated_hue: False
-  hidden: False
-  icon: mdi:router-wireless
-
-sensor.hue_hub_2:
-  friendly_name: 'Hue Hub 2'
-  emulated_hue: False
-  hidden: False
-  icon: mdi:router-wireless
-
-sensor.ipchange:
-  friendly_name: 'Ipchange'
-  emulated_hue: False
-  hidden: True
-
-
-
 sensor.moon:
   friendly_name: 'Moon'
   emulated_hue: False
@@ -360,6 +348,41 @@ sensor.sleepnumber_carlo_stacey_sleepnumber:
   icon: mdi:hotel
 
 
+sensor.small_garage:
+  friendly_name: 'Small Garage'
+  emulated_hue: False
+  hidden: False
+  icon: mdi:car-connected
+
+
+sensor.small_garage_reflection_rate:
+  friendly_name: 'Reflection Rate'
+  emulated_hue: False
+  hidden: False
+
+
+
+sensor.small_garage_status:
+  friendly_name: 'State Of The Door'
+  emulated_hue: False
+  hidden: False
+
+
+
+sensor.small_garage_time_in_state:
+  friendly_name: 'Time In State'
+  emulated_hue: False
+  hidden: False
+  icon: mdi:timer-sand
+
+
+sensor.small_garage_wifi_signal_strength:
+  friendly_name: 'Wifi Strength'
+  emulated_hue: False
+  hidden: False
+  icon: mdi:wifi
+
+
 sensor.smart_water_meter:
   friendly_name: 'Smart Water Meter'
   emulated_hue: False
diff --git a/customize/switches.yaml b/customize/switches.yaml
index e2ec6bf0..7d7907de 100755
--- a/customize/switches.yaml
+++ b/customize/switches.yaml
@@ -1,79 +1,99 @@
 ###################################
 ##  Switches Section
 ###################################
-switch.garage_outlet: 
-  friendly_name: 'Garage Outlet'
-  icon: mdi:power-plug
-  assumed_state: true
-  emulated_hue: true
-  
-switch.living_room_amp:
-  friendly_name: 'Living Room AMP'
-  icon: mdi:music-circle
-  assumed_state: true
-  emulated_hue: true
-  
-switch.den_outlet: 
+switch.den_outlet:
   friendly_name: 'Den Outlet'
+  emulated_hue: True
+  hidden: False
   icon: mdi:power-plug
-  assumed_state: true
-  emulated_hue: true
 
-switch.dining_room_outlet: 
-  friendly_name: 'Dining Room Outlet'
-  icon: mdi:power-plug
-  assumed_state: true
-  emulated_hue: true
-  
-switch.Foyer_Outlet: 
+
+switch.foyer_outlet:
   friendly_name: 'Foyer Outlet'
+  emulated_hue: True
+  hidden: False
   icon: mdi:power-plug
-  assumed_state: true
-  emulated_hue: true
-  
-switch.Kitchen_Accents: 
-  friendly_name: 'Kitchen Accents'
-  icon: mdi:lightbulb-outline
-  assumed_state: true  
-  emulated_hue: true
-  
-switch.Kitchen_Accent_2: 
+
+
+switch.front_door_outlet:
+  friendly_name: 'Front Door Outlet'
+  emulated_hue: True
+  hidden: False
+  icon: mdi:power-plug
+
+
+switch.garage_outlet:
+  friendly_name: 'Garage Outlet'
+  emulated_hue: True
+  hidden: False
+  icon: mdi:power-plug
+
+
+switch.ge_outdoor_outle_switch_7_0:
+  friendly_name: 'Back Landscape Lighting'
+  emulated_hue: True
+  hidden: False
+  icon: mdi:flower
+
+
+switch.ge_outdoor_outle_switch_8_0:
+  friendly_name: 'Front Landscape Lighting'
+  emulated_hue: True
+  hidden: False
+  icon: mdi:flower
+
+
+switch.kitchen_accent_2:
   friendly_name: 'Kitchen Accents 2'
+  emulated_hue: False
+  hidden: False
   icon: mdi:lightbulb-outline
-  assumed_state: true
-  emulated_hue: true
-  
-switch.Printer_Outlet: 
-  friendly_name: 'Printer Outlet'
-  icon: mdi:printer
-  assumed_state: true  
-  emulated_hue: true
-  
-switch.living_room_outlet: 
+
+
+switch.kitchen_accents:
+  friendly_name: 'Kitchen Accents'
+  emulated_hue: True
+  hidden: False
+  icon: mdi:lightbulb-outline
+
+
+switch.living_room_amp:
+  friendly_name: 'Living Room Amp'
+  emulated_hue: True
+  hidden: False
+  icon: mdi:music-circle
+
+
+switch.living_room_outlet:
   friendly_name: 'Living Room Outlet'
+  emulated_hue: True
+  hidden: False
   icon: mdi:power-plug
-  assumed_state: true  
-  emulated_hue: true
-  
-switch.Outlet_304_1: 
-  friendly_name: 'Outlet_304_1'
-  icon: mdi:power-plug
-  assumed_state: true  
-  
-switch.Outlet_304_2: 
-  friendly_name: 'Outlet_304_2'
+
+
+switch.outlet_304_1:
+  friendly_name: 'Outlet 304 1'
+  emulated_hue: False
+  hidden: False
   icon: mdi:power-plug
-  assumed_state: true  
-  
-switch.Front_Door_Outlet: 
-  friendly_name: 'Front Door Outlet'
-  emulated_hue: true
+
+
+switch.outlet_304_2:
+  friendly_name: 'Outlet 304 2'
+  emulated_hue: False
+  hidden: False
   icon: mdi:power-plug
-  assumed_state: true  
-  
-switch.Outlet_304_4: 
-  friendly_name: 'Outlet_304_4'
-  emulated_hue: true
+
+
+switch.outlet_304_4:
+  friendly_name: 'Outlet 304 4'
+  emulated_hue: True
+  hidden: False
   icon: mdi:power-plug
-  assumed_state: true  
-  
\ No newline at end of file
+
+
+switch.printer_outlet:
+  friendly_name: 'Printer Outlet'
+  emulated_hue: True
+  hidden: False
+  icon: mdi:printer