diff --git a/home/linux/gui/hyprland/conf/configs/windowrules.conf b/home/linux/gui/hyprland/conf/configs/windowrules.conf
index 9e7c779a..34f0da2f 100644
--- a/home/linux/gui/hyprland/conf/configs/windowrules.conf
+++ b/home/linux/gui/hyprland/conf/configs/windowrules.conf
@@ -19,10 +19,13 @@ windowrulev2   =   workspace 6,     class:^(QQ)$
 windowrulev2   =   workspace 6,     class:^(org.telegram.desktop)$
 # Music
 # windowrulev2   =   workspace 7,     class:^(music)$
-# Mail / Calendahunar)$
+# Mail / Calendar
+windowrulev2   =   workspace 8,     class:^(thunderbird)$,title:^(.*Reminder)
+# File Manager & Image/PDF Viewer
+windowrulev2   =   workspace 9,     class:^(thunder)$
 # Other
-windowrulev2   =   workspace 9,     class:^(code)$ # VS Code
-windowrulev2   =   workspace 9,     class:^(org.wireshark.Wireshark)$
+windowrulev2   =   workspace 10,     class:^(code)$ # VS Code
+windowrulev2   =   workspace 10,     class:^(org.wireshark.Wireshark)$
 
 
 # Float             RULE               WINDOW
diff --git a/home/linux/gui/hyprland/conf/waybar/config.jsonc b/home/linux/gui/hyprland/conf/waybar/config.jsonc
index f71c0edb..7b7a9bd3 100644
--- a/home/linux/gui/hyprland/conf/waybar/config.jsonc
+++ b/home/linux/gui/hyprland/conf/waybar/config.jsonc
@@ -20,14 +20,14 @@
     "on-click": "activate",
     "format-icons": {
       "1": "",
-      "2": "",
-      "3": "",
-      "4": "",
-      "5": "",
-      "6": "",
+      "2": "",
+      "3": "",
+      "4": "",
+      "5": "",
+      "6": "",
       "7": "",
-      "8": "",
-      "9": "",
+      "8": "",
+      "9": "",
       "10": "〇",
       "focused": "",
       "default": "",