diff --git a/apps/apps.yaml b/apps/apps.yaml
index 642018b..9da968e 100644
--- a/apps/apps.yaml
+++ b/apps/apps.yaml
@@ -21,4 +21,8 @@ motion_tracker:
       motion_sensors: binary_sensor.hallway_motion
     restroom:
       motion_sensors: binary_sensor.restroom_motion
+    garage:
+      motion_sensors: binary_sensor.garage_motion
+    kitchen: 
+      motion_sensors: binary_sensor.kitchen_motion
 
diff --git a/apps/rooms/garage.yaml b/apps/rooms/garage.yaml
new file mode 100644
index 0000000..6d55782
--- /dev/null
+++ b/apps/rooms/garage.yaml
@@ -0,0 +1,7 @@
+light_garage:
+  module: smartlight
+  class: SmartLight
+  entity: switch.garage_01
+
+  smart_conditions: sensor.garage_last_motion < 3
+  blocking_conditions: sensor.garage_motion_light_level > 10 and not self
diff --git a/apps/rooms/kitchen.yaml b/apps/rooms/kitchen.yaml
new file mode 100644
index 0000000..a43a83a
--- /dev/null
+++ b/apps/rooms/kitchen.yaml
@@ -0,0 +1,22 @@
+light_kitchen_sink:
+  module: smartlight
+  class: SmartLight
+  entity: light.kitchen_sink
+
+  smart_conditions: 
+    - light.kitchen_sink_switch
+    - sensor.kitchen_last_motion < 3 and (sensor.garage_motion_light_level < 10 or self)
+  
+  light_brightness_pct:
+    100: light.kitchen_sink_switch
+    1: binary_sensor.day_interval_night or input_boolean.sleeping
+    15: True
+
+light_kitchen_sink_switch:
+  module: smartswitch
+  class: SmartSwitch
+
+  entity: light.kitchen_sink_switch
+
+  off_events:
+    - turn_off_all_lights
\ No newline at end of file