diff --git a/apps/rooms/living_room.yaml b/apps/rooms/living_room.yaml
index baff10a..89737db 100644
--- a/apps/rooms/living_room.yaml
+++ b/apps/rooms/living_room.yaml
@@ -49,7 +49,13 @@ light_bookshelves:
     25: sensor.living_room_ambiance_light == 1
     100: True
 
+light_christmas_tree:
   module: smartswitch
+  class: SmartSwitch
+  entity: switch.chrismas_tree
+
+  smart_conditions: sensor.living_room_ambiance_light >= 1
+
 light_tree:
   module: smartlight
   class: SmartLight
@@ -103,7 +109,7 @@ mezzanine_curtains:
 
   close_conditions: 
     trigger_conditions: binary_sensor.projector_on or not binary_sensor.projector_off_for_a_while
-    disable_conditions: self == 'closed' and (binary_sensor.is_dark_outside or binary_sensor.is_anybody_sleeping)
+    disable_conditions: binary_sensor.is_dark_outside or binary_sensor.is_anybody_sleeping
 
 living_room_sleep_switch:
   module: smartswitch