From 0fc79deb09b7e0625120f1d3058b9dd90dd3d160 Mon Sep 17 00:00:00 2001
From: Erick Hitter <services@ethitter.com>
Date: Sat, 3 Sep 2016 20:40:19 -0700
Subject: [PATCH] Sync with upstream

edadb98
---
 automations/dining-area-on-at-entry.yaml      |  6 +-
 automations/dining-area-timeout.yaml          |  6 +-
 .../dining-area-window-opened-outside.yaml    |  6 +-
 automations/kitchen-light-timeout.yaml        | 10 +--
 automations/lights-off-when-alarm-away.yaml   |  6 +-
 automations/living-room-timeout.yaml          |  6 +-
 automations/maybe-an-earthquake.yaml          |  6 +-
 automations/office-lights-timeout.yaml        |  6 +-
 automations/scenes-balcony.yaml               | 25 ++++++
 automations/scenes-dining-area.yaml           | 25 ++++++
 automations/scenes-ericks-desk-lamp.yaml      | 25 ++++++
 automations/scenes-living-room.yaml           | 25 ++++++
 automations/scenes-master-bath.yaml           | 25 ++++++
 automations/scenes-master-bedroom.yaml        | 25 ++++++
 automations/scenes-office.yaml                | 25 ++++++
 automations/update-notification.yaml          |  4 +-
 automations/wireless-charger-timeout.yaml     |  6 +-
 configuration.yaml                            |  6 +-
 customizations/lights.yaml                    |  2 +
 customizations/scenes.yaml                    | 21 +++++
 customizations/sensors.yaml                   | 30 ++++++++
 groups.yaml                                   | 35 ++-------
 input-selects.yaml                            | 77 +++++++++++++++++++
 scenes/balcony-off.yaml                       |  4 +
 scenes/dining-area-off.yaml                   |  6 ++
 scenes/ericks-desk-lamp-off.yaml              |  4 +
 scenes/living-room-off.yaml                   |  6 ++
 scenes/master-bath-off.yaml                   |  8 ++
 scenes/master-bedroom-off.yaml                |  4 +
 scenes/office-off.yaml                        |  4 +
 scripts.yaml                                  |  2 +-
 31 files changed, 382 insertions(+), 64 deletions(-)
 create mode 100644 automations/scenes-balcony.yaml
 create mode 100644 automations/scenes-dining-area.yaml
 create mode 100644 automations/scenes-ericks-desk-lamp.yaml
 create mode 100644 automations/scenes-living-room.yaml
 create mode 100644 automations/scenes-master-bath.yaml
 create mode 100644 automations/scenes-master-bedroom.yaml
 create mode 100644 automations/scenes-office.yaml
 create mode 100644 input-selects.yaml
 create mode 100644 scenes/balcony-off.yaml
 create mode 100644 scenes/dining-area-off.yaml
 create mode 100644 scenes/ericks-desk-lamp-off.yaml
 create mode 100644 scenes/living-room-off.yaml
 create mode 100644 scenes/master-bath-off.yaml
 create mode 100644 scenes/master-bedroom-off.yaml
 create mode 100644 scenes/office-off.yaml

diff --git a/automations/dining-area-on-at-entry.yaml b/automations/dining-area-on-at-entry.yaml
index c954360..fe4ac0f 100644
--- a/automations/dining-area-on-at-entry.yaml
+++ b/automations/dining-area-on-at-entry.yaml
@@ -1,8 +1,8 @@
 alias: Turn on dining area lights when front door opens
 trigger:
-  - platform: state
-    entity_id: binary_sensor.front_door
-    to: 'off'
+  platform: state
+  entity_id: binary_sensor.front_door
+  to: 'off'
 condition:
   condition: and
   conditions:
diff --git a/automations/dining-area-timeout.yaml b/automations/dining-area-timeout.yaml
index 6bae2a4..b4f6439 100644
--- a/automations/dining-area-timeout.yaml
+++ b/automations/dining-area-timeout.yaml
@@ -1,8 +1,8 @@
 alias: Turn off dining area lights after no motion
 trigger:
-  - platform: state
-    entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
+  to: 'on'
 condition:
   condition: or
   conditions:
diff --git a/automations/dining-area-window-opened-outside.yaml b/automations/dining-area-window-opened-outside.yaml
index 86dfdde..b92ebfd 100644
--- a/automations/dining-area-window-opened-outside.yaml
+++ b/automations/dining-area-window-opened-outside.yaml
@@ -1,8 +1,8 @@
 alias: Turn on lights when dining room window opened from outside
 trigger:
-  - platform: state
-    entity_id: binary_sensor.dining_area_window_motion
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.dining_area_window_motion
+  to: 'on'
 condition:
   condition: and
   conditions:
diff --git a/automations/kitchen-light-timeout.yaml b/automations/kitchen-light-timeout.yaml
index 1cae449..e273f0d 100644
--- a/automations/kitchen-light-timeout.yaml
+++ b/automations/kitchen-light-timeout.yaml
@@ -1,13 +1,13 @@
 alias: Turn off kitchen light after no motion
 trigger:
-  - platform: state
-    entity_id: switch.kitchen
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.kitchen
+  to: 'on'
 condition:
-  condition: and
+  condition: or
   conditions:
     - condition: state
-      entity_id: binary_sensor.kitchen
+      entity_id: switch.kitchen
       state: 'on'
 action:
   service: homeassistant.turn_on
diff --git a/automations/lights-off-when-alarm-away.yaml b/automations/lights-off-when-alarm-away.yaml
index 25da64c..84d187c 100644
--- a/automations/lights-off-when-alarm-away.yaml
+++ b/automations/lights-off-when-alarm-away.yaml
@@ -1,8 +1,8 @@
 alias: Turn off lights when alarm is set to away
 trigger:
-  - platform: state
-    entity_id: alarm_control_panel.shm
-    to: 'armed_away'
+  platform: state
+  entity_id: alarm_control_panel.shm
+  to: 'armed_away'
 action:
   service: homeassistant.turn_off
   entity_id:
diff --git a/automations/living-room-timeout.yaml b/automations/living-room-timeout.yaml
index 6a87996..77a18d5 100644
--- a/automations/living-room-timeout.yaml
+++ b/automations/living-room-timeout.yaml
@@ -1,8 +1,8 @@
 alias: Turn off living room lights after no motion
 trigger:
-  - platform: state
-    entity_id: binary_sensor.lr_motion_sensor_over_slider
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.lr_motion_sensor_over_slider
+  to: 'on'
 condition:
   condition: or
   conditions:
diff --git a/automations/maybe-an-earthquake.yaml b/automations/maybe-an-earthquake.yaml
index e507716..e04d6cd 100644
--- a/automations/maybe-an-earthquake.yaml
+++ b/automations/maybe-an-earthquake.yaml
@@ -1,8 +1,8 @@
 alias: Turn on all lights when all accelerometers move
 trigger:
-  - platform: state
-    entity_id: binary_sensor.office_cabinet_door_motion
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.office_cabinet_door_motion
+  to: 'on'
 condition:
   condition: and
   conditions:
diff --git a/automations/office-lights-timeout.yaml b/automations/office-lights-timeout.yaml
index 9a15d6f..ab52771 100644
--- a/automations/office-lights-timeout.yaml
+++ b/automations/office-lights-timeout.yaml
@@ -1,8 +1,8 @@
 alias: Turn off office lights after no motion
 trigger:
-  - platform: state
-    entity_id: binary_sensor.office_motion_sensor_over_closet
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.office_motion_sensor_over_closet
+  to: 'on'
 condition:
   condition: or
   conditions:
diff --git a/automations/scenes-balcony.yaml b/automations/scenes-balcony.yaml
new file mode 100644
index 0000000..35b7684
--- /dev/null
+++ b/automations/scenes-balcony.yaml
@@ -0,0 +1,25 @@
+alias: Scene Balcony
+trigger:
+  platform: state
+  entity_id: input_select.scene_balcony
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_balcony", "Nightlight" ) %}
+          scene.balcony_nightlight
+        {%-elif is_state( "input_select.scene_balcony", "Dimmed" ) %}
+          scene.balcony_dimmed
+        {%-elif is_state( "input_select.scene_balcony", "Relax" ) %}
+          scene.balcony_relax
+        {%-elif is_state( "input_select.scene_balcony", "Read" ) %}
+          scene.balcony_read
+        {%-elif is_state( "input_select.scene_balcony", "Bright" ) %}
+          scene.balcony_concentrate
+        {%-elif is_state( "input_select.scene_balcony", "Off" ) %}
+          scene.balcony_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_balcony
+      option: "-"
diff --git a/automations/scenes-dining-area.yaml b/automations/scenes-dining-area.yaml
new file mode 100644
index 0000000..b1946a7
--- /dev/null
+++ b/automations/scenes-dining-area.yaml
@@ -0,0 +1,25 @@
+alias: Scene Dining Area
+trigger:
+  platform: state
+  entity_id: input_select.scene_da
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_da", "Nightlight" ) %}
+          scene.da_nightlight
+        {%-elif is_state( "input_select.scene_da", "Dimmed" ) %}
+          scene.da_dimmed
+        {%-elif is_state( "input_select.scene_da", "Relax" ) %}
+          scene.da_relax
+        {%-elif is_state( "input_select.scene_da", "Read" ) %}
+          scene.da_read
+        {%-elif is_state( "input_select.scene_da", "Bright" ) %}
+          scene.da_concentrate
+        {%-elif is_state( "input_select.scene_da", "Off" ) %}
+          scene.da_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_da
+      option: "-"
diff --git a/automations/scenes-ericks-desk-lamp.yaml b/automations/scenes-ericks-desk-lamp.yaml
new file mode 100644
index 0000000..0eb21f2
--- /dev/null
+++ b/automations/scenes-ericks-desk-lamp.yaml
@@ -0,0 +1,25 @@
+alias: Scene Erick's Desk Lamp
+trigger:
+  platform: state
+  entity_id: input_select.scene_ericks_desk_lamp
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_ericks_desk_lamp", "Nightlight" ) %}
+          scene.ericks_desk_lamp_nightlight
+        {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Dimmed" ) %}
+          scene.ericks_desk_lamp_dimmed
+        {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Relax" ) %}
+          scene.ericks_desk_lamp_relax
+        {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Read" ) %}
+          scene.ericks_desk_lamp_read
+        {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Bright" ) %}
+          scene.ericks_desk_lamp_concentrate
+        {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Off" ) %}
+          scene.ericks_desk_lamp_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_ericks_desk_lamp
+      option: "-"
diff --git a/automations/scenes-living-room.yaml b/automations/scenes-living-room.yaml
new file mode 100644
index 0000000..608cf4f
--- /dev/null
+++ b/automations/scenes-living-room.yaml
@@ -0,0 +1,25 @@
+alias: Scene Living Room
+trigger:
+  platform: state
+  entity_id: input_select.scene_lr
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_lr", "Nightlight" ) %}
+          scene.lr_nightlight
+        {%-elif is_state( "input_select.scene_lr", "Dimmed" ) %}
+          scene.lr_dimmed
+        {%-elif is_state( "input_select.scene_lr", "Relax" ) %}
+          scene.lr_relax
+        {%-elif is_state( "input_select.scene_lr", "Read" ) %}
+          scene.lr_read
+        {%-elif is_state( "input_select.scene_lr", "Bright" ) %}
+          scene.lr_concentrate
+        {%-elif is_state( "input_select.scene_lr", "Off" ) %}
+          scene.lr_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_lr
+      option: "-"
diff --git a/automations/scenes-master-bath.yaml b/automations/scenes-master-bath.yaml
new file mode 100644
index 0000000..a1c134b
--- /dev/null
+++ b/automations/scenes-master-bath.yaml
@@ -0,0 +1,25 @@
+alias: Scene Master Bath
+trigger:
+  platform: state
+  entity_id: input_select.scene_master_bath
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_master_bath", "Nightlight" ) %}
+          scene.master_bath_nightlight
+        {%-elif is_state( "input_select.scene_master_bath", "Dimmed" ) %}
+          scene.master_bath_dimmed
+        {%-elif is_state( "input_select.scene_master_bath", "Relax" ) %}
+          scene.master_bath_relax
+        {%-elif is_state( "input_select.scene_master_bath", "Read" ) %}
+          scene.master_bath_read
+        {%-elif is_state( "input_select.scene_master_bath", "Bright" ) %}
+          scene.master_bath_concentrate
+        {%-elif is_state( "input_select.scene_master_bath", "Off" ) %}
+          scene.master_bath_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_master_bath
+      option: "-"
diff --git a/automations/scenes-master-bedroom.yaml b/automations/scenes-master-bedroom.yaml
new file mode 100644
index 0000000..beb3d2a
--- /dev/null
+++ b/automations/scenes-master-bedroom.yaml
@@ -0,0 +1,25 @@
+alias: Scene Master Bedroom
+trigger:
+  platform: state
+  entity_id: input_select.scene_master_bedroom
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_master_bedroom", "Nightlight" ) %}
+          scene.master_bedroom_nightlight
+        {%-elif is_state( "input_select.scene_master_bedroom", "Dimmed" ) %}
+          scene.master_bedroom_dimmed
+        {%-elif is_state( "input_select.scene_master_bedroom", "Relax" ) %}
+          scene.master_bedroom_relax
+        {%-elif is_state( "input_select.scene_master_bedroom", "Read" ) %}
+          scene.master_bedroom_read
+        {%-elif is_state( "input_select.scene_master_bedroom", "Bright" ) %}
+          scene.master_bedroom_concentrate
+        {%-elif is_state( "input_select.scene_master_bedroom", "Off" ) %}
+          scene.master_bedroom_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_master_bedroom
+      option: "-"
diff --git a/automations/scenes-office.yaml b/automations/scenes-office.yaml
new file mode 100644
index 0000000..630da29
--- /dev/null
+++ b/automations/scenes-office.yaml
@@ -0,0 +1,25 @@
+alias: Scene Office
+trigger:
+  platform: state
+  entity_id: input_select.scene_office
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_office", "Nightlight" ) %}
+          scene.office_nightlight
+        {%-elif is_state( "input_select.scene_office", "Dimmed" ) %}
+          scene.office_dimmed
+        {%-elif is_state( "input_select.scene_office", "Relax" ) %}
+          scene.office_relax
+        {%-elif is_state( "input_select.scene_office", "Read" ) %}
+          scene.office_read
+        {%-elif is_state( "input_select.scene_office", "Bright" ) %}
+          scene.office_concentrate
+        {%-elif is_state( "input_select.scene_office", "Off" ) %}
+          scene.office_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_office
+      option: "-"
diff --git a/automations/update-notification.yaml b/automations/update-notification.yaml
index 50072e7..18bbe7e 100644
--- a/automations/update-notification.yaml
+++ b/automations/update-notification.yaml
@@ -1,7 +1,7 @@
 alias: Update notifications
 trigger:
-  - platform: state
-    entity_id: updater.updater
+  platform: state
+  entity_id: updater.updater
 action:
   service: notify.jabber
   data:
diff --git a/automations/wireless-charger-timeout.yaml b/automations/wireless-charger-timeout.yaml
index 599054d..304596b 100644
--- a/automations/wireless-charger-timeout.yaml
+++ b/automations/wireless-charger-timeout.yaml
@@ -1,8 +1,8 @@
 alias: Turn off wireless charger after delay
 trigger:
-  - platform: state
-    entity_id: switch.wireless_charger
-    to: 'on'
+  platform: state
+  entity_id: switch.wireless_charger
+  to: 'on'
 action:
   service: homeassistant.turn_on
   entity_id: script.wireless_charger_set_timeout
diff --git a/configuration.yaml b/configuration.yaml
index 0bdeefd..63c5242 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -40,10 +40,6 @@ recorder:
 # Enables support for tracking state changes over time.
 history:
 
-# Save events to logentries service
-logentries:
-  token: !secret logentries_token
-
 # Discover some devices automatically
 discovery:
 
@@ -88,4 +84,6 @@ shell_command: !include shell_commands.yaml
 automation: !include_dir_list automations
 
 # Controls
+input_select: !include input-selects.yaml
+
 input_slider: !include input-sliders.yaml
diff --git a/customizations/lights.yaml b/customizations/lights.yaml
index 9a132cd..c4a7306 100644
--- a/customizations/lights.yaml
+++ b/customizations/lights.yaml
@@ -1,3 +1,5 @@
+light.office:
+  friendly_name: Office Lamp
 light.ericks_desk_lamp:
   icon: mdi:lightbulb-outline
 light.ceiling_fan_1:
diff --git a/customizations/scenes.yaml b/customizations/scenes.yaml
index b91cf16..9b5126b 100644
--- a/customizations/scenes.yaml
+++ b/customizations/scenes.yaml
@@ -13,6 +13,9 @@ scene.master_bedroom_read:
 scene.master_bedroom_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.master_bedroom_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off
 scene.master_bath_nightlight:
   friendly_name: 'Nightlight'
   icon: mdi:brightness-4
@@ -28,6 +31,9 @@ scene.master_bath_read:
 scene.master_bath_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.master_bath_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off
 scene.lr_nightlight:
   friendly_name: 'Nightlight'
   icon: mdi:brightness-4
@@ -43,6 +49,9 @@ scene.lr_read:
 scene.lr_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.lr_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off
 scene.da_nightlight:
   friendly_name: 'Nightlight'
   icon: mdi:brightness-4
@@ -58,6 +67,9 @@ scene.da_read:
 scene.da_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.da_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off
 scene.office_nightlight:
   friendly_name: 'Nightlight'
   icon: mdi:brightness-4
@@ -73,12 +85,18 @@ scene.office_read:
 scene.office_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.office_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off
 scene.ericks_desk_lamp_nightlight:
   friendly_name: 'Desk Lamp Dim'
   icon: mdi:brightness-3
 scene.ericks_desk_lamp_relax:
   friendly_name: 'Desk Lamp Bright'
   icon: mdi:brightness-1
+scene.ericks_desk_lamp_off:
+  friendly_name: 'Desk Lamp Off'
+  icon: mdi:flashlight-off
 scene.balcony_nightlight:
   friendly_name: 'Nightlight'
   icon: mdi:brightness-4
@@ -94,3 +112,6 @@ scene.balcony_read:
 scene.balcony_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.balcony_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off
diff --git a/customizations/sensors.yaml b/customizations/sensors.yaml
index b66e0a0..9cb485d 100644
--- a/customizations/sensors.yaml
+++ b/customizations/sensors.yaml
@@ -101,3 +101,33 @@ sensor.pws_uv:
 sensor.pws_solarradiation:
   friendly_name: Solar Radiation
   icon: mdi:weather-sunny
+sensor.pws_dewpoint_c:
+  friendly_name: Dew Point (C)
+sensor.pws_dewpoint_f:
+  friendly_name: Dew Point (F)
+sensor.pws_feelslike_c:
+  friendly_name: Feels Like (C)
+sensor.pws_feelslike_f:
+  friendly_name: Feels Like (F)
+sensor.pws_heat_index_c:
+  friendly_name: Heat Index (C)
+sensor.pws_heat_index_f:
+  friendly_name: Heat Index (F)
+sensor.pws_precip_today_in:
+  friendly_name: Precipitation (in)
+sensor.pws_precip_today_metric:
+  friendly_name: Precipitation (mm)
+sensor.pws_pressure_mb:
+  friendly_name: Pressure (mb)
+sensor.pws_station_id:
+  friendly_name: Weather Station ID
+sensor.pws_temp_c:
+  friendly_name: Temperature (C)
+sensor.pws_visibility_km:
+  friendly_name: Visibility
+sensor.pws_wind_dir:
+  friendly_name: Wind Direction
+sensor.pws_wind_kph:
+  friendly_name: Wind Speed (kph)
+sensor.pws_wind_mph:
+  friendly_name: Wind Speed (mph)
diff --git a/groups.yaml b/groups.yaml
index c4f45d0..bc8abc9 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -57,61 +57,40 @@ master_bedroom:
   name: Master Bedroom
   entities:
     - light.nightstand
-    - scene.master_bedroom_nightlight
-    - scene.master_bedroom_dimmed
-    - scene.master_bedroom_relax
-    - scene.master_bedroom_read
+    - input_select.scene_master_bedroom
 master_bathroom:
   name: Master Bathroom
   entities:
     - light.master_bath_1
     - light.master_bath_2
     - light.master_bath_3
-    - scene.master_bath_nightlight
-    - scene.master_bath_dimmed
-    - scene.master_bath_relax
-    - scene.master_bath_read
-    - scene.master_bath_concentrate
+    - input_select.scene_master_bath
 living_room:
   name: Living Room
   entities:
     - light.endtable
     - light.corner_table
-    - scene.lr_nightlight
-    - scene.lr_dimmed
-    - scene.lr_relax
-    - scene.lr_read
+    - input_select.scene_lr
 dining_area:
   name: Kitchen & Dining
   entities:
     - switch.kitchen
     - light.ceiling_fan_1
     - light.ceiling_fan_2
-    - scene.da_nightlight
-    - scene.da_dimmed
-    - scene.da_relax
-    - scene.da_read
+    - input_select.scene_da
 office:
   name: Office
   entities:
     - light.office
     - light.ericks_desk_lamp
     - switch.lava_lamp
-    - scene.office_nightlight
-    - scene.office_dimmed
-    - scene.office_relax
-    - scene.office_read
-    - scene.ericks_desk_lamp_nightlight
-    - scene.ericks_desk_lamp_relax
+    - input_select.scene_office
+    - input_select.scene_ericks_desk_lamp
 balcony:
   name: Balcony
   entities:
     - light.balcony
-    - scene.balcony_nightlight
-    - scene.balcony_dimmed
-    - scene.balcony_relax
-    - scene.balcony_read
-    - scene.balcony_concentrate
+    - input_select.scene_balcony
 other:
   name: Other
   entities:
diff --git a/input-selects.yaml b/input-selects.yaml
new file mode 100644
index 0000000..21e75cf
--- /dev/null
+++ b/input-selects.yaml
@@ -0,0 +1,77 @@
+scene_balcony:
+  name: Scene
+  icon: mdi:brightness-auto
+  initial: "-"
+  options:
+    - "-"
+    - "Off"
+    - Nightlight
+    - Dimmed
+    - Relax
+    - Read
+    - Bright
+scene_da:
+  name: Scene
+  icon: mdi:brightness-auto
+  initial: "-"
+  options:
+    - "-"
+    - "Off"
+    - Nightlight
+    - Dimmed
+    - Relax
+    - Read
+scene_ericks_desk_lamp:
+  name: Desk Lamp Scene
+  icon: mdi:brightness-auto
+  initial: "-"
+  options:
+    - "-"
+    - "Off"
+    - Nightlight
+    - Relax
+scene_lr:
+  name: Scene
+  icon: mdi:brightness-auto
+  initial: "-"
+  options:
+    - "-"
+    - "Off"
+    - Nightlight
+    - Dimmed
+    - Relax
+    - Read
+scene_master_bath:
+  name: Scene
+  icon: mdi:brightness-auto
+  initial: "-"
+  options:
+    - "-"
+    - "Off"
+    - Nightlight
+    - Dimmed
+    - Relax
+    - Read
+    - Bright
+scene_master_bedroom:
+  name: Scene
+  icon: mdi:brightness-auto
+  initial: "-"
+  options:
+    - "-"
+    - "Off"
+    - Nightlight
+    - Dimmed
+    - Relax
+    - Read
+scene_office:
+  name: Office Lamp Scene
+  icon: mdi:brightness-auto
+  initial: "-"
+  options:
+    - "-"
+    - "Off"
+    - Nightlight
+    - Dimmed
+    - Relax
+    - Read
diff --git a/scenes/balcony-off.yaml b/scenes/balcony-off.yaml
new file mode 100644
index 0000000..14ee175
--- /dev/null
+++ b/scenes/balcony-off.yaml
@@ -0,0 +1,4 @@
+name: Balcony Off
+entities:
+  light.balcony:
+    state: off
diff --git a/scenes/dining-area-off.yaml b/scenes/dining-area-off.yaml
new file mode 100644
index 0000000..32cb76b
--- /dev/null
+++ b/scenes/dining-area-off.yaml
@@ -0,0 +1,6 @@
+name: DA Off
+entities:
+  light.ceiling_fan_1:
+    state: off
+  light.ceiling_fan_2:
+    state: off
diff --git a/scenes/ericks-desk-lamp-off.yaml b/scenes/ericks-desk-lamp-off.yaml
new file mode 100644
index 0000000..50eb45e
--- /dev/null
+++ b/scenes/ericks-desk-lamp-off.yaml
@@ -0,0 +1,4 @@
+name: Erick's Desk Lamp Off
+entities:
+  light.ericks_desk_lamp:
+    state: off
diff --git a/scenes/living-room-off.yaml b/scenes/living-room-off.yaml
new file mode 100644
index 0000000..48f2ec0
--- /dev/null
+++ b/scenes/living-room-off.yaml
@@ -0,0 +1,6 @@
+name: LR Off
+entities:
+  light.endtable:
+    state: off
+  light.corner_table:
+    state: off
diff --git a/scenes/master-bath-off.yaml b/scenes/master-bath-off.yaml
new file mode 100644
index 0000000..f7fb8ef
--- /dev/null
+++ b/scenes/master-bath-off.yaml
@@ -0,0 +1,8 @@
+name: Master Bath Off
+entities:
+  light.master_bath_1:
+    state: off
+  light.master_bath_2:
+    state: off
+  light.master_bath_3:
+    state: off
diff --git a/scenes/master-bedroom-off.yaml b/scenes/master-bedroom-off.yaml
new file mode 100644
index 0000000..96ce7a3
--- /dev/null
+++ b/scenes/master-bedroom-off.yaml
@@ -0,0 +1,4 @@
+name: Master Bedroom Off
+entities:
+  light.nightstand:
+    state: off
diff --git a/scenes/office-off.yaml b/scenes/office-off.yaml
new file mode 100644
index 0000000..dac4796
--- /dev/null
+++ b/scenes/office-off.yaml
@@ -0,0 +1,4 @@
+name: Office Off
+entities:
+  light.office:
+    state: off
diff --git a/scripts.yaml b/scripts.yaml
index a51bff1..5d0d535 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -140,7 +140,7 @@ kitchen_light_set_timeout:
         entity_id: script.kitchen_light_timeout
 
 kitchen_light_timeout:
-  alias: "Turn off kitchen light after 15 minutes of inactivity"
+  alias: "Turn off kitchen light after 5 minutes of inactivity"
   sequence:
     - delay:
         minutes: 5
-- 
GitLab