diff --git a/.config/aerc/helix-config/.helix/languages.toml b/.config/aerc/helix-config/.helix/languages.toml
index 46d33381..675f6a5f 100644
--- a/.config/aerc/helix-config/.helix/languages.toml
+++ b/.config/aerc/helix-config/.helix/languages.toml
@@ -3,5 +3,5 @@ name = "markdown"
 file-types = [{ glob = "/tmp/aerc-compose-*.eml" }]
 language-servers = ["harper-ls", "marksman", "scls"]
 # formatter = { command = "/usr/lib/aerc/filters/wrap", args = ["-w", "74"] }
-formatter = { command = "/home/fic/.config/mail/format.py" }
+formatter = { command = "/home/fic/dev/mail-utils/format.py" }
 auto-format = true
diff --git a/.config/niri/config.kdl##hostname.dpad b/.config/niri/config.kdl##hostname.dpad
index 494c2ae9..c63c0a1c 100644
--- a/.config/niri/config.kdl##hostname.dpad
+++ b/.config/niri/config.kdl##hostname.dpad
@@ -65,6 +65,16 @@ output "DP-1" {
 layout {
     // Set gaps around windows in logical pixels.
     gaps 16
+    struts {
+        top -16
+        bottom -16
+ // left 8
+        // right 8
+ // top 7
+ // bottom 16
+    }
+    // gaps 16
+    // gaps 8
     // When to center a column when changing focus, options are:
     // - "never", default behavior, focusing an off-screen column will keep at the left
     //   or right edge of the screen.
@@ -104,13 +114,13 @@ layout {
     // `draw-border-with-background`.
     // You can change how the focus ring looks.
     focus-ring {
-        // off
+        off
         width 1
         active-color "#B14242"
         inactive-color "#121212"
     }
     border {
-        off
+        // off
         width 1
         active-color "#B14242"
         inactive-color "#121212"
@@ -145,18 +155,11 @@ layout {
         // You can also change the shadow color and opacity.
         color "#0007"
     }
-    // Struts shrink the area occupied by windows, similarly to layer-shell panels.
+ // Struts shrink the area occupied by windows, similarly to layer-shell panels.
     // You can think of them as a kind of outer gaps. They are set in logical pixels.
     // Left and right struts will cause the next window to the side to always be visible.
     // Top and bottom struts will simply add outer gaps in addition to the area occupied by
     // layer-shell panels and regular gaps.
-    struts {
- // left 64
-        // right 64
-        // top 64
-        // bottom 64
-
-    }
 }
 // Add lines like this to spawn processes at startup.
 // Note that running niri as a session supports xdg-desktop-autostart,
@@ -165,8 +168,9 @@ layout {
 // spawn-at-startup "alacritty" "-e" "fish"
 // spawn-at-startup "dunst" "&"
 // spawn-at-startup "dunst" "&"
-spawn-at-startup "systemctl" "--user" "start" "dunst"
 spawn-at-startup "systemctl" "--user" "restart" "blueman-applet.service"
+spawn-at-startup "systemctl" "--user" "restart" "blueman-manager.service"
+spawn-at-startup "systemctl" "--user" "restart" "waybar"
 spawn-at-startup "xwayland-satellite"
 // Uncomment this line to ask the clients to omit their client-side decorations if possible.
 // If the client will specifically ask for CSD, the request will be honored.
@@ -293,6 +297,9 @@ binds {
     Mod+Return {
         spawn "footclient"
     }
+    Mod+Space {
+        spawn "footclient"
+    }
     Mod+D {
         spawn "fuzzel" "--hide-before-typing" "-I" "--placeholder=Select an application:"
     }
diff --git a/.config/waybar/config b/.config/waybar/config
deleted file mode 100644
index dfa021f2..00000000
--- a/.config/waybar/config
+++ /dev/null
@@ -1,356 +0,0 @@
-[
-  // TOP BAR
-  {
-    // "output": "DP-1",
-    "layer": "top",
-    "position": "top",
-    "modules-left": [
-      "cava",
-      "custom/colcount"
-      // "niri/workspaces"
-    ],
-    "modules-center": [
-      "niri/window"
-    ],
-    "modules-right": [
-      "clock"
-    ],
-    "niri/window": {
-      "max-length": 50,
-      "separate-outputs": true
-    },
-    "custom/colcount": {
-      "exec": "~/dev/niri-windows/niri-windows.py",
-      "return-type": "json",
-      "restart-interval": "never",
-      "format": "{} "
-    },
-    "custom/mail": {
-      "exec": "~/.config/mail/mail-indicator.sh",
-      "restart-interval": "never",
-      "format": "{}"
-    },
-    "custom/recorder": {
-      "exec": "~/dev/niri-recorder/recorder.py",
-      "return-type": "json",
-      "restart-interval": "never",
-      "on-click": "~/dev/niri-recorder/recorder.sh screen",
-      "on-click-right": "~/dev/niri-recorder/recorder.sh region",
-      "format": " {} "
-    },
-    "custom/delim": {
-      "format": "|"
-    },
-    "cava": {
-      "cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
-      "format-icons": [
-        "▁",
-        "▂",
-        "▃",
-        "▄",
-        "▅",
-        "▆",
-        "▇",
-        "█"
-      ],
-      "actions": {
-        "on-click-right": "mode"
-      }
-    },
-    "niri/workspaces": {
-      "format": "{icon}",
-      "format-icons": {
-        "music": "󰎇",
-        "active": "",
-        "default": ""
-      }
-    },
-    "battery": {
-      "format": "bat {capacity}%"
-    },
-    "clock": {
-      "format-alt": "{:%a, %d. %b  %H:%M}"
-    },
-    "pulseaudio": {
-      "scroll-step": 5,
-      "max-volume": 150,
-      "format": "vol {volume}%",
-      "format-muted": "vol mut",
-      "nospacing": 1,
-      "on-click": "pavucontrol",
-      "tooltip": false
-    },
-    "cpu": {
-      "interval": 10,
-      "format": "cpu {usage}%",
-      "max-length": 10
-    },
-    "memory": {
-      "interval": 30,
-      "format": "mem {percentage}%",
-      "max-length": 10
-    }
-  },
-  // bottom bar
-  {
-    // "output": "DP-1",
-    "layer": "top",
-    "position": "bottom",
-    "modules-left": [
-      "cava"
-    ],
-    "modules-center": [
-      "cpu",
-      "custom/delim",
-      "memory",
-      "custom/delim",
-      "pulseaudio",
-      "custom/delim",
-      "battery",
-      "custom/delim",
-      "custom/recorder"
-    ],
-    "modules-right": [
-      "tray"
-    ],
-    "niri/window": {
-      "max-length": 50,
-      "separate-outputs": true
-    },
-    "custom/colcount": {
-      "exec": "~/dev/niri-windows/niri-windows.py",
-      "return-type": "json",
-      "restart-interval": "never",
-      "format": "{} "
-    },
-    "custom/recorder": {
-      "exec": "~/dev/niri-recorder/recorder.py",
-      "return-type": "json",
-      "restart-interval": "never",
-      "on-click": "~/dev/niri-recorder/recorder.sh screen",
-      "on-click-right": "~/dev/niri-recorder/recorder.sh region",
-      "format": " {} "
-    },
-    "custom/delim": {
-      "format": "|"
-    },
-    "cava": {
-      "cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
-      "format-icons": [
-        "▁",
-        "▂",
-        "▃",
-        "▄",
-        "▅",
-        "▆",
-        "▇",
-        "█"
-      ],
-      "actions": {
-        "on-click-right": "mode"
-      }
-    },
-    "niri/workspaces": {
-      "format": "{icon}",
-      "format-icons": {
-        "music": "󰎇",
-        "active": "",
-        "default": ""
-      }
-    },
-    "battery": {
-      "format": "bat {capacity}%"
-    },
-    "clock": {
-      "format-alt": "{:%a, %d. %b  %H:%M}"
-    },
-    "pulseaudio": {
-      "scroll-step": 5,
-      "max-volume": 150,
-      "format": "vol {volume}%",
-      "format-muted": "vol mut",
-      "nospacing": 1,
-      "on-click": "pavucontrol",
-      "tooltip": false
-    },
-    "cpu": {
-      "interval": 10,
-      "format": "cpu {usage}%",
-      "max-length": 10
-    },
-    "memory": {
-      "interval": 30,
-      "format": "mem {percentage}%",
-      "max-length": 10
-    }
-  },
-  // LEFT BAR
-  {
-    // "output": "DP-1",
-    "layer": "top",
-    "exclusive": false,
-    "gtk-layer-shell": true,
-    "name": "leftbar",
-    "width": 14,
-    "position": "left",
-    "modules-left": [
-      "niri/workspaces"
-    ],
-    "niri/workspaces": {
-      "format": "{icon}",
-      "format-icons": {
-        "active": "",
-        "default": ""
-      }
-    }
-  }
-  // TOP BAR
-  // {
-  //   // "output": "HDMI-A-1",
-  //   "layer": "top",
-  //   "position": "top",
-  //   "modules-left": [
-  //     "cava",
-  //     "custom/colcount"
-  //     // "niri/workspaces"
-  //   ],
-  //   "modules-center": [
-  //     "niri/window"
-  //   ],
-  //   "modules-right": [
-  //     // "custom/mail",
-  //     "cpu",
-  //     "custom/delim",
-  //     "memory",
-  //     "custom/delim",
-  //     "pulseaudio",
-  //     "custom/delim",
-  //     "battery",
-  //     "custom/delim",
-  //     "custom/recorder",
-  //     "custom/delim",
-  //     "tray",
-  //     "clock"
-  //   ],
-  //   "niri/window": {
-  //     "max-length": 50,
-  //     "separate-outputs": true
-  //   },
-  //   "custom/colcount": {
-  //     "exec": "~/dev/niri-windows/niri-windows.py",
-  //     "return-type": "json",
-  //     "restart-interval": "never",
-  //     "format": "{} "
-  //   },
-  //   "custom/mail": {
-  //     "exec": "~/.config/mail/mail-indicator.sh",
-  //     "restart-interval": "never",
-  //     "format": "{}"
-  //   },
-  //   "custom/recorder": {
-  //     "exec": "~/dev/niri-recorder/recorder.py",
-  //     "return-type": "json",
-  //     "restart-interval": "never",
-  //     "on-click": "~/dev/niri-recorder/recorder.sh screen",
-  //     "on-click-right": "~/dev/niri-recorder/recorder.sh region",
-  //     "format": " {} "
-  //   },
-  //   "custom/delim": {
-  //     "format": "|"
-  //   },
-  //   "cava": {
-  //     "cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
-  //     // "framerate": 30,
-  //     // "autosens": 1,
-  //     // "sensitivity": 100,
-  //     // "bars": 14,
-  //     // "lower_cutoff_freq": 50,
-  //     // "higher_cutoff_freq": 10000,
-  //     // "method": "pulse",
-  //     // "source": "auto",
-  //     // "stereo": true,
-  //     // "reverse": false,
-  //     // "bar_delimiter": 0,
-  //     // "monstercat": false,
-  //     // "waves": false,
-  //     // "noise_reduction": 0.77,
-  //     // "input_delay": 2,
-  //     "format-icons": [
-  //       "▁",
-  //       "▂",
-  //       "▃",
-  //       "▄",
-  //       "▅",
-  //       "▆",
-  //       "▇",
-  //       "█"
-  //     ],
-  //     "actions": {
-  //       "on-click-right": "mode"
-  //     }
-  //   },
-  //   "niri/workspaces": {
-  //     "format": "{icon}",
-  //     "format-icons": {
-  //       // Named workspaces
-  //       // (you need to configure them in niri)
-  //       // "browser": "",
-  //       // "discord": "",
-  //       // "chat": "<b></b>",
-  //       // Icons by state
-  //       "music": "󰎇",
-  //       "active": "",
-  //       "default": ""
-  //     }
-  //   },
-  //   //   "sway/workspaces": {
-  //   //     "disable-scroll" : false,
-  //   // },
-  //   "battery": {
-  //     "format": "bat {capacity}%"
-  //     // "format-icons": ["", "", "", "", ""]
-  //   },
-  //   "clock": {
-  //     "format-alt": "{:%a, %d. %b  %H:%M}"
-  //   },
-  //   "pulseaudio": {
-  //     "scroll-step": 5,
-  //     "max-volume": 150,
-  //     "format": "vol {volume}%",
-  //     "format-muted": "vol mut",
-  //     "nospacing": 1,
-  //     "on-click": "pavucontrol",
-  //     "tooltip": false
-  //   },
-  //   "cpu": {
-  //     "interval": 10,
-  //     "format": "cpu {usage}%",
-  //     "max-length": 10
-  //   },
-  //   "memory": {
-  //     "interval": 30,
-  //     "format": "mem {percentage}%",
-  //     "max-length": 10
-  //   }
-  // },
-  // // LEFT BAR
-  // {
-  //   // "output": "HDMI-A-1",
-  //   "layer": "top",
-  //   "exclusive": false,
-  //   "gtk-layer-shell": true,
-  //   "name": "leftbar",
-  //   "width": 14,
-  //   "position": "left",
-  //   "modules-left": [
-  //     "niri/workspaces"
-  //   ],
-  //   "niri/workspaces": {
-  //     "format": "{icon}",
-  //     "format-icons": {
-  //       "active": "",
-  //       "default": ""
-  //     }
-  //   }
-  // }
-]
\ No newline at end of file
diff --git a/.config/waybar/config b/.config/waybar/config
new file mode 120000
index 00000000..cb232026
--- /dev/null
+++ b/.config/waybar/config
@@ -0,0 +1 @@
+config##hostname.dpad
\ No newline at end of file
diff --git a/.config/waybar/config##hostname.dpad b/.config/waybar/config##hostname.dpad
index 6f2d415a..b0161e96 100644
--- a/.config/waybar/config##hostname.dpad
+++ b/.config/waybar/config##hostname.dpad
@@ -13,18 +13,6 @@
       "niri/window"
     ],
     "modules-right": [
-      "custom/mail",
-      "cpu",
-      "custom/delim",
-      "memory",
-      "custom/delim",
-      "pulseaudio",
-      "custom/delim",
-      "battery",
-      "custom/delim",
-      "custom/recorder",
-      "custom/delim",
-      "tray",
       "clock"
     ],
     "niri/window": {
@@ -55,21 +43,6 @@
     },
     "cava": {
       "cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
-      // "framerate": 30,
-      // "autosens": 1,
-      // "sensitivity": 100,
-      // "bars": 14,
-      // "lower_cutoff_freq": 50,
-      // "higher_cutoff_freq": 10000,
-      // "method": "pulse",
-      // "source": "auto",
-      // "stereo": true,
-      // "reverse": false,
-      // "bar_delimiter": 0,
-      // "monstercat": false,
-      // "waves": false,
-      // "noise_reduction": 0.77,
-      // "input_delay": 2,
       "format-icons": [
         "▁",
         "▂",
@@ -87,23 +60,106 @@
     "niri/workspaces": {
       "format": "{icon}",
       "format-icons": {
-        // Named workspaces
-        // (you need to configure them in niri)
-        // "browser": "",
-        // "discord": "",
-        // "chat": "<b></b>",
-        // Icons by state
         "music": "󰎇",
         "active": "",
         "default": ""
       }
     },
-    //   "sway/workspaces": {
-    //     "disable-scroll" : false,
-    // },
     "battery": {
       "format": "bat {capacity}%"
-      // "format-icons": ["", "", "", "", ""]
+    },
+    "clock": {
+      "format-alt": "{:%a, %d. %b  %H:%M}"
+    },
+    "pulseaudio": {
+      "scroll-step": 5,
+      "max-volume": 150,
+      "format": "vol {volume}%",
+      "format-muted": "vol mut",
+      "nospacing": 1,
+      "on-click": "pavucontrol",
+      "tooltip": false
+    },
+    "cpu": {
+      "interval": 10,
+      "format": "cpu {usage}%",
+      "max-length": 10
+    },
+    "memory": {
+      "interval": 30,
+      "format": "mem {percentage}%",
+      "max-length": 10
+    }
+  },
+  // bottom bar
+  {
+    // "output": "DP-1",
+    "layer": "top",
+    "position": "bottom",
+    "modules-left": [
+      "cava"
+    ],
+    "modules-center": [
+      "cpu",
+      "custom/delim",
+      "memory",
+      "custom/delim",
+      "pulseaudio",
+      "custom/delim",
+      "battery",
+      "custom/delim",
+      "custom/recorder"
+    ],
+    "modules-right": [
+      "tray"
+    ],
+    "niri/window": {
+      "max-length": 50,
+      "separate-outputs": true
+    },
+    "custom/colcount": {
+      "exec": "~/dev/niri-windows/niri-windows.py",
+      "return-type": "json",
+      "restart-interval": "never",
+      "format": "{} "
+    },
+    "custom/recorder": {
+      "exec": "~/dev/niri-recorder/recorder.py",
+      "return-type": "json",
+      "restart-interval": "never",
+      "on-click": "~/dev/niri-recorder/recorder.sh screen",
+      "on-click-right": "~/dev/niri-recorder/recorder.sh region",
+      "format": " {} "
+    },
+    "custom/delim": {
+      "format": "|"
+    },
+    "cava": {
+      "cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
+      "format-icons": [
+        "▁",
+        "▂",
+        "▃",
+        "▄",
+        "▅",
+        "▆",
+        "▇",
+        "█"
+      ],
+      "actions": {
+        "on-click-right": "mode"
+      }
+    },
+    "niri/workspaces": {
+      "format": "{icon}",
+      "format-icons": {
+        "music": "󰎇",
+        "active": "",
+        "default": ""
+      }
+    },
+    "battery": {
+      "format": "bat {capacity}%"
     },
     "clock": {
       "format-alt": "{:%a, %d. %b  %H:%M}"
@@ -297,4 +353,4 @@
   //     }
   //   }
   // }
-]
\ No newline at end of file
+]