diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
new file mode 100644
index 0000000..f5d371f
--- /dev/null
+++ b/.config/dunst/dunstrc
@@ -0,0 +1,20 @@
+[global]
+    follow = keyboard
+    scale = 1
+    idle_threshold = 3
+    font = Monospace 10
+    history_length = 100
+    corner_radius = 5
+    ignore_dbusclose = true
+    timeout = 0
+    background = "#333333"
+    frame_color = "#009900"
+
+[urgency_low]
+    foreground = "#009900"
+
+[urgency_normal]
+    foreground = "#ffee33"
+
+[urgency_critical]
+    foreground = "#aa3333"
diff --git a/.config/i3status-rust/config.toml b/.config/i3status-rust/config.toml
index 6e92eba..d115b80 100644
--- a/.config/i3status-rust/config.toml
+++ b/.config/i3status-rust/config.toml
@@ -29,37 +29,37 @@ format = "$icon $ip $graph_down $speed_down $graph_up $speed_up via $device "
 block = "net"
 device = "wlp3s0"
 inactive_format = "$icon x "
-format = "$icon $ip $speed_down $speed_up $signal_strength $ssid $frequency "
+format = "$icon $ip $speed_down $speed_up $signal_strength $ssid $frequency.eng(w:3) "
 
 [[block]]
 block = "disk_space"
 path = "/"
-warning = 70.0
-alert = 85.0
+warning = 80.0
+alert = 90.0
 info_type = "used"
 format = "$icon $path $percentage "
 
 [[block]]
 block = "disk_space"
 path = "/boot"
-warning = 70.0
-alert = 85.0
+warning = 80.0
+alert = 90.0
 info_type = "used"
 format = "$icon $path $percentage "
 
 [[block]]
 block = "disk_space"
 path = "/home"
-warning = 70.0
-alert = 85.0
+warning = 80.0
+alert = 90.0
 info_type = "used"
 format = "$icon $path $percentage "
 
 [[block]]
 block = "disk_space"
 path = "/var"
-warning = 70.0
-alert = 85.0
+warning = 80.0
+alert = 90.0
 info_type = "used"
 format = "$icon $path $percentage "
 
diff --git a/.config/sway/config b/.config/sway/config
index c2b4e1e..10e6c6d 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -9,7 +9,6 @@ set $right f
 set $term alacritty
 set $editor em
 set $menu bemenu-run -i -p "" --hf "#009900" --hb "#333333"
-set $lock fuzzy-swaylock
 set $screenshot grim
 
 # use mouse + $mod to drag floating windows to their wanted position
@@ -24,9 +23,6 @@ bindsym $mod+Shift+Return exec $editor
 # take screenshot
 bindsym $mod+Print exec $screenshot
 
-# lock screen
-bindsym $mod+l exec $lock
-
 # kill focused window
 bindsym $mod+Shift+q kill
 
@@ -59,19 +55,6 @@ bindsym $mod+a focus parent
 # focus the child container
 bindsym $mod+q focus child
 
-# media keys
-set $refresh_i3status killall -SIGUSR1 i3status-rs
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status
-bindsym $mod+XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -1% && $refresh_i3status
-bindsym $mod+XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +1% && $refresh_i3status
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-bindsym XF86AudioNext exec --no-startup-id mpc next
-bindsym XF86AudioPlay exec --no-startup-id mpc toggle
-bindsym XF86AudioPrev exec --no-startup-id mpc prev
-bindsym XF86AudioStop exec --no-startup-id mpc stop
-
 # exit sway
 bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
 
@@ -124,8 +107,8 @@ bindsym $mod+4 workspace number $ws4
 bindsym $mod+5 workspace number $ws5
 bindsym $mod+6 workspace number $ws6
 bindsym $mod+7 workspace number $ws7
-bindsym $mod+8 workspace number $w8
-bindsym $mod+9 workspace number $w9
+bindsym $mod+8 workspace number $ws8
+bindsym $mod+9 workspace number $ws9
 bindsym $mod+0 workspace number $ws10
 
 # Move focused container to workspace
diff --git a/.config/sway/config.d/dunst b/.config/sway/config.d/dunst
new file mode 100644
index 0000000..f95ae4d
--- /dev/null
+++ b/.config/sway/config.d/dunst
@@ -0,0 +1,4 @@
+# dunst control
+bindsym $mod+comma exec dunstctl close
+bindsym $mod+Shift+comma exec dunstctl close-all
+bindsym $mod+period exec dunstctl history-pop
diff --git a/.config/sway/config.d/media b/.config/sway/config.d/media
new file mode 100644
index 0000000..02cd8f0
--- /dev/null
+++ b/.config/sway/config.d/media
@@ -0,0 +1,12 @@
+# media keys
+set $refresh_i3status killall -SIGUSR1 i3status-rs
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status
+bindsym $mod+XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -1% && $refresh_i3status
+bindsym $mod+XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +1% && $refresh_i3status
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
+bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
+bindsym XF86AudioNext exec --no-startup-id mpc next
+bindsym XF86AudioPlay exec --no-startup-id mpc toggle
+bindsym XF86AudioPrev exec --no-startup-id mpc prev
+bindsym XF86AudioStop exec --no-startup-id mpc stop
diff --git a/.config/sway/config.d/screenlock b/.config/sway/config.d/screenlock
new file mode 100644
index 0000000..019985c
--- /dev/null
+++ b/.config/sway/config.d/screenlock
@@ -0,0 +1,3 @@
+# screenlock
+set $lock fuzzy-swaylock 37c3
+bindsym $mod+Shift+l exec $lock
diff --git a/.gitignore.d/sway b/.gitignore.d/sway
index 2e0b392..e4ec63a 100644
--- a/.gitignore.d/sway
+++ b/.gitignore.d/sway
@@ -1,6 +1,19 @@
 *
+!/.config
+!/.config/dunst
+!/.config/dunst/dunstrc
+!/.config/i3status-rust
 !/.config/i3status-rust/config.toml
 !/.config/i3status-rust/secondary.toml
+!/.config/sway
 !/.config/sway/config
+!/.config/sway/config.d
+!/.config/sway/config.d/dunst
+!/.config/sway/config.d/media
+!/.config/sway/config.d/screenlock
+!/.gitignore.d
+!/.gitignore.d/sway
+!/.local
+!/.local/bin
 !/.local/bin/fuzzy-i3lock
 !/.local/bin/i3-run