diff --git a/lock b/bin/lock
similarity index 100%
rename from lock
rename to bin/lock
diff --git a/i3status.toml b/conf.d/i3status_annoyance.conf
similarity index 100%
rename from i3status.toml
rename to conf.d/i3status_annoyance.conf
diff --git a/conf.d/i3status_silence.toml b/conf.d/i3status_silence.toml
new file mode 100644
index 0000000..2e1fb16
--- /dev/null
+++ b/conf.d/i3status_silence.toml
@@ -0,0 +1,45 @@
+theme = "slick"
+icons = "awesome5"
+
+[[block]]
+block = "cpu"
+interval = 1
+format = "{barchart} {utilization}%"
+
+[[block]]
+block = "memory"
+format_mem = "{Mug}/{MTg}GB ({Mup}%)"
+format_swap = "{SUm}MB/{STm}MB({SUp}%)"
+display_type = "memory"
+icons = true
+clickable = true
+interval = 5
+warning_mem = 80
+warning_swap = 80
+critical_mem = 95
+critical_swap = 95
+
+# [[block]]
+# block = "memory"
+# format_mem = "{Mug}/{MTg}GB ({Mup}%)"
+# format_swap = "{SUg}/{STg}GB ({SUp}%)"
+# display_type = "swap"
+# icons = true
+# clickable = true
+# interval = 5
+# warning_mem = 80
+# warning_swap = 80
+# critical_mem = 95
+# critical_swap = 95
+
+[[block]]
+block = "battery"
+interval = 10
+format = "{percentage}% {time}"
+
+[[block]]
+block = "time"
+format = "%Y/%m/%d %R"
+timezone = "Europe/Berlin"
+interval = 60
+locale = "de_DE"
diff --git a/config b/config
index 2432ca6..5981a52 100644
--- a/config
+++ b/config
@@ -17,7 +17,7 @@ set $right l
 # Your preferred terminal emulator
 set $term termite
 set $background $HOME/Cloud/xkonni/Pictures/wallpaper/5k_bavarian_forest_bw.jpg
-set $lock_cmd $HOME/.config/sway/lock
+set $lock_cmd $HOME/.config/sway/bin/lock
 
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
@@ -31,12 +31,13 @@ output * bg $background fill
 # You can get the names of your outputs by running: swaymsg -t get_outputs
 
 ### Idle configuration
-bindsym $mod+Ctrl+Escape exec $lock_cmd
 exec swayidle -w \
-       timeout 300 '$lock_cmd' \
        timeout 600 'swaymsg "output * dpms off"' \
-       resume 'swaymsg "output * dpms on"' \
+           resume 'swaymsg "output * dpms on"' \
+       timeout 900 '$lock_cmd' \
+       timeout 1800 'systemctl suspend-then-hibernate' \
        before-sleep '$lock_cmd'
+bindsym $mod+Ctrl+Escape exec $lock_cmd
 
 ### Input configuration
 # You can get the names of your inputs by running: swaymsg -t get_inputs
@@ -207,7 +208,7 @@ bindsym $mod+r mode "resize"
 # Read `man 5 sway-bar` for more information about this section.
 bar {
     position top
-    status_command i3status-rs $HOME/.config/sway/i3status.toml
+    status_command i3status-rs $HOME/.config/sway/conf.d/i3status_$(hostname).toml
     font "Cascadia Code PL Regular 11"
     colors {
         separator #666666