diff --git a/.HA_VERSION b/.HA_VERSION
index 1f2864e6..e987a6ff 100755
--- a/.HA_VERSION
+++ b/.HA_VERSION
@@ -1 +1 @@
-0.39.3
\ No newline at end of file
+0.40.0.dev0
\ No newline at end of file
diff --git a/configuration.yaml b/configuration.yaml
index 7bcff14e..fa43293e 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -88,8 +88,8 @@ history:
      - sensor.last_boot
      - sensor.date
 
-#logger: !include logger.yaml
-#recorder: !include recorder.yaml
+logger: !include logger.yaml
+recorder: !include recorder.yaml
 
 mqtt:
   broker: 127.0.0.1
diff --git a/customize/device_tracker.yaml b/customize/device_tracker.yaml
index 05bb817b..84838a3f 100755
--- a/customize/device_tracker.yaml
+++ b/customize/device_tracker.yaml
@@ -206,15 +206,20 @@ device_tracker.tablotv:
 
 
 
+device_tracker.unifi_ap:
+  friendly_name: 'Unifi Ap'
+  emulated_hue: False
+  hidden: True
+
+
+
+
 device_tracker.wii:
   friendly_name: 'Wii'
   emulated_hue: False
   hidden: True
 
-device_tracker.unifi_ap:
-  friendly_name: 'Unifi AP'
-  emulated_hue: False
-  hidden: True
+
 
 
 device_tracker.withings_scale:
diff --git a/customize/sensors.yaml b/customize/sensors.yaml
index 886ce74a..ce58eb6b 100755
--- a/customize/sensors.yaml
+++ b/customize/sensors.yaml
@@ -2,6 +2,38 @@ sensor.actiontechap:
   friendly_name: 'Actiontech Ap'
   emulated_hue: False
   hidden: False
+  icon: mdi:router-wireless
+
+
+sensor.aeotec_dsb04100_doorwindow_sensor_alarm_level_3_1:
+  friendly_name: 'Aeotec Dsb04100 Door/window Sensor Alarm Level'
+  emulated_hue: False
+  hidden: True
+
+
+
+
+sensor.aeotec_dsb04100_doorwindow_sensor_alarm_level_5_1:
+  friendly_name: 'Aeotec Dsb04100 Door/window Sensor Alarm Level'
+  emulated_hue: False
+  hidden: True
+
+
+
+
+sensor.aeotec_dsb04100_doorwindow_sensor_alarm_type_3_0:
+  friendly_name: 'Aeotec Dsb04100 Door/window Sensor Alarm Type'
+  emulated_hue: False
+  hidden: True
+
+
+
+
+sensor.aeotec_dsb04100_doorwindow_sensor_alarm_type_5_0:
+  friendly_name: 'Aeotec Dsb04100 Door/window Sensor Alarm Type'
+  emulated_hue: False
+  hidden: True
+
 
 
 
@@ -12,6 +44,7 @@ sensor.alexa_echo:
   icon: mdi:amazon
 
 
+
 sensor.amazon_dot:
   friendly_name: 'Amazon Dot'
   emulated_hue: False
@@ -19,6 +52,15 @@ sensor.amazon_dot:
   icon: mdi:amazon
 
 
+
+sensor.amazon_fire_stick:
+  friendly_name: 'Fire Stick'
+  emulated_hue: False
+  hidden: False
+  icon: mdi:Amazon
+
+
+
 sensor.chromecast_audio_1:
   friendly_name: 'Chromecast Audio 1'
   emulated_hue: False
@@ -26,6 +68,7 @@ sensor.chromecast_audio_1:
   icon: mdi:music-circle
 
 
+
 sensor.chromecast_audio_2:
   friendly_name: 'Chromecast Audio 2'
   emulated_hue: False
@@ -33,6 +76,7 @@ sensor.chromecast_audio_2:
   icon: mdi:music-circle
 
 
+
 sensor.circle:
   friendly_name: 'Disney Circle'
   emulated_hue: False
@@ -40,10 +84,12 @@ sensor.circle:
   icon: mdi:google-circles-group
 
 
+
 sensor.cisco_ap:
   friendly_name: 'Cisco Main Ap'
   emulated_hue: False
   hidden: False
+  icon: mdi:router-wireless
 
 
 
@@ -54,6 +100,7 @@ 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
@@ -61,6 +108,7 @@ sensor.dark_sky_daily_max_precip_intensity:
   icon: mdi:thermometer
 
 
+
 sensor.dark_sky_humidity:
   friendly_name: 'Outdoor Humidity'
   emulated_hue: False
@@ -68,6 +116,7 @@ sensor.dark_sky_humidity:
   icon: mdi:water-percent
 
 
+
 sensor.dark_sky_minutely_summary:
   friendly_name: 'Current Conditions'
   emulated_hue: False
@@ -75,6 +124,7 @@ sensor.dark_sky_minutely_summary:
   icon: mdi:beach
 
 
+
 sensor.dark_sky_precip_intensity:
   friendly_name: 'Rainfall'
   emulated_hue: False
@@ -82,6 +132,7 @@ sensor.dark_sky_precip_intensity:
   icon: mdi:weather-rainy
 
 
+
 sensor.dark_sky_temperature:
   friendly_name: 'Outdoor Temp'
   emulated_hue: False
@@ -89,6 +140,7 @@ sensor.dark_sky_temperature:
   icon: mdi:thermometer
 
 
+
 sensor.dark_sky_wind_speed:
   friendly_name: 'Dark Sky Wind Speed'
   emulated_hue: False
@@ -96,6 +148,7 @@ sensor.dark_sky_wind_speed:
   icon: mdi:weather-windy
 
 
+
 sensor.date:
   friendly_name: 'Date'
   emulated_hue: False
@@ -103,6 +156,7 @@ sensor.date:
   icon: mdi:calendar
 
 
+
 sensor.disk_use_:
   friendly_name: 'Disk Usage'
   emulated_hue: False
@@ -110,6 +164,7 @@ sensor.disk_use_:
   icon: mdi:harddisk
 
 
+
 sensor.downstairs_away_mode:
   friendly_name: 'Downstairs Away Mode'
   emulated_hue: False
@@ -117,6 +172,7 @@ sensor.downstairs_away_mode:
 
 
 
+
 sensor.downstairs_thermostat_humidity:
   friendly_name: 'Downstairs Thermostat Humidity'
   emulated_hue: False
@@ -124,6 +180,7 @@ sensor.downstairs_thermostat_humidity:
   icon: mdi:water-percent
 
 
+
 sensor.downstairs_thermostat_hvac_state:
   friendly_name: 'Downstairs Thermostat Hvac State'
   emulated_hue: False
@@ -131,6 +188,7 @@ sensor.downstairs_thermostat_hvac_state:
 
 
 
+
 sensor.downstairs_thermostat_operation_mode:
   friendly_name: 'Downstairs Thermostat Operation Mode'
   emulated_hue: False
@@ -138,6 +196,7 @@ sensor.downstairs_thermostat_operation_mode:
 
 
 
+
 sensor.downstairs_thermostat_target:
   friendly_name: 'Downstairs Thermostat Target'
   emulated_hue: False
@@ -145,6 +204,7 @@ sensor.downstairs_thermostat_target:
 
 
 
+
 sensor.downstairs_thermostat_temperature:
   friendly_name: 'Downstairs Thermostat Temperature'
   emulated_hue: False
@@ -152,6 +212,7 @@ sensor.downstairs_thermostat_temperature:
 
 
 
+
 sensor.enerwave_unknown_type0601_id0903_alarm_level_2_1:
   friendly_name: 'Enerwave Unknown: Type=0601, Id=0903 Alarm Level'
   emulated_hue: False
@@ -159,6 +220,7 @@ sensor.enerwave_unknown_type0601_id0903_alarm_level_2_1:
 
 
 
+
 sensor.enerwave_unknown_type0601_id0903_alarm_type_2_0:
   friendly_name: 'Enerwave Unknown: Type=0601, Id=0903 Alarm Type'
   emulated_hue: False
@@ -166,6 +228,7 @@ sensor.enerwave_unknown_type0601_id0903_alarm_type_2_0:
 
 
 
+
 sensor.enerwave_unknown_type0601_id0903_general_2_0:
   friendly_name: 'Enerwave Unknown: Type=0601, Id=0903 General'
   emulated_hue: False
@@ -173,6 +236,7 @@ sensor.enerwave_unknown_type0601_id0903_general_2_0:
 
 
 
+
 sensor.external_ip:
   friendly_name: 'External Ip'
   emulated_hue: False
@@ -180,6 +244,7 @@ sensor.external_ip:
 
 
 
+
 sensor.hue_hub_1:
   friendly_name: 'Hue Hub 1'
   emulated_hue: False
@@ -187,6 +252,7 @@ sensor.hue_hub_1:
   icon: mdi:router-wireless
 
 
+
 sensor.hue_hub_2:
   friendly_name: 'Hue Hub 2'
   emulated_hue: False
@@ -194,10 +260,12 @@ sensor.hue_hub_2:
   icon: mdi:router-wireless
 
 
+
 sensor.ifttt_rachio_watering_time:
   friendly_name: 'Ifttt Rachio Watering Time'
   emulated_hue: False
   hidden: False
+  icon: mdi:text-to-speech
 
 
 
@@ -208,6 +276,7 @@ sensor.ipchange:
 
 
 
+
 sensor.large_garage:
   friendly_name: 'Large Garage'
   emulated_hue: False
@@ -215,6 +284,7 @@ sensor.large_garage:
   icon: mdi:car-connected
 
 
+
 sensor.large_garage_reflection_rate:
   friendly_name: 'Reflection Rate'
   emulated_hue: False
@@ -222,6 +292,7 @@ sensor.large_garage_reflection_rate:
 
 
 
+
 sensor.large_garage_status:
   friendly_name: 'State Of The Door'
   emulated_hue: False
@@ -229,6 +300,7 @@ sensor.large_garage_status:
 
 
 
+
 sensor.large_garage_time_in_state:
   friendly_name: 'Time In State'
   emulated_hue: False
@@ -236,6 +308,7 @@ sensor.large_garage_time_in_state:
   icon: mdi:timer-sand
 
 
+
 sensor.large_garage_wifi_signal_strength:
   friendly_name: 'Wifi Strength'
   emulated_hue: False
@@ -243,6 +316,7 @@ sensor.large_garage_wifi_signal_strength:
   icon: mdi:wifi
 
 
+
 sensor.moon:
   friendly_name: 'Moon'
   emulated_hue: False
@@ -250,6 +324,7 @@ sensor.moon:
   icon: mdi:brightness-3
 
 
+
 sensor.nest_downstairs:
   friendly_name: 'Downstairs Nest'
   emulated_hue: False
@@ -257,6 +332,7 @@ sensor.nest_downstairs:
   icon: mdi:air-conditioner
 
 
+
 sensor.nest_upstairs:
   friendly_name: 'Upstairs Nest'
   emulated_hue: False
@@ -264,10 +340,20 @@ sensor.nest_upstairs:
   icon: mdi:air-conditioner
 
 
+
 sensor.polly_lastmsg:
   friendly_name: 'Polly Lastmsg'
   emulated_hue: False
   hidden: True
+  icon: mdi:text-to-speech
+
+
+
+sensor.printer:
+  friendly_name: 'Printer'
+  emulated_hue: False
+  hidden: False
+  icon: mdi:printer
 
 
 
@@ -278,24 +364,12 @@ sensor.rachio:
   icon: mdi:spray
 
 
+
 sensor.rgb_led_garage_large:
   friendly_name: 'Rgb Led Garage Large'
   emulated_hue: False
   hidden: False
-
-
-
-sensor.rgb_led_garage_small:
-  friendly_name: 'Rgb Led Garage Small'
-  emulated_hue: False
-  hidden: False
-
-
-
-sensor.rgb_led_outdoor_den:
-  friendly_name: 'Rgb Led Outdoor Den'
-  emulated_hue: False
-  hidden: False
+  icon: mdi:led-on
 
 
 
@@ -306,6 +380,7 @@ sensor.samsungtv:
   icon: mdi:television
 
 
+
 sensor.since_last_boot:
   friendly_name: 'Since Last Boot'
   emulated_hue: False
@@ -313,6 +388,7 @@ sensor.since_last_boot:
   icon: mdi:clock
 
 
+
 sensor.since_last_boot_templated:
   friendly_name: 'Homeassistant Uptime'
   emulated_hue: False
@@ -320,6 +396,7 @@ sensor.since_last_boot_templated:
   icon: mdi:clock-start
 
 
+
 sensor.skybell:
   friendly_name: 'Skybell Doorbell'
   emulated_hue: False
@@ -327,6 +404,7 @@ sensor.skybell:
   icon: mdi:camera-front
 
 
+
 sensor.sleep_number_bed:
   friendly_name: 'Sleep Number Bed'
   emulated_hue: False
@@ -334,6 +412,7 @@ sensor.sleep_number_bed:
   icon: mdi:hotel
 
 
+
 sensor.sleepnumber_carlo_carlo_sleepnumber:
   friendly_name: 'Carlo Sleepnumber'
   emulated_hue: False
@@ -341,6 +420,7 @@ sensor.sleepnumber_carlo_carlo_sleepnumber:
   icon: mdi:hotel
 
 
+
 sensor.sleepnumber_carlo_stacey_sleepnumber:
   friendly_name: 'Stacey Sleepnumber'
   emulated_hue: False
@@ -348,6 +428,7 @@ sensor.sleepnumber_carlo_stacey_sleepnumber:
   icon: mdi:hotel
 
 
+
 sensor.small_garage:
   friendly_name: 'Small Garage'
   emulated_hue: False
@@ -355,6 +436,7 @@ sensor.small_garage:
   icon: mdi:car-connected
 
 
+
 sensor.small_garage_reflection_rate:
   friendly_name: 'Reflection Rate'
   emulated_hue: False
@@ -362,6 +444,7 @@ sensor.small_garage_reflection_rate:
 
 
 
+
 sensor.small_garage_status:
   friendly_name: 'State Of The Door'
   emulated_hue: False
@@ -369,6 +452,7 @@ sensor.small_garage_status:
 
 
 
+
 sensor.small_garage_time_in_state:
   friendly_name: 'Time In State'
   emulated_hue: False
@@ -376,6 +460,7 @@ sensor.small_garage_time_in_state:
   icon: mdi:timer-sand
 
 
+
 sensor.small_garage_wifi_signal_strength:
   friendly_name: 'Wifi Strength'
   emulated_hue: False
@@ -383,6 +468,7 @@ sensor.small_garage_wifi_signal_strength:
   icon: mdi:wifi
 
 
+
 sensor.smart_water_meter:
   friendly_name: 'Smart Water Meter'
   emulated_hue: False
@@ -390,6 +476,7 @@ sensor.smart_water_meter:
   icon: mdi:water
 
 
+
 sensor.speedtest_download:
   friendly_name: 'Download'
   emulated_hue: False
@@ -397,6 +484,7 @@ sensor.speedtest_download:
   icon: mdi:speedometer
 
 
+
 sensor.speedtest_upload:
   friendly_name: 'Upload'
   emulated_hue: False
@@ -404,6 +492,7 @@ sensor.speedtest_upload:
   icon: mdi:speedometer
 
 
+
 sensor.tablotv:
   friendly_name: 'Tablo Tv'
   emulated_hue: False
@@ -411,6 +500,7 @@ sensor.tablotv:
   icon: mdi:television-guide
 
 
+
 sensor.time:
   friendly_name: 'Time'
   emulated_hue: False
@@ -418,6 +508,15 @@ sensor.time:
   icon: mdi:clock
 
 
+
+sensor.unifi_ap:
+  friendly_name: 'Unifi Ap'
+  emulated_hue: False
+  hidden: False
+  icon: mdi:router-wireless
+
+
+
 sensor.upstairs_away_mode:
   friendly_name: 'Upstairs Away Mode'
   emulated_hue: False
@@ -425,6 +524,7 @@ sensor.upstairs_away_mode:
 
 
 
+
 sensor.upstairs_thermostat_humidity:
   friendly_name: 'Upstairs Thermostat Humidity'
   emulated_hue: False
@@ -432,6 +532,7 @@ sensor.upstairs_thermostat_humidity:
   icon: mdi:water-percent
 
 
+
 sensor.upstairs_thermostat_hvac_state:
   friendly_name: 'Upstairs Thermostat Hvac State'
   emulated_hue: False
@@ -439,6 +540,7 @@ sensor.upstairs_thermostat_hvac_state:
 
 
 
+
 sensor.upstairs_thermostat_operation_mode:
   friendly_name: 'Upstairs Thermostat Operation Mode'
   emulated_hue: False
@@ -446,6 +548,7 @@ sensor.upstairs_thermostat_operation_mode:
 
 
 
+
 sensor.upstairs_thermostat_target:
   friendly_name: 'Upstairs Thermostat Target'
   emulated_hue: False
@@ -453,22 +556,14 @@ sensor.upstairs_thermostat_target:
 
 
 
+
 sensor.upstairs_thermostat_temperature:
   friendly_name: 'Upstairs Thermostat Temperature'
   emulated_hue: False
   hidden: True
 
-sensor.amazon_fire_stick:
-  friendly_name: 'Fire Stick'
-  emulated_hue: False
-  hidden: False
-  icon: mdi:Amazon
 
-sensor.printer:
-  friendly_name: 'Printer'
-  emulated_hue: False
-  hidden: False
-  icon: mdi:printer
+
 
 sensor.wii:
   friendly_name: 'Wii'
@@ -476,10 +571,7 @@ sensor.wii:
   hidden: False
   icon: mdi:gamepad-variant
 
-sensor.unifi_ap:
-  friendly_name: 'Unifi AP'
-  emulated_hue: False
-  hidden: False
+
 
 sensor.withings_scale:
   friendly_name: 'Withings Scale'