diff --git a/automations/kitchen-light-timeout.yaml b/automations/kitchen-light-timeout.yaml
index d4fd07da1ae353f027025342ea599a7b7528aee9..1cae449a75cb97823b211dc9e7d0717e02dd15f8 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: binary_sensor.kitchen
+    entity_id: switch.kitchen
     to: 'on'
 condition:
-  condition: or
+  condition: and
   conditions:
     - condition: state
-      entity_id: switch.kitchen
+      entity_id: binary_sensor.kitchen
       state: 'on'
 action:
   service: homeassistant.turn_on
diff --git a/configuration.yaml b/configuration.yaml
index 4d87869aee3ef7cf0f3251e53aef90205681e408..0bdeefdae1e607cf186f9cd09481f5b826f19f2f 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -32,9 +32,18 @@ updater:
 # Enables the frontend
 frontend:
 
+# Set recorder options
+recorder:
+  # purge_days: 365
+  db_url: !secret mysql_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:
 
diff --git a/scripts.yaml b/scripts.yaml
index b6e8cc08eaa81da8bcdb1f4564877077116585c4..a51bff18002e43d6a80f8b43847297774cbcd5ff 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -143,7 +143,7 @@ kitchen_light_timeout:
   alias: "Turn off kitchen light after 15 minutes of inactivity"
   sequence:
     - delay:
-        minutes: 15
+        minutes: 5
     - service: switch.turn_off
       data:
         entity_id: switch.kitchen
diff --git a/secrets.yaml b/secrets.yaml
index 2f623ad514c09618f7b8809e2e361fdc47adbd36..24cc3cb95d1339cd839bb5cdd6bead293783e3a0 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -11,3 +11,5 @@ gravatar_chris:
 gravatar_chris_2:
 wunderground_key:
 wunderground_pws_id:
+logentries_token:
+mysql_recorder: