diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
new file mode 100644
index 0000000..b05c0db
--- /dev/null
+++ b/.config/dunst/dunstrc
@@ -0,0 +1,30 @@
+[global]
+monitor = 1
+frame_width = 1
+frame_color = "#b4befe"
+separator_color= frame
+highlight = "#74c7ec"
+background = "#1e1e2e"
+foreground = "#cdd6f4"
+corner_radius = 5
+progress_bar_corner_radius = 5
+corners = top-left,bottom
+progress_bar_corners = top-left,bottom-right
+offset = (15, 25)
+gap_size = 5
+format = "<b>󰁕 %a</b>\n%s\n<i>%b</i>"
+
+[urgency_low]
+foreground = "#a6e3a1"
+frame_color = "#a6e3a1"
+default_icon = "~/.config/dunst/icons/bell-badge-low.svg"
+
+[urgency_normal]
+foreground = "#74c7ec"
+frame_color = "#74c7ec"
+default_icon = "~/.config/dunst/icons/bell-badge.svg"
+
+[urgency_critical]
+foreground = "#f38ba8"
+frame_color = "#f38ba8"
+default_icon = "~/.config/dunst/icons/alert-decagram.svg"
diff --git a/.config/dunst/icons/alert-decagram.svg b/.config/dunst/icons/alert-decagram.svg
new file mode 100644
index 0000000..9c1da29
--- /dev/null
+++ b/.config/dunst/icons/alert-decagram.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#f38ba8" d="M23,12L20.56,9.22L20.9,5.54L17.29,4.72L15.4,1.54L12,3L8.6,1.54L6.71,4.72L3.1,5.53L3.44,9.21L1,12L3.44,14.78L3.1,18.47L6.71,19.29L8.6,22.47L12,21L15.4,22.46L17.29,19.28L20.9,18.46L20.56,14.78L23,12M13,17H11V15H13V17M13,13H11V7H13V13Z" /></svg>
diff --git a/.config/dunst/icons/bell-badge-low.svg b/.config/dunst/icons/bell-badge-low.svg
new file mode 100644
index 0000000..60f3fec
--- /dev/null
+++ b/.config/dunst/icons/bell-badge-low.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#a6e3a1" d="M21 6.5C21 8.43 19.43 10 17.5 10S14 8.43 14 6.5 15.57 3 17.5 3 21 4.57 21 6.5M19 11.79C18.5 11.92 18 12 17.5 12C14.47 12 12 9.53 12 6.5C12 5.03 12.58 3.7 13.5 2.71C13.15 2.28 12.61 2 12 2C10.9 2 10 2.9 10 4V4.29C7.03 5.17 5 7.9 5 11V17L3 19V20H21V19L19 17V11.79M12 23C13.11 23 14 22.11 14 21H10C10 22.11 10.9 23 12 23Z" /></svg>
diff --git a/.config/dunst/icons/bell-badge.svg b/.config/dunst/icons/bell-badge.svg
new file mode 100644
index 0000000..4a975f9
--- /dev/null
+++ b/.config/dunst/icons/bell-badge.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M21 6.5C21 8.43 19.43 10 17.5 10S14 8.43 14 6.5 15.57 3 17.5 3 21 4.57 21 6.5M19 11.79C18.5 11.92 18 12 17.5 12C14.47 12 12 9.53 12 6.5C12 5.03 12.58 3.7 13.5 2.71C13.15 2.28 12.61 2 12 2C10.9 2 10 2.9 10 4V4.29C7.03 5.17 5 7.9 5 11V17L3 19V20H21V19L19 17V11.79M12 23C13.11 23 14 22.11 14 21H10C10 22.11 10.9 23 12 23Z" /></svg>
diff --git a/.config/dunst/icons/brightness-1.svg b/.config/dunst/icons/brightness-1.svg
new file mode 100644
index 0000000..986d0b7
--- /dev/null
+++ b/.config/dunst/icons/brightness-1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2Z" /></svg>
diff --git a/.config/dunst/icons/brightness-2.svg b/.config/dunst/icons/brightness-2.svg
new file mode 100644
index 0000000..e11d513
--- /dev/null
+++ b/.config/dunst/icons/brightness-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M10,2C8.18,2 6.47,2.5 5,3.35C8,5.08 10,8.3 10,12C10,15.7 8,18.92 5,20.65C6.47,21.5 8.18,22 10,22A10,10 0 0,0 20,12A10,10 0 0,0 10,2Z" /></svg>
diff --git a/.config/dunst/icons/brightness-3.svg b/.config/dunst/icons/brightness-3.svg
new file mode 100644
index 0000000..441e109
--- /dev/null
+++ b/.config/dunst/icons/brightness-3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M9,2C7.95,2 6.95,2.16 6,2.46C10.06,3.73 13,7.5 13,12C13,16.5 10.06,20.27 6,21.54C6.95,21.84 7.95,22 9,22A10,10 0 0,0 19,12A10,10 0 0,0 9,2Z" /></svg>
diff --git a/.config/dunst/icons/brightness-4.svg b/.config/dunst/icons/brightness-4.svg
new file mode 100644
index 0000000..e7fa9c4
--- /dev/null
+++ b/.config/dunst/icons/brightness-4.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,15.31L23.31,12L20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31Z" /></svg>
diff --git a/.config/dunst/icons/brightness-5.svg b/.config/dunst/icons/brightness-5.svg
new file mode 100644
index 0000000..a4c139c
--- /dev/null
+++ b/.config/dunst/icons/brightness-5.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M12,18C11.11,18 10.26,17.8 9.5,17.45C11.56,16.5 13,14.42 13,12C13,9.58 11.56,7.5 9.5,6.55C10.26,6.2 11.11,6 12,6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31L23.31,12L20,8.69Z" /></svg>
diff --git a/.config/dunst/icons/brightness-6.svg b/.config/dunst/icons/brightness-6.svg
new file mode 100644
index 0000000..3c8b3f1
--- /dev/null
+++ b/.config/dunst/icons/brightness-6.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M12,18V6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,15.31L23.31,12L20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31Z" /></svg>
diff --git a/.config/dunst/icons/brightness-7.svg b/.config/dunst/icons/brightness-7.svg
new file mode 100644
index 0000000..cad78d1
--- /dev/null
+++ b/.config/dunst/icons/brightness-7.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M12,8A4,4 0 0,0 8,12A4,4 0 0,0 12,16A4,4 0 0,0 16,12A4,4 0 0,0 12,8M12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31L23.31,12L20,8.69Z" /></svg>
diff --git a/.config/dunst/icons/low-battery.svg b/.config/dunst/icons/low-battery.svg
new file mode 100644
index 0000000..e644bdb
--- /dev/null
+++ b/.config/dunst/icons/low-battery.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#cdd6f4" class="bi bi-battery-low" viewBox="0 0 16 16">
+  <path d="M2 6h2v4H2z"/>
+  <path d="M2 4a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2zm10 1a1 1 0 0 1 1 1v4a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V6a1 1 0 0 1 1-1zm4 3a1.5 1.5 0 0 1-1.5 1.5v-3A1.5 1.5 0 0 1 16 8"/>
+</svg>
diff --git a/.config/dunst/icons/muted.svg b/.config/dunst/icons/muted.svg
new file mode 100644
index 0000000..5985c53
--- /dev/null
+++ b/.config/dunst/icons/muted.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M3,9H7L12,4V20L7,15H3V9M16.59,12L14,9.41L15.41,8L18,10.59L20.59,8L22,9.41L19.41,12L22,14.59L20.59,16L18,13.41L15.41,16L14,14.59L16.59,12Z" /></svg>
diff --git a/.config/dunst/icons/volume-1.svg b/.config/dunst/icons/volume-1.svg
new file mode 100644
index 0000000..fd9e638
--- /dev/null
+++ b/.config/dunst/icons/volume-1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M7,9V15H11L16,20V4L11,9H7Z" /></svg>
diff --git a/.config/dunst/icons/volume-2.svg b/.config/dunst/icons/volume-2.svg
new file mode 100644
index 0000000..c22a559
--- /dev/null
+++ b/.config/dunst/icons/volume-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M5,9V15H9L14,20V4L9,9M18.5,12C18.5,10.23 17.5,8.71 16,7.97V16C17.5,15.29 18.5,13.76 18.5,12Z" /></svg>
diff --git a/.config/dunst/icons/volume-3.svg b/.config/dunst/icons/volume-3.svg
new file mode 100644
index 0000000..4eeb574
--- /dev/null
+++ b/.config/dunst/icons/volume-3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#74c7ec" d="M14,3.23V5.29C16.89,6.15 19,8.83 19,12C19,15.17 16.89,17.84 14,18.7V20.77C18,19.86 21,16.28 21,12C21,7.72 18,4.14 14,3.23M16.5,12C16.5,10.23 15.5,8.71 14,7.97V16C15.5,15.29 16.5,13.76 16.5,12M3,9V15H7L12,20V4L7,9H3Z" /></svg>
diff --git a/.config/dunst/launch_dunst.sh b/.config/dunst/launch_dunst.sh
new file mode 100755
index 0000000..01f5a0b
--- /dev/null
+++ b/.config/dunst/launch_dunst.sh
@@ -0,0 +1,4 @@
+if pgrep -f i3-battery-popup > /dev/null; then
+    pkill -f i3-battery-popup
+fi
+i3-battery-popup -L 21% -I 5% -t 10s -n -i $HOME/.config/dunst/icons/low-battery.svg
diff --git a/.config/i3/config b/.config/i3/config
index b2241b2..db1e4fa 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -11,6 +11,7 @@ exec_always xmousepasteblock
 exec --no-startup-id xset s off -dpms
 exec --no-startup-id export GTK_THEME="catppuccin-mocha-green-standard+default"
 
+exec_always --no-startup-id ~/.config/dunst/launch_dunst.sh
 
 exec_always killall polybar
 exec_always --no-startup-id ~/.config/polybar/launch_polybar.sh
@@ -35,7 +36,7 @@ bindsym Ctrl+$mod+Print exec maim --window $(xdotool getactivewindow) "$HOME/pic
 bindsym Ctrl+Shift+Print exec maim "$HOME/pictures/screenshots/$(date).png"
 
 exec --no-startup-id dex --autostart --environment i3
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock-fancy --nofork
 exec --no-startup-id nm-applet
 
 # Use pactl to adjust volume in PulseAudio.
@@ -219,5 +220,6 @@ client.urgent           $peach      $base   $peach      $overlay0       $peach
 client.placeholder      $overlay0   $base0  $text       $overlay0       $overlay0
 client.background       $base
 
+bindsym $mod+Shift+x exec i3lock-fancy --nofork
 bindsym $mod+Shift+period exec systemctl suspend
 bindsym $mod+Shift+slash exec systemctl hibernate