diff --git a/apps/global/homecinema.yaml b/apps/global/homecinema.yaml
index 1593e74..999a9e6 100644
--- a/apps/global/homecinema.yaml
+++ b/apps/global/homecinema.yaml
@@ -25,7 +25,8 @@ samsung_the_frame:
         power_off:
           trigger_conditions:
             - binary_sensor.is_everybody_sleeping or binary_sensor.is_living_room_sleeping or not binary_sensor.someone_home
-            - binary_sensor.projector_on or binary_sensor.projector_screen_down
+            - binary_sensor.projector_screen_down
+        #hdmi: binary_sensor.vertex2_tx0_plus5_for_a_while and binary_sensor.vertex2_has_input_signal and not binary_sensor.projector_screen_down
         hdmi: binary_sensor.vertex2_has_input_signal and not binary_sensor.projector_screen_down
         manual: binary_sensor.is_tv_on and not binary_sensor.tv_auto_shutdown
         tv_off: not binary_sensor.living_room_occupancy
@@ -74,7 +75,7 @@ w4000i:
         time: 30
       continuous_condition.has_allm_signal_for_a_while:
         conditions: binary_sensor.vertex2_allm
-        time: 5
+        time: 10
 
   attributes_override:
     icon: sensor.projector_icon
@@ -121,11 +122,10 @@ bravia_theatre:
     trigger_conditions: sensor.vertex2_output_selected == 'Projector' or input_boolean.use_bravia_theater_for_the_frame
     blocking_conditions: not binary_sensor.vertex2_has_input_signal
 
-projection_screen:
-  module: smartshutter
-  class: SmartShutter
-  entity: cover.living_room_projection_screen
-  close_position: 22
+projection_screen_switch:
+  module: smartswitch
+  class: SmartSwitch
+  entity: input_boolean.projection_screen
 
   toggle_events:
     apple_tv_mute_long_press:
@@ -137,16 +137,13 @@ projection_screen:
         new_state:
           state: "on"
 
-  # close_conditions: # close mean screen down
-  #   # when the projector is turn back on, it can happen that this condition is evaluated before projector_off_for_a_while is updated
-  #   # so I need to test both binary_sensor.projector_on and not binary_sensor.projector_off_for_a_while
-  #   trigger_conditions: binary_sensor.projector_on or not binary_sensor.projector_off_for_a_while
-  #   disable_conditions:
-  #     - binary_sensor.day_interval_night and not binary_sensor.projector_on
-  #     - binary_sensor.is_everybody_sleeping and not binary_sensor.projector_on
+projection_screen:
+  module: smartshutter
+  class: SmartShutter
+  entity: cover.living_room_projection_screen
+  close_position: 22
 
-  open_conditions: # close mean screen up
-    trigger_conditions: binary_sensor.projector_off_for_a_while
+  close_conditions: input_boolean.projection_screen
 
 vertex_2:
   module: vertex2
@@ -158,7 +155,7 @@ vertex_2:
       binary_sensor.is_tv_on: false
       binary_sensor.vertex2_has_input_signal: false
     sensors:
-      binary_sensor.projector_screen_down: cover.living_room_projection_screen.current_position < 90
+      binary_sensor.projector_screen_down: input_boolean.projection_screen
 
   input_config:
     default: