diff --git a/automations/alert-office-cabinet.yaml b/automations/alert-office-cabinet.yaml
index d9e2677d2fe88cf3d939324ba4ebc8196c65f053..1383c9819c01854be69ec6196e440a2a922f86ca 100644
--- a/automations/alert-office-cabinet.yaml
+++ b/automations/alert-office-cabinet.yaml
@@ -2,12 +2,11 @@ alias: Slack notification for office cabinet access
 trigger:
   - platform: state
     entity_id: binary_sensor.office_cabinet
-    to: "off"
+    to: "on"
   - platform: state
     entity_id: binary_sensor.office_cabinet_door_motion
     to: "on"
 action:
-  service: notify.slack
+  service: notify.mattermost
   data:
-    message: ':bellhop_bell: *Office cabinet accessed*'
-    target: '#home'
+    message: ':bell: **Office cabinet accessed**'
diff --git a/automations/apc-notification-not-online.yaml b/automations/apc-notification-not-online.yaml
index 20c9ddd1e91690284508a3988c01568267069d45..937849904d6bfffd3b7f33f5e3470821fdc0889a 100644
--- a/automations/apc-notification-not-online.yaml
+++ b/automations/apc-notification-not-online.yaml
@@ -8,7 +8,7 @@ action:
     data:
       message: "Office APC has status \"{{ states( 'sensor.ups_status' ) }}\""
       target: !secret jabber_recipient
-  - service: notify.slack
+  - service: notify.mattermost
     data:
       message: ":exclamation: :battery: Office APC has status \"{{ states( 'sensor.ups_status' ) }}\""
       target: '#home'
diff --git a/automations/apc-notification-online.yaml b/automations/apc-notification-online.yaml
index 2f752f25bec32d63a76f34534c64749420d04278..ea78dfd76ee37b8e720c0e641298d498f8aaace0 100644
--- a/automations/apc-notification-online.yaml
+++ b/automations/apc-notification-online.yaml
@@ -8,7 +8,7 @@ action:
     data:
       message: 'Office APC is "ONLINE"'
       target: !secret jabber_recipient
-  - service: notify.slack
+  - service: notify.mattermost
     data:
       message: ':exclamation: :electric_plug: Office APC is "ONLINE"'
       target: '#home'
diff --git a/automations/balcony-sunrise-off.yaml b/automations/balcony-sunrise-off.yaml
index 8a098f46cf149d449b95837d82fc139201e437bc..0277a4746c80ab0db28962f0da031b72bdc8f220 100644
--- a/automations/balcony-sunrise-off.yaml
+++ b/automations/balcony-sunrise-off.yaml
@@ -2,7 +2,7 @@ alias: 'Turn off balcony at sunrise'
 trigger:
   platform: sun
   event: sunrise
-  offset: "+00:60:00"
+  offset: "+00:30:00"
 condition:
   - condition: state
     entity_id: light.balcony
diff --git a/automations/dining-area-on-at-entry.yaml b/automations/dining-area-on-at-entry.yaml
index fe4ac0f55c1da05299fd3b6f20f23ec975461018..6127291fd380bc1c6db112cec0548ea616987a7e 100644
--- a/automations/dining-area-on-at-entry.yaml
+++ b/automations/dining-area-on-at-entry.yaml
@@ -2,21 +2,15 @@ alias: Turn on dining area lights when front door opens
 trigger:
   platform: state
   entity_id: binary_sensor.front_door
-  to: 'off'
+  to: 'on'
 condition:
   condition: and
   conditions:
     - condition: state
-      entity_id: light.ceiling_fan_1
+      entity_id: group.living_room
       state: 'off'
     - condition: state
-      entity_id: light.ceiling_fan_2
-      state: 'off'
-    - condition: state
-      entity_id: light.endtable
-      state: 'off'
-    - condition: state
-      entity_id: light.corner_table
+      entity_id: group.dining_area
       state: 'off'
     - condition: state
       entity_id: binary_sensor.lr_motion_sensor_over_slider
diff --git a/automations/dining-area-window-opened-outside.yaml b/automations/dining-area-window-opened-outside.yaml
deleted file mode 100644
index b92ebfd1f7bc4e2b03edf5b21df74763de664c35..0000000000000000000000000000000000000000
--- a/automations/dining-area-window-opened-outside.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-alias: Turn on lights when dining room window opened from outside
-trigger:
-  platform: state
-  entity_id: binary_sensor.dining_area_window_motion
-  to: 'on'
-condition:
-  condition: and
-  conditions:
-    - condition: state
-      entity_id: binary_sensor.lr_motion_sensor_over_slider
-      state: 'off'
-    - condition: state
-      entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
-      state: 'off'
-    - condition: state
-      entity_id: binary_sensor.kitchen
-      state: 'off'
-action:
-  service: scene.turn_on
-  entity_id:
-    - scene.da_bright
-    - scene.lr_bright
-    - scene.office_bright
-    - scene.master_bedroom_bright
-    - scene.master_bath_bright
-    - scene.balcony_bright
diff --git a/automations/lights-off-no-one-home.yaml b/automations/lights-off-no-one-home.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9cd01589fbd02cb84c99610b9f76194e5f220071
--- /dev/null
+++ b/automations/lights-off-no-one-home.yaml
@@ -0,0 +1,10 @@
+alias: Turn off certain lights when no one is home
+trigger:
+  platform: state
+  entity_id: group.presence
+  from: 'home'
+  to: 'not_home'
+action:
+  service: switch.turn_off
+  entity_id:
+    - switch.lava_lamp
diff --git a/automations/maybe-an-earthquake.yaml b/automations/maybe-an-earthquake.yaml
index 803a9993bb6ec75fce3268ccd3d76ae06b6ab94b..0f07cf940825b62dfff473f812bf132eaacb2260 100644
--- a/automations/maybe-an-earthquake.yaml
+++ b/automations/maybe-an-earthquake.yaml
@@ -35,7 +35,7 @@ action:
     data:
       message: 'MAYBE AN EARTHQUAKE?!? ALL ACCELEROMETERS ARE ACTIVE.'
       target: !secret jabber_recipient
-  - service: notify.slack
+  - service: notify.mattermost
     data:
       message: 'MAYBE AN EARTHQUAKE?!? ALL ACCELEROMETERS ARE ACTIVE.'
       target:
diff --git a/automations/update-notification.yaml b/automations/update-notification.yaml
index 45a2ada6d0e5640602676caf33ff45d34a621065..1694ed76134dfc7dfcef211932130c8e8ff98ae6 100644
--- a/automations/update-notification.yaml
+++ b/automations/update-notification.yaml
@@ -3,11 +3,6 @@ trigger:
   platform: state
   entity_id: updater.updater
 action:
-  - service: notify.jabber
-    data:
-      message: 'There is a new release of Home Assistant available.'
-      target: !secret jabber_recipient
-  - service: notify.slack
-    data:
-      message: ':exclamation: There is a new release of Home Assistant available.'
-      target: '#home'
+  service: notify.mattermost
+  data:
+    message: ':exclamation: There is a new release of Home Assistant available.'
diff --git a/binary-sensors/acceleration-dining-area-window.yaml b/binary-sensors/acceleration-dining-area-window.yaml
index b375103eec169574d569253e9737c83db67b27b9..73a10d86946ac02e315cc74323f8189bc370b04a 100644
--- a/binary-sensors/acceleration-dining-area-window.yaml
+++ b/binary-sensors/acceleration-dining-area-window.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Dining Area Window/acceleration"
 name: "Dining Area Window motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/acceleration-front-door.yaml b/binary-sensors/acceleration-front-door.yaml
index 68999ccbd10d9d8149dfd237907777d895bbd6e2..eb93097cf5582eb8702bbee9b6729009c8b55be1 100644
--- a/binary-sensors/acceleration-front-door.yaml
+++ b/binary-sensors/acceleration-front-door.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Front Door/acceleration"
 name: "Front Door motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/acceleration-master-bedroom-window.yaml b/binary-sensors/acceleration-master-bedroom-window.yaml
index d278b14468d8cc9658afbc7142b0746ce07ffe61..74683f63791affd76cb605b550fbcf52ef83b262 100644
--- a/binary-sensors/acceleration-master-bedroom-window.yaml
+++ b/binary-sensors/acceleration-master-bedroom-window.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Master Bedroom Window/acceleration"
 name: "Master Bedroom Window motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/acceleration-office-cabinet.yaml b/binary-sensors/acceleration-office-cabinet.yaml
index 40a9fdf51a5d641d3b730075b922737685e3665f..f7ac4bd57f5d5a008e436866b1aa5c01e4889741 100644
--- a/binary-sensors/acceleration-office-cabinet.yaml
+++ b/binary-sensors/acceleration-office-cabinet.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Office Cabinet/acceleration"
 name: "Office Cabinet door motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/acceleration-office-window.yaml b/binary-sensors/acceleration-office-window.yaml
index ff8ad559d46ff7868c170e826f4a83532397e7cb..7de1eac05b3951e43b9004d6ea6b7ff20de03c74 100644
--- a/binary-sensors/acceleration-office-window.yaml
+++ b/binary-sensors/acceleration-office-window.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Office Window/acceleration"
 name: "Office Window motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/acceleration-slider.yaml b/binary-sensors/acceleration-slider.yaml
index 2c14c162c04e6402257e1e207d8d80c1c3672b02..2b2ad38771efc7aa1fde47342626555c61c27e51 100644
--- a/binary-sensors/acceleration-slider.yaml
+++ b/binary-sensors/acceleration-slider.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Slider/acceleration"
 name: "Slider motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/co-gas-living-room.yaml b/binary-sensors/co-gas-living-room.yaml
index a77d947b91dc6d2e945ccb2bd11db53863fb5f26..138bf623f625b9ee942bf01409a114f01e2749ac 100644
--- a/binary-sensors/co-gas-living-room.yaml
+++ b/binary-sensors/co-gas-living-room.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Living Room Alarm/carbonMonoxide"
 name: "Living Room CO Detector"
 payload_on: "detected"
 payload_off: "clear"
-sensor_class: gas
+device_class: gas
diff --git a/binary-sensors/co-gas-master-bedroom.yaml b/binary-sensors/co-gas-master-bedroom.yaml
index 0a6a2efe66fa36ca9df45d308ed94988f1fccd1b..f077680c39ad33dd144c6250f98c5d9204d20860 100644
--- a/binary-sensors/co-gas-master-bedroom.yaml
+++ b/binary-sensors/co-gas-master-bedroom.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Master Bedroom Alarm/carbonMonoxide"
 name: "Master Bedroom CO Detector"
 payload_on: "detected"
 payload_off: "clear"
-sensor_class: gas
+device_class: gas
diff --git a/binary-sensors/contact-dining-area-window.yaml b/binary-sensors/contact-dining-area-window.yaml
index 2f144ba9d0212ec1f8ff7e1d7024c47c63000e88..c3b7682289844f54898c94f754b7eab5b6d143b8 100644
--- a/binary-sensors/contact-dining-area-window.yaml
+++ b/binary-sensors/contact-dining-area-window.yaml
@@ -1,6 +1,6 @@
 platform: mqtt
 state_topic: "smartthings/Dining Area Window/contact"
 name: "Dining Area Window"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/contact-front-door.yaml b/binary-sensors/contact-front-door.yaml
index a271967f5235a7422aaad2af1111ccce7c4a4e3a..39c58d99feec4630575fcb72429eb2f64a0058f5 100644
--- a/binary-sensors/contact-front-door.yaml
+++ b/binary-sensors/contact-front-door.yaml
@@ -1,6 +1,6 @@
 platform: mqtt
 state_topic: "smartthings/Front Door/contact"
 name: "Front Door"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/contact-master-bedroom-window.yaml b/binary-sensors/contact-master-bedroom-window.yaml
index 0eed570908bcc5ea7a218a7a72bf0391807e5af5..297b3641edfa09a5fcaf41b719208e775d9c449f 100644
--- a/binary-sensors/contact-master-bedroom-window.yaml
+++ b/binary-sensors/contact-master-bedroom-window.yaml
@@ -1,6 +1,6 @@
 platform: mqtt
 state_topic: "smartthings/Master Bedroom Window/contact"
 name: "Master Bedroom Window"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/contact-office-cabinet.yaml b/binary-sensors/contact-office-cabinet.yaml
index 41058925b436fdaf85936851bc64fe504757a3f5..1ef344b3a717ebcdba2dc5299bacaae1220e8a7d 100644
--- a/binary-sensors/contact-office-cabinet.yaml
+++ b/binary-sensors/contact-office-cabinet.yaml
@@ -1,6 +1,6 @@
 platform: mqtt
 state_topic: "smartthings/Office Cabinet/contact"
 name: "Office Cabinet"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/contact-office-window.yaml b/binary-sensors/contact-office-window.yaml
index 0671a74622282e3689c06b0bbbcf0a459f1c5453..1fcc8cf70d9541f8f0e1b96ff074fe9466af273a 100644
--- a/binary-sensors/contact-office-window.yaml
+++ b/binary-sensors/contact-office-window.yaml
@@ -1,6 +1,6 @@
 platform: mqtt
 state_topic: "smartthings/Office Window/contact"
 name: "Office Window"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/contact-slider.yaml b/binary-sensors/contact-slider.yaml
index 14be92a8f8e76aced91e405efff4a52f589d1550..45a0b6bb750a5555c19a27bbead0bf5782b6770c 100644
--- a/binary-sensors/contact-slider.yaml
+++ b/binary-sensors/contact-slider.yaml
@@ -1,6 +1,6 @@
 platform: mqtt
 state_topic: "smartthings/Slider/contact"
 name: "Slider"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/motion-kitchen.yaml b/binary-sensors/motion-kitchen.yaml
index d54e8a4ef7db44368b7a1aa9bca0861bed1e3760..63a24d27378a68010e1ac9187990b52b595bff43 100644
--- a/binary-sensors/motion-kitchen.yaml
+++ b/binary-sensors/motion-kitchen.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Dining Area Motion Sensor near cabinets/motion"
 name: "Kitchen"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: motion
+device_class: motion
diff --git a/binary-sensors/motion-office-far-wall.yaml b/binary-sensors/motion-office-far-wall.yaml
index bbeebd867a6db86be02957ba11ac7289bb679bd1..aebf6026884d1c54a157576d2fcca542e18de95a 100644
--- a/binary-sensors/motion-office-far-wall.yaml
+++ b/binary-sensors/motion-office-far-wall.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Office Motion Sensor Far Wall/motion"
 name: "Office Motion Sensor Far Wall"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: motion
+device_class: motion
diff --git a/binary-sensors/motion-office-over-closet.yaml b/binary-sensors/motion-office-over-closet.yaml
index c9f1f929a12438282d6edd1b555619734e26569e..05f6249d031b4f9db33a456129525a2b4ab4d245 100644
--- a/binary-sensors/motion-office-over-closet.yaml
+++ b/binary-sensors/motion-office-over-closet.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Office Motion Sensor over Closet/motion"
 name: "Office Motion Sensor over Closet"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: motion
+device_class: motion
diff --git a/binary-sensors/motion-over-slider.yaml b/binary-sensors/motion-over-slider.yaml
index aa3fcbb822a449350ed3dc6a1dade924ac18a202..9e1fb50f55084ff0ae169847fa44aa3f5b2be699 100644
--- a/binary-sensors/motion-over-slider.yaml
+++ b/binary-sensors/motion-over-slider.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/LR Motion Sensor over Slider/motion"
 name: "LR Motion Sensor over Slider"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: motion
+device_class: motion
diff --git a/binary-sensors/motion-over-utility-closet.yaml b/binary-sensors/motion-over-utility-closet.yaml
index 39e6960b66cf0183dce8b19fd8e4e321eb76e0ff..2dc01c9054fcd4e0af8b9013ed2fe37b5b7101af 100644
--- a/binary-sensors/motion-over-utility-closet.yaml
+++ b/binary-sensors/motion-over-utility-closet.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/LR Motion Sensor over Utility Closet/motion"
 name: "LR Motion Sensor over Utility Closet"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: motion
+device_class: motion
diff --git a/binary-sensors/smoke-living-room.yaml b/binary-sensors/smoke-living-room.yaml
index ff6fb07324da16b49c6073739f0a988dcbb096d3..6fb0a6c218380ed4b8d3c4d63a2bb0ee778d421c 100644
--- a/binary-sensors/smoke-living-room.yaml
+++ b/binary-sensors/smoke-living-room.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Living Room Alarm/smoke"
 name: "Living Room Smoke Detector"
 payload_on: "detected"
 payload_off: "clear"
-sensor_class: smoke
+device_class: smoke
diff --git a/binary-sensors/smoke-master-bedroom.yaml b/binary-sensors/smoke-master-bedroom.yaml
index d28b075308b5154efeb8774893bc02b60840c720..18063fd38cb50640494df99ec9b271f35d6dd07c 100644
--- a/binary-sensors/smoke-master-bedroom.yaml
+++ b/binary-sensors/smoke-master-bedroom.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Master Bedroom Alarm/smoke"
 name: "Master Bedroom Smoke Detector"
 payload_on: "detected"
 payload_off: "clear"
-sensor_class: smoke
+device_class: smoke
diff --git a/configuration.yaml b/configuration.yaml
index 4912c9ba6434e786e32ff30c45d62bbda4983cde..2d7029bcf5c03fbef6ddac8f231ca237bc86ff1c 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -43,9 +43,6 @@ recorder:
   purge_days: 14
   db_url: !secret mysql_recorder
 
-# Also log states to InfluxDB
-influxdb: !include influxdb.yaml
-
 # Enables support for tracking state changes over time.
 history:
 
@@ -95,6 +92,15 @@ panel_iframe: !include panels-iframe.yaml
 
 apcupsd:
 
+emulated_hue:
+  type: google_home
+  host_ip: !secret host_ip
+  listen_port: 80
+  expose_by_default: true
+  exposed_domains:
+    - switch
+    - light
+
 # Display
 group: !include groups.yaml
 
diff --git a/customizations/lights.yaml b/customizations/lights.yaml
index c4a7306714e85b33905db361540c49fe94da0480..f0cf059946f89beddb882684f47e916511e252a2 100644
--- a/customizations/lights.yaml
+++ b/customizations/lights.yaml
@@ -12,3 +12,5 @@ light.master_bath_2:
   friendly_name: Vanity Center
 light.master_bath_3:
   friendly_name: Vanity Right
+light.balcony:
+  friendly_name: Sconce
diff --git a/customizations/switches.yaml b/customizations/switches.yaml
index 14e1f3d28646ba7f4d923cdf07a279d56d02fba7..01842d1525f29128824298b6bed8f9d6f017b491 100644
--- a/customizations/switches.yaml
+++ b/customizations/switches.yaml
@@ -7,11 +7,19 @@ switch.wireless_charger:
 switch.august_interior:
   friendly_name: Interior Bolt
   icon: mdi:key
+  emulated_hue: false
 switch.august_keyed:
   friendly_name: Keyed Bolt
   icon: mdi:key
+  emulated_hue: false
 switch.kitchen_nightlight:
   icon: mdi:theme-light-dark
 switch.alarm_status:
   friendly_name: Alarm Status indicator
   icon: mdi:security-home
+switch.balcony_christmas_lights:
+  friendly_name: Christmas Lights
+  icon: mdi:led-outline
+switch.christmas_tree:
+  friendly_name: Christmas Tree
+  icon: mdi:pine-tree
diff --git a/groups.yaml b/groups.yaml
index 05e0539c054e2c1edcc10cf4d424c06e47b1b530..d86b1bda187c6bac50c19b2c1eb0ef2ef97ab75a 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -97,6 +97,7 @@ balcony:
   entities:
     - light.balcony
     - input_select.scene_balcony
+    - switch.balcony_outlet
 other:
   name: Other
   entities:
diff --git a/influxdb.yaml b/influxdb.yaml
deleted file mode 100644
index 1fc81c4b846bfec3a53eea815d7e1e4b941c3cd4..0000000000000000000000000000000000000000
--- a/influxdb.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-host: !secret influxdb_host
-database: !secret influxdb_db
-username: !secret influxdb_user
-password: !secret influxdb_password
-ssl: true
-verify_ssl: true
-whitelist:
-  - sensor.master_bedroom_window
-  - sensor.slider
-  - sensor.above_slider
-  - sensor.above_utility_closet
-  - sensor.front_door
-  - sensor.dining_area_window
-  - sensor.kitchen
-  - sensor.office_window
-  - sensor.office_near_closet
-  - sensor.office_far_wall
-  - sensor.office_cabinet
diff --git a/notifications.yaml b/notifications.yaml
index f655b61c8a2901c1c1af56ae740bb02641384f13..88053d8e75df3917b020daac000b1ded1d7453bd 100644
--- a/notifications.yaml
+++ b/notifications.yaml
@@ -4,7 +4,8 @@
   password: !secret jabber_password
   recipient: !secret jabber_recipient
   tls: true
-- name: slack
-  platform: slack
-  api_key: !secret slack_api_key
-  default_channel: '#home'
+- name: mattermost
+  platform: rest
+  resource: !secret mattermost_webhook
+  method: POST
+  message_param_name: 'text'
diff --git a/secrets.yaml b/secrets.yaml
index 243b702bc5a81abcc4a4123aa1b78076213a19e0..499ba704130b040cab7b811f5c24f0273d8951c2 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -1,3 +1,4 @@
+host_ip:
 api_password:
 latitude:
 longitude:
@@ -15,9 +16,8 @@ wunderground_forecast_url:
 logentries_token:
 mysql_recorder:
 wemo_kitchen_ip:
-slack_api_key:
-influxdb_host:
-influxdb_user:
-influxdb_password:
-influxdb_db:
+pi_hole_host:
+pi_hole_backup_host:
+pi_hole_admin:
 monit_admin:
+mattermost_webhook:
diff --git a/switches.yaml b/switches.yaml
index 118577bf8f79111a895947f702b3bbe186d203f1..0519235cb8a82a0b16d21d4d4cf52a10d5d7854d 100644
--- a/switches.yaml
+++ b/switches.yaml
@@ -26,6 +26,20 @@
   payload_on: "on"
   payload_off: "off"
   retain: true
+- platform: mqtt
+  name: "Balcony Outlet"
+  state_topic: "smartthings/Balcony Outlet/switch"
+  command_topic: "smartthings/Balcony Outlet/switch"
+  payload_on: "on"
+  payload_off: "off"
+  retain: true
+- platform: mqtt
+  name: "Christmas Tree"
+  state_topic: "smartthings/Spare Outlet/switch"
+  command_topic: "smartthings/Spare Outlet/switch"
+  payload_on: "on"
+  payload_off: "off"
+  retain: true
 - platform: command_line
   switches:
     august_interior: