diff --git a/.dotter/aleidk-work-laptop.toml b/.dotter/aleidk-work-laptop.toml
index 66baeae..c9e77d5 100644
--- a/.dotter/aleidk-work-laptop.toml
+++ b/.dotter/aleidk-work-laptop.toml
@@ -1,8 +1,7 @@
-includes = []
-packages = ["default"]
+includes = [  ]
+packages = [ "default", "niri", "dev" ]
 
 [files]
-"configs/hypr/work-laptop/hyprland.conf" = "~/.config/hypr/include/work-laptop.conf"
-"configs/niri/work-laptop/local.kdl" = "~/.config/niri/include/local.kdl"
+  "configs/niri/work-laptop/local.kdl" = "~/.config/niri/include/local.kdl"
 
 [variables]
diff --git a/.dotter/global.toml b/.dotter/global.toml
index 91826df..8170728 100644
--- a/.dotter/global.toml
+++ b/.dotter/global.toml
@@ -1,43 +1,61 @@
 [settings]
-default_target_type = "symbolic"
+  default_target_type = "symbolic"
 
 [helpers]
 
 [default]
-depends = ["niri"]
+  depends = [ "cli-utils" ]
 
-[default.files]
-"configs/fish" = "~/.config/fish"
-"configs/alacritty" = "~/.config/alacritty"
-"configs/atuin" = "~/.config/atuin"
-"configs/bat" = "~/.config/bat"
-"configs/containers" = "~/.config/containers"
-"configs/fzf" = "~/.config/fzf"
-"configs/ghostty" = "~/.config/ghostty"
-"configs/git" = "~/.config/git"
-"configs/hypr/base" = "~/.config/hypr"
-"configs/kitty" = "~/.config/kitty"
-"configs/lazygit" = "~/.config/lazygit"
-"configs/mako" = "~/.config/mako"
-"configs/mise" = "~/.config/mise"
-"configs/mpv" = "~/.config/mpv"
-"configs/nvim" = "~/.config/nvim"
-"configs/rofi" = "~/.config/rofi"
-"configs/swappy" = "~/.config/swappy"
-"configs/swaync" = "~/.config/swaync"
-"configs/uwsm" = "~/.config/uwsm"
-"configs/vimiv" = "~/.config/vimiv"
-"configs/waybar" = "~/.config/waybar"
-"configs/wezterm" = "~/.config/wezterm"
-"configs/wlogout" = "~/.config/wlogout"
-"configs/wpaperd" = "~/.config/wpaperd"
-"configs/yazi" = "~/.config/yazi"
-"configs/systemd" = "~/.config/systemd"
-"configs/zed" = "~/.config/zed"
+  [default.files]
+    "configs/containers" = "~/.config/containers"
+    "configs/mpv"        = "~/.config/mpv"
+    "configs/swappy"     = "~/.config/swappy"
+
+  [default.variables]
+
+[wm.files]
+  "configs/uwsm"  = "~/.config/uwsm"
+  "configs/vimiv" = "~/.config/vimiv"
+
+[niri]
+  depends = [ "wm", "terminals" ]
+  [niri.files]
+    "configs/niri/base"                       = "~/.config/niri"
+    "configs/noctalia"                        = "~/.config/noctalia"
+    "configs/systemd/user/niri.service.wants" = "~/.config/systemd/user/niri.service.wants"
+
+[hyprland.files]
+  "configs/hypr/base"                                       = "~/.config/hypr"
+  "configs/systemd/waybar.service.d/hyprland-override.conf" = "~/.config/systemd/waybar.service.d/override.conf"
+
+[wayland-composed.files]
+  "configs/mako"    = "~/.config/mako"
+  "configs/rofi"    = "~/.config/rofi"
+  "configs/swaync"  = "~/.config/swaync"
+  "configs/waybar"  = "~/.config/waybar"
+  "configs/wlogout" = "~/.config/wlogout"
+  "configs/wpaperd" = "~/.config/wpaperd"
 
 
-[default.variables]
+[terminals.files]
+  "configs/alacritty" = "~/.config/alacritty"
+  "configs/ghostty"   = "~/.config/ghostty"
+  "configs/kitty"     = "~/.config/kitty"
+  "configs/wezterm"   = "~/.config/wezterm"
 
-[niri.files]
-"configs/niri/base" = "~/.config/niri"
-"configs/noctalia" = "~/.config/noctalia"
+[cli-utils.files]
+  "configs/atuin" = "~/.config/atuin"
+  "configs/bat"   = "~/.config/bat"
+  "configs/fish"  = "~/.config/fish"
+  "configs/fzf"   = "~/.config/fzf"
+  "configs/yazi"  = "~/.config/yazi"
+
+[dev]
+  depends = [ "cli-utils", "terminals" ]
+
+  [dev.files]
+    "configs/git"     = "~/.config/git"
+    "configs/lazygit" = "~/.config/lazygit"
+    "configs/mise"    = "~/.config/mise"
+    "configs/nvim"    = "~/.config/nvim"
+    "configs/zed"     = "~/.config/zed"
diff --git a/bootstrap/pkgs_arch_raw.txt b/bootstrap/pkgs_arch_raw.txt
new file mode 100644
index 0000000..5e67356
--- /dev/null
+++ b/bootstrap/pkgs_arch_raw.txt
@@ -0,0 +1,216 @@
+age
+arch-update
+arm-none-eabi-binutils
+arm-none-eabi-gcc
+arm-none-eabi-newlib
+atuin
+avr-binutils
+avr-gcc
+avr-libc
+avrdude
+base
+base-devel
+bat
+beekeeper-studio-bin
+bitwarden
+blueman
+bluetui
+bluez
+bluez-utils
+brave-bin
+btrfs-progs
+bun-bin
+catppuccin-cursors-macchiato
+catppuccin-gtk-theme-macchiato
+catppuccin-sddm-theme-macchiato
+cava
+celluloid
+cliphist
+composer
+cpio
+cronie
+cups
+deno
+dfu-programmer
+dfu-util
+dolphin
+dotter-rs-bin
+dunst
+efibootmgr
+egl-wayland
+evince
+eza
+fd
+feishin-bin
+fgj
+firefox
+fish
+flatpak
+font-manager
+fzf
+gedit
+git
+gitleaks
+gnome-disk-utility
+gnome-keyring
+gnome-shell-extension-appindicator
+gnome-system-monitor
+goimapnotify
+grim
+gst-plugin-pipewire
+hoppscotch-bin
+htop
+hypridle
+hyprland
+hyprlock
+hyprpaper
+hyprpolkitagent
+hyprshot
+intel-media-driver
+intel-ucode
+iwd
+just
+kitty
+kvantum
+kvantum-theme-catppuccin-git
+kwallet-pam
+kwalletmanager
+lazygit
+lib32-nvidia-580xx-utils
+libcurl-compat
+libfido2
+libre-menu-editor
+libreoffice-still
+libva-intel-driver
+limine
+limine-mkinitcpio-hook
+limine-snapper-sync
+linux-firmware
+linux-headers
+linux-lts
+linux-lts-headers
+linux-zen
+linux-zen-headers
+lostfiles
+lxappearance
+ly
+man-db
+mutt-wizard
+nano
+nautilus
+nautilus-admin-gtk4
+nautilus-image-converter
+nautilus-open-any-terminal
+neomutt
+neovim
+network-manager-applet
+networkmanager
+niri
+noctalia-shell
+noto-fonts
+noto-fonts-cjk
+noto-fonts-emoji
+nss-mdns
+nvidia-580xx-dkms
+nvidia-580xx-settings
+nvtop
+obs-studio
+obsidian
+ouch
+paccache-hook
+paru
+paru-debug
+perl-image-exiftool
+php-pear
+picard
+pipewire-alsa
+pipewire-jack
+pipewire-pulse
+plymouth-theme-catppuccin-macchiato-git
+pnpm
+podman
+polkit-kde-agent
+power-profiles-daemon
+pre-commit
+pwvucontrol
+python-pip
+qt5-wayland
+qt6-wayland
+resvg
+riscv64-elf-binutils
+riscv64-elf-gcc
+riscv64-elf-newlib
+rofi
+rofi-rbw
+rofimoji
+rsync
+rtl8821ce-dkms-git
+rust-analyzer
+seahorse
+selectdefaultapplication-fork-git
+slimbookbattery
+slurp
+smartmontools
+snap-pac
+snp
+sof-firmware
+sops
+stylepak-git
+swappy
+swaync
+swayosd-git
+system-config-printer
+tailscale
+tealdeer
+texlive-fontsextra
+toml-bombadil
+trash-cli
+tsukimi-bin
+ttf-dejavu
+ttf-fira-code
+ttf-fira-mono
+ttf-fira-sans
+ttf-firacode-nerd
+ttf-jetbrains-mono-nerd
+ttf-ms-win11-auto
+ttf-nerd-fonts-symbols-mono
+ttf-nunito
+ttf-opensans
+ttf-roboto
+ttf-roboto-mono-nerd
+tuckr
+udiskie
+ueberzugpp
+unrar
+uwsm
+vim
+vulkan-intel
+vulkan-nouveau
+vulkan-radeon
+waybar
+waypaper
+webkit2gtk-4.1
+wev
+wezterm
+wget
+wireless_tools
+wlogout
+wlsunset
+wofi
+wpaperd
+wtype
+xdg-desktop-portal-gtk
+xdg-desktop-portal-hyprland
+xdg-terminal-exec
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-nouveau
+xorg-server
+xorg-xinit
+xwayland-satellite
+yadm
+yazi
+zed
+zip
+zoxide
+zram-generator
diff --git a/configs/noctalia/settings.json b/configs/noctalia/settings.json
index fa6174d..a3edb4f 100644
--- a/configs/noctalia/settings.json
+++ b/configs/noctalia/settings.json
@@ -1,12 +1,14 @@
 {
     "appLauncher": {
+        "autoPasteClipboard": false,
+        "clipboardWrapText": true,
         "customLaunchPrefix": "",
         "customLaunchPrefixEnabled": false,
         "enableClipPreview": true,
         "enableClipboardHistory": true,
         "iconMode": "tabler",
         "ignoreMouseInput": false,
-        "pinnedExecs": [
+        "pinnedApps": [
         ],
         "position": "center",
         "screenshotAnnotationTool": "",
@@ -19,7 +21,6 @@
     },
     "audio": {
         "cavaFrameRate": 30,
-        "externalMixer": "pwvucontrol || pavucontrol",
         "mprisBlacklist": [
         ],
         "preferredPlayer": "",
@@ -33,8 +34,8 @@
         "density": "default",
         "exclusive": true,
         "floating": true,
-        "marginHorizontal": 0.18,
-        "marginVertical": 0.25,
+        "marginHorizontal": 3,
+        "marginVertical": 5,
         "monitors": [
         ],
         "outerCorners": true,
@@ -70,10 +71,15 @@
                     "unfocusedIconsOpacity": 1
                 },
                 {
+                    "compactMode": false,
+                    "compactShowAlbumArt": true,
+                    "compactShowVisualizer": false,
                     "hideMode": "hidden",
                     "hideWhenIdle": false,
                     "id": "MediaMini",
                     "maxWidth": 200,
+                    "panelShowAlbumArt": true,
+                    "panelShowVisualizer": true,
                     "scrollingMode": "hover",
                     "showAlbumArt": false,
                     "showArtistFirst": false,
@@ -113,7 +119,8 @@
                 },
                 {
                     "displayMode": "onhover",
-                    "id": "Volume"
+                    "id": "Volume",
+                    "middleClickCommand": "pwvucontrol || pavucontrol"
                 },
                 {
                     "deviceNativePath": "",
@@ -163,7 +170,6 @@
     },
     "colorSchemes": {
         "darkMode": true,
-        "generateTemplatesForPredefined": false,
         "manualSunrise": "06:30",
         "manualSunset": "18:30",
         "matugenSchemeType": "scheme-fruit-salad",
@@ -208,9 +214,6 @@
                 {
                     "id": "Bluetooth"
                 },
-                {
-                    "id": "ScreenRecorder"
-                },
                 {
                     "id": "WallpaperSelector"
                 }
@@ -254,6 +257,7 @@
             "yazi"
         ],
         "pinnedStatic": false,
+        "position": "bottom",
         "size": 1
     },
     "general": {
@@ -275,6 +279,7 @@
         "shadowDirection": "bottom_right",
         "shadowOffsetX": 2,
         "shadowOffsetY": 3,
+        "showChangelogOnStartup": true,
         "showHibernateOnLockScreen": false,
         "showScreenCorners": false,
         "showSessionButtonsOnLockScreen": true
@@ -291,6 +296,8 @@
     "location": {
         "analogClockInCalendar": false,
         "firstDayOfWeek": -1,
+        "hideWeatherCityName": false,
+        "hideWeatherTimezone": false,
         "name": "Santiago",
         "showCalendarEvents": true,
         "showCalendarWeather": true,
@@ -359,18 +366,6 @@
         ],
         "overlayLayer": true
     },
-    "screenRecorder": {
-        "audioCodec": "opus",
-        "audioSource": "default_output",
-        "colorRange": "limited",
-        "copyToClipboard": false,
-        "directory": "/home/aleidk/Videos",
-        "frameRate": 60,
-        "quality": "very_high",
-        "showCursor": true,
-        "videoCodec": "h264",
-        "videoSource": "portal"
-    },
     "sessionMenu": {
         "countdownDuration": 5000,
         "enableCountdown": true,
@@ -418,7 +413,7 @@
         "showHeader": true,
         "showNumberLabels": true
     },
-    "settingsVersion": 37,
+    "settingsVersion": 39,
     "systemMonitor": {
         "cpuCriticalThreshold": 90,
         "cpuPollingInterval": 3000,
@@ -468,18 +463,23 @@
         "walker": false,
         "wezterm": false,
         "yazi": false,
-        "zed": false
+        "zed": false,
+        "zenBrowser": false
     },
     "ui": {
+        "bluetoothDetailsViewMode": "grid",
+        "bluetoothHideUnnamedDevices": false,
         "boxBorderEnabled": false,
         "fontDefault": "Sans Serif",
         "fontDefaultScale": 1,
         "fontFixed": "monospace",
         "fontFixedScale": 1,
+        "networkPanelView": "wifi",
         "panelBackgroundOpacity": 0.93,
         "panelsAttachedToBar": false,
         "settingsPanelMode": "centered",
-        "tooltipsEnabled": true
+        "tooltipsEnabled": true,
+        "wifiDetailsViewMode": "grid"
     },
     "wallpaper": {
         "directory": "/home/aleidk/Pictures/Wallpapers",
diff --git a/configs/systemd/user/niri.service.wants/noctalia.service b/configs/systemd/user/niri.service.wants/noctalia.service
new file mode 120000
index 0000000..7643639
--- /dev/null
+++ b/configs/systemd/user/niri.service.wants/noctalia.service
@@ -0,0 +1 @@
+/usr/lib/systemd/user/noctalia.service
\ No newline at end of file
diff --git a/configs/systemd/waybar.service.d/override.conf b/configs/systemd/waybar.service.d/hyprland-override.conf
similarity index 100%
rename from configs/systemd/waybar.service.d/override.conf
rename to configs/systemd/waybar.service.d/hyprland-override.conf