diff --git a/automations/files/scripts/modes.yaml b/automations/files/scripts/modes.yaml
index 88d7536..d3f19de 100644
--- a/automations/files/scripts/modes.yaml
+++ b/automations/files/scripts/modes.yaml
@@ -28,12 +28,19 @@ good_night:
         - light.hallway_lightstrip
         - light.computer_computer_cave_background
     - service: switch.turn_off
-      entity_id:
-        - switch.desk_motor_on_off
-        - switch.computer_outlet
-    - service: shell_command.pc_suspend
+      entity_id: switch.desk_motor_on_off
+    - service: input_boolean.turn_off
+      target:
+        entity_id: input_boolean.pc_caffeine
+    - service: script.pc_sleep
+    - service: hassio.addon_stop
+      data:
+        addon: core_samba
+    - service: cover.close_cover
+      target:
+        entity_id: cover.bedroom_blind
   mode: single
-  icon: 'mdi:weather-night'
+  icon: mdi:weather-night
 good_morning:
   alias: Good Morning
   sequence:
@@ -44,12 +51,11 @@ good_morning:
         option: Day
       entity_id: input_select.home_mode
     - service: switch.turn_on
-      data: { }
       entity_id:
         - switch.desk_motor_on_off
         - switch.computer_outlet
   mode: single
-  icon: 'mdi:weather-sunny'
+  icon: mdi:weather-sunny
 leave_home:
   alias: Leave Home
   sequence:
@@ -60,7 +66,6 @@ leave_home:
         option: Away
       entity_id: input_select.home_mode
     - service: light.turn_off
-      data: { }
       entity_id:
         - light.desk_lightbar
         - light.desk_lightbar_ambilight
@@ -82,9 +87,9 @@ leave_home:
         - light.computer_computer_cave_background
     - service: switch.turn_off
       entity_id: switch.desk_motor_on_off
-    - service: shell_command.pc_suspend
+    - service: script.pc_sleep
   mode: single
-  icon: 'mdi:home-export-outline'
+  icon: mdi:home-export-outline
 arrive_home:
   alias: Arrive Home
   sequence:
@@ -95,10 +100,8 @@ arrive_home:
         option: Day
       entity_id: input_select.home_mode
     - service: switch.turn_on
-      data: { }
       entity_id:
         - switch.desk_motor_on_off
         - switch.computer_outlet
   mode: single
-  icon: 'mdi:home-import-outline'
-
+  icon: mdi:home-import-outline
\ No newline at end of file