diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
old mode 100644
new mode 100755
diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/AGENTS.md b/AGENTS.md
old mode 100644
new mode 100755
index 09451fbf..a0d4d380
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,139 +1,342 @@
-# PROJECT KNOWLEDGE BASE
+# AGENTS.md — Ambxst
 
-**Generated:** 2026-03-01
-**Framework:** QtQuick / Quickshell
-**Language:** QML / JavaScript
+**Project:** Ambxst  
+**Version:** 1.1.5  
+**Framework:** QtQuick / Quickshell  
+**Primary Languages:** QML, JavaScript, Python, Bash, Nix  
+**Compositor:** Hyprland (via `axctl` abstraction)  
+**Target Platforms:** Arch Linux, Fedora, NixOS  
 
-## IMPORTANT: axctl Build Requirement
+---
 
-When changes are made to axctl (in `/home/adriano/Repos/Axenide/axctl/`), manual build and install is required:
+## 1. Project Overview
 
-1. Build: `cd /home/adriano/Repos/Axenide/axctl && go build -o bin/axctl .`
-2. Install: Replace `/usr/local/bin/axctl` with the new binary (requires manual intervention)
+Ambxst is a highly customizable Wayland shell built on [Quickshell](https://git.outfoxxed.me/outfoxxed/quickshell). It provides a unified desktop environment layer including a status bar, dynamic notch ("dynamic island"), app dock, dashboard, lockscreen, desktop widgets, notification popups, and an AI assistant sidebar. The shell is driven by a reactive JSON configuration system and supports multi-monitor setups via per-screen `Variants`.
 
-The agent cannot test axctl changes directly because the daemon runs in the user's session environment.
+The project was forked from [Ambxst](https://github.com/Axenide/Ambxst) and maintains the same upstream license. All Ambxst-specific modifications are provided under that same license.
 
-## OVERVIEW
-Ambxst is a highly customizable Wayland shell built with Quickshell. It provides a unified panel (bar, dock, notch), dashboard, lockscreen, desktop widgets, and notification system, driven by a reactive JSON configuration system. Multi-monitor support via `Variants` on `Quickshell.screens`.
+### Key Differentiators from Upstream
+- **130+ compositor settings** across 11 categories (vs. ~40 upstream)
+- **Hardware-accelerated video wallpapers** via QtMultimedia + FFmpeg (instead of mpv)
+- **Custom MangoHud integration** for real-time FPS display in the notch
+- **Configurable rendering backend:** OpenGL (default) or Vulkan with threaded render loop
+- **Ndot dot-matrix typography** and monochrome-with-red-accents design language
+
+---
+
+## 2. Technology Stack
+
+| Layer | Technology | Purpose |
+|-------|-----------|---------|
+| **UI Framework** | Qt 6 (QtQuick, QtQuick.Controls, QtQuick.Effects, QtQuick.Layouts) | Rendering, animations, controls |
+| **Shell Runtime** | Quickshell (`qs`) | Wayland panel/surface manager, QML engine, IPC |
+| **Compositor Bridge** | `axctl` (Go binary, external repo) | Hyprland abstraction: window focus, workspace dispatch, config persistence |
+| **Configuration** | JSON on disk + `Quickshell.Io.FileView` / `JsonAdapter` | Reactive, file-backed persistent config |
+| **Backend Scripts** | Python 3, Bash | System monitoring, clipboard, OCR, screenshots, wallpaper thumbs |
+| **Color Generation** | `matugen` | Material You color extraction from wallpapers |
+| **Packaging** | Nix Flake (`flake.nix`) | Reproducible builds, NixOS module, dev shells |
+| **Install Script** | `install.sh` (Bash) | Arch / Fedora dependency install, repo clone, launcher setup |
+
+### Runtime Dependencies
+- **Core:** `quickshell`, `qt6-base`, `qt6-declarative`, `qt6-wayland`, `qt6-svg`, `qt6-multimedia`, `qt6-shadertools`, `kf6-syntax-highlighting`, `kf6-breeze-icons`
+- **Compositor:** `hyprland`, `axctl`
+- **System:** `brightnessctl`, `grim`, `slurp`, `wl-clipboard`, `wlsunset`, `wtype`, `upower`, `power-profiles-daemon`, `NetworkManager`, `bluetooth`
+- **Media:** `playerctl`, `ffmpeg`, `gpu-screen-recorder`, `wf-recorder`
+- **Fonts:** `ttf-phosphor-icons`, `ttf-ndot` (custom), `ttf-roboto`, `noto-fonts`, `noto-fonts-emoji`
+- **Tools:** `kitty`, `tmux`, `fuzzel`, `matugen`, `tesseract`, `zenity`, `jq`, `sqlite`
+- **Python packages** (installed via pipx where applicable): script dependencies are runtime-checked
+
+---
+
+## 3. Project Structure
 
-## STRUCTURE
 ```
 ./
-├── config/               # Config singleton + JSON defaults (see config/AGENTS.md)
-│   └── defaults/*.js     # Blueprint for each config domain (bar, theme, ai, etc.)
-├── modules/
-│   ├── bar/              # Panel widgets: clock, systray, workspaces, indicators
-│   ├── components/       # Reusable UI primitives + GLSL shaders (55 files)
-│   ├── corners/          # Rounded screen corners overlay
-│   ├── desktop/          # Desktop background + icon grid
-│   ├── dock/             # App dock (standalone or integrated into bar)
-│   ├── frame/            # Screen border/glow effect
-│   ├── globals/          # GlobalStates.qml — transient runtime state
-│   ├── lockscreen/       # WlSessionLock + PAM authentication
-│   ├── notch/            # Dynamic island UI (launcher, dashboard, notifications)
-│   ├── notifications/    # Notification popup system + history
-│   ├── services/         # Backend singletons (30+): Battery, AI, Network, etc.
-│   ├── shell/            # UnifiedShellPanel + ReservationWindows + OSD
-│   ├── theme/            # Colors, Icons, Styling singletons + app generators
-│   ├── tools/            # Screenshot, screen recording, mirror, color picker
-│   └── widgets/          # Complex overlays: dashboard, launcher, overview, etc.
-│       ├── config/       # Standalone settings window
-│       ├── dashboard/    # Main hub: controls, metrics, assistant, clipboard, notes
-│       ├── defaultview/  # Notch idle content (compact player, notification indicator)
-│       ├── launcher/     # App search + multi-tab launcher
-│       ├── overview/     # Mission Control workspace overview
-│       ├── powermenu/    # Lock, logout, shutdown actions
-│       ├── presets/      # Theme/layout preset switcher
-│       └── tools/        # Quick utility access (OCR, recording, etc.)
-├── assets/               # Wallpapers, color presets, AI provider configs, sounds
-├── scripts/              # Python/Bash backends (system monitor, clipboard, OCR)
-├── nix/                  # Nix flake, packages, and module definitions
-├── shell.qml             # Entry point: ShellRoot, Variants, service init
-└── cli.sh                # Launch wrapper and IPC controller
+├── shell.qml                 # Entry point: ShellRoot, Variants per screen, service init
+├── cli.sh                    # Launch wrapper & IPC controller (brightness, lock, install, etc.)
+├── install.sh                # Distribution-aware installer (Arch, Fedora, NixOS)
+├── flake.nix                 # Nix flake: packages, devShells, apps, NixOS module
+├── version                   # Single-line version string (e.g., "1.1.5")
+│
+├── config/                   # Central configuration system
+│   ├── Config.qml            # >3700 lines. Singleton. FileView + JsonAdapter persistence
+│   ├── ConfigValidator.js    # Deep-merge validation against defaults
+│   ├── KeybindActions.js     # Keybind action dispatch table
+│   └── defaults/*.js         # 14 default blueprints: bar.js, theme.js, ai.js, compositor.js, etc.
+│
+├── modules/                  # All QML code organized by domain
+│   ├── bar/                  # Panel widgets: clock, systray, workspaces, battery, volume
+│   ├── components/           # Reusable UI primitives + GLSL shaders (55 files)
+│   ├── corners/              # Rounded screen-corners overlay
+│   ├── desktop/              # Desktop background + icon grid
+│   ├── dock/                 # App dock (standalone or integrated)
+│   ├── frame/                # Screen border / glow effect
+│   ├── globals/              # GlobalStates.qml — transient runtime state (non-persistent)
+│   ├── lockscreen/           # WlSessionLock + PAM authentication
+│   ├── notch/                # Dynamic island UI (launcher, dashboard, notifications)
+│   ├── notifications/        # Popup system + delegate + history
+│   ├── services/             # 43+ backend singletons (Battery, AI, Network, AxctlService, etc.)
+│   ├── shell/                # UnifiedShellPanel + ReservationWindows + OSD
+│   ├── sidebar/              # AI assistant sidebar
+│   ├── theme/                # Colors, Icons, Styling singletons + app config generators
+│   ├── tools/                # Screenshot, screen recording, mirror, color picker
+│   └── widgets/              # Complex overlays
+│       ├── config/           # Standalone settings window
+│       ├── dashboard/        # Main hub: controls, metrics, assistant, clipboard, notes
+│       ├── defaultview/      # Notch idle content (compact player, notification indicator)
+│       ├── launcher/         # App search + multi-tab launcher
+│       ├── overview/         # Mission Control workspace overview
+│       ├── powermenu/        # Lock, logout, shutdown actions
+│       ├── presets/          # Theme/layout preset switcher
+│       └── tools/            # Quick utility access (OCR, recording, etc.)
+│
+├── scripts/                  # Python & Bash backends invoked by QML via Quickshell.Io.Process
+│   ├── system_monitor.py     # CPU/RAM/GPU/disk/temp JSON output
+│   ├── clipboard_watch.sh    # wl-paste --watch wrapper
+│   ├── thumbgen.py           # Wallpaper thumbnail generation
+│   ├── lockwall.py           # Lockscreen wallpaper blur preprocessing
+│   ├── colorpicker.py        # hyprpicker wrapper
+│   ├── ocr.sh                # Screenshot → OCR text extraction
+│   ├── wf-record.sh          # Screen recording wrapper
+│   ├── weather.sh            # Weather data fetching
+│   └── ...
+│
+├── assets/                   # Wallpapers, color presets, AI provider configs, sounds, fonts
+│   ├── presets/              # Default theme/layout presets (copied to ~/.config on first run)
+│   ├── ambxst/          # Brand assets (logo, animations)
+│   ├── aiproviders/          # Per-provider config templates
+│   ├── colors/               # Color preset JSONs
+│   └── sound/                # UI sounds
+│
+└── nix/                      # Nix-specific packaging
+    ├── lib.nix               # `forAllSystems` helper
+    ├── modules/default.nix   # NixOS module (enables services, fonts)
+    └── packages/             # Granular package sets: core, apps, tools, media, fonts, tesseract
 ```
 
-## WHERE TO LOOK
-| Task | Location | Notes |
-|------|----------|-------|
-| **Entry Point** | `shell.qml` | `ShellRoot` → `Variants` per screen for each layer |
-| **Config Logic** | `config/Config.qml` | >3100 lines. `FileView` + `JsonAdapter` persistence |
-| **Transient State** | `modules/globals/GlobalStates.qml` | Window visibility, active modes, runtime flags |
-| **Services** | `modules/services/*.qml` | 30+ singletons. System integration layer |
-| **Theme/Colors** | `modules/theme/Colors.qml` | Watches `~/.cache/ambxst/colors.json` reactively |
-| **Styling** | `modules/theme/Styling.qml` | `radius()`, `fontSize()`, `getStyledRectConfig()` |
-| **UI Primitives** | `modules/components/` | `StyledRect`, `BarPopup`, `SearchInput`, shaders |
-| **Dashboard** | `modules/widgets/dashboard/` | Tabbed hub with LRU lazy-loading |
-| **Launcher** | `modules/widgets/launcher/LauncherView.qml` | Unified search: apps, clipboard, emoji |
-| **Bar Layout** | `modules/bar/BarContent.qml` | Auto-hide, horizontal/vertical, widget groups |
-| **Notch** | `modules/notch/Notch.qml` | Dynamic island with StackView navigation |
-| **Overview** | `modules/widgets/overview/` | Mission Control workspace view |
-| **Lockscreen** | `modules/lockscreen/LockScreen.qml` | PAM auth + `WlSessionLockSurface` |
-| **Notifications** | `modules/notifications/` | Popup system + delegate + history |
-| **Adding Config** | `config/defaults/*.js` + `Config.qml` | Always update both when adding keys |
-
-## CODE MAP
-
-| Symbol | Type | Location | Role |
-|--------|------|----------|------|
-| `Config` | Singleton | `config/Config.qml` | Central config store. Reactive to JSON file changes |
-| `GlobalStates` | Singleton | `modules/globals/GlobalStates.qml` | Shared runtime state (non-persistent) |
-| `Visibilities` | Singleton | `modules/services/Visibilities.qml` | UI visibility/layering manager per screen |
-| `Colors` | Singleton | `modules/theme/Colors.qml` | Dynamic color palette from JSON |
-| `Styling` | Singleton | `modules/theme/Styling.qml` | Shared style utilities (radius, font, variants) |
-| `Icons` | Singleton | `modules/theme/Icons.qml` | Phosphor-Bold icon font character map |
-| `StyledRect` | Component | `modules/components/StyledRect.qml` | Base themed container (300+ usages) |
-| `GradientCache` | Singleton | `modules/components/GradientCache.qml` | GPU texture sharing optimization |
-| `UnifiedShellPanel` | Component | `modules/shell/UnifiedShellPanel.qml` | Full-screen `PanelWindow` for Bar + Notch + Dock |
-| `ShellRoot` | Component | `shell.qml` | Root window. `Variants` per screen |
-| `AxctlService` | Singleton | `modules/services/AxctlService.qml` | Compositor abstraction (focus, dispatch) |
-| `StateService` | Singleton | `modules/services/StateService.qml` | JSON persistence for session state |
-| `FocusGrabManager` | Singleton | `modules/services/FocusGrabManager.qml` | Input focus coordination |
-
-## CONVENTIONS
-- **Singletons**: `pragma Singleton` + `Singleton { id: root }` for all services and global state.
-- **Imports**: `import qs.modules.*` namespace. Resolved by Quickshell's module system, not `qmldir` files.
-- **Persistence**: `FileView` watches JSON on disk; `JsonAdapter` creates bidirectional QML bindings.
-- **Formatting**: 4-space indent.
-- **Defaults**: New config keys MUST have entries in `config/defaults/*.js`.
-- **Multi-monitor**: `Variants { model: Quickshell.screens }` pattern for per-screen instances.
-- **StyledRect variants**: Use `"pane"`, `"popup"`, `"common"`, `"internalbg"`, `"focus"` for containers.
-- **Null safety**: Always null-check nested properties in QML to avoid `TypeError: Value is undefined`.
-- **Bulk config**: Use `root.pauseAutoSave` when updating multiple Config properties at once.
-- **Service init**: Critical services init on next tick via `Qt.callLater`; non-critical deferred 2s (see `shell.qml:280-302`).
-- **Async safety**: Use `Qt.callLater()` when modifying lists inside process handlers.
-
-## ANTI-PATTERNS (THIS PROJECT)
-- **Hardcoding**: NEVER hardcode colors/sizes. Use `Config.theme.*`, `Config.bar.*`, `Colors.*`, `Styling.*`.
-- **Direct Config Props**: AVOID modifying `Config` properties directly; they are bound to `JsonAdapter`.
-- **Global Pollution**: Do not add properties to `root` in `shell.qml`. Use `GlobalStates`.
-- **Raw JS Objects**: `JSON.parse()` results have NO QML signals. Never use them in `Connections` blocks.
-- **Missing Defaults**: NEVER add a config key without updating `config/defaults/*.js`.
-- **StyledRect bypass**: NEVER create raw `Rectangle` containers. Use `StyledRect` with a variant.
-
-## COMMANDS
+### Module Registration
+Quickshell uses a VFS import prefix `qs.` rather than physical `qmldir` files for most modules. A few directories (e.g., `modules/bar/`, `modules/widgets/launcher/`) contain `qmldir` files for legacy compatibility, but the primary resolution mechanism is Quickshell's built-in module system.
+
+---
+
+## 4. Build, Run, and Test Commands
+
+### Running Locally (Development)
 ```bash
-# Run shell (requires Quickshell + Hyprland)
+# Direct Quickshell launch (requires qs in PATH)
 qs -p shell.qml
-# Or via CLI wrapper:
+
+# Or via the CLI wrapper (sets up QML import paths, config presets, etc.)
 ./cli.sh
+```
 
-# Install (Arch/Fedora/NixOS)
-curl -L get.axeni.de/ambxst | sh
+### Installation (End Users)
+```bash
+# One-liner installer (Arch / Fedora / NixOS)
+curl -sL https://github.com/Axenide/Ambxst/raw/main/install.sh | sh
+
+# Manual clone + symlink
+git clone https://github.com/Axenide/Ambxst.git ~/.local/src/ambxst
+sudo ln -s ~/.local/src/ambxst/cli.sh /usr/local/bin/ambxst
 ```
 
-## NOTES
-- `Config.qml` is >3100 lines. Modify with care; use `pauseAutoSave` for bulk edits.
+### Nix Development Shell
+```bash
+# Enter a shell with all dependencies and QML_IMPORT_PATH set
+nix develop
+
+# Run directly from the flake
+nix run github:Axenide/Ambxst
+```
+
+### Compositor Integration
+```bash
+ambxst install hyprland           # Auto-detect config mode
+ambxst install hyprland --conf    # Force .conf mode (safe default)
+ambxst install hyprland --lua     # Force Lua mode (Hyprland >= 0.48)
+ambxst remove hyprland            # Remove integration
+```
+
+### Testing
+**There is currently no automated test suite.** The project relies on:
+- Manual runtime testing on Hyprland
+- Visual regression testing via screenshots in PRs (see `.github/pull_request_template.md`)
+- Nix flake evaluation (`nix flake check`) for packaging correctness
+
+When modifying UI, authors are expected to provide before/after screenshots in pull requests.
+
+---
+
+## 5. Runtime Architecture
+
+### Entry Point (`shell.qml`)
+1. **`ShellRoot`** initializes a global `ContextMenu` and per-screen `Variants`.
+2. **Per-screen layers** (stacked bottom to top):
+   - `Wallpaper` (per screen)
+   - `Desktop` icon grid (if enabled)
+   - `UnifiedShellPanel` — contains Bar, Notch, Dock, Frame
+   - `ScreenCorners` rounded overlay (if enabled)
+   - `ReservationWindows` — Wayland exclusive-zone reservations for bar/dock/sidebar
+   - `OverviewPopup`, `PresetsPopup` (conditional)
+3. **Global overlays** (single instance):
+   - `WlSessionLock` → `LockScreen` (secure lockscreen)
+   - `ScreenshotTool`, `ScreenshotOverlay`, `ScreenrecordTool`, `MirrorWindow`
+   - `SettingsWindow`, `OSD`
+4. **Service initialization** is deferred:
+   - Critical services (`CaffeineService`, `IdleService`, `GlobalShortcuts`, `BatteryAlertService`) init on next tick via `Qt.callLater`
+   - Non-critical services (`NightLightService`, `GameModeService`) deferred 2s
+5. **Boot splash** (`assets/ambxst/NOTHING_splash.webp`) auto-fades after ~5.3s.
+
+### Config Lifecycle
+- `Config.qml` watches `~/.config/ambxst/config/*.json` via `FileView`
+- Missing files are bootstrapped from `assets/presets/Ambxst Default/`
+- `JsonAdapter` creates bidirectional QML property bindings
+- Changes auto-persist to disk; use `Config.pauseAutoSave` for batch updates
+- `Config.initialLoadComplete` gates components that need fully initialized config
+
+### Color System
+- `Colors.qml` watches `~/.cache/ambxst/colors.json` (generated by `matugen`)
+- On change, it regenerates app configs: Qt6ct, GTK, Pywal, Kitty, NvChad, Discord
+- `Config.resolveColor(name)` maps semantic names (e.g., `"surface"`, `"primary"`) to actual colors
+
+### Compositor Integration (`axctl`)
+- `AxctlService.qml` is the single point of contact with Hyprland
+- It reads/writes `~/.local/share/ambxst/axctl.toml`
+- Dispatches workspace/window/monitor commands via the `axctl` CLI daemon
+- `CompositorConfig.qml` applies shell theme colors to Hyprland decoration settings
+- `CompositorKeybinds.qml` manages dynamic keybind injection
+
+---
+
+## 6. Code Organization and Key Symbols
+
+### Singletons (Services & Globals)
+All services use `pragma Singleton` and expose `Singleton { id: root }`.
+
+| Symbol | File | Responsibility |
+|--------|------|----------------|
+| `Config` | `config/Config.qml` | Central reactive config store |
+| `GlobalStates` | `modules/globals/GlobalStates.qml` | Transient runtime state (visibility flags, wallpaper manager, layout) |
+| `Visibilities` | `modules/services/Visibilities.qml` | Per-screen UI visibility/layering manager |
+| `Colors` | `modules/theme/Colors.qml` | Dynamic color palette from `matugen` output |
+| `Styling` | `modules/theme/Styling.qml` | Shared style utilities: `radius()`, `fontSize()`, `getStyledRectConfig()` |
+| `Anim` | `modules/theme/Anim.qml` | Material 3 animation system: `duration()`, `easing()`, `configure()`, global speed scale |
+| `Icons` | `modules/theme/Icons.qml` | Phosphor-Bold icon font character map |
+| `AxctlService` | `modules/services/AxctlService.qml` | Compositor abstraction (focus, dispatch, state sync) |
+| `PerMonitorConfig` | `modules/services/PerMonitorConfig.qml` | Per-monitor config overrides (bar/notch/dock position) |
+| `StateService` | `modules/services/StateService.qml` | JSON persistence for session state (layout, presets) |
+| `FocusGrabManager` | `modules/services/FocusGrabManager.qml` | Input focus coordination for popups |
+| `GradientCache` | `modules/components/GradientCache.qml` | GPU texture sharing optimization for gradients |
+
+### Component Primitives
+| Component | File | Usage |
+|-----------|------|-------|
+| `StyledRect` | `modules/components/StyledRect.qml` | Base themed container (300+ usages). Supports gradient, halftone, border, shadow variants |
+| `StateLayer` | `modules/components/StateLayer.qml` | M3 interaction overlay: ripple + hover/press/focus state opacity |
+| `Surface` | `modules/components/Surface.qml` | M3 elevated surface wrapper (`StyledRect` + `StateLayer`). Elevation 0-4 mapping |
+| `BarPopup` | `modules/components/BarPopup.qml` | Popup anchored to bar items |
+| `SearchInput` | `modules/components/SearchInput.qml` | Universal search field |
+| `PaneRect` | `modules/components/PaneRect.qml` | Pane variant container |
+
+### `StyledRect` Variants
+Always use one of these string values for the `variant` property:
+`"transparent"`, `"bg"`, `"popup"`, `"internalbg"`, `"barbg"`, `"pane"`, `"common"`, `"focus"`, `"primary"`, `"primaryfocus"`, `"overprimary"`, `"secondary"`, `"secondaryfocus"`, `"oversecondary"`, `"tertiary"`, `"tertiaryfocus"`, `"overtertiary"`, `"error"`, `"errorfocus"`, `"overerror"`
+
+---
+
+## 7. Development Conventions
+
+### QML & JavaScript
+- **Indentation:** 4 spaces
+- **Imports:** Use `qs.modules.<domain>` namespace. Example: `import qs.modules.services`
+- **Null safety:** Always null-check nested properties. QML configs may be undefined during load.
+- **Async safety:** Use `Qt.callLater()` when modifying lists inside process handlers.
+- **Raw JS objects:** Results from `JSON.parse()` have NO QML signals. Never use them in `Connections` targets.
+- **Focus management:** Never call `forceActiveFocus()` directly on popups. Use `FocusGrabManager.requestGrab(item)` / `releaseGrab(item)`.
+- **Color resolution:** Never hardcode colors. Use `Config.resolveColor(name)` or bind to `Colors.*`.
+
+### Configuration
+- **Atomic defaults:** Every new config key MUST have a corresponding entry in `config/defaults/<domain>.js`.
+- **Bulk updates:** Wrap multi-property config changes in `Config.pauseAutoSave = true` ... `Config.pauseAutoSave = false`.
+- **Bind to Config:** UI elements should bind to `Config.<module>.<property>`. Avoid local state for persistent settings.
+- **Validation:** Add type constraints in `ConfigValidator.js` when introducing new config shapes.
+
+### Anti-Patterns (Strictly Avoid)
+1. **Hardcoding:** NEVER hardcode colors, sizes, or durations. Use `Config.theme.*`, `Config.bar.*`, `Colors.*`, `Styling.*`.
+2. **Direct Config Props:** AVOID modifying `Config` properties directly outside the `JsonAdapter` binding system.
+3. **Global Pollution:** Do not add properties to `root` in `shell.qml`. Use `GlobalStates` for shared transient state.
+4. **Missing Defaults:** NEVER add a config key without updating `config/defaults/*.js`.
+5. **StyledRect bypass:** NEVER create raw `Rectangle` containers. Use `StyledRect` with an appropriate variant.
+
+---
+
+## 8. Security Considerations
+
+- **Lockscreen:** Uses `WlSessionLock` (Wayland secure session lock protocol) + PAM authentication via `Quickshell.Services.Pam`. The PAM config is in `config/pam/`.
+- **Credential storage:** API keys (AI providers) are stored via `KeyStore.qml` which delegates to a Python script (`scripts/keystore.py`). No credentials are committed to the repo.
+- **Process execution:** QML spawns external processes via `Quickshell.Io.Process`. All shell commands are constructed internally; no user input is passed directly to shell interpreters without sanitization.
+- **Compositor config:** `axctl.toml` is written to the user's data directory (`~/.local/share/ambxst/`). The `axctl` daemon runs as the user and communicates over IPC, not network sockets.
+- **File paths:** Avoid traversing outside `~/.config/ambxst/` and `~/.local/share/ambxst/` for user-facing file operations.
+
+---
+
+## 9. Deployment and Release Process
+
+### Versioning
+- The version is stored in the plain-text file `version` at the repo root.
+- `flake.nix` reads this file at evaluation time.
+
+### Nix Package
+- `nix/packages/default.nix` builds a `buildEnv` named `Ambxst-${version}`.
+- The launcher script (`ambxst`) wraps `cli.sh` with:
+  - `AMBXST_QS` pointing to the Quickshell binary
+  - `QML2_IMPORT_PATH` / `QML_IMPORT_PATH` set for Nix store Qt modules
+  - `FONTCONFIG_PATH` for bundled fonts
+
+### Installer (`install.sh`)
+1. Detects distro (Arch, Fedora, NixOS, or unknown)
+2. Installs dependencies via `pacman`/`yay` (Arch), `dnf` (Fedora), or `nix profile` (NixOS)
+3. Clones or updates the repo to `~/.local/src/ambxst`
+4. Builds Quickshell from source if not available (on unsupported distros)
+5. Creates `/usr/local/bin/ambxst` launcher
+6. Configures systemd services: disables `iwd`, enables `NetworkManager` and `bluetooth`
+
+### Pull Requests
+- Template is in `.github/pull_request_template.md`
+- Required: description of changes, screenshots for UI changes, behavior impact statement
+- No CI/CD workflows are configured; reviewers rely on Nix flake evaluation and manual testing
+
+---
+
+## 10. Where to Look for Common Tasks
+
+| Task | Primary Location | Notes |
+|------|------------------|-------|
+| **Add config key** | `config/defaults/<domain>.js` + `config/Config.qml` | Both MUST be updated |
+| **Change bar layout** | `modules/bar/BarContent.qml` | Auto-hide, horizontal/vertical, widget groups |
+| **Change notch behavior** | `modules/notch/Notch.qml`, `modules/notch/NotchContent.qml` | StackView navigation, animations |
+| **Add AI provider** | `modules/services/ai/strategies/` | Implement `ApiStrategy` interface |
+| **Theme / colors** | `modules/theme/Colors.qml`, `modules/theme/Styling.qml` | Watches `~/.cache/ambxst/colors.json` |
+| **Animations (M3)** | `modules/theme/Anim.qml` | Standard / Emphasized / Spatial curves with global speed scale |
+| **Interaction states** | `modules/components/StateLayer.qml`, `modules/components/Surface.qml` | Ripple + M3 elevation surfaces |
+| **System monitoring** | `modules/services/SystemResources.qml` | Reads `scripts/system_monitor.py` JSON output |
+| **Clipboard** | `modules/services/ClipboardService.qml` | Interacts with `scripts/clipboard_*.sh` |
+| **Lockscreen** | `modules/lockscreen/LockScreen.qml` | `WlSessionLockSurface` + PAM |
+| **Screenshots** | `modules/tools/ScreenshotTool.qml` | Uses `grim`/`slurp` |
+| **Screen recording** | `modules/tools/ScreenrecordTool.qml` | Uses `wf-recorder` / `gpu-screen-recorder` |
+| **Add new widget/tab to dashboard** | `modules/widgets/dashboard/` | Lazy-loaded LRU tabs |
+| **Overview / Mission Control** | `modules/widgets/overview/` | Workspace window overview |
+| **Notifications** | `modules/notifications/` | Popup system + history |
+| **Compositor settings** | `modules/services/CompositorConfig.qml` | Live apply to Hyprland via `axctl` |
+
+---
+
+## 11. Important Notes for Agents
+
+- `Config.qml` is >3700 lines. Modify with extreme care; use `pauseAutoSave` for bulk edits.
 - Large files (>1000 lines): `ClipboardTab`, `NotesTab`, `TmuxTab`, `BindsPanel`, `ShellPanel`, `PresetsTab`, `ThemePanel`, `LauncherView`, `AssistantTab`, `Ai.qml`.
 - The `qs.` import prefix is a Quickshell VFS construct, not a physical directory.
 - `screenshotToolMode` in `GlobalStates.qml` is **DEPRECATED**.
-- Gemini AI provider doesn't support the `system` role; handled in `services/ai/strategies/`.
-- `axctl` is a core part of this project. It abstracts compositor interactions. It is one of Axenide's projects and the source code is available at `/home/adriano/Repos/Axenide/axctl/`.
-- We register a changelog in a website. The local repo for this website is at `/home/adriano/Repos/Axenide/web/`. The changelog entries are stored in `content/ambxst/changelog/` as Zola markdown files. Write following the structure by referencing other entries, and add links to PRs and issues when relevant. Only write a changelog when the user asks for it.
-
-- Some projects to keep in mind for reference:
-  - DankMaterialShell (DMS): https://github.com/AvengeMedia/DankMaterialShell
-  - Noctalia: https://github.com/noctalia-dev/noctalia-shell
-  - end-4 Dotfiles: https://github.com/end-4/dots-hyprland
-  - Hyprland: https://github.com/hyprwm/hyprland
-  - MangoWC: https://github.com/DreamMaoMao/mangowc
-  - Niri: https://github.com/YaLTeR/niri
+- Gemini AI provider does not support the `system` role; this is handled in `modules/services/ai/strategies/GeminiApiStrategy.qml`.
+- `axctl` is maintained in a separate repository (`github:Axenide/axctl`). When changes are made there, a manual build and install is required (the daemon runs in the user's session environment and cannot be tested by this agent directly).
+- Changelog entries for the project website are stored in a separate repo at `/home/adriano/Repos/Axenide/web/content/Ambxst/changelog/` as Zola markdown files. Only write a changelog when explicitly asked.
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/assets/colors/Nothing/dark b/assets/colors/Nothing/dark
new file mode 100644
index 00000000..0efbb484
--- /dev/null
+++ b/assets/colors/Nothing/dark
@@ -0,0 +1,8 @@
+#0A0A0A
+#E80012
+#FFFFFF
+#888888
+#E80012
+#FFFFFF
+#888888
+#333333
diff --git a/assets/colors/Nothing/dark.json b/assets/colors/Nothing/dark.json
new file mode 100644
index 00000000..6ade11b0
--- /dev/null
+++ b/assets/colors/Nothing/dark.json
@@ -0,0 +1,100 @@
+{
+  "background": "#0A0A0A",
+  "red": "#E80012",
+  "green": "#FFFFFF",
+  "yellow": "#888888",
+  "blue": "#E80012",
+  "magenta": "#FFFFFF",
+  "cyan": "#888888",
+  "white": "#333333",
+  "lightRed": "#FF1A2B",
+  "lightGreen": "#FFFFFF",
+  "lightYellow": "#999999",
+  "lightBlue": "#FF1A2B",
+  "lightMagenta": "#FFFFFF",
+  "lightCyan": "#999999",
+  "redContainer": "#3D0006",
+  "greenContainer": "#1A1A1A",
+  "yellowContainer": "#222222",
+  "blueContainer": "#3D0006",
+  "magentaContainer": "#1A1A1A",
+  "cyanContainer": "#222222",
+  "whiteContainer": "#151515",
+  "redSource": "#E80012",
+  "greenSource": "#FFFFFF",
+  "yellowSource": "#888888",
+  "blueSource": "#E80012",
+  "magentaSource": "#FFFFFF",
+  "cyanSource": "#888888",
+  "whiteSource": "#333333",
+  "redValue": "#E80012",
+  "greenValue": "#FFFFFF",
+  "yellowValue": "#888888",
+  "blueValue": "#E80012",
+  "magentaValue": "#FFFFFF",
+  "cyanValue": "#888888",
+  "whiteValue": "#333333",
+  "primary": "#E80012",
+  "primaryContainer": "#3D0006",
+  "primaryFixed": "#FF6B76",
+  "primaryFixedDim": "#E80012",
+  "secondary": "#FFFFFF",
+  "secondaryContainer": "#1A1A1A",
+  "secondaryFixed": "#E0E0E0",
+  "secondaryFixedDim": "#FFFFFF",
+  "tertiary": "#888888",
+  "tertiaryContainer": "#222222",
+  "tertiaryFixed": "#AAAAAA",
+  "tertiaryFixedDim": "#888888",
+  "error": "#E80012",
+  "errorContainer": "#3D0006",
+  "surface": "#0A0A0A",
+  "surfaceBright": "#1A1A1A",
+  "surfaceContainer": "#0E0E0E",
+  "surfaceContainerHigh": "#121212",
+  "surfaceContainerHighest": "#161616",
+  "surfaceContainerLow": "#0C0C0C",
+  "surfaceContainerLowest": "#080808",
+  "surfaceDim": "#0A0A0A",
+  "surfaceTint": "#E80012",
+  "surfaceVariant": "#1A1A1A",
+  "outline": "#333333",
+  "outlineVariant": "#1A1A1A",
+  "inverseOnSurface": "#0A0A0A",
+  "inversePrimary": "#E80012",
+  "inverseSurface": "#E0E0E0",
+  "overBackground": "#E8E8E8",
+  "overSurface": "#E8E8E8",
+  "overSurfaceVariant": "#CCCCCC",
+  "overPrimary": "#FFFFFF",
+  "overPrimaryContainer": "#FF6B76",
+  "overPrimaryFixed": "#FFFFFF",
+  "overPrimaryFixedVariant": "#E80012",
+  "overSecondary": "#E8E8E8",
+  "overSecondaryContainer": "#E0E0E0",
+  "overSecondaryFixed": "#0A0A0A",
+  "overSecondaryFixedVariant": "#CCCCCC",
+  "overTertiary": "#E8E8E8",
+  "overTertiaryContainer": "#AAAAAA",
+  "overTertiaryFixed": "#000000",
+  "overTertiaryFixedVariant": "#666666",
+  "overRed": "#FFFFFF",
+  "overRedContainer": "#FF6B76",
+  "overGreen": "#0A0A0A",
+  "overGreenContainer": "#E0E0E0",
+  "overYellow": "#000000",
+  "overYellowContainer": "#AAAAAA",
+  "overBlue": "#FFFFFF",
+  "overBlueContainer": "#FF6B76",
+  "overMagenta": "#0A0A0A",
+  "overMagentaContainer": "#E0E0E0",
+  "overCyan": "#000000",
+  "overCyanContainer": "#AAAAAA",
+  "overWhite": "#FFFFFF",
+  "overWhiteContainer": "#666666",
+  "overError": "#FFFFFF",
+  "overErrorContainer": "#FF6B76",
+  "scrim": "#000000",
+  "shadow": "#000000",
+  "sourceColor": "#E80012"
+}
diff --git a/assets/colors/Nothing/light b/assets/colors/Nothing/light
new file mode 100644
index 00000000..622bd20b
--- /dev/null
+++ b/assets/colors/Nothing/light
@@ -0,0 +1,8 @@
+#FFFFFF
+#E80012
+#000000
+#666666
+#E80012
+#000000
+#666666
+#CCCCCC
diff --git a/assets/colors/Nothing/light.json b/assets/colors/Nothing/light.json
new file mode 100644
index 00000000..d9f105a8
--- /dev/null
+++ b/assets/colors/Nothing/light.json
@@ -0,0 +1,100 @@
+{
+  "background": "#FFFFFF",
+  "red": "#E80012",
+  "green": "#000000",
+  "yellow": "#666666",
+  "blue": "#E80012",
+  "magenta": "#000000",
+  "cyan": "#666666",
+  "white": "#CCCCCC",
+  "lightRed": "#FF1A2B",
+  "lightGreen": "#333333",
+  "lightYellow": "#777777",
+  "lightBlue": "#FF1A2B",
+  "lightMagenta": "#333333",
+  "lightCyan": "#777777",
+  "redContainer": "#FFE0E0",
+  "greenContainer": "#F0F0F0",
+  "yellowContainer": "#E8E8E8",
+  "blueContainer": "#FFE0E0",
+  "magentaContainer": "#F0F0F0",
+  "cyanContainer": "#E8E8E8",
+  "whiteContainer": "#F5F5F5",
+  "redSource": "#E80012",
+  "greenSource": "#000000",
+  "yellowSource": "#666666",
+  "blueSource": "#E80012",
+  "magentaSource": "#000000",
+  "cyanSource": "#666666",
+  "whiteSource": "#CCCCCC",
+  "redValue": "#E80012",
+  "greenValue": "#000000",
+  "yellowValue": "#666666",
+  "blueValue": "#E80012",
+  "magentaValue": "#000000",
+  "cyanValue": "#666666",
+  "whiteValue": "#CCCCCC",
+  "primary": "#E80012",
+  "primaryContainer": "#FFE0E0",
+  "primaryFixed": "#FF6B76",
+  "primaryFixedDim": "#E80012",
+  "secondary": "#000000",
+  "secondaryContainer": "#F0F0F0",
+  "secondaryFixed": "#333333",
+  "secondaryFixedDim": "#000000",
+  "tertiary": "#666666",
+  "tertiaryContainer": "#E8E8E8",
+  "tertiaryFixed": "#888888",
+  "tertiaryFixedDim": "#666666",
+  "error": "#E80012",
+  "errorContainer": "#FFE0E0",
+  "surface": "#FFFFFF",
+  "surfaceBright": "#F5F5F5",
+  "surfaceContainer": "#FAFAFA",
+  "surfaceContainerHigh": "#F0F0F0",
+  "surfaceContainerHighest": "#E8E8E8",
+  "surfaceContainerLow": "#FCFCFC",
+  "surfaceContainerLowest": "#FFFFFF",
+  "surfaceDim": "#FFFFFF",
+  "surfaceTint": "#E80012",
+  "surfaceVariant": "#F0F0F0",
+  "outline": "#CCCCCC",
+  "outlineVariant": "#E8E8E8",
+  "inverseOnSurface": "#FFFFFF",
+  "inversePrimary": "#E80012",
+  "inverseSurface": "#333333",
+  "overBackground": "#666666",
+  "overSurface": "#666666",
+  "overSurfaceVariant": "#777777",
+  "overPrimary": "#FFFFFF",
+  "overPrimaryContainer": "#FF6B76",
+  "overPrimaryFixed": "#FFFFFF",
+  "overPrimaryFixedVariant": "#E80012",
+  "overSecondary": "#FFFFFF",
+  "overSecondaryContainer": "#333333",
+  "overSecondaryFixed": "#FFFFFF",
+  "overSecondaryFixedVariant": "#000000",
+  "overTertiary": "#FFFFFF",
+  "overTertiaryContainer": "#888888",
+  "overTertiaryFixed": "#FFFFFF",
+  "overTertiaryFixedVariant": "#444444",
+  "overRed": "#FFFFFF",
+  "overRedContainer": "#FF6B76",
+  "overGreen": "#FFFFFF",
+  "overGreenContainer": "#333333",
+  "overYellow": "#FFFFFF",
+  "overYellowContainer": "#888888",
+  "overBlue": "#FFFFFF",
+  "overBlueContainer": "#FF6B76",
+  "overMagenta": "#FFFFFF",
+  "overMagentaContainer": "#333333",
+  "overCyan": "#FFFFFF",
+  "overCyanContainer": "#888888",
+  "overWhite": "#000000",
+  "overWhiteContainer": "#AAAAAA",
+  "overError": "#FFFFFF",
+  "overErrorContainer": "#FF6B76",
+  "scrim": "#000000",
+  "shadow": "#000000",
+  "sourceColor": "#E80012"
+}
diff --git a/assets/compositors/hyprland.example.conf b/assets/compositors/hyprland.example.conf
new file mode 100644
index 00000000..d44885ae
--- /dev/null
+++ b/assets/compositors/hyprland.example.conf
@@ -0,0 +1,181 @@
+# This config is a STUB! This should never be generated.
+# Use the default lua config from https://github.com/hyprwm/Hyprland/blob/main/example/hyprland.lua
+
+source = ~/.config/hypr/monitors.conf
+
+# Optimizaciones NVIDIA
+env = LIBVA_DRIVER_NAME,nvidia
+env = XDG_SESSION_TYPE,wayland
+env = GBM_BACKEND,nvidia-drm
+env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+env = WLR_NO_HARDWARE_CURSORS,1
+
+# Disable Hyprland's default wallpaper/logo to prevent flash before Ambxst loads
+misc {
+    force_default_wallpaper = -1
+    disable_hyprland_logo = true
+}
+
+$mainMod = SUPER
+$terminal = kitty
+$fileManager = dolphin
+
+###################
+### KEYBINDINGS ###
+###################
+
+bind = $mainMod, Q, exec, $terminal
+bind = $mainMod, C, killactive,
+bind = $mainMod, E, exec, $fileManager
+bind = $mainMod, E, exec, $browser
+bind = $mainMod, H, togglefloating,
+bind = $mainMod, P, pseudo,
+bind = $mainMod, W, togglefloating,
+bind = $mainMod, G, togglegroup,
+bind = $mainMod, J, exec, kitty -e spf
+bind = SHIFT, F11, fullscreen
+
+# Workspaces
+bind = CTRL SUPER, left, workspace, -1
+bind = CTRL SUPER, right, workspace, +1
+bind = SHIFT CTRL SUPER, left, movetoworkspace, -1
+bind = SHIFT CTRL SUPER, right, movetoworkspace, +1
+
+# Qt/Quickshell GPU acceleration (opengl or vulkan)
+env = QSG_RHI_BACKEND, opengl
+env = QSG_RENDER_LOOP, threaded
+env = QT_QUICK_BACKEND, opengl
+env = QS_ICON_THEME,breeze
+####################
+### ANIMATIONS #####
+####################
+
+animations {
+    enabled = true
+
+    # Smooth reveal bezier — starts slow, ends smooth
+    bezier = reveal, 0.2, 0.0, 0.1, 1.0
+
+    # Windows - popin reveal effect (scale in from center)
+    animation = windows, 1, 4, reveal, popin 65%
+    animation = windowsOut, 1, 3, reveal, popin 65%
+
+    # Fade for dimmed/inactive
+    animation = fade, 1, 3, reveal
+    animation = fadeDim, 1, 3, reveal
+
+    # Border
+    animation = border, 1, 5, reveal
+    animation = borderangle, 1, 30, reveal, once
+
+    # Workspaces - slidefade (ambxst default)
+    # Inherited from ambxst config
+    # animation = workspaces, 1, 2.5, myBezier, slidefade 20%
+}
+
+# Window behavior
+misc {
+    animate_mouse_windowdragging = true
+    enable_swallow = false
+}
+
+#############
+### INPUT ###
+#############
+input {
+    kb_layout = latam 
+    follow_mouse = 1
+    sensitivity = 0
+    touchpad {
+        natural_scroll = false
+    }
+}
+##################
+### DECORATION ###
+##################
+
+decoration {
+
+    # ─── GPU-saving tweaks ───
+    # Opacity at 1.0 avoids extra alpha compositing pass on every window.
+    # Ambxst already manages its own opacity internally via QML layer effects.
+    active_opacity = 1.0
+    inactive_opacity = 1.0
+    fullscreen_opacity = 1.0
+
+    blur {
+        # Disabled at compositor level — Ambxst manages its own blur in QML.
+        # Compositor-level blur affects ALL windows (including terminals),
+        # adding GPU overhead even for apps that don't need it.
+        enabled = false
+        size = 3
+        passes = 1
+    }
+}
+
+
+###################
+### ###################
+### WINDOW RULES ###
+###################
+
+windowrule {
+    name = kitty-opacity
+    match:class = kitty
+    opacity = 0.95 0.85
+}
+
+windowrule {
+    name = zen-opacity
+    match:class = app.zen_browser.zen
+    opacity = 0.90 0.80
+}
+
+windowrule {
+    name = chrome-opacity
+    match:class = google-chrome
+    opacity = 0.97 0.92
+}
+
+windowrule {
+    name = dolphin-opacity
+    match:class = org.kde.dolphin
+    opacity = 0.92 0.85
+}
+
+windowrule {
+    name = micro-transparent
+    match:class = konsole
+    opacity = 0.92 0.85
+}
+
+windowrule {
+    name = yt-music-opacity
+    match:class = com.github.th_ch.youtube_music
+    opacity = 0.95 0.85
+}
+
+windowrule {
+    name = code-oss
+    match:class = code-oss
+    opacity = 0.95 0.85
+}
+
+
+windowrule {
+    name = fix-xwayland-drags
+    match:class = ^$
+    match:title = ^$
+    match:xwayland = true
+    match:float = true
+    no_focus = true
+}
+
+
+# Ambxst
+source = ~/.local/share/ambxst/hyprland.conf
+exec-once = ambxst
+exec-once = axctl -c ~/.local/share/ambxst/axctl.toml daemon
+
+# OVERRIDES
+# Down here you can write or source anything that you want to override from Ambxst's settings.
diff --git a/assets/fonts/MaterialSymbolsRounded-Variable.ttf b/assets/fonts/MaterialSymbolsRounded-Variable.ttf
new file mode 100644
index 00000000..8bec866a
Binary files /dev/null and b/assets/fonts/MaterialSymbolsRounded-Variable.ttf differ
diff --git a/assets/fonts/Ndot-57-Aligned.ttf b/assets/fonts/Ndot-57-Aligned.ttf
new file mode 100755
index 00000000..c6394582
Binary files /dev/null and b/assets/fonts/Ndot-57-Aligned.ttf differ
diff --git a/assets/presets/Dot Matrix/bar.json b/assets/presets/Dot Matrix/bar.json
new file mode 100755
index 00000000..0bb60b0e
--- /dev/null
+++ b/assets/presets/Dot Matrix/bar.json	
@@ -0,0 +1,28 @@
+{
+  "position": "top",
+  "launcherIcon": "/home/leo/Im\u00e1genes/Iconos/Nothing.png",
+  "launcherIconTint": true,
+  "launcherIconFullTint": true,
+  "launcherIconSize": 22,
+  "pillStyle": "default",
+  "screenList": [],
+  "enableFirefoxPlayer": true,
+  "barColor": [
+    [
+      "surfaceContainer",
+      0
+    ]
+  ],
+  "frameEnabled": false,
+  "frameThickness": 8,
+  "pinnedOnStartup": true,
+  "hoverToReveal": true,
+  "hoverRegionHeight": 4,
+  "showPinButton": false,
+  "availableOnFullscreen": true,
+  "use12hFormat": true,
+  "containBar": false,
+  "keepBarShadow": false,
+  "keepBarBorder": false,
+  "barMode": "extended"
+}
\ No newline at end of file
diff --git a/assets/presets/Dot Matrix/compositor.json b/assets/presets/Dot Matrix/compositor.json
new file mode 100755
index 00000000..28210c8b
--- /dev/null
+++ b/assets/presets/Dot Matrix/compositor.json	
@@ -0,0 +1,144 @@
+{
+  "showBorder": true,
+  "activeBorderColor": [
+    "primary"
+  ],
+  "borderAngle": 45,
+  "inactiveBorderColor": [
+    "surface"
+  ],
+  "inactiveBorderAngle": 45,
+  "borderSize": 2,
+  "rounding": 16,
+  "roundingPower": 2.0,
+  "syncRoundness": true,
+  "syncBorderWidth": false,
+  "syncBorderColor": false,
+  "syncShadowOpacity": false,
+  "syncShadowColor": false,
+  "resizeOnBorder": false,
+  "extendBorderGrabArea": 15,
+  "hoverIconOnBorder": true,
+  "gapsIn": 2,
+  "gapsOut": 4,
+  "layout": "dwindle",
+  "allowTearing": false,
+  "snapEnabled": true,
+  "snapWindowGap": 10,
+  "snapMonitorGap": 10,
+  "snapBorderOverlap": false,
+  "snapRespectGaps": false,
+  "activeOpacity": 1.0,
+  "inactiveOpacity": 1.0,
+  "fullscreenOpacity": 1.0,
+  "dimInactive": false,
+  "dimStrength": 0.5,
+  "dimAround": 0.4,
+  "dimSpecial": 0.2,
+  "shadowEnabled": true,
+  "shadowRange": 8,
+  "shadowRenderPower": 3,
+  "shadowSharp": false,
+  "shadowIgnoreWindow": true,
+  "shadowColor": "shadow",
+  "shadowColorInactive": "shadow",
+  "shadowOpacity": 0.5,
+  "shadowOffset": "0 0",
+  "shadowScale": 1.0,
+  "blurEnabled": true,
+  "blurSize": 4,
+  "blurPasses": 2,
+  "blurIgnoreOpacity": true,
+  "blurExplicitIgnoreAlpha": false,
+  "blurIgnoreAlphaValue": 0.2,
+  "blurNewOptimizations": true,
+  "blurXray": false,
+  "blurNoise": 0.0,
+  "blurContrast": 1.0,
+  "blurBrightness": 1.0,
+  "blurVibrancy": 0.0,
+  "blurVibrancyDarkness": 0.0,
+  "blurSpecial": true,
+  "blurPopups": false,
+  "blurPopupsIgnorealpha": 0.2,
+  "blurInputMethods": false,
+  "blurInputMethodsIgnorealpha": 0.2,
+  "animationsEnabled": true,
+  "mouseSensitivity": 0.0,
+  "mouseAccelProfile": "",
+  "followMouse": 1,
+  "mouseNaturalScroll": false,
+  "mouseScrollFactor": 1.0,
+  "mouseLeftHanded": false,
+  "mouseRefocus": false,
+  "floatSwitchOverrideFocus": 0,
+  "touchpadDisableWhileTyping": true,
+  "touchpadNaturalScroll": true,
+  "touchpadTapToClick": true,
+  "touchpadClickfingerBehavior": false,
+  "touchpadTapButtonMap": "",
+  "touchpadMiddleButtonEmulation": false,
+  "touchpadDragLock": 0,
+  "touchpadScrollFactor": 1.0,
+  "noHardwareCursors": false,
+  "enableHyprcursor": true,
+  "noWarps": false,
+  "persistentWarps": false,
+  "warpOnChangeWorkspace": false,
+  "cursorZoomFactor": 1.0,
+  "cursorInactiveTimeout": 0,
+  "cursorHideOnKeyPress": false,
+  "cursorHideOnTouch": false,
+  "cursorHideOnTablet": false,
+  "workspaceSwipeCreateNew": true,
+  "workspaceSwipeForever": false,
+  "workspaceSwipeCancelRatio": 0.5,
+  "workspaceSwipeMinSpeedToForce": 30,
+  "workspaceSwipeDirectionLock": true,
+  "workspaceSwipeUseR": false,
+  "workspaceSwipeDistance": 300,
+  "workspaceSwipeInvert": true,
+  "workspaceSwipeTouch": false,
+  "workspaceSwipeTouchInvert": false,
+  "dwindlePreserveSplit": true,
+  "dwindlePseudotile": false,
+  "dwindleForceSplit": 0,
+  "dwindleSmartSplit": true,
+  "dwindleDefaultSplitRatio": 1.0,
+  "dwindleSplitWidthMultiplier": 1.0,
+  "dwindlePermanentDirectionOverride": false,
+  "dwindleUseActiveForSplits": true,
+  "dwindleSmartResizing": true,
+  "dwindleSpecialScaleFactor": 0.8,
+  "masterOrientation": "left",
+  "masterMfact": 0.55,
+  "masterNewStatus": "slave",
+  "masterNewOnTop": false,
+  "masterNewOnActive": "none",
+  "masterSmartResizing": true,
+  "masterSpecialScaleFactor": 0.8,
+  "masterAllowSmallSplit": false,
+  "scrollingColumnWidth": 0.3,
+  "scrollingExplicitColumnWidths": "",
+  "scrollingDirection": "right",
+  "scrollingFullscreenOnOneColumn": true,
+  "scrollingFocusFitMethod": "center",
+  "scrollingFollowFocus": true,
+  "scrollingFollowMinVisible": 0.1,
+  "xwaylandEnabled": true,
+  "xwaylandForceZeroScaling": false,
+  "xwaylandUseNearestNeighbor": true,
+  "vrr": 0,
+  "vfr": true,
+  "mouseMoveEnablesDpms": false,
+  "keyPressEnablesDpms": false,
+  "disableAutoreload": false,
+  "focusOnActivate": false,
+  "animateManualResizes": false,
+  "animateMouseWindowdragging": true,
+  "disableHyprlandLogo": true,
+  "disableSplashRendering": false,
+  "forceDefaultWallpaper": -1,
+  "noUpdateNews": true,
+  "enforcePermissions": false
+}
\ No newline at end of file
diff --git a/assets/presets/Dot Matrix/dock.json b/assets/presets/Dot Matrix/dock.json
new file mode 100755
index 00000000..ea13ca27
--- /dev/null
+++ b/assets/presets/Dot Matrix/dock.json	
@@ -0,0 +1,22 @@
+{
+  "enabled": true,
+  "theme": "default",
+  "position": "bottom",
+  "height": 48,
+  "iconSize": 24,
+  "spacing": 4,
+  "margin": 4,
+  "hoverRegionHeight": 16,
+  "pinnedOnStartup": false,
+  "hoverToReveal": true,
+  "availableOnFullscreen": true,
+  "showRunningIndicators": true,
+  "showPinButton": false,
+  "showOverviewButton": true,
+  "ignoredAppRegexes": [
+    "quickshell.*",
+    "xdg-desktop-portal.*"
+  ],
+  "screenList": [],
+  "keepHidden": false
+}
\ No newline at end of file
diff --git a/assets/presets/Dot Matrix/info.json b/assets/presets/Dot Matrix/info.json
new file mode 100644
index 00000000..81fd0d08
--- /dev/null
+++ b/assets/presets/Dot Matrix/info.json	
@@ -0,0 +1,6 @@
+{
+  "name": "Dot Matrix",
+  "author": "Leriart",
+  "description": "Ndot dot-matrix font aesthetic with halftone patterns. Retro-futuristic Nothing Phone style.",
+  "version": "1.0.0"
+}
\ No newline at end of file
diff --git a/assets/presets/Dot Matrix/notch.json b/assets/presets/Dot Matrix/notch.json
new file mode 100755
index 00000000..d94f6ebd
--- /dev/null
+++ b/assets/presets/Dot Matrix/notch.json	
@@ -0,0 +1,10 @@
+{
+  "theme": "default",
+  "position": "top",
+  "hoverRegionHeight": 16,
+  "keepHidden": false,
+  "noMediaDisplay": "compositor",
+  "customText": "Ambxst",
+  "disableHoverExpansion": false,
+  "showMetrics": false
+}
diff --git a/assets/presets/Dot Matrix/overview.json b/assets/presets/Dot Matrix/overview.json
new file mode 100755
index 00000000..e440f799
--- /dev/null
+++ b/assets/presets/Dot Matrix/overview.json	
@@ -0,0 +1,6 @@
+{
+  "rows": 2,
+  "columns": 5,
+  "scale": 0.15,
+  "workspaceSpacing": 8
+}
\ No newline at end of file
diff --git a/assets/presets/Dot Matrix/theme.json b/assets/presets/Dot Matrix/theme.json
new file mode 100644
index 00000000..cbf73db1
--- /dev/null
+++ b/assets/presets/Dot Matrix/theme.json	
@@ -0,0 +1,492 @@
+{
+  "oledMode": false,
+  "lightMode": false,
+  "roundness": 8,
+  "font": "Ndot",
+  "fontSize": 13,
+  "monoFont": "Ndot",
+  "monoFontSize": 13,
+  "tintIcons": true,
+  "enableCorners": true,
+  "animDuration": 250,
+  "shadowOpacity": 0.2,
+  "shadowColor": "shadow",
+  "shadowXOffset": 0,
+  "shadowYOffset": 0,
+  "shadowBlur": 1,
+  "srBg": {
+    "label": "Background",
+    "gradient": [
+      [
+        "background",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0,
+    "halftoneDotMin": 1,
+    "halftoneDotMax": 3,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surface",
+    "halftoneBackgroundColor": "background",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1
+  },
+  "srPopup": {
+    "label": "Popup",
+    "gradient": [
+      [
+        "surfaceContainer",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surface",
+    "halftoneBackgroundColor": "surfaceContainer",
+    "border": [
+      "surfaceBright",
+      1
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1
+  },
+  "srInternalBg": {
+    "label": "Internal BG",
+    "gradient": [
+      [
+        "surface",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surfaceBright",
+    "halftoneBackgroundColor": "surface",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1
+  },
+  "srBarBg": {
+    "label": "Bar BG",
+    "gradient": [
+      [
+        "surfaceContainer",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surface",
+    "halftoneBackgroundColor": "surfaceContainer",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 0
+  },
+  "srPane": {
+    "label": "Pane",
+    "gradient": [
+      [
+        "surface",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surfaceBright",
+    "halftoneBackgroundColor": "surface",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1
+  },
+  "srCommon": {
+    "label": "Common",
+    "gradient": [
+      [
+        "surface",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surfaceBright",
+    "halftoneBackgroundColor": "surface",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1
+  },
+  "srFocus": {
+    "label": "Focus",
+    "gradient": [
+      [
+        "primary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surfaceVariant",
+    "halftoneBackgroundColor": "primary",
+    "border": [
+      "primary",
+      0
+    ],
+    "itemColor": "overPrimary",
+    "opacity": 1
+  },
+  "srPrimary": {
+    "label": "Primary",
+    "gradient": [
+      [
+        "primary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "overPrimaryContainer",
+    "halftoneBackgroundColor": "primary",
+    "border": [
+      "primary",
+      0
+    ],
+    "itemColor": "overPrimary",
+    "opacity": 1
+  },
+  "srPrimaryFocus": {
+    "label": "Primary Focus",
+    "gradient": [
+      [
+        "overPrimaryContainer",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "primary",
+    "halftoneBackgroundColor": "overPrimaryContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overPrimary",
+    "opacity": 1
+  },
+  "srOverPrimary": {
+    "label": "Over Primary",
+    "gradient": [
+      [
+        "overPrimary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "primaryContainer",
+    "halftoneBackgroundColor": "overPrimary",
+    "border": [
+      "overPrimary",
+      0
+    ],
+    "itemColor": "primary",
+    "opacity": 1
+  },
+  "srSecondary": {
+    "label": "Secondary",
+    "gradient": [
+      [
+        "secondary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "overSecondaryContainer",
+    "halftoneBackgroundColor": "secondary",
+    "border": [
+      "secondary",
+      0
+    ],
+    "itemColor": "overSecondary",
+    "opacity": 1
+  },
+  "srSecondaryFocus": {
+    "label": "Secondary Focus",
+    "gradient": [
+      [
+        "overSecondaryContainer",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "secondary",
+    "halftoneBackgroundColor": "overSecondaryContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overSecondary",
+    "opacity": 1
+  },
+  "srOverSecondary": {
+    "label": "Over Secondary",
+    "gradient": [
+      [
+        "overSecondary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "secondaryContainer",
+    "halftoneBackgroundColor": "overSecondary",
+    "border": [
+      "overSecondary",
+      0
+    ],
+    "itemColor": "secondary",
+    "opacity": 1
+  },
+  "srTertiary": {
+    "label": "Tertiary",
+    "gradient": [
+      [
+        "tertiary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "overTertiaryContainer",
+    "halftoneBackgroundColor": "tertiary",
+    "border": [
+      "tertiary",
+      0
+    ],
+    "itemColor": "overTertiary",
+    "opacity": 1
+  },
+  "srTertiaryFocus": {
+    "label": "Tertiary Focus",
+    "gradient": [
+      [
+        "overTertiaryContainer",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "tertiary",
+    "halftoneBackgroundColor": "overTertiaryContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overTertiary",
+    "opacity": 1
+  },
+  "srOverTertiary": {
+    "label": "Over Tertiary",
+    "gradient": [
+      [
+        "overTertiary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "tertiaryContainer",
+    "halftoneBackgroundColor": "overTertiary",
+    "border": [
+      "overTertiary",
+      0
+    ],
+    "itemColor": "tertiary",
+    "opacity": 1
+  },
+  "srError": {
+    "label": "Error",
+    "gradient": [
+      [
+        "error",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "overErrorContainer",
+    "halftoneBackgroundColor": "error",
+    "border": [
+      "error",
+      0
+    ],
+    "itemColor": "overError",
+    "opacity": 1
+  },
+  "srErrorFocus": {
+    "label": "Error Focus",
+    "gradient": [
+      [
+        "overBackground",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "error",
+    "halftoneBackgroundColor": "overErrorContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overError",
+    "opacity": 1
+  },
+  "srOverError": {
+    "label": "Over Error",
+    "gradient": [
+      [
+        "overError",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "errorContainer",
+    "halftoneBackgroundColor": "overError",
+    "border": [
+      "overError",
+      0
+    ],
+    "itemColor": "error",
+    "opacity": 1
+  }
+}
\ No newline at end of file
diff --git a/assets/presets/Dot Matrix/workspaces.json b/assets/presets/Dot Matrix/workspaces.json
new file mode 100755
index 00000000..e9dc1c34
--- /dev/null
+++ b/assets/presets/Dot Matrix/workspaces.json	
@@ -0,0 +1,7 @@
+{
+  "shown": 10,
+  "showAppIcons": false,
+  "alwaysShowNumbers": false,
+  "showNumbers": false,
+  "dynamic": true
+}
\ No newline at end of file
diff --git a/assets/presets/Minimal/info.json b/assets/presets/Minimal/info.json
new file mode 100644
index 00000000..3e28f6db
--- /dev/null
+++ b/assets/presets/Minimal/info.json
@@ -0,0 +1,7 @@
+{
+  "name": "Minimal",
+  "author": "Leriart",
+  "authorUrl": "https://github.com/Leriart",
+  "description": "Maximum performance preset — no animations, no shadows, no blur, no borders. Pure function.",
+  "version": "1.0.0"
+}
diff --git a/assets/presets/Minimal/theme.json b/assets/presets/Minimal/theme.json
new file mode 100644
index 00000000..d1bf6196
--- /dev/null
+++ b/assets/presets/Minimal/theme.json
@@ -0,0 +1,34 @@
+{
+  "oledMode": true,
+  "lightMode": false,
+  "roundness": 0,
+  "font": "Roboto Condensed",
+  "fontSize": 13,
+  "monoFont": "Iosevka Nerd Font Mono",
+  "monoFontSize": 13,
+  "tintIcons": true,
+  "enableCorners": false,
+  "animDuration": 0,
+  "animScale": 0,
+  "shadowOpacity": 0,
+  "shadowColor": "shadow",
+  "shadowXOffset": 0,
+  "shadowYOffset": 0,
+  "shadowBlur": 0,
+  "srBg": { "label": "Background", "gradient": [["background", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "surface", "halftoneBackgroundColor": "background", "border": ["surfaceBright", 0], "itemColor": "overBackground", "opacity": 1 },
+  "srPopup": { "label": "Popup", "gradient": [["surfaceContainer", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "surface", "halftoneBackgroundColor": "surfaceContainer", "border": ["surfaceBright", 0], "itemColor": "overBackground", "opacity": 1 },
+  "srInternalBg": { "label": "Internal BG", "gradient": [["surface", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "surfaceBright", "halftoneBackgroundColor": "surface", "border": ["surfaceBright", 0], "itemColor": "overBackground", "opacity": 1 },
+  "srBarBg": { "label": "Bar BG", "gradient": [["surfaceDim", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "surfaceBright", "halftoneBackgroundColor": "surfaceDim", "border": ["surfaceBright", 0], "itemColor": "overBackground", "opacity": 0 },
+  "srPane": { "label": "Pane", "gradient": [["surfaceContainer", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "surfaceBright", "halftoneBackgroundColor": "surfaceContainer", "border": ["surfaceBright", 0], "itemColor": "overBackground", "opacity": 1 },
+  "srCommon": { "label": "Common", "gradient": [["surface", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "background", "halftoneBackgroundColor": "surface", "border": ["surfaceBright", 0], "itemColor": "overBackground", "opacity": 1 },
+  "srFocus": { "label": "Focus", "gradient": [["surfaceBright", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "surfaceVariant", "halftoneBackgroundColor": "surfaceBright", "border": ["surfaceBright", 0], "itemColor": "overBackground", "opacity": 1 },
+  "srPrimary": { "label": "Primary", "gradient": [["primary", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "overPrimaryContainer", "halftoneBackgroundColor": "primary", "border": ["primary", 0], "itemColor": "overPrimary", "opacity": 1 },
+  "srPrimaryFocus": { "label": "Primary Focus", "gradient": [["overPrimaryContainer", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "primary", "halftoneBackgroundColor": "overPrimaryContainer", "border": ["overBackground", 0], "itemColor": "overPrimary", "opacity": 1 },
+  "srOverPrimary": { "label": "Over Primary", "gradient": [["overPrimary", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "primaryContainer", "halftoneBackgroundColor": "overPrimary", "border": ["overPrimary", 0], "itemColor": "primary", "opacity": 1 },
+  "srSecondary": { "label": "Secondary", "gradient": [["secondary", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "overSecondaryContainer", "halftoneBackgroundColor": "secondary", "border": ["secondary", 0], "itemColor": "overSecondary", "opacity": 1 },
+  "srSecondaryFocus": { "label": "Secondary Focus", "gradient": [["overSecondaryContainer", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "secondary", "halftoneBackgroundColor": "overSecondaryContainer", "border": ["overBackground", 0], "itemColor": "overSecondary", "opacity": 1 },
+  "srOverSecondary": { "label": "Over Secondary", "gradient": [["overSecondary", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "secondaryContainer", "halftoneBackgroundColor": "overSecondary", "border": ["overSecondary", 0], "itemColor": "secondary", "opacity": 1 },
+  "srError": { "label": "Error", "gradient": [["error", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "overErrorContainer", "halftoneBackgroundColor": "error", "border": ["error", 0], "itemColor": "overError", "opacity": 1 },
+  "srErrorFocus": { "label": "Error Focus", "gradient": [["overBackground", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "error", "halftoneBackgroundColor": "overErrorContainer", "border": ["overBackground", 0], "itemColor": "overError", "opacity": 1 },
+  "srOverError": { "label": "Over Error", "gradient": [["overError", 0]], "gradientType": "linear", "gradientAngle": 0, "gradientCenterX": 0.5, "gradientCenterY": 0.5, "halftoneDotMin": 0, "halftoneDotMax": 0, "halftoneStart": 0, "halftoneEnd": 1, "halftoneDotColor": "errorContainer", "halftoneBackgroundColor": "overError", "border": ["overError", 0], "itemColor": "error", "opacity": 1 }
+}
diff --git a/assets/presets/Nothing/bar.json b/assets/presets/Nothing/bar.json
new file mode 100755
index 00000000..8ba1b9d6
--- /dev/null
+++ b/assets/presets/Nothing/bar.json
@@ -0,0 +1,40 @@
+{
+  "position": "top",
+  "launcherIconTint": true,
+  "launcherIconFullTint": true,
+  "launcherIconSize": 22,
+  "pillStyle": "default",
+  "enableFirefoxPlayer": true,
+  "enableChromiumPlayer": true,
+  "barColor": [
+    [
+      "surfaceDim",
+      0.85
+    ]
+  ],
+  "frameEnabled": false,
+  "pinnedOnStartup": false,
+  "hoverToReveal": false,
+  "showPinButton": false,
+  "availableOnFullscreen": true,
+  "use12hFormat": true,
+  "containBar": false,
+  "keepBarShadow": false,
+  "keepBarBorder": false,
+  "iconSpacing": 6,
+  "widgetSpacing": 4,
+  "barPadding": 4,
+  "clockFormat": "hh:mm",
+  "showDate": false,
+  "showBattery": true,
+  "showVolume": true,
+  "showBluetooth": true,
+  "showNetwork": true,
+  "showTray": true,
+  "taskTrayEnabled": true,
+  "taskTrayShowToggle": true,
+  "taskTrayAlwaysVisible": false,
+  "showWorkspaces": true,
+  "showActiveWindow": false,
+  "barMode": "dynamic"
+}
\ No newline at end of file
diff --git a/assets/presets/Nothing/compositor.json b/assets/presets/Nothing/compositor.json
new file mode 100755
index 00000000..0fea7d6f
--- /dev/null
+++ b/assets/presets/Nothing/compositor.json
@@ -0,0 +1,62 @@
+{
+  "showBorder": true,
+  "activeBorderColor": [
+    "primary"
+  ],
+  "borderAngle": 45,
+  "inactiveBorderColor": [
+    "surfaceContainer"
+  ],
+  "inactiveBorderAngle": 45,
+  "borderSize": 2,
+  "rounding": 16,
+  "roundingPower": 2.0,
+  "syncRoundness": true,
+  "syncBorderWidth": false,
+  "syncBorderColor": false,
+  "syncShadowOpacity": false,
+  "syncShadowColor": false,
+  "resizeOnBorder": false,
+  "extendBorderGrabArea": 15,
+  "hoverIconOnBorder": true,
+  "gapsIn": 2,
+  "gapsOut": 4,
+  "layout": "dwindle",
+  "snapEnabled": true,
+  "snapWindowGap": 10,
+  "snapMonitorGap": 10,
+  "activeOpacity": 1.0,
+  "inactiveOpacity": 0.85,
+  "fullscreenOpacity": 1.0,
+  "shadowEnabled": true,
+  "shadowPower": 2.0,
+  "shadowScale": 1.0,
+  "shadowRange": 12,
+  "shadowRenderPower": 3,
+  "shadowColor": "shadow",
+  "shadowOpacity": 0.4,
+  "shadowOffset": [
+    0,
+    4
+  ],
+  "blurEnabled": true,
+  "blurSize": 4,
+  "blurPasses": 2,
+  "blurNewOptimizations": true,
+  "blurXray": true,
+  "blurIgnoreOpacity": true,
+  "blurExplicitIgnoreAlpha": true,
+  "blurIgnoreAlphaValue": 0.2,
+  "animationsEnabled": true,
+  "animSpeed": 1.0,
+  "renderBackend": "opengl",
+  "vrrEnabled": false,
+  "maxFps": 0,
+  "allowTearing": false,
+  "swapBuffersDelay": 0,
+  "tripleBuffering": true,
+  "animateManualResizes": false,
+  "animateMouseWindowdragging": true,
+  "dmabuf": true,
+  "explicitSync": true
+}
\ No newline at end of file
diff --git a/assets/presets/Nothing/desktop.json b/assets/presets/Nothing/desktop.json
new file mode 100755
index 00000000..91444049
--- /dev/null
+++ b/assets/presets/Nothing/desktop.json
@@ -0,0 +1,6 @@
+{
+    "enabled": false,
+    "iconSize": 40,
+    "spacingVertical": 16,
+    "textColor": "overBackground"
+}
diff --git a/assets/presets/Nothing/dock.json b/assets/presets/Nothing/dock.json
new file mode 100755
index 00000000..21ed3664
--- /dev/null
+++ b/assets/presets/Nothing/dock.json
@@ -0,0 +1,20 @@
+{
+  "enabled": true,
+  "theme": "default",
+  "position": "bottom",
+  "height": 48,
+  "iconSize": 24,
+  "spacing": 4,
+  "margin": 4,
+  "hoverRegionHeight": 8,
+  "pinnedOnStartup": false,
+  "hoverToReveal": true,
+  "availableOnFullscreen": true,
+  "showRunningIndicators": true,
+  "showPinButton": false,
+  "showOverviewButton": true,
+  "ignoredAppRegexes": [
+    "quickshell.*",
+    "xdg-desktop-portal.*"
+  ]
+}
\ No newline at end of file
diff --git a/assets/presets/Nothing/info.json b/assets/presets/Nothing/info.json
new file mode 100755
index 00000000..f1049513
--- /dev/null
+++ b/assets/presets/Nothing/info.json
@@ -0,0 +1,7 @@
+{
+  "name": "Nothing",
+  "author": "Leriart",
+  "authorUrl": "https://github.com/Leriart",
+  "description": "Nothing Phone (3a) aesthetic × Material 3. Dot-matrix typography, glyph-style bar, dynamic color from wallpaper, M3 motion system, and translucent M3 surfaces. The flagship Ambxst experience.",
+  "version": "2.0.0"
+}
diff --git a/assets/presets/Nothing/lockscreen.json b/assets/presets/Nothing/lockscreen.json
new file mode 100755
index 00000000..7da0e440
--- /dev/null
+++ b/assets/presets/Nothing/lockscreen.json
@@ -0,0 +1,3 @@
+{
+    "position": "bottom"
+}
diff --git a/assets/presets/Nothing/notch.json b/assets/presets/Nothing/notch.json
new file mode 100755
index 00000000..432608be
--- /dev/null
+++ b/assets/presets/Nothing/notch.json
@@ -0,0 +1,10 @@
+{
+  "theme": "island",
+  "position": "top",
+  "hoverRegionHeight": 8,
+  "keepHidden": false,
+  "noMediaDisplay": "compositor",
+  "customText": "Ambxst",
+  "disableHoverExpansion": false,
+  "showMetrics": false
+}
\ No newline at end of file
diff --git a/assets/presets/Nothing/overview.json b/assets/presets/Nothing/overview.json
new file mode 100755
index 00000000..5ea89075
--- /dev/null
+++ b/assets/presets/Nothing/overview.json
@@ -0,0 +1,14 @@
+{
+  "scale": 0.3,
+  "rows": 2,
+  "columns": 4,
+  "workspaceSpacing": 8,
+  "windowSpacing": 4,
+  "animEnabled": true,
+  "animDuration": 300,
+  "showActiveIndicator": true,
+  "searchEnabled": true,
+  "dragEnabled": true,
+  "livePreview": true,
+  "scrollingMode": "vertical"
+}
\ No newline at end of file
diff --git a/assets/presets/Nothing/theme.json b/assets/presets/Nothing/theme.json
new file mode 100755
index 00000000..c87272ad
--- /dev/null
+++ b/assets/presets/Nothing/theme.json
@@ -0,0 +1,498 @@
+{
+  "oledMode": false,
+  "lightMode": false,
+  "roundness": 16,
+  "font": "Ndot",
+  "fontSize": 13,
+  "monoFont": "Ndot",
+  "monoFontSize": 13,
+  "tintIcons": true,
+  "enableCorners": true,
+  "animDuration": 300,
+  "animScale": 1.0,
+  "dynamicColor": true,
+  "shadowOpacity": 0.35,
+  "shadowColor": "shadow",
+  "shadowXOffset": 0,
+  "shadowYOffset": 4,
+  "shadowBlur": 3,
+  "srBg": {
+    "label": "Background",
+    "gradient": [
+      [
+        "surfaceDim",
+        0.0
+      ],
+      [
+        "surface",
+        0.5
+      ]
+    ],
+    "gradientType": "radial",
+    "gradientAngle": 45,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.0,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 2,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 0.8,
+    "halftoneDotColor": "surfaceContainerHighest",
+    "halftoneBackgroundColor": "surfaceDim",
+    "border": [
+      "surfaceVariant",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1.0
+  },
+  "srPopup": {
+    "label": "Popup",
+    "gradient": [
+      [
+        "surfaceContainerHigh",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 1,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "surfaceContainerHighest",
+    "halftoneBackgroundColor": "surfaceContainerHigh",
+    "border": [
+      "surfaceBright",
+      1
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1.0
+  },
+  "srInternalBg": {
+    "label": "Internal BG",
+    "gradient": [
+      [
+        "surfaceContainer",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 1,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "surfaceBright",
+    "halftoneBackgroundColor": "surfaceContainer",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1.0
+  },
+  "srBarBg": {
+    "label": "Bar BG",
+    "gradient": [
+      [
+        "surfaceDim",
+        0.85
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "surface",
+    "halftoneBackgroundColor": "surfaceDim",
+    "border": [
+      "surfaceVariant",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 0.85
+  },
+  "srPane": {
+    "label": "Pane",
+    "gradient": [
+      [
+        "surfaceContainer",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 1,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "surfaceBright",
+    "halftoneBackgroundColor": "surfaceContainer",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1.0
+  },
+  "srCommon": {
+    "label": "Common",
+    "gradient": [
+      [
+        "surfaceContainerLow",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 1,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "background",
+    "halftoneBackgroundColor": "surfaceContainerLow",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1.0
+  },
+  "srFocus": {
+    "label": "Focus",
+    "gradient": [
+      [
+        "surfaceContainerHigh",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 2,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "surfaceVariant",
+    "halftoneBackgroundColor": "surfaceContainerHigh",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1.0
+  },
+  "srPrimary": {
+    "label": "Primary",
+    "gradient": [
+      [
+        "primary",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 2,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "overPrimaryContainer",
+    "halftoneBackgroundColor": "primary",
+    "border": [
+      "primary",
+      0
+    ],
+    "itemColor": "overPrimary",
+    "opacity": 1.0
+  },
+  "srPrimaryFocus": {
+    "label": "Primary Focus",
+    "gradient": [
+      [
+        "overPrimaryContainer",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 2,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "primary",
+    "halftoneBackgroundColor": "overPrimaryContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overPrimary",
+    "opacity": 1.0
+  },
+  "srOverPrimary": {
+    "label": "Over Primary",
+    "gradient": [
+      [
+        "overPrimary",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 2,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "primaryContainer",
+    "halftoneBackgroundColor": "overPrimary",
+    "border": [
+      "overPrimary",
+      0
+    ],
+    "itemColor": "primary",
+    "opacity": 1.0
+  },
+  "srSecondary": {
+    "label": "Secondary",
+    "gradient": [
+      [
+        "secondary",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 1,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "overSecondaryContainer",
+    "halftoneBackgroundColor": "secondary",
+    "border": [
+      "secondary",
+      0
+    ],
+    "itemColor": "overSecondary",
+    "opacity": 1.0
+  },
+  "srSecondaryFocus": {
+    "label": "Secondary Focus",
+    "gradient": [
+      [
+        "overSecondaryContainer",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 1,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "secondary",
+    "halftoneBackgroundColor": "overSecondaryContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overSecondary",
+    "opacity": 1.0
+  },
+  "srOverSecondary": {
+    "label": "Over Secondary",
+    "gradient": [
+      [
+        "overSecondary",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 1,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "secondaryContainer",
+    "halftoneBackgroundColor": "overSecondary",
+    "border": [
+      "overSecondary",
+      0
+    ],
+    "itemColor": "secondary",
+    "opacity": 1.0
+  },
+  "srTertiary": {
+    "label": "Tertiary",
+    "gradient": [
+      [
+        "tertiary",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 1,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "overTertiaryContainer",
+    "halftoneBackgroundColor": "tertiary",
+    "border": [
+      "tertiary",
+      0
+    ],
+    "itemColor": "overTertiary",
+    "opacity": 1.0
+  },
+  "srTertiaryFocus": {
+    "label": "Tertiary Focus",
+    "gradient": [
+      [
+        "overTertiaryContainer",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 1,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "tertiary",
+    "halftoneBackgroundColor": "overTertiaryContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overTertiary",
+    "opacity": 1.0
+  },
+  "srOverTertiary": {
+    "label": "Over Tertiary",
+    "gradient": [
+      [
+        "overTertiary",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 1,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "tertiaryContainer",
+    "halftoneBackgroundColor": "overTertiary",
+    "border": [
+      "overTertiary",
+      0
+    ],
+    "itemColor": "tertiary",
+    "opacity": 1.0
+  },
+  "srError": {
+    "label": "Error",
+    "gradient": [
+      [
+        "error",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 2,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "overErrorContainer",
+    "halftoneBackgroundColor": "error",
+    "border": [
+      "error",
+      0
+    ],
+    "itemColor": "overError",
+    "opacity": 1.0
+  },
+  "srErrorFocus": {
+    "label": "Error Focus",
+    "gradient": [
+      [
+        "overErrorContainer",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 2,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "error",
+    "halftoneBackgroundColor": "overErrorContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overError",
+    "opacity": 1.0
+  },
+  "srOverError": {
+    "label": "Over Error",
+    "gradient": [
+      [
+        "overError",
+        0.0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 2,
+    "halftoneStart": 0.0,
+    "halftoneEnd": 1.0,
+    "halftoneDotColor": "errorContainer",
+    "halftoneBackgroundColor": "overError",
+    "border": [
+      "overError",
+      0
+    ],
+    "itemColor": "error",
+    "opacity": 1.0
+  }
+}
\ No newline at end of file
diff --git a/assets/presets/Nothing/workspaces.json b/assets/presets/Nothing/workspaces.json
new file mode 100755
index 00000000..6c429951
--- /dev/null
+++ b/assets/presets/Nothing/workspaces.json
@@ -0,0 +1,7 @@
+{
+  "shown": 5,
+  "showAppIcons": true,
+  "alwaysShowNumbers": false,
+  "showNumbers": true,
+  "dynamic": false
+}
\ No newline at end of file
diff --git a/assets/presets/Pure Monochrome/bar.json b/assets/presets/Pure Monochrome/bar.json
new file mode 100755
index 00000000..0bb60b0e
--- /dev/null
+++ b/assets/presets/Pure Monochrome/bar.json	
@@ -0,0 +1,28 @@
+{
+  "position": "top",
+  "launcherIcon": "/home/leo/Im\u00e1genes/Iconos/Nothing.png",
+  "launcherIconTint": true,
+  "launcherIconFullTint": true,
+  "launcherIconSize": 22,
+  "pillStyle": "default",
+  "screenList": [],
+  "enableFirefoxPlayer": true,
+  "barColor": [
+    [
+      "surfaceContainer",
+      0
+    ]
+  ],
+  "frameEnabled": false,
+  "frameThickness": 8,
+  "pinnedOnStartup": true,
+  "hoverToReveal": true,
+  "hoverRegionHeight": 4,
+  "showPinButton": false,
+  "availableOnFullscreen": true,
+  "use12hFormat": true,
+  "containBar": false,
+  "keepBarShadow": false,
+  "keepBarBorder": false,
+  "barMode": "extended"
+}
\ No newline at end of file
diff --git a/assets/presets/Pure Monochrome/compositor.json b/assets/presets/Pure Monochrome/compositor.json
new file mode 100755
index 00000000..28210c8b
--- /dev/null
+++ b/assets/presets/Pure Monochrome/compositor.json	
@@ -0,0 +1,144 @@
+{
+  "showBorder": true,
+  "activeBorderColor": [
+    "primary"
+  ],
+  "borderAngle": 45,
+  "inactiveBorderColor": [
+    "surface"
+  ],
+  "inactiveBorderAngle": 45,
+  "borderSize": 2,
+  "rounding": 16,
+  "roundingPower": 2.0,
+  "syncRoundness": true,
+  "syncBorderWidth": false,
+  "syncBorderColor": false,
+  "syncShadowOpacity": false,
+  "syncShadowColor": false,
+  "resizeOnBorder": false,
+  "extendBorderGrabArea": 15,
+  "hoverIconOnBorder": true,
+  "gapsIn": 2,
+  "gapsOut": 4,
+  "layout": "dwindle",
+  "allowTearing": false,
+  "snapEnabled": true,
+  "snapWindowGap": 10,
+  "snapMonitorGap": 10,
+  "snapBorderOverlap": false,
+  "snapRespectGaps": false,
+  "activeOpacity": 1.0,
+  "inactiveOpacity": 1.0,
+  "fullscreenOpacity": 1.0,
+  "dimInactive": false,
+  "dimStrength": 0.5,
+  "dimAround": 0.4,
+  "dimSpecial": 0.2,
+  "shadowEnabled": true,
+  "shadowRange": 8,
+  "shadowRenderPower": 3,
+  "shadowSharp": false,
+  "shadowIgnoreWindow": true,
+  "shadowColor": "shadow",
+  "shadowColorInactive": "shadow",
+  "shadowOpacity": 0.5,
+  "shadowOffset": "0 0",
+  "shadowScale": 1.0,
+  "blurEnabled": true,
+  "blurSize": 4,
+  "blurPasses": 2,
+  "blurIgnoreOpacity": true,
+  "blurExplicitIgnoreAlpha": false,
+  "blurIgnoreAlphaValue": 0.2,
+  "blurNewOptimizations": true,
+  "blurXray": false,
+  "blurNoise": 0.0,
+  "blurContrast": 1.0,
+  "blurBrightness": 1.0,
+  "blurVibrancy": 0.0,
+  "blurVibrancyDarkness": 0.0,
+  "blurSpecial": true,
+  "blurPopups": false,
+  "blurPopupsIgnorealpha": 0.2,
+  "blurInputMethods": false,
+  "blurInputMethodsIgnorealpha": 0.2,
+  "animationsEnabled": true,
+  "mouseSensitivity": 0.0,
+  "mouseAccelProfile": "",
+  "followMouse": 1,
+  "mouseNaturalScroll": false,
+  "mouseScrollFactor": 1.0,
+  "mouseLeftHanded": false,
+  "mouseRefocus": false,
+  "floatSwitchOverrideFocus": 0,
+  "touchpadDisableWhileTyping": true,
+  "touchpadNaturalScroll": true,
+  "touchpadTapToClick": true,
+  "touchpadClickfingerBehavior": false,
+  "touchpadTapButtonMap": "",
+  "touchpadMiddleButtonEmulation": false,
+  "touchpadDragLock": 0,
+  "touchpadScrollFactor": 1.0,
+  "noHardwareCursors": false,
+  "enableHyprcursor": true,
+  "noWarps": false,
+  "persistentWarps": false,
+  "warpOnChangeWorkspace": false,
+  "cursorZoomFactor": 1.0,
+  "cursorInactiveTimeout": 0,
+  "cursorHideOnKeyPress": false,
+  "cursorHideOnTouch": false,
+  "cursorHideOnTablet": false,
+  "workspaceSwipeCreateNew": true,
+  "workspaceSwipeForever": false,
+  "workspaceSwipeCancelRatio": 0.5,
+  "workspaceSwipeMinSpeedToForce": 30,
+  "workspaceSwipeDirectionLock": true,
+  "workspaceSwipeUseR": false,
+  "workspaceSwipeDistance": 300,
+  "workspaceSwipeInvert": true,
+  "workspaceSwipeTouch": false,
+  "workspaceSwipeTouchInvert": false,
+  "dwindlePreserveSplit": true,
+  "dwindlePseudotile": false,
+  "dwindleForceSplit": 0,
+  "dwindleSmartSplit": true,
+  "dwindleDefaultSplitRatio": 1.0,
+  "dwindleSplitWidthMultiplier": 1.0,
+  "dwindlePermanentDirectionOverride": false,
+  "dwindleUseActiveForSplits": true,
+  "dwindleSmartResizing": true,
+  "dwindleSpecialScaleFactor": 0.8,
+  "masterOrientation": "left",
+  "masterMfact": 0.55,
+  "masterNewStatus": "slave",
+  "masterNewOnTop": false,
+  "masterNewOnActive": "none",
+  "masterSmartResizing": true,
+  "masterSpecialScaleFactor": 0.8,
+  "masterAllowSmallSplit": false,
+  "scrollingColumnWidth": 0.3,
+  "scrollingExplicitColumnWidths": "",
+  "scrollingDirection": "right",
+  "scrollingFullscreenOnOneColumn": true,
+  "scrollingFocusFitMethod": "center",
+  "scrollingFollowFocus": true,
+  "scrollingFollowMinVisible": 0.1,
+  "xwaylandEnabled": true,
+  "xwaylandForceZeroScaling": false,
+  "xwaylandUseNearestNeighbor": true,
+  "vrr": 0,
+  "vfr": true,
+  "mouseMoveEnablesDpms": false,
+  "keyPressEnablesDpms": false,
+  "disableAutoreload": false,
+  "focusOnActivate": false,
+  "animateManualResizes": false,
+  "animateMouseWindowdragging": true,
+  "disableHyprlandLogo": true,
+  "disableSplashRendering": false,
+  "forceDefaultWallpaper": -1,
+  "noUpdateNews": true,
+  "enforcePermissions": false
+}
\ No newline at end of file
diff --git a/assets/presets/Pure Monochrome/dock.json b/assets/presets/Pure Monochrome/dock.json
new file mode 100755
index 00000000..ea13ca27
--- /dev/null
+++ b/assets/presets/Pure Monochrome/dock.json	
@@ -0,0 +1,22 @@
+{
+  "enabled": true,
+  "theme": "default",
+  "position": "bottom",
+  "height": 48,
+  "iconSize": 24,
+  "spacing": 4,
+  "margin": 4,
+  "hoverRegionHeight": 16,
+  "pinnedOnStartup": false,
+  "hoverToReveal": true,
+  "availableOnFullscreen": true,
+  "showRunningIndicators": true,
+  "showPinButton": false,
+  "showOverviewButton": true,
+  "ignoredAppRegexes": [
+    "quickshell.*",
+    "xdg-desktop-portal.*"
+  ],
+  "screenList": [],
+  "keepHidden": false
+}
\ No newline at end of file
diff --git a/assets/presets/Pure Monochrome/info.json b/assets/presets/Pure Monochrome/info.json
new file mode 100644
index 00000000..cadd8a0b
--- /dev/null
+++ b/assets/presets/Pure Monochrome/info.json	
@@ -0,0 +1,6 @@
+{
+  "name": "Pure Monochrome",
+  "author": "Leriart",
+  "description": "True monochrome — pure black and white, no colors, no gradients. Maximum contrast and battery savings on OLED.",
+  "version": "1.0.0"
+}
diff --git a/assets/presets/Pure Monochrome/notch.json b/assets/presets/Pure Monochrome/notch.json
new file mode 100755
index 00000000..d94f6ebd
--- /dev/null
+++ b/assets/presets/Pure Monochrome/notch.json	
@@ -0,0 +1,10 @@
+{
+  "theme": "default",
+  "position": "top",
+  "hoverRegionHeight": 16,
+  "keepHidden": false,
+  "noMediaDisplay": "compositor",
+  "customText": "Ambxst",
+  "disableHoverExpansion": false,
+  "showMetrics": false
+}
diff --git a/assets/presets/Pure Monochrome/overview.json b/assets/presets/Pure Monochrome/overview.json
new file mode 100755
index 00000000..e440f799
--- /dev/null
+++ b/assets/presets/Pure Monochrome/overview.json	
@@ -0,0 +1,6 @@
+{
+  "rows": 2,
+  "columns": 5,
+  "scale": 0.15,
+  "workspaceSpacing": 8
+}
\ No newline at end of file
diff --git a/assets/presets/Pure Monochrome/theme.json b/assets/presets/Pure Monochrome/theme.json
new file mode 100644
index 00000000..a172b4bd
--- /dev/null
+++ b/assets/presets/Pure Monochrome/theme.json	
@@ -0,0 +1,492 @@
+{
+  "oledMode": true,
+  "lightMode": false,
+  "roundness": 8,
+  "font": "Roboto Condensed",
+  "fontSize": 14,
+  "monoFont": "Iosevka Nerd Font Mono",
+  "monoFontSize": 13,
+  "tintIcons": true,
+  "enableCorners": false,
+  "animDuration": 0,
+  "shadowOpacity": 0,
+  "shadowColor": "shadow",
+  "shadowXOffset": 0,
+  "shadowYOffset": 0,
+  "shadowBlur": 1,
+  "srBg": {
+    "label": "Background",
+    "gradient": [
+      [
+        "background",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surface",
+    "halftoneBackgroundColor": "background",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1
+  },
+  "srPopup": {
+    "label": "Popup",
+    "gradient": [
+      [
+        "surfaceContainer",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surface",
+    "halftoneBackgroundColor": "surfaceContainer",
+    "border": [
+      "surfaceBright",
+      1
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1
+  },
+  "srInternalBg": {
+    "label": "Internal BG",
+    "gradient": [
+      [
+        "surface",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surfaceBright",
+    "halftoneBackgroundColor": "surface",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1
+  },
+  "srBarBg": {
+    "label": "Bar BG",
+    "gradient": [
+      [
+        "surfaceContainer",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surface",
+    "halftoneBackgroundColor": "surfaceContainer",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 0
+  },
+  "srPane": {
+    "label": "Pane",
+    "gradient": [
+      [
+        "surface",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surfaceBright",
+    "halftoneBackgroundColor": "surface",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1
+  },
+  "srCommon": {
+    "label": "Common",
+    "gradient": [
+      [
+        "surface",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surfaceBright",
+    "halftoneBackgroundColor": "surface",
+    "border": [
+      "surfaceBright",
+      0
+    ],
+    "itemColor": "overBackground",
+    "opacity": 1
+  },
+  "srFocus": {
+    "label": "Focus",
+    "gradient": [
+      [
+        "primary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "surfaceVariant",
+    "halftoneBackgroundColor": "primary",
+    "border": [
+      "primary",
+      0
+    ],
+    "itemColor": "overPrimary",
+    "opacity": 1
+  },
+  "srPrimary": {
+    "label": "Primary",
+    "gradient": [
+      [
+        "primary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "overPrimaryContainer",
+    "halftoneBackgroundColor": "primary",
+    "border": [
+      "primary",
+      0
+    ],
+    "itemColor": "overPrimary",
+    "opacity": 1
+  },
+  "srPrimaryFocus": {
+    "label": "Primary Focus",
+    "gradient": [
+      [
+        "overPrimaryContainer",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "primary",
+    "halftoneBackgroundColor": "overPrimaryContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overPrimary",
+    "opacity": 1
+  },
+  "srOverPrimary": {
+    "label": "Over Primary",
+    "gradient": [
+      [
+        "overPrimary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "primaryContainer",
+    "halftoneBackgroundColor": "overPrimary",
+    "border": [
+      "overPrimary",
+      0
+    ],
+    "itemColor": "primary",
+    "opacity": 1
+  },
+  "srSecondary": {
+    "label": "Secondary",
+    "gradient": [
+      [
+        "secondary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "overSecondaryContainer",
+    "halftoneBackgroundColor": "secondary",
+    "border": [
+      "secondary",
+      0
+    ],
+    "itemColor": "overSecondary",
+    "opacity": 1
+  },
+  "srSecondaryFocus": {
+    "label": "Secondary Focus",
+    "gradient": [
+      [
+        "overSecondaryContainer",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "secondary",
+    "halftoneBackgroundColor": "overSecondaryContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overSecondary",
+    "opacity": 1
+  },
+  "srOverSecondary": {
+    "label": "Over Secondary",
+    "gradient": [
+      [
+        "overSecondary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "secondaryContainer",
+    "halftoneBackgroundColor": "overSecondary",
+    "border": [
+      "overSecondary",
+      0
+    ],
+    "itemColor": "secondary",
+    "opacity": 1
+  },
+  "srTertiary": {
+    "label": "Tertiary",
+    "gradient": [
+      [
+        "tertiary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "overTertiaryContainer",
+    "halftoneBackgroundColor": "tertiary",
+    "border": [
+      "tertiary",
+      0
+    ],
+    "itemColor": "overTertiary",
+    "opacity": 1
+  },
+  "srTertiaryFocus": {
+    "label": "Tertiary Focus",
+    "gradient": [
+      [
+        "overTertiaryContainer",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "tertiary",
+    "halftoneBackgroundColor": "overTertiaryContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overTertiary",
+    "opacity": 1
+  },
+  "srOverTertiary": {
+    "label": "Over Tertiary",
+    "gradient": [
+      [
+        "overTertiary",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "tertiaryContainer",
+    "halftoneBackgroundColor": "overTertiary",
+    "border": [
+      "overTertiary",
+      0
+    ],
+    "itemColor": "tertiary",
+    "opacity": 1
+  },
+  "srError": {
+    "label": "Error",
+    "gradient": [
+      [
+        "error",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "overErrorContainer",
+    "halftoneBackgroundColor": "error",
+    "border": [
+      "error",
+      0
+    ],
+    "itemColor": "overError",
+    "opacity": 1
+  },
+  "srErrorFocus": {
+    "label": "Error Focus",
+    "gradient": [
+      [
+        "overBackground",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "error",
+    "halftoneBackgroundColor": "overErrorContainer",
+    "border": [
+      "overBackground",
+      0
+    ],
+    "itemColor": "overError",
+    "opacity": 1
+  },
+  "srOverError": {
+    "label": "Over Error",
+    "gradient": [
+      [
+        "overError",
+        0
+      ]
+    ],
+    "gradientType": "linear",
+    "gradientAngle": 0,
+    "gradientCenterX": 0.5,
+    "gradientCenterY": 0.5,
+    "halftoneDotMin": 0,
+    "halftoneDotMax": 0,
+    "halftoneStart": 0,
+    "halftoneEnd": 1,
+    "halftoneDotColor": "errorContainer",
+    "halftoneBackgroundColor": "overError",
+    "border": [
+      "overError",
+      0
+    ],
+    "itemColor": "error",
+    "opacity": 1
+  }
+}
\ No newline at end of file
diff --git a/assets/presets/Pure Monochrome/workspaces.json b/assets/presets/Pure Monochrome/workspaces.json
new file mode 100755
index 00000000..e9dc1c34
--- /dev/null
+++ b/assets/presets/Pure Monochrome/workspaces.json	
@@ -0,0 +1,7 @@
+{
+  "shown": 10,
+  "showAppIcons": false,
+  "alwaysShowNumbers": false,
+  "showNumbers": false,
+  "dynamic": true
+}
\ No newline at end of file
diff --git a/assets/screenshots/dynamic-bar.png b/assets/screenshots/dynamic-bar.png
new file mode 100644
index 00000000..8143bd9b
Binary files /dev/null and b/assets/screenshots/dynamic-bar.png differ
diff --git a/assets/screenshots/free-layout.png b/assets/screenshots/free-layout.png
new file mode 100644
index 00000000..94c51019
Binary files /dev/null and b/assets/screenshots/free-layout.png differ
diff --git a/assets/screenshots/gaming.png b/assets/screenshots/gaming.png
new file mode 100644
index 00000000..694c82d3
Binary files /dev/null and b/assets/screenshots/gaming.png differ
diff --git a/assets/screenshots/nothing.png b/assets/screenshots/nothing.png
new file mode 100644
index 00000000..dfe2aa6f
Binary files /dev/null and b/assets/screenshots/nothing.png differ
diff --git a/assets/screenshots/settings.png b/assets/screenshots/settings.png
new file mode 100644
index 00000000..3a44dffd
Binary files /dev/null and b/assets/screenshots/settings.png differ
diff --git a/cli.sh b/cli.sh
index 695c033f..4b09d6ab 100755
--- a/cli.sh
+++ b/cli.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
-# Ambxst CLI - It was needed, so here it is. lol
+# Ambxst CLI - Minimal Ambxst fork - It was needed, so here it is. lol
 
 set -euo pipefail
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" && pwd)"
 
 # Use environment variables if set by flake, otherwise fall back to PATH
 QS_BIN="${AMBXST_QS:-qs}"
@@ -48,15 +48,33 @@ Commands:
     update                            Update Ambxst
     refresh                           Refresh local/dev profile (for developers)
     lock                              Activate lockscreen
+    reload                            Restart Ambxst
+    quit                              Stop Ambxst
+    screen [on|off]                   Turn screen on/off
+    suspend                           Suspend the system
+
     brightness <percent> [monitor]    Set brightness (0-100)
     brightness +/-<delta> [monitor]   Adjust brightness relatively
     brightness -s [monitor]           Save current brightness
     brightness -r [monitor]           Restore saved brightness
     brightness -l                     List monitors and their brightness
+
+    volume-up                         Increase volume
+    volume-down                       Decrease volume
+    volume-mute                       Toggle volume mute
+    mic-mute                          Toggle microphone mute
+    caffeine                          Toggle caffeine (idle inhibition)
+    gamemode                          Toggle game mode
+    nightlight                        Toggle night light
+
+    run <command>                     Run any IPC command (launcher, dashboard, overview, etc.)
+
     help                              Show this help message
     version, -v, --version            Show Ambxst version
     goodbye                           Uninstall Ambxst :(
     install <target>                    Install compositor config (hyprland)
+    install hyprland --lua            Install with Lua config (Hyprland >= 0.48)
+    install hyprland --conf           Install with config file (default, safe)
     remove <target>                    Remove compositor config (hyprland)
 
 Examples:
@@ -128,7 +146,9 @@ remove_ambxst_hyprland_block() {
 				|| line == "# OVERRIDES" \
 				|| line == "-- OVERRIDES" \
 				|| line == "# Down here you can write or source anything that you want to override from Ambxst'\''s settings." \
-				|| line == "-- Down here you can write or source anything that you want to override from Ambxst'\''s settings."
+				|| line == "-- Down here you can write or source anything that you want to override from Ambxst'\''s settings." \
+				|| line == "exec-once = ambxst" \
+				|| line == "exec-once = axctl -c ~/.local/share/ambxst/axctl.toml daemon"
 		}
 		{
 			lines[NR] = $0
@@ -225,7 +245,7 @@ restart_ambxst() {
 case "${1:-}" in
 update)
 	echo "Updating Ambxst..."
-	curl -fsSL get.axeni.de/ambxst | sh
+	curl -fsSL github.com/Axenide/Ambxst/ambxst | sh
 	restart_ambxst
 	;;
 refresh)
@@ -241,6 +261,42 @@ run)
 		exit 1
 	fi
 
+	# toggle-metrics: write directly to notch.json (no IPC needed)
+	if [ "$CMD" = "toggle-metrics" ]; then
+		# Debounce: prevent double-fire from Hyprland key repeat
+		LOCK_FILE="/tmp/ambxst_toggle_metrics.lock"
+		if [ -f "$LOCK_FILE" ]; then
+			last_run=$(cat "$LOCK_FILE")
+			now=$(date +%s%N)
+			elapsed=$(( (now - last_run) / 1000000 ))
+			if [ "$elapsed" -lt 500 ]; then
+				exit 0
+			fi
+		fi
+		date +%s%N > "$LOCK_FILE"
+
+		NOTCH_JSON="${XDG_CONFIG_HOME:-$HOME/.config}/ambxst/config/notch.json"
+		if [ -f "$NOTCH_JSON" ]; then
+			# Toggle showMetrics in the JSON
+			python3 -c "
+import json
+with open('$NOTCH_JSON') as f:
+    cfg = json.load(f)
+cfg['showMetrics'] = not cfg.get('showMetrics', False)
+with open('$NOTCH_JSON', 'w') as f:
+    json.dump(cfg, f, indent=2)
+print('Metrics toggled to', cfg['showMetrics'])
+" 2>&1 || {
+				echo "Error: Failed to toggle metrics"
+				exit 1
+			}
+			exit 0
+		else
+			echo "Error: notch.json not found at $NOTCH_JSON"
+			exit 1
+		fi
+	fi
+
 	# Fast path: Write directly to pipe if it exists (Zero latency)
 	if [ -p "$PIPE" ]; then
 		echo "$CMD" >"$PIPE" &
@@ -315,6 +371,17 @@ suspend)
 		dbus-send --system --print-reply --dest=org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager.Suspend boolean:true
 	fi
 	;;
+volume-up|volume-down|volume-mute|mic-mute|caffeine|gamemode|nightlight)
+	PID=$(find_ambxst_pid_cached)
+	if [ -z "$PID" ]; then
+		echo "Error: Ambxst is not running"
+		exit 1
+	fi
+	qs ipc --pid "$PID" call ambxst run "$1" 2>/dev/null || {
+		echo "Error: Could not run command '$1'"
+		exit 1
+	}
+	;;
 brightness)
 	PID=$(find_ambxst_pid_cached)
 	if [ -z "$PID" ]; then
@@ -540,22 +607,100 @@ version | -v | --version)
 	;;
 install)
 	TARGET="${2:-}"
-	if [ "$TARGET" = "hyprland" ]; then
-		HYPR_DIR="$HOME/.config/hypr"
-		HYPR_LUA="$HYPR_DIR/hyprland.lua"
-		HYPR_CONF="$HYPR_DIR/hyprland.conf"
+	MODE="auto"
 
-		# Create directory if needed
-		mkdir -p "$HYPR_DIR"
+	# Parse optional flags
+	if [ "$TARGET" = "hyprland" ]; then
+		shift 2 2>/dev/null || true
+		for arg in "$@"; do
+			case "$arg" in
+				--lua) MODE="lua" ;;
+				--conf) MODE="conf" ;;
+				*) echo "Warning: Unknown option '$arg'. Use --lua or --conf." ;;
+			esac
+		done
+	elif [ "$TARGET" != "hyprland" ]; then
+		echo "Error: Unknown target '$TARGET'. Supported: hyprland"
+		exit 1
+	fi
 
-		if [ -f "$HYPR_LUA" ] || [ ! -f "$HYPR_CONF" ]; then
-			append_ambxst_hyprland_block "$HYPR_LUA" "$AMBXST_HYPR_LUA_SOURCE" "$AMBXST_HYPR_LUA_BLOCK"
+	HYPR_DIR="$HOME/.config/hypr"
+	HYPR_LUA="$HYPR_DIR/hyprland.lua"
+	HYPR_CONF="$HYPR_DIR/hyprland.conf"
+	SHARE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/ambxst"
+
+	# Create directories if needed
+	mkdir -p "$HYPR_DIR"
+	mkdir -p "$SHARE_DIR"
+
+	# ---- Base config content - always valid conf syntax ----
+	BASE_CONF=$(cat <<-'ENDCONF'
+exec-once = sh -c '[ -f /tmp/.nl_booted ] || { touch /tmp/.nl_booted && ambxst; }'
+
+# Core binds — baseline for Hyprland reload recovery
+bind = SUPER, Super_L, exec, ambxst run launcher
+bind = SUPER, D, exec, ambxst run dashboard
+bind = SUPER, A, exec, ambxst run assistant
+bind = SUPER, V, exec, ambxst run clipboard
+bind = SUPER, PERIOD, exec, ambxst run emoji
+bind = SUPER, N, exec, ambxst run notes
+bind = SUPER, T, exec, ambxst run tmux
+bind = SUPER, COMMA, exec, ambxst run wallpapers
+bind = SUPER, L, exec, ambxst lock
+bind = SUPER, TAB, exec, ambxst run overview
+bind = SUPER, ESCAPE, exec, ambxst run powermenu
+bind = SUPER, S, exec, ambxst run tools
+bind = SUPER SHIFT, C, exec, ambxst run config
+bind = SUPER SHIFT, S, exec, ambxst run screenshot
+bind = SUPER SHIFT, R, exec, ambxst run screenrecord
+bind = SUPER SHIFT, A, exec, ambxst run lens
+bind = SUPER SHIFT, BACKSPACE, exec, ambxst run toggle-metrics
+ENDCONF
+	)
+
+	# ---- Detect mode if auto ----
+	if [ "$MODE" = "auto" ]; then
+		if [ -f "$HYPR_LUA" ]; then
+			# User already has hyprland.lua → stick with lua mode
+			MODE="lua"
+		elif [ -f "$HYPR_CONF" ]; then
+			# User has hyprland.conf → use conf mode
+			MODE="conf"
 		else
-			append_ambxst_hyprland_block "$HYPR_CONF" "$AMBXST_HYPR_CONF_SOURCE" "$AMBXST_HYPR_CONF_BLOCK"
+			# No config exists yet → default to conf (safe)
+			MODE="conf"
 		fi
+	fi
+
+	# ---- Generate config files ----
+	if [ "$MODE" = "lua" ]; then
+		# Write sourced file as valid Lua: returns the config as a string
+		# Hyprland's Lua mode (>= 0.48) expects valid Lua; returning a string
+		# is the simplest way to embed conf syntax inside Lua.
+		{
+			printf "return [[\n"
+			printf "%s\n" "$BASE_CONF"
+			printf "]]\n"
+		} > "$SHARE_DIR/hyprland.lua"
+
+		echo "Created compositor Lua config at $SHARE_DIR/hyprland.lua"
+
+		# Main Hyprland config: inject Ambxst block into hyprland.lua
+		append_ambxst_hyprland_block "$HYPR_LUA" "$AMBXST_HYPR_LUA_SOURCE" "$AMBXST_HYPR_LUA_BLOCK"
+
+		# Clean up stale .conf if switching from conf to lua
+		rm -f "$HYPR_CONF" 2>/dev/null || true
 	else
-		echo "Error: Unknown target '$TARGET'. Supported: hyprland"
-		exit 1
+		# Write the plain conf version
+		printf "%s\n" "$BASE_CONF" > "$SHARE_DIR/hyprland.conf"
+
+		echo "Created compositor config at $SHARE_DIR/hyprland.conf"
+
+		# Main Hyprland config: inject Ambxst block into hyprland.conf
+		append_ambxst_hyprland_block "$HYPR_CONF" "$AMBXST_HYPR_CONF_SOURCE" "$AMBXST_HYPR_CONF_BLOCK"
+
+		# Clean up stale .lua if switching from lua to conf
+		rm -f "$HYPR_LUA" 2>/dev/null || true
 	fi
 	;;
 remove)
@@ -567,6 +712,11 @@ remove)
 
 		remove_ambxst_hyprland_block "$HYPR_LUA" "$AMBXST_HYPR_LUA_SOURCE"
 		remove_ambxst_hyprland_block "$HYPR_CONF" "$AMBXST_HYPR_CONF_SOURCE"
+
+		# Clean up stale .lua if user switched from lua to conf mode
+		if [ ! -f "$HYPR_CONF" ] && [ -f "$HYPR_LUA" ] && [ ! -s "$HYPR_LUA" ] || grep -q "Ambxst" "$HYPR_LUA" 2>/dev/null; then
+			rm -f "$HYPR_LUA" 2>/dev/null || true
+		fi
 	else
 		echo "Error: Unknown target '$TARGET'. Supported: hyprland"
 		exit 1
@@ -616,6 +766,15 @@ help | --help | -h)
 	show_help
 	;;
 "")
+	# Prevent duplicate instances: if Ambxst is already running, exit.
+	# This handles Hyprland config reloads where exec-once is re-executed
+	# and the daemon tries to start a second Ambxst.
+	EXISTING_PID=$(find_ambxst_pid_cached)
+	if [ -n "$EXISTING_PID" ]; then
+		echo "Ambxst is already running (PID $EXISTING_PID), not starting duplicate."
+		exit 0
+	fi
+
 	# Run daemon priority script (backgrounded to not block startup)
 	bash "${SCRIPT_DIR}/scripts/daemon_priority.sh" &
 
@@ -630,6 +789,21 @@ help | --help | -h)
 	export QT_QPA_PLATFORMTHEME=qt6ct
 	unset HL_INITIAL_WORKSPACE_TOKEN
 
+	# Set Qt rendering backend from compositor config (opengl or vulkan)
+	COMPOSITOR_CFG="${XDG_CONFIG_HOME:-$HOME/.config}/ambxst/config/compositor.json"
+	if [ -f "$COMPOSITOR_CFG" ]; then
+		RHI_BACKEND=$(python3 -c "import json; print(json.load(open('$COMPOSITOR_CFG')).get('renderBackend','opengl'))" 2>/dev/null || echo "opengl")
+	else
+		RHI_BACKEND="opengl"
+	fi
+	# Let Qt auto-detect the RHI backend (don't force opengl if unavailable)
+	# Only set if a working backend was explicitly configured
+	if [ "$RHI_BACKEND" = "vulkan" ] || [ "$RHI_BACKEND" = "opengl" ]; then
+		export QSG_RHI_BACKEND="$RHI_BACKEND"
+	fi
+	export QSG_RENDER_LOOP="threaded"
+	export QML_XHR_ALLOW_FILE_READ=1
+
 	# Cache this script's PID before exec (for fast PID lookups in future CLI calls)
 	echo $$ >/tmp/ambxst.pid
 
diff --git a/config/AGENTS.md b/config/AGENTS.md
old mode 100644
new mode 100755
index f2476462..aa3e09bc
--- a/config/AGENTS.md
+++ b/config/AGENTS.md
@@ -1,7 +1,7 @@
 # CONFIG KNOWLEDGE BASE
 
 ## OVERVIEW
-Reactive, file-backed configuration system built on `Quickshell.Io`. Source of truth for all shell modules. Stores JSON in `~/.config/ambxst/config/`. Gracefully handles missing/malformed files by falling back to hardcoded defaults.
+Reactive, file-backed configuration system built on `Quickshell.Io`. Source of truth for all shell modules. Stores JSON in `~/.config/Ambxst/config/`. Gracefully handles missing/malformed files by falling back to hardcoded defaults.
 
 ## STRUCTURE
 - **Config.qml**: Core singleton (>3100 lines). `FileView` monitors disk; `JsonAdapter` creates bidirectional QML bindings. Each module domain (bar, theme, ai, dock, etc.) has its own `FileView`/`JsonAdapter` pair.
diff --git a/config/Config.qml b/config/Config.qml
old mode 100644
new mode 100755
index c9bb6ee5..c21d475c
--- a/config/Config.qml
+++ b/config/Config.qml
@@ -36,7 +36,7 @@ Singleton {
 
     property string configDir: (Quickshell.env("XDG_CONFIG_HOME") || (Quickshell.env("HOME") + "/.config")) + "/ambxst/config"
     property string keybindsPath: (Quickshell.env("XDG_CONFIG_HOME") || (Quickshell.env("HOME") + "/.config")) + "/ambxst/binds.json"
-    property string presetDir: Qt.resolvedUrl("../assets/presets/Ambxst Default").toString().replace("file://", "")
+    property string presetDir: Qt.resolvedUrl("../assets/presets/Nothing").toString().replace("file://", "")
 
     property bool pauseAutoSave: false
 
@@ -99,6 +99,17 @@ Singleton {
     // ============================================
     // THEME MODULE
     // ============================================
+    Timer {
+        id: themeSaveDebounce
+        interval: 300
+        repeat: false
+        onTriggered: {
+            if (root.themeReady && !root.pauseAutoSave) {
+                themeLoader.writeAdapter();
+            }
+        }
+    }
+
     FileView {
         id: themeLoader
         path: root.configDir + "/theme.json"
@@ -111,8 +122,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.themeReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.themeReady) {
                 handleMissingConfig("theme", themeLoader, ThemeDefaults.data, () => {
                     root.themeReady = true;
                 });
@@ -126,7 +136,7 @@ Singleton {
         onPathChanged: reload()
         onAdapterUpdated: {
             if (root.themeReady && !root.pauseAutoSave) {
-                themeLoader.writeAdapter();
+                themeSaveDebounce.restart();
             }
         }
 
@@ -140,7 +150,10 @@ Singleton {
             property int monoFontSize: 14
             property bool tintIcons: false
             property bool enableCorners: true
+            property bool dynamicColor: false
             property int animDuration: 300
+            property real animScale: 1.0
+            property string animStyle: "m3"
             property real shadowOpacity: 0.5
             property string shadowColor: "shadow"
             property int shadowXOffset: 0
@@ -506,8 +519,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.barReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.barReady) {
                 handleMissingConfig("bar", barLoader, BarDefaults.data, () => {
                     root.barReady = true;
                 });
@@ -527,6 +539,7 @@ Singleton {
 
         adapter: JsonAdapter {
             property string position: "top"
+            property string barMode: "extended"
             property string launcherIcon: ""
             property bool launcherIconTint: true
             property bool launcherIconFullTint: true
@@ -534,6 +547,7 @@ Singleton {
             property string pillStyle: "default"
             property list<string> screenList: []
             property bool enableFirefoxPlayer: false
+            property bool enableChromiumPlayer: false
             property list<var> barColor: [["surface", 0.0]]
             property bool frameEnabled: false
             property int frameThickness: 6
@@ -547,6 +561,7 @@ Singleton {
             property bool containBar: false
             property bool keepBarShadow: false
             property bool keepBarBorder: false
+            property var hiddenIcons: []
         }
     }
 
@@ -565,8 +580,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.workspacesReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.workspacesReady) {
                 handleMissingConfig("workspaces", workspacesLoader, WorkspacesDefaults.data, () => {
                     root.workspacesReady = true;
                 });
@@ -608,8 +622,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.overviewReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.overviewReady) {
                 handleMissingConfig("overview", overviewLoader, OverviewDefaults.data, () => {
                     root.overviewReady = true;
                 });
@@ -650,8 +663,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.notchReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.notchReady) {
                 handleMissingConfig("notch", notchLoader, NotchDefaults.data, () => {
                     root.notchReady = true;
                 });
@@ -677,6 +689,10 @@ Singleton {
             property string noMediaDisplay: "userHost"
             property string customText: "Ambxst"
             property bool disableHoverExpansion: true
+            property bool showMetrics: false
+            property bool showDockInIsland: true
+            property int islandButtonSize: 36
+            property bool pinnedOnStartup: true
         }
     }
 
@@ -695,8 +711,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.compositorReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.compositorReady) {
                 handleMissingConfig("compositor", compositorLoader, CompositorDefaults.data, () => {
                     root.compositorReady = true;
                 });
@@ -709,26 +724,56 @@ Singleton {
         }
         onPathChanged: reload()
         onAdapterUpdated: {
-            if (root.compositorReady && !root.pauseAutoSave) {
-                compositorLoader.writeAdapter();
+            if (root.compositorReady) {
+                if (!root.pauseAutoSave) {
+                    compositorLoader.writeAdapter();
+                }
+                GlobalStates.compositorConfigChanged();
             }
         }
 
         adapter: JsonAdapter {
+            // Borders & Rounding
+            property bool showBorder: true
             property var activeBorderColor: ["primary"]
             property int borderAngle: 45
             property var inactiveBorderColor: ["surface"]
             property int inactiveBorderAngle: 45
             property int borderSize: 2
             property int rounding: 16
+            property real roundingPower: 2.0
             property bool syncRoundness: true
             property bool syncBorderWidth: false
             property bool syncBorderColor: false
             property bool syncShadowOpacity: false
             property bool syncShadowColor: false
+            property bool resizeOnBorder: false
+            property int extendBorderGrabArea: 15
+            property bool hoverIconOnBorder: true
+
+            // Gaps & Layout
             property int gapsIn: 2
             property int gapsOut: 4
             property string layout: "dwindle"
+            property bool allowTearing: false
+
+            // Snap
+            property bool snapEnabled: true
+            property int snapWindowGap: 10
+            property int snapMonitorGap: 10
+            property bool snapBorderOverlap: false
+            property bool snapRespectGaps: false
+
+            // Opacity & Dim
+            property real activeOpacity: 1.0
+            property real inactiveOpacity: 1.0
+            property real fullscreenOpacity: 1.0
+            property bool dimInactive: false
+            property real dimStrength: 0.5
+            property real dimAround: 0.4
+            property real dimSpecial: 0.2
+
+            // Shadow
             property bool shadowEnabled: true
             property int shadowRange: 8
             property int shadowRenderPower: 3
@@ -739,6 +784,8 @@ Singleton {
             property real shadowOpacity: 0.5
             property string shadowOffset: "0 0"
             property real shadowScale: 1.0
+
+            // Blur
             property bool blurEnabled: true
             property int blurSize: 4
             property int blurPasses: 2
@@ -757,6 +804,127 @@ Singleton {
             property real blurPopupsIgnorealpha: 0.2
             property bool blurInputMethods: false
             property real blurInputMethodsIgnorealpha: 0.2
+
+            // Animations
+            property bool animationsEnabled: true
+
+            // Input: Keyboard
+            property string kbLayout: "us"
+            property string kbVariant: ""
+            property string kbOptions: ""
+            property bool numlockByDefault: false
+            property int repeatRate: 25
+            property int repeatDelay: 600
+
+            // Input: Mouse
+            property real mouseSensitivity: 0.0
+            property string mouseAccelProfile: ""
+            property int followMouse: 1
+            property bool mouseNaturalScroll: false
+            property real mouseScrollFactor: 1.0
+            property bool mouseLeftHanded: false
+            property bool mouseRefocus: false
+            property int floatSwitchOverrideFocus: 0
+
+            // Input: Touchpad
+            property bool touchpadDisableWhileTyping: true
+            property bool touchpadNaturalScroll: true
+            property bool touchpadTapToClick: true
+            property bool touchpadClickfingerBehavior: false
+            property string touchpadTapButtonMap: ""
+            property bool touchpadMiddleButtonEmulation: false
+            property int touchpadDragLock: 0
+            property real touchpadScrollFactor: 1.0
+
+            // Cursor
+            property bool noHardwareCursors: false
+            property bool enableHyprcursor: true
+            property bool noWarps: false
+            property bool persistentWarps: false
+            property bool warpOnChangeWorkspace: false
+            property real cursorZoomFactor: 1.0
+            property int cursorInactiveTimeout: 0
+            property bool cursorHideOnKeyPress: false
+            property bool cursorHideOnTouch: false
+            property bool cursorHideOnTablet: false
+
+            // Gestures
+            property bool workspaceSwipeCreateNew: true
+            property bool workspaceSwipeForever: false
+            property real workspaceSwipeCancelRatio: 0.5
+            property int workspaceSwipeMinSpeedToForce: 30
+            property bool workspaceSwipeDirectionLock: true
+            property bool workspaceSwipeUseR: false
+            property int workspaceSwipeDistance: 300
+            property bool workspaceSwipeInvert: true
+            property bool workspaceSwipeTouch: false
+            property bool workspaceSwipeTouchInvert: false
+
+            // Dwindle Layout
+            property bool dwindlePreserveSplit: true
+            property bool dwindlePseudotile: false
+            property int dwindleForceSplit: 0
+            property bool dwindleSmartSplit: true
+            property real dwindleDefaultSplitRatio: 1.0
+            property real dwindleSplitWidthMultiplier: 1.0
+            property bool dwindlePermanentDirectionOverride: false
+            property bool dwindleUseActiveForSplits: true
+            property bool dwindleSmartResizing: true
+            property real dwindleSpecialScaleFactor: 0.8
+
+            // Master Layout
+            property string masterOrientation: "left"
+            property real masterMfact: 0.55
+            property string masterNewStatus: "slave"
+            property bool masterNewOnTop: false
+            property string masterNewOnActive: "none"
+            property bool masterSmartResizing: true
+            property real masterSpecialScaleFactor: 0.8
+            property bool masterAllowSmallSplit: false
+
+            // Scrolling Layout
+            property real scrollingColumnWidth: 0.3
+            property string scrollingExplicitColumnWidths: ""
+            property string scrollingDirection: "right"
+            property bool scrollingFullscreenOnOneColumn: true
+            property string scrollingFocusFitMethod: "center"
+            property bool scrollingFollowFocus: true
+            property real scrollingFollowMinVisible: 0.1
+
+            // Free Layout
+            property int freeGridSize: 20
+            property int freeSnapSensitivity: 10
+            property bool freeSnapEdges: true
+            property bool freeSnapCenter: true
+            property int freeSnapGaps: 4
+            property bool freeTileByDefault: false
+            property bool freeMaximizedByDefault: false
+            property bool smartResizeAnchors: true
+
+            // XWayland
+            property bool xwaylandEnabled: true
+            property bool xwaylandForceZeroScaling: false
+            property bool xwaylandUseNearestNeighbor: true
+
+            // Monitor Globals
+            property int vrr: 0
+            property bool vfr: true
+            property bool mouseMoveEnablesDpms: false
+            property bool keyPressEnablesDpms: false
+
+            // Misc
+            property string renderBackend: "opengl"
+            property bool disableAutoreload: false
+            property bool focusOnActivate: false
+            property bool animateManualResizes: false
+            property bool animateMouseWindowdragging: true
+            property bool disableHyprlandLogo: true
+            property bool disableSplashRendering: false
+            property int forceDefaultWallpaper: -1
+
+            // Ecosystem
+            property bool noUpdateNews: true
+            property bool enforcePermissions: false
         }
     }
 
@@ -775,8 +943,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.performanceReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.performanceReady) {
                 handleMissingConfig("performance", performanceLoader, PerformanceDefaults.data, () => {
                     root.performanceReady = true;
                 });
@@ -819,8 +986,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.weatherReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.weatherReady) {
                 handleMissingConfig("weather", weatherLoader, WeatherDefaults.data, () => {
                     root.weatherReady = true;
                 });
@@ -859,8 +1025,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.desktopReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.desktopReady) {
                 handleMissingConfig("desktop", desktopLoader, DesktopDefaults.data, () => {
                     root.desktopReady = true;
                 });
@@ -901,8 +1066,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.lockscreenReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.lockscreenReady) {
                 handleMissingConfig("lockscreen", lockscreenLoader, LockscreenDefaults.data, () => {
                     root.lockscreenReady = true;
                 });
@@ -940,8 +1104,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.prefixReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.prefixReady) {
                 handleMissingConfig("prefix", prefixLoader, PrefixDefaults.data, () => {
                     root.prefixReady = true;
                 });
@@ -983,8 +1146,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.systemReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.systemReady) {
                 handleMissingConfig("system", systemLoader, SystemDefaults.data, () => {
                     root.systemReady = true;
                 });
@@ -1005,6 +1167,15 @@ Singleton {
         adapter: JsonAdapter {
             property list<string> disks: ["/"]
             property bool updateServiceEnabled: true
+            property JsonObject batteryNotifications: JsonObject {
+                property bool enabled: true
+                property int lowThreshold: 20
+                property int criticalThreshold: 10
+                property bool autoPowerSave: false
+                property int powerSaveThreshold: 15
+                property bool chargeLimitEnabled: false
+                property int chargeLimit: 80
+            }
             property JsonObject idle: JsonObject {
                 property JsonObject general: JsonObject {
                     property string lock_cmd: "ambxst lock"
@@ -1065,8 +1236,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.dockReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.dockReady) {
                 handleMissingConfig("dock", dockLoader, DockDefaults.data, () => {
                     root.dockReady = true;
                 });
@@ -1155,8 +1325,7 @@ Singleton {
                 });
             }
         }
-        onLoadFailed: {
-            if (error.toString().includes("FileNotFound") && !root.aiReady) {
+        onLoadFailed: function(error) { if (error.toString().includes("FileNotFound") && !root.aiReady) {
                 handleMissingConfig("ai", aiLoader, AiDefaults.data, () => {
                     root.aiReady = true;
                 });
@@ -1319,12 +1488,21 @@ Singleton {
                 }
             }
 
+            // Get default binds from adapter.defaultNothinglessBinds (fallback for keys not yet in user's ambxst)
+            const defaultBinds = adapter.defaultNothinglessBinds || {};
+            
             // Check system binds
-            const systemKeys = ["overview", "powermenu", "config", "lockscreen", "tools", "screenshot", "screenrecord", "lens", "reload", "quit"];
+            const systemKeys = ["overview", "powermenu", "config", "lockscreen", "tools", "screenshot", "screenrecord", "lens", "reload", "quit", "toggle-metrics"];
             for (const key of systemKeys) {
-                if (!current.ambxst.system[key] && adapter.ambxst.system && adapter.ambxst.system[key]) {
+                let defaultBind = null;
+                if (adapter.ambxst.system && adapter.ambxst.system[key]) {
+                    defaultBind = adapter.ambxst.system[key];
+                } else if (defaultBinds.system && defaultBinds.system[key]) {
+                    defaultBind = defaultBinds.system[key];
+                }
+                if (!current.ambxst.system[key] && defaultBind) {
                     console.log("Adding missing system bind:", key);
-                    current.ambxst.system[key] = createCleanBind(adapter.ambxst.system[key]);
+                    current.ambxst.system[key] = createCleanBind(defaultBind);
                     needsUpdate = true;
                 } else if (current.ambxst.system[key] && !current.ambxst.system[key].action) {
                     current.ambxst.system[key].action = createAction(current.ambxst.system[key]);
@@ -1500,7 +1678,7 @@ Singleton {
             }
             }
             // Default getters
-            readonly property var defaultAmbxstBinds: {
+            readonly property var defaultNothinglessBinds: {
                 "ambxst": {
                     "launcher": { "modifiers": ["SUPER"], "key": "Super_L", "action": { "id": "ambxst.launcher", "args": {} } },
                     "dashboard": { "modifiers": ["SUPER"], "key": "D", "action": { "id": "ambxst.dashboard", "args": {} } },
@@ -1513,7 +1691,7 @@ Singleton {
                 },
                 "system": {
                     "config": { "modifiers": ["SUPER", "SHIFT"], "key": "C", "action": { "id": "ambxst.config", "args": {} } },
-                    "lockscreen": { "modifiers": ["SUPER"], "key": "L", "action": { "id": "system.lock", "args": {} } },
+                    "lockscreen": { "modifiers": ["SUPER"], "key": "L", "action": { "id": "ambxst.lock", "args": {} } },
                     "overview": { "modifiers": ["SUPER"], "key": "TAB", "action": { "id": "ambxst.overview", "args": {} } },
                     "powermenu": { "modifiers": ["SUPER"], "key": "ESCAPE", "action": { "id": "ambxst.powermenu", "args": {} } },
                     "tools": { "modifiers": ["SUPER"], "key": "S", "action": { "id": "ambxst.tools", "args": {} } },
@@ -1521,13 +1699,14 @@ Singleton {
                     "screenrecord": { "modifiers": ["SUPER", "SHIFT"], "key": "R", "action": { "id": "ambxst.screenrecord", "args": {} } },
                     "lens": { "modifiers": ["SUPER", "SHIFT"], "key": "A", "action": { "id": "ambxst.lens", "args": {} } },
                     "reload": { "modifiers": ["SUPER", "ALT"], "key": "B", "action": { "id": "ambxst.reload", "args": {} } },
-                    "quit": { "modifiers": ["SUPER", "CTRL", "ALT"], "key": "B", "action": { "id": "ambxst.quit", "args": {} } }
+                    "toggle-metrics": { "modifiers": ["SUPER", "SHIFT"], "key": "BACKSPACE", "action": { "id": "ambxst.toggle-metrics", "args": {} } },
+            "quit": { "modifiers": ["SUPER", "CTRL", "ALT"], "key": "B", "action": { "id": "ambxst.quit", "args": {} } }
                 }
             }
 
-            function getAmbxstDefault(section, key) {
-                if (defaultAmbxstBinds[section] && defaultAmbxstBinds[section][key]) {
-                    const bind = defaultAmbxstBinds[section][key];
+            function getNothinglessDefault(section, key) {
+                if (defaultNothinglessBinds[section] && defaultNothinglessBinds[section][key]) {
+                    const bind = defaultNothinglessBinds[section][key];
                     return {
                         "modifiers": bind.modifiers || [],
                         "key": bind.key || "",
diff --git a/config/ConfigValidator.js b/config/ConfigValidator.js
old mode 100644
new mode 100755
diff --git a/config/KeybindActions.js b/config/KeybindActions.js
old mode 100644
new mode 100755
index bf147e01..6d3385b3
--- a/config/KeybindActions.js
+++ b/config/KeybindActions.js
@@ -46,6 +46,7 @@ var ACTION_CATALOG = [
     { id: "ambxst.lens", label: "Open Lens", category: "Ambxst", dispatcher: "exec", argument: "ambxst run lens" },
     { id: "ambxst.reload", label: "Reload Ambxst", category: "Ambxst", dispatcher: "exec", argument: "ambxst reload" },
     { id: "ambxst.quit", label: "Quit Ambxst", category: "Ambxst", dispatcher: "exec", argument: "ambxst quit" },
+    { id: "ambxst.toggle-metrics", label: "Toggle Metrics", category: "Ambxst", dispatcher: "exec", argument: "ambxst run toggle-metrics" },
 
     { id: "window.close", label: "Close Window", category: "Window", dispatcher: "killactive", argument: "" },
     { id: "window.focus", label: "Focus Window", category: "Window", dispatcher: "movefocus", args: [{ key: "direction", label: "Direction", placeholder: "up/down/left/right", defaultValue: "up" }], argumentBuilder: function (args) {
@@ -55,10 +56,12 @@ var ACTION_CATALOG = [
         return directionToLetter(args.direction);
     } },
     { id: "window.drag", label: "Drag Window", category: "Window", dispatcher: "movewindow", argument: "", flags: "m" },
-    { id: "window.resize-drag", label: "Resize Window (Drag)", category: "Window", dispatcher: "resizewindow", argument: "", flags: "m" },
+    { id: "window.resize-drag", label: "Resize Window (Drag)", category: "Window", dispatcher: "resizeactive", argument: "", flags: "m" },
     { id: "window.resize", label: "Resize Window", category: "Window", dispatcher: "resizeactive", args: [{ key: "delta", label: "Delta", placeholder: "50 0", defaultValue: "50 0" }], argumentBuilder: function (args) {
         return String(args.delta || "").trim();
     } },
+    { id: "window.resize-expand", label: "Expand Window (Top-Left Anchor)", category: "Window", dispatcher: "resizeactive", argument: "50 50" },
+    { id: "window.resize-shrink", label: "Shrink Window (Top-Left Anchor)", category: "Window", dispatcher: "resizeactive", argument: "-50 -50" },
 
     { id: "workspace.switch", label: "Switch Workspace", category: "Workspace", dispatcher: "workspace", args: [{ key: "index", label: "Workspace", placeholder: "1", defaultValue: "1" }], argumentBuilder: function (args) {
         return String(args.index || "").trim();
@@ -99,6 +102,23 @@ var ACTION_CATALOG = [
         return "movecoltoworkspace " + String(args.index || "").trim();
     } },
 
+    // Free Layout Actions (Windows-style)
+    { id: "free.snap-left", label: "Snap Left Half", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch centerwindow && hyprctl dispatch resizeactive -50% 0" },
+    { id: "free.snap-right", label: "Snap Right Half", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch centerwindow && hyprctl dispatch resizeactive 50% 0" },
+    { id: "free.snap-top", label: "Snap Top Half", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch centerwindow && hyprctl dispatch resizeactive 0 -50%" },
+    { id: "free.snap-bottom", label: "Snap Bottom Half", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch centerwindow && hyprctl dispatch resizeactive 0 50%" },
+    { id: "free.snap-center", label: "Center Window", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch centerwindow" },
+    { id: "free.snap-maximize", label: "Maximize", category: "Free Layout", dispatcher: "fullscreen", argument: "1" },
+    { id: "free.snap-restore", label: "Restore", category: "Free Layout", dispatcher: "fullscreen", argument: "0" },
+    { id: "free.snap-top-left", label: "Snap Top-Left Quarter", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch movewindow pixel exact 0 0,active && hyprctl dispatch resizeactive 50% 50%" },
+    { id: "free.snap-top-right", label: "Snap Top-Right Quarter", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch movewindow pixel exact 50% 0,active && hyprctl dispatch resizeactive 50% 50%" },
+    { id: "free.snap-bottom-left", label: "Snap Bottom-Left Quarter", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch movewindow pixel exact 0 50%,active && hyprctl dispatch resizeactive 50% 50%" },
+    { id: "free.snap-bottom-right", label: "Snap Bottom-Right Quarter", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch movewindow pixel exact 50% 50%,active && hyprctl dispatch resizeactive 50% 50%" },
+    { id: "free.toggle-tile", label: "Toggle Tile/Float", category: "Free Layout", dispatcher: "togglefloating" },
+    { id: "free.show-desktop", label: "Show Desktop", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch workspaceopt allfloat" },
+    { id: "free.workspace-left", label: "Move Window to Left Monitor", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch movewindow m:-1" },
+    { id: "free.workspace-right", label: "Move Window to Right Monitor", category: "Free Layout", dispatcher: "exec", argument: "hyprctl dispatch movewindow m:+1" },
+
     { id: "media.play-pause", label: "Play/Pause", category: "Media", dispatcher: "exec", argument: "playerctl play-pause" },
     { id: "media.play-pause-locked", label: "Play/Pause (Locked)", category: "Media", dispatcher: "exec", argument: "playerctl play-pause", flags: "l" },
     { id: "media.prev", label: "Previous Track", category: "Media", dispatcher: "exec", argument: "playerctl previous" },
@@ -113,6 +133,7 @@ var ACTION_CATALOG = [
     { id: "brightness.down", label: "Brightness Down", category: "Brightness", dispatcher: "exec", argument: "ambxst brightness -5", flags: "le" },
 
     { id: "system.calculator", label: "Calculator", category: "System", dispatcher: "exec", argument: "notify-send \"Soon\"" },
+    { id: "ambxst.lock", label: "Lock Screen", category: "Ambxst", dispatcher: "exec", argument: "ambxst lock" },
     { id: "system.lock", label: "Lock Session", category: "System", dispatcher: "exec", argument: "loginctl lock-session" },
     { id: "system.lock-locked", label: "Lock Session (Locked)", category: "System", dispatcher: "exec", argument: "loginctl lock-session", flags: "l" },
     { id: "system.dpms-off", label: "Display Off", category: "System", dispatcher: "exec", argument: "axctl monitor set-dpms 0 0", flags: "l" },
@@ -252,7 +273,7 @@ function actionFromLegacy(dispatcher, argument, flags) {
     }
     if (dispatcher === "togglespecialworkspace") return { id: "workspace.toggle-special", args: {} };
     if (dispatcher === "movewindow" && flags === "m") return { id: "window.drag", args: {} };
-    if (dispatcher === "resizewindow" && flags === "m") return { id: "window.resize-drag", args: {} };
+    if (dispatcher === "resizeactive" && flags === "m") return { id: "window.resize-drag", args: {} };
     if (dispatcher === "movewindow") return { id: "window.move", args: { direction: arg } };
     if (dispatcher === "movefocus") return { id: "window.focus", args: { direction: arg } };
     if (dispatcher === "resizeactive") return { id: "window.resize", args: { delta: arg } };
@@ -269,6 +290,22 @@ function actionFromLegacy(dispatcher, argument, flags) {
         if (arg.startsWith("swapcol ")) return { id: "scrolling.swap-column", args: { direction: arg.split(" ")[1] } };
         if (arg.startsWith("movecoltoworkspace ")) return { id: "scrolling.move-column-workspace", args: { index: arg.split(" ")[1] } };
     }
+    if (dispatcher === "axctl") {
+        if (arg.startsWith("movesnap ")) {
+            const pos = arg.split(" ")[1] || "";
+            const snapMap = {
+                "left": "free.snap-left", "right": "free.snap-right",
+                "up": "free.snap-top", "down": "free.snap-bottom",
+                "center": "free.snap-center", "maximize": "free.snap-maximize",
+                "restore": "free.snap-restore",
+                "topleft": "free.snap-top-left", "topright": "free.snap-top-right",
+                "bottomleft": "free.snap-bottom-left", "bottomright": "free.snap-bottom-right",
+            };
+            const id = snapMap[pos];
+            if (id) return { id: id, args: {} };
+        }
+        return { id: "command.run", args: { command: arg } };
+    }
     if (dispatcher === "exec") {
         if (arg === "playerctl play-pause" && flags === "l") return { id: "media.play-pause-locked", args: {} };
         if (arg === "playerctl play-pause") return { id: "media.play-pause", args: {} };
@@ -281,6 +318,7 @@ function actionFromLegacy(dispatcher, argument, flags) {
         if (arg.indexOf("ambxst brightness +5") === 0) return { id: "brightness.up", args: {} };
         if (arg.indexOf("ambxst brightness -5") === 0) return { id: "brightness.down", args: {} };
         if (arg === "notify-send \"Soon\"") return { id: "system.calculator", args: {} };
+        if (arg === "ambxst lock") return { id: "ambxst.lock", args: {} };
         if (arg === "loginctl lock-session" && flags === "l") return { id: "system.lock-locked", args: {} };
         if (arg === "loginctl lock-session") return { id: "system.lock", args: {} };
         if (arg === "axctl monitor set-dpms 0 0") return { id: "system.dpms-off", args: {} };
diff --git a/config/defaults/ai.js b/config/defaults/ai.js
old mode 100644
new mode 100755
diff --git a/config/defaults/bar.js b/config/defaults/bar.js
old mode 100644
new mode 100755
index 7962cdde..a7ca06bb
--- a/config/defaults/bar.js
+++ b/config/defaults/bar.js
@@ -1,6 +1,7 @@
 .pragma library
 
 var data = {
+    "barMode": "extended",
     "position": "top",
     "launcherIcon": "",
     "launcherIconTint": true,
@@ -9,16 +10,21 @@ var data = {
     "pillStyle": "default",
     "screenList": [],
     "enableFirefoxPlayer": false,
+    "enableChromiumPlayer": false,
     "barColor": [["surface", 0.0]],
     "frameEnabled": false,
     "frameThickness": 6,
     "pinnedOnStartup": true,
     "hoverToReveal": true,
-    "hoverRegionHeight": 8,
+    "hoverRegionHeight": 2,
     "showPinButton": true,
     "availableOnFullscreen": false,
     "use12hFormat": false,
     "containBar": false,
     "keepBarShadow": false,
-    "keepBarBorder": false
+    "keepBarBorder": false,
+    "hiddenIcons": [],
+    "taskTrayEnabled": true,
+    "taskTrayShowToggle": true,
+    "taskTrayAlwaysVisible": []
 }
diff --git a/config/defaults/compositor.js b/config/defaults/compositor.js
old mode 100644
new mode 100755
index 89b3dd39..07d26614
--- a/config/defaults/compositor.js
+++ b/config/defaults/compositor.js
@@ -1,19 +1,47 @@
 .pragma library
 
 var data = {
+    // === Borders & Rounding ===
+    "showBorder": true,
     "activeBorderColor": ["primary"],
     "borderAngle": 45,
     "inactiveBorderColor": ["surface"],
     "inactiveBorderAngle": 45,
     "borderSize": 2,
     "rounding": 16,
+    "roundingPower": 2.0,
     "syncRoundness": true,
     "syncBorderWidth": false,
     "syncBorderColor": false,
     "syncShadowOpacity": false,
     "syncShadowColor": false,
+    "resizeOnBorder": false,
+    "extendBorderGrabArea": 15,
+    "hoverIconOnBorder": true,
+
+    // === Gaps & Layout ===
     "gapsIn": 2,
     "gapsOut": 4,
+    "layout": "dwindle",
+    "allowTearing": false,
+
+    // === Snap ===
+    "snapEnabled": true,
+    "snapWindowGap": 10,
+    "snapMonitorGap": 10,
+    "snapBorderOverlap": false,
+    "snapRespectGaps": false,
+
+    // === Opacity & Dim ===
+    "activeOpacity": 1.0,
+    "inactiveOpacity": 1.0,
+    "fullscreenOpacity": 1.0,
+    "dimInactive": false,
+    "dimStrength": 0.5,
+    "dimAround": 0.4,
+    "dimSpecial": 0.2,
+
+    // === Shadow ===
     "shadowEnabled": true,
     "shadowRange": 8,
     "shadowRenderPower": 3,
@@ -24,6 +52,8 @@ var data = {
     "shadowOpacity": 0.5,
     "shadowOffset": "0 0",
     "shadowScale": 1.0,
+
+    // === Blur ===
     "blurEnabled": true,
     "blurSize": 4,
     "blurPasses": 2,
@@ -41,5 +71,128 @@ var data = {
     "blurPopups": false,
     "blurPopupsIgnorealpha": 0.2,
     "blurInputMethods": false,
-    "blurInputMethodsIgnorealpha": 0.2
+    "blurInputMethodsIgnorealpha": 0.2,
+
+    // === Animations ===
+    "animationsEnabled": true,
+
+    // === Input: Keyboard ===
+    "kbLayout": "us",
+    "kbVariant": "",
+    "kbOptions": "",
+    "numlockByDefault": false,
+    "repeatRate": 25,
+    "repeatDelay": 600,
+
+    // === Input: Mouse ===
+    "mouseSensitivity": 0.0,
+    "mouseAccelProfile": "",
+    "followMouse": 1,
+    "mouseNaturalScroll": false,
+    "mouseScrollFactor": 1.0,
+    "mouseLeftHanded": false,
+    "mouseRefocus": false,
+    "floatSwitchOverrideFocus": 0,
+
+    // === Input: Touchpad ===
+    "touchpadDisableWhileTyping": true,
+    "touchpadNaturalScroll": true,
+    "touchpadTapToClick": true,
+    "touchpadClickfingerBehavior": false,
+    "touchpadTapButtonMap": "",
+    "touchpadMiddleButtonEmulation": false,
+    "touchpadDragLock": 0,
+    "touchpadScrollFactor": 1.0,
+
+    // === Cursor ===
+    "noHardwareCursors": false,
+    "enableHyprcursor": true,
+    "noWarps": false,
+    "persistentWarps": false,
+    "warpOnChangeWorkspace": false,
+    "cursorZoomFactor": 1.0,
+    "cursorInactiveTimeout": 0,
+    "cursorHideOnKeyPress": false,
+    "cursorHideOnTouch": false,
+    "cursorHideOnTablet": false,
+
+    // === Gestures ===
+    "workspaceSwipeCreateNew": true,
+    "workspaceSwipeForever": false,
+    "workspaceSwipeCancelRatio": 0.5,
+    "workspaceSwipeMinSpeedToForce": 30,
+    "workspaceSwipeDirectionLock": true,
+    "workspaceSwipeUseR": false,
+    "workspaceSwipeDistance": 300,
+    "workspaceSwipeInvert": true,
+    "workspaceSwipeTouch": false,
+    "workspaceSwipeTouchInvert": false,
+
+    // === Dwindle Layout ===
+    "dwindlePreserveSplit": true,
+    "dwindlePseudotile": false,
+    "dwindleForceSplit": 0,
+    "dwindleSmartSplit": true,
+    "dwindleDefaultSplitRatio": 1.0,
+    "dwindleSplitWidthMultiplier": 1.0,
+    "dwindlePermanentDirectionOverride": false,
+    "dwindleUseActiveForSplits": true,
+    "dwindleSmartResizing": true,
+    "dwindleSpecialScaleFactor": 0.8,
+
+    // === Master Layout ===
+    "masterOrientation": "left",
+    "masterMfact": 0.55,
+    "masterNewStatus": "slave",
+    "masterNewOnTop": false,
+    "masterNewOnActive": "none",
+    "masterSmartResizing": true,
+    "masterSpecialScaleFactor": 0.8,
+    "masterAllowSmallSplit": false,
+
+    // === Scrolling Layout ===
+    "scrollingColumnWidth": 0.3,
+    "scrollingExplicitColumnWidths": "",
+    "scrollingDirection": "right",
+    "scrollingFullscreenOnOneColumn": true,
+    "scrollingFocusFitMethod": "center",
+    "scrollingFollowFocus": true,
+    "scrollingFollowMinVisible": 0.1,
+
+    // === XWayland ===
+    "xwaylandEnabled": true,
+    "xwaylandForceZeroScaling": false,
+    "xwaylandUseNearestNeighbor": true,
+
+    // === Monitor Globals ===
+    "vrr": 0,
+    "vfr": true,
+    "mouseMoveEnablesDpms": false,
+    "keyPressEnablesDpms": false,
+
+    // === Misc ===
+    "renderBackend": "opengl",
+    "disableAutoreload": false,
+    "focusOnActivate": false,
+    "animateManualResizes": false,
+    "animateMouseWindowdragging": true,
+    "disableHyprlandLogo": true,
+    "disableSplashRendering": false,
+    "forceDefaultWallpaper": -1,
+
+    // === Ecosystem ===
+    "noUpdateNews": true,
+    "enforcePermissions": false,
+
+    // === Free Layout ===
+    "freeGridSize": 20,
+    "freeSnapSensitivity": 10,
+    "freeSnapEdges": true,
+    "freeSnapCenter": true,
+    "freeSnapGaps": 4,
+    "freeTileByDefault": false,
+    "freeMaximizedByDefault": false,
+
+    // === Smart Resize Anchors ===
+    "smartResizeAnchors": true
 }
diff --git a/config/defaults/desktop.js b/config/defaults/desktop.js
old mode 100644
new mode 100755
diff --git a/config/defaults/dock.js b/config/defaults/dock.js
old mode 100644
new mode 100755
index ffde30ec..364032f5
--- a/config/defaults/dock.js
+++ b/config/defaults/dock.js
@@ -8,7 +8,7 @@ var data = {
     "iconSize": 24,
     "spacing": 4,
     "margin": 4,
-    "hoverRegionHeight": 16,
+    "hoverRegionHeight": 2,
     "pinnedOnStartup": false,
     "hoverToReveal": true,
     "availableOnFullscreen": false,
diff --git a/config/defaults/lockscreen.js b/config/defaults/lockscreen.js
old mode 100644
new mode 100755
diff --git a/config/defaults/notch.js b/config/defaults/notch.js
old mode 100644
new mode 100755
index decb7159..e3500fb8
--- a/config/defaults/notch.js
+++ b/config/defaults/notch.js
@@ -3,9 +3,13 @@
 var data = {
     "theme": "default",
     "position": "top",
-    "hoverRegionHeight": 8,
+    "hoverRegionHeight": 2,
     "keepHidden": false,
     "noMediaDisplay": "userHost",
     "customText": "Ambxst",
-    "disableHoverExpansion": true
+    "disableHoverExpansion": true,
+    "showMetrics": false,
+    "showDockInIsland": true,
+    "islandButtonSize": 36,
+    "pinnedOnStartup": true
 }
diff --git a/config/defaults/overview.js b/config/defaults/overview.js
old mode 100644
new mode 100755
diff --git a/config/defaults/performance.js b/config/defaults/performance.js
old mode 100644
new mode 100755
diff --git a/config/defaults/prefix.js b/config/defaults/prefix.js
old mode 100644
new mode 100755
diff --git a/config/defaults/system.js b/config/defaults/system.js
old mode 100644
new mode 100755
index e3619102..4bb01a19
--- a/config/defaults/system.js
+++ b/config/defaults/system.js
@@ -3,6 +3,15 @@
 var data = {
     "disks": ["/"],
     "updateServiceEnabled": true,
+    "batteryNotifications": {
+        "enabled": true,
+        "lowThreshold": 20,
+        "criticalThreshold": 10,
+        "autoPowerSave": false,
+        "powerSaveThreshold": 15,
+        "chargeLimit": 80,
+        "chargeLimitEnabled": false
+    },
     "idle": {
         "general": {
             "lock_cmd": "ambxst lock",
diff --git a/config/defaults/theme.js b/config/defaults/theme.js
old mode 100644
new mode 100755
index ec7003db..80e72adc
--- a/config/defaults/theme.js
+++ b/config/defaults/theme.js
@@ -11,6 +11,9 @@ var data = {
     "tintIcons": false,
     "enableCorners": true,
     "animDuration": 300,
+    "dynamicColor": false,
+    "animStyle": "m3",
+    "animScale": 1.0,
     "shadowOpacity": 0.5,
     "shadowColor": "shadow",
     "shadowXOffset": 0,
diff --git a/config/defaults/weather.js b/config/defaults/weather.js
old mode 100644
new mode 100755
diff --git a/config/defaults/workspaces.js b/config/defaults/workspaces.js
old mode 100644
new mode 100755
diff --git a/config/pam/password.conf b/config/pam/password.conf
old mode 100644
new mode 100755
diff --git a/flake.lock b/flake.lock
old mode 100644
new mode 100755
index 3f7609dc..85bcb320
--- a/flake.lock
+++ b/flake.lock
@@ -9,13 +9,13 @@
       "locked": {
         "lastModified": 1779243005,
         "narHash": "sha256-oDJEY0yeMUDFvCUTKW69/lzoVk6cuRPscT0myeKnvec=",
-        "owner": "Axenide",
+        "owner": "Leriart",
         "repo": "axctl",
         "rev": "e8ac14221379cc5a5c8565c510123e1c0b7dff01",
         "type": "github"
       },
       "original": {
-        "owner": "Axenide",
+        "owner": "Leriart",
         "repo": "axctl",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
old mode 100644
new mode 100755
index 7e654c0b..0fdaf93f
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,11 @@
 {
-  description = "Ambxst - An Axtremely customizable shell by Axenide";
+  description = "Ambxst - An Axtremely customizable shell by Leriart";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     axctl = {
-      url = "github:Axenide/axctl";
+      url = "github:Leriart/axctl";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/install.sh b/install.sh
index 22c36696..d6277deb 100755
--- a/install.sh
+++ b/install.sh
@@ -36,7 +36,6 @@ DISTRO=$(detect_distro)
 log_info "Detected: $DISTRO"
 
 # === Package Filtering ===
-# Maps packages to their binary/check - only for conflict-prone packages
 declare -A BINARY_CHECK=(
   ["matugen"]="matugen"
   ["quickshell"]="qs"
@@ -65,6 +64,7 @@ declare -A THEME_CHECK=(
 
 declare -A FONT_CHECK=(
   ["ttf-phosphor-icons"]="Phosphor"
+  ["ttf-ndot"]="Ndot"
 )
 
 filter_packages() {
@@ -140,6 +140,8 @@ install_dependencies() {
     flatpak install -y flathub be.alexandervanhee.gradia 2>/dev/null || true
 
     install_phosphor_fonts
+    install_ndot_font
+install_color_presets
     ;;
 
   arch)
@@ -177,6 +179,7 @@ install_dependencies() {
       ttf-nerd-fonts-symbols
       matugen gpu-screen-recorder wl-clip-persist mpvpaper gradia
       quickshell ttf-phosphor-icons ttf-league-gothic adw-gtk-theme
+      ttf-material-symbols-variable-git translate-shell songrec libqalculate
     )
 
     log_info "Installing dependencies with $AUR_HELPER..."
@@ -189,6 +192,47 @@ install_dependencies() {
     else
       log_info "All packages already installed"
     fi
+    install_color_presets
+
+    install_ndot_font
+    install_material_symbols_font
+    ;;
+
+  fedora)
+    log_info "Enabling COPR repositories..."
+    sudo dnf install -y --best --allowerasing --setopt=install_weak_deps=False dnf-plugins-core
+    yes | sudo dnf copr enable errornointernet/quickshell
+    yes | sudo dnf copr enable solopasha/hyprland
+    yes | sudo dnf copr enable zirconium/packages
+    yes | sudo dnf copr enable iucar/cran
+
+    local PKGS=(
+      kitty tmux fuzzel network-manager-applet blueman
+      pipewire wireplumber easyeffects playerctl
+      qt6-qtbase qt6-qtdeclarative qt6-qtwayland qt6-qtsvg qt6-qttools
+      qt6-qtimageformats qt6-qtmultimedia qt6-qtshadertools
+      kf6-syntax-highlighting kf6-breeze-icons hicolor-icon-theme
+      brightnessctl ddcutil fontconfig grim slurp ImageMagick jq sqlite upower
+      wl-clipboard wlsunset wtype zbar glib2 pipx zenity power-profiles-daemon
+      python3.12 libnotify flatpak
+      tesseract tesseract-langpack-eng tesseract-langpack-spa tesseract-langpack-jpn
+      tesseract-langpack-chi_sim tesseract-langpack-chi_tra tesseract-langpack-kor tesseract-langpack-lat
+      google-roboto-fonts google-roboto-mono-fonts dejavu-sans-fonts liberation-fonts
+      google-noto-fonts-common google-noto-cjk-fonts google-noto-emoji-fonts
+      mpvpaper matugen R-CRAN-phosphoricons adw-gtk3-theme quickshell unzip curl
+      translate-shell songrec libqalculate
+    )
+
+    log_info "Installing dependencies..."
+    sudo dnf install -y --best --allowerasing --setopt=install_weak_deps=False $(filter_packages "${PKGS[@]}")
+
+    log_info "Installing Gradia (Flatpak)..."
+    flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    flatpak install -y flathub be.alexandervanhee.gradia 2>/dev/null || true
+
+    install_phosphor_fonts
+    install_ndot_font
+    install_material_symbols_font
     ;;
 
   *)
@@ -216,71 +260,78 @@ install_phosphor_fonts() {
   log_success "Phosphor Icons installed"
 }
 
-# === Migration ===
-migrate_old_paths() {
-  log_info "Checking for old Ambxst paths..."
+install_color_presets() {
+    log_info "Installing Nothing color theme..."
+    local COLOR_DIR="$HOME/.config/ambxst/colors/Nothing"
+    mkdir -p "$COLOR_DIR"
+    
+    local SRC_DIR="$INSTALL_PATH/assets/colors/Nothing"
+    if [[ -d "$SRC_DIR" ]]; then
+        cp -rn "$SRC_DIR"/* "$COLOR_DIR/" 2>/dev/null || true
+        log_success "Nothing color theme installed"
+    else
+        log_warn "Nothing color theme not found in repo."
+    fi
+}
 
-  # Source migration (PascalCase -> lowercase)
-  local OLD_SRC="$HOME/Ambxst"
-  if [[ -d "$OLD_SRC" && ! -d "$INSTALL_PATH" ]]; then
-    log_info "Migrating source: $OLD_SRC -> $INSTALL_PATH"
-    mkdir -p "$(dirname "$INSTALL_PATH")"
-    cp -r "$OLD_SRC" "$INSTALL_PATH"
-  fi
+install_ndot_font() {
+  has_font "Ndot" && return
 
-  # Config migration
-  local OLD_CONFIG="$HOME/.config/Ambxst"
-  local NEW_CONFIG="$HOME/.config/ambxst"
-  if [[ -d "$OLD_CONFIG" && ! -d "$NEW_CONFIG" ]]; then
-    log_info "Migrating config: $OLD_CONFIG -> $NEW_CONFIG"
-    mv "$OLD_CONFIG" "$NEW_CONFIG"
-  fi
+  log_info "Installing Ndot font..."
+  local FONT_DIR="$HOME/.local/share/fonts/ndot"
+  mkdir -p "$FONT_DIR"
 
-  # Share migration
-  local OLD_SHARE="$HOME/.local/share/Ambxst"
-  local NEW_SHARE="$HOME/.local/share/ambxst"
-  if [[ -d "$OLD_SHARE" && ! -d "$NEW_SHARE" ]]; then
-    log_info "Migrating share: $OLD_SHARE -> $NEW_SHARE"
-    mv "$OLD_SHARE" "$NEW_SHARE"
+  local NDOT_SRC="$INSTALL_PATH/assets/fonts"
+  if [[ -f "$NDOT_SRC/Ndot-57-Aligned.ttf" ]]; then
+    cp "$NDOT_SRC/Ndot-57-Aligned.ttf" "$FONT_DIR/"
+  else
+    # Try from the script's location
+    local SCRIPT_DIR
+    SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    if [[ -f "$SCRIPT_DIR/assets/fonts/Ndot-57-Aligned.ttf" ]]; then
+      cp "$SCRIPT_DIR/assets/fonts/Ndot-57-Aligned.ttf" "$FONT_DIR/"
+    else
+      log_warn "Ndot font not found in repo. Skipping."
+      return
+    fi
   fi
 
-  # State migration
-  local OLD_STATE="$HOME/.local/state/Ambxst"
-  local NEW_STATE="$HOME/.local/state/ambxst"
-  if [[ -d "$OLD_STATE" && ! -d "$NEW_STATE" ]]; then
-    log_info "Migrating state: $OLD_STATE -> $NEW_STATE"
-    mv "$OLD_STATE" "$NEW_STATE"
-  fi
+  fc-cache -f "$FONT_DIR"
+  log_success "Ndot font installed"
+}
 
-  # Cache migration
-  local OLD_CACHE_DIR="$HOME/.cache/Ambxst"
-  local NEW_CACHE_DIR="$HOME/.cache/ambxst"
-  if [[ -d "$OLD_CACHE_DIR" && ! -d "$NEW_CACHE_DIR" ]]; then
-    log_info "Migrating cache: $OLD_CACHE_DIR -> $NEW_CACHE_DIR"
-    mv "$OLD_CACHE_DIR" "$NEW_CACHE_DIR"
-  fi
+install_material_symbols_font() {
+  has_font "Material Symbols" && return
 
-  # Legacy share -> cache migration (Wallpapers & Thumbnails)
-  local NEW_CACHE="$HOME/.cache/ambxst"
-  if [[ -d "$NEW_SHARE" ]]; then
-    mkdir -p "$NEW_CACHE"
+  log_info "Installing Material Symbols Variable font..."
+  local FONT_DIR="$HOME/.local/share/fonts/material-symbols"
+  mkdir -p "$FONT_DIR"
 
-    if [[ -f "$NEW_SHARE/wallpapers.json" && ! -f "$NEW_CACHE/wallpapers.json" ]]; then
-      log_info "Migrating wallpapers.json to cache..."
-      cp "$NEW_SHARE/wallpapers.json" "$NEW_CACHE/wallpapers.json"
-    fi
+  local SRC_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-    if [[ -d "$NEW_SHARE/thumbnails" && ! -d "$NEW_CACHE/thumbnails" ]]; then
-      log_info "Migrating thumbnails to cache..."
-      cp -r "$NEW_SHARE/thumbnails" "$NEW_CACHE/thumbnails"
-    fi
+  if [[ -f "$SRC_DIR/assets/fonts/MaterialSymbolsRounded-Variable.ttf" ]]; then
+    cp "$SRC_DIR/assets/fonts/MaterialSymbolsRounded-Variable.ttf" "$FONT_DIR/"
+    log_success "Material Symbols font installed from repo"
+  elif has_cmd pacman; then
+    log_info "Material Symbols not in repo. Install via: yay -S ttf-material-symbols-variable-git"
+    return
   fi
 
-  # Config structure warning
-  if [[ -f "$NEW_CONFIG/config.json" && ! -d "$NEW_CONFIG/config" ]]; then
-    log_warn "Old single-file config detected."
-    log_info "Ambxst now uses a multi-file configuration in $NEW_CONFIG/config/"
-    log_info "Your old config.json remains at $NEW_CONFIG/config.json for reference."
+  fc-cache -f "$FONT_DIR" 2>/dev/null || true
+}
+
+# === Migration ===
+migrate_old_paths() {
+  log_info "Checking for old paths..."
+
+  local OLD_CONFIG="$HOME/.config/ambxst"
+  if [[ ! -d "$OLD_CONFIG" ]]; then
+    mkdir -p "$OLD_CONFIG/config"
+
+    # Copy default configs from the install path
+    if [[ -d "$INSTALL_PATH/config/defaults" ]]; then
+      cp -r "$INSTALL_PATH/config/defaults/"* "$OLD_CONFIG/config/" 2>/dev/null || true
+    fi
   fi
 }
 
@@ -295,13 +346,11 @@ setup_repo() {
     return
   fi
 
-  # Check if it's a git repository
   if [[ ! -d "$INSTALL_PATH/.git" ]]; then
     log_warn "$INSTALL_PATH exists but is not a git repository."
     log_info "Re-initializing repository..."
     local TMP_DIR
     TMP_DIR=$(mktemp -d)
-    # Move everything to tmp, avoiding . and ..
     find "$INSTALL_PATH" -mindepth 1 -maxdepth 1 -exec mv -t "$TMP_DIR" {} +
     rm -rf "$INSTALL_PATH"
     git clone "$REPO_URL" "$INSTALL_PATH"
@@ -361,17 +410,6 @@ install_quickshell() {
   log_success "Quickshell installed to ~/.local/bin/qs"
 }
 
-install_axctl() {
-  if [[ "$DISTRO" == "nixos" ]]; then
-    log_info "Skipping axctl install on NixOS (managed by flake)"
-    return
-  fi
-
-  log_info "Installing axctl..."
-  curl -L get.axeni.de/axctl | sh
-  log_success "axctl installed"
-}
-
 # === Python Tools ===
 install_python_tools() {
   [[ "$DISTRO" == "nixos" ]] && return
@@ -381,7 +419,6 @@ install_python_tools() {
   }
 
   log_info "Installing Python tools..."
-
   pipx ensurepath 2>/dev/null || true
 }
 
@@ -410,10 +447,6 @@ configure_services() {
 
   elif has_cmd rc-service; then
     log_info "Configuring OpenRC services..."
-    rc-update show | grep -q "iwd" && {
-      sudo rc-service iwd stop 2>/dev/null || true
-      sudo rc-update del iwd default 2>/dev/null || true
-    }
     sudo rc-update add NetworkManager default 2>/dev/null || true
     sudo rc-service NetworkManager start 2>/dev/null || true
     sudo rc-update add bluetooth default 2>/dev/null || true
@@ -422,7 +455,6 @@ configure_services() {
   elif has_cmd sv; then
     log_info "Configuring runit services..."
     local SV_DIR="/var/service"
-    [[ -L "$SV_DIR/iwd" ]] && sudo rm "$SV_DIR/iwd"
     [[ -d "/etc/sv/NetworkManager" && ! -L "$SV_DIR/NetworkManager" ]] && sudo ln -s /etc/sv/NetworkManager "$SV_DIR/"
     [[ -d "/etc/sv/bluetooth" && ! -L "$SV_DIR/bluetooth" ]] && sudo ln -s /etc/sv/bluetooth "$SV_DIR/"
 
@@ -455,9 +487,9 @@ setup_launcher() {
 # === Main ===
 migrate_old_paths
 install_dependencies "$1"
-install_axctl
 setup_repo
 install_quickshell
+install_ndot_font
 install_python_tools
 configure_services
 setup_launcher
diff --git a/modules/bar/AGENTS.md b/modules/bar/AGENTS.md
old mode 100644
new mode 100755
diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml
old mode 100644
new mode 100755
diff --git a/modules/bar/BarBg.qml b/modules/bar/BarBg.qml
old mode 100644
new mode 100755
diff --git a/modules/bar/BarBgShadow.qml b/modules/bar/BarBgShadow.qml
old mode 100644
new mode 100755
diff --git a/modules/bar/BarContent.qml b/modules/bar/BarContent.qml
old mode 100644
new mode 100755
index b9e57ca7..4c8d0ebd
--- a/modules/bar/BarContent.qml
+++ b/modules/bar/BarContent.qml
@@ -8,6 +8,8 @@ import qs.modules.bar.workspaces
 import qs.modules.theme
 import qs.modules.bar.clock
 import qs.modules.bar.systray
+import qs.modules.widgets.defaultview
+import qs.modules.bar.tasktray
 import qs.modules.widgets.overview
 import qs.modules.widgets.dashboard
 import qs.modules.widgets.powermenu
@@ -19,28 +21,25 @@ import qs.modules.globals
 import qs.modules.bar
 import qs.config
 import "." as Bar
-
 Item {
     id: root
-
     required property ShellScreen screen
-
-    property string barPosition: (Config.bar && Config.bar.position !== undefined && ["top", "bottom", "left", "right"].includes(Config.bar.position) ? Config.bar.position : "top")
+    property string barPosition: {
+        const global = (Config.bar && Config.bar.position !== undefined && ["top", "bottom", "left", "right"].includes(Config.bar.position) ? Config.bar.position : "top");
+        return PerMonitorConfig.resolve(screen.name, "bar", "position", global);
+    }
+    property string barMode: (Config.bar && Config.bar.barMode) || "extended"
     property string orientation: barPosition === "left" || barPosition === "right" ? "vertical" : "horizontal"
-
     // Auto-hide properties
     onPinnedChanged: {
         if (Config.bar && Config.bar.pinnedOnStartup !== pinned) {
             Config.bar.pinnedOnStartup = pinned;
         }
     }
-
-    property bool pinned: (Config.bar && Config.bar.pinnedOnStartup !== undefined ? Config.bar.pinnedOnStartup : true)
-
+    property bool pinned: (Config.bar && Config.bar.pinnedOnStartup !== undefined ? Config.bar.pinnedOnStartup : true) && !(Config.bar && Config.bar.hoverToReveal !== undefined ? Config.bar.hoverToReveal : false)
     // Monitor reference and reference to toplevels on monitor
     readonly property var compositorMonitor: AxctlService.monitorFor(screen)
     readonly property var toplevels: (!compositorMonitor || !compositorMonitor.activeWorkspace || !AxctlService.clients.values) ? [] : AxctlService.clients.values.filter(c => c.workspace.id === compositorMonitor.activeWorkspace.id)
-
     // Fullscreen detection - use ToplevelManager (native Wayland) for reliable detection
     readonly property bool activeWindowFullscreen: {
         const toplevel = ToplevelManager.activeToplevel;
@@ -48,24 +47,18 @@ Item {
             return false;
         return toplevel.fullscreen === true;
     }
-
-
     // Whether auto-hide should be active (not pinned, or fullscreen forces it)
     readonly property bool shouldAutoHide: !pinned || activeWindowFullscreen
-
     onShouldAutoHideChanged: {
         if (!shouldAutoHide) {
             hoverActive = false;
             hideDelayTimer.stop();
         }
     }
-
     // Hover state with delay to prevent flickering
     property bool hoverActive: false
-
     // Track if mouse is over bar area
-    readonly property bool isMouseOverBar: barMouseArea.containsMouse
-
+    property bool isMouseOverBar: false
     // Check if notch hover is active (for synchronized reveal when bar is at same side)
     // NOTE: We access Visibilities.notchPanels directly because UnifiedShellPanel registers itself as the panel ref
     readonly property var notchPanelRef: Visibilities.notchPanels[screen.name]
@@ -73,7 +66,6 @@ Item {
     readonly property bool notchHoverActive: {
         if (barPosition !== notchPosition)
             return false;
-        
         if (notchPanelRef) {
             // UnifiedShellPanel exposes 'notchHoverActive' property alias pointing to notchContent.hoverActive
             // We need to check if that property exists on the panel object
@@ -87,66 +79,101 @@ Item {
         }
         return false;
     }
-
     // Check if notch is open (dashboard, powermenu, etc.)
     readonly property var screenVisibilities: Visibilities.getForScreen(screen.name)
     readonly property bool notchOpen: screenVisibilities ? (screenVisibilities.launcher || screenVisibilities.dashboard || screenVisibilities.powermenu || screenVisibilities.tools) : false
-
     // Radius logic for "Squished" style
     readonly property real outerRadius: Styling.radius(0)
     readonly property real innerRadius: (Config.bar && Config.bar.pillStyle === "squished") ? Styling.radius(0) / 2 : Styling.radius(0)
     readonly property bool pinButtonVisible: (Config.bar && Config.bar.showPinButton !== undefined ? Config.bar.showPinButton : true)
-
+    // Check if there's an adjacent monitor on the bar's edge side
+    readonly property bool _hasAdjacentMonitor: {
+        const mon = root.compositorMonitor;
+        if (!mon || !AxctlService.monitors || !AxctlService.monitors.values) return false;
+        const edgeX = root.barPosition === "left" ? mon.x : (root.barPosition === "right" ? mon.x + mon.width : 0);
+        const edgeY = root.barPosition === "top" ? mon.y : (root.barPosition === "bottom" ? mon.y + mon.height : 0);
+        const others = AxctlService.monitors.values.filter(m => m.name !== mon.name);
+        for (let i = 0; i < others.length; i++) {
+            const o = others[i];
+            if (root.barPosition === "left" || root.barPosition === "right") {
+                // Check horizontal adjacency (same Y range, touching at X edge)
+                if (o.y + o.height > mon.y && o.y < mon.y + mon.height) {
+                    if (root.barPosition === "left" && o.x + o.width === edgeX) return true;
+                    if (root.barPosition === "right" && o.x === edgeX) return true;
+                }
+            } else {
+                // Check vertical adjacency (same X range, touching at Y edge)
+                if (o.x + o.width > mon.x && o.x < mon.x + mon.width) {
+                    if (root.barPosition === "top" && o.y + o.height === edgeY) return true;
+                    if (root.barPosition === "bottom" && o.y === edgeY) return true;
+                }
+            }
+        }
+        return false;
+    }
+    // Effective hover region height: 2px when at screen edge, 8px when adjacent monitor exists
+    readonly property int _effectiveHoverRegion: root._hasAdjacentMonitor ? 8 : (Config.bar && Config.bar.hoverRegionHeight !== undefined ? Config.bar.hoverRegionHeight : 2)
     // Reveal logic
     readonly property bool reveal: {
         // If not auto-hiding, always reveal
         if (!shouldAutoHide)
             return true;
-
         // If fullscreen and not available on fullscreen, hide
         if (activeWindowFullscreen && !(Config.bar && Config.bar.availableOnFullscreen !== undefined ? Config.bar.availableOnFullscreen : false)) {
             return false;
         }
-
-        // Show if: hovering, notch hovering (when at top), notch open
-        // IMPORTANT: notchHoverActive must be checked to synchronize with notch
+        // Show if: hovering, notch hovering, or notch open
         return isMouseOverBar || hoverActive || notchHoverActive || notchOpen;
     }
 
+    // Mouse proximity timer — requires hovering at edge for 200ms before showing
+    property bool _mousePending: false
+    Timer {
+        id: showDelayTimer
+        interval: 200
+        repeat: false
+        onTriggered: {
+            if (root.isMouseOverBar && root.shouldAutoHide) {
+                root.hoverActive = true;
+            }
+            root._mousePending = false;
+        }
+    }
     // Timer to delay hiding the bar after mouse leaves
     Timer {
         id: hideDelayTimer
-        interval: 1000
+        interval: 800
         repeat: false
         onTriggered: {
-            if (!root.isMouseOverBar) {
+            if (!root.isMouseOverBar && !root._mousePending) {
                 root.hoverActive = false;
             }
         }
     }
-
     // Watch for mouse state changes
     onIsMouseOverBarChanged: {
         if (isMouseOverBar) {
+            // Don't show immediately — wait a moment to confirm intent
             hideDelayTimer.stop();
-            hoverActive = true;
+            root._mousePending = true;
+            showDelayTimer.restart();
         } else {
-            // Si está fijada, podemos resetear el hoverActive inmediatamente
-            // Si está en auto-hide, usamos el timer para dar margen
+            // Mouse left the hover zone
+            showDelayTimer.stop();
+            root._mousePending = false;
             if (shouldAutoHide) {
+                // Brief delay before hiding (allows moving back to the edge)
                 hideDelayTimer.restart();
             } else {
                 hoverActive = false;
             }
         }
     }
-
     // Integrated dock configuration
     readonly property bool integratedDockEnabled: (Config.dock && Config.dock.enabled !== undefined ? Config.dock.enabled : false) && (Config.dock && Config.dock.theme !== undefined ? Config.dock.theme : "default") === "integrated"
     // Map dock position for integrated based on orientation
     readonly property string integratedDockPosition: {
         const pos = (Config.dock && Config.dock.position !== undefined ? Config.dock.position : "center");
-
         if (root.orientation === "horizontal") {
             if (pos === "left" || pos === "start")
                 return "start";
@@ -154,128 +181,147 @@ Item {
                 return "end";
             return "center";
         }
-        
         // Vertical always falls back to center logic inside the column but we treat it as appended to group
         return "center";
     }
-
     // Radius helpers for dock connections
     readonly property bool dockAtStart: integratedDockEnabled && integratedDockPosition === "start"
     readonly property bool dockAtEnd: integratedDockEnabled && integratedDockPosition === "end"
-
     readonly property int frameOffset: (Config.bar && Config.bar.frameEnabled !== undefined ? Config.bar.frameEnabled : false) ? (Config.bar && Config.bar.frameThickness !== undefined ? Config.bar.frameThickness : 6) : 0
-
     // Size derived from barBg properties
     readonly property int barPadding: barBg.padding
     readonly property int topOuterMargin: (orientation === "vertical" || barPosition === "top") ? barBg.outerMargin : 0
     readonly property int bottomOuterMargin: (orientation === "vertical" || barPosition === "bottom") ? barBg.outerMargin : 0
     readonly property int leftOuterMargin: (orientation === "horizontal" || barPosition === "left") ? barBg.outerMargin : 0
     readonly property int rightOuterMargin: (orientation === "horizontal" || barPosition === "right") ? barBg.outerMargin : 0
-
     readonly property int contentImplicitWidth: orientation === "horizontal" ? (horizontalLoader.item && horizontalLoader.item.implicitWidth !== undefined ? horizontalLoader.item.implicitWidth : 0) : (verticalLoader.item && verticalLoader.item.implicitWidth !== undefined ? verticalLoader.item.implicitWidth : 0)
     readonly property int contentImplicitHeight: orientation === "horizontal" ? (horizontalLoader.item && horizontalLoader.item.implicitHeight !== undefined ? horizontalLoader.item.implicitHeight : 0) : (verticalLoader.item && verticalLoader.item.implicitHeight !== undefined ? verticalLoader.item.implicitHeight : 0)
-    
     readonly property int barTargetWidth: orientation === "vertical" ? (contentImplicitWidth + 2 * barPadding) : 0
     readonly property int barTargetHeight: orientation === "horizontal" ? (contentImplicitHeight + 2 * barPadding) : 0
-
     readonly property bool actualContainBar: (Config.bar && Config.bar.containBar !== undefined ? Config.bar.containBar : false) && (Config.bar && Config.bar.frameEnabled !== undefined ? Config.bar.frameEnabled : false)
     readonly property int totalBarWidth: barTargetWidth + 
         ((root.barPosition === "left" || root.orientation === "horizontal") ? (root.frameOffset + root.leftOuterMargin) : 0) +
         ((root.barPosition === "right" || root.orientation === "horizontal") ? (root.frameOffset + root.rightOuterMargin) : 0)
-
     readonly property int totalBarHeight: barTargetHeight + 
         ((root.barPosition === "top" || root.orientation === "vertical") ? (root.frameOffset + root.topOuterMargin) : 0) +
         ((root.barPosition === "bottom" || root.orientation === "vertical") ? (root.frameOffset + root.bottomOuterMargin) : 0)
-
     // Base outer margin for reservation logic (4px + border when !containBar)
     readonly property int baseOuterMargin: barBg.outerMargin
-
     // Shadow logic for bar components
     readonly property bool shadowsEnabled: Config.showBackground && (!actualContainBar || (Config.bar && Config.bar.keepBarShadow !== undefined ? Config.bar.keepBarShadow : false))
-
     // The hitbox for the mask
     property alias barHitbox: barMouseArea
-
     // MouseArea for hover detection - contains bar content (like Dock)
     MouseArea {
         id: barMouseArea
-        hoverEnabled: true
-
+        hoverEnabled: false
+        acceptedButtons: Qt.NoButton
+        propagateComposedEvents: true
+        // HoverHandler for bar hover detection (without blocking child hovers)
+        HoverHandler {
+            id: barHoverHandler
+            enabled: !bar.islandModeActive
+            onHoveredChanged: {
+                if (!bar.islandModeActive) {
+                    root.isMouseOverBar = barHoverHandler.hovered;
+                }
+            }
+        }
         // Size includes margins
-        width: root.orientation === "horizontal" ? root.width : (root.reveal ? root.totalBarWidth : Math.max((Config.bar && Config.bar.hoverRegionHeight !== undefined ? Config.bar.hoverRegionHeight : 8), 4) + root.frameOffset)
-        height: root.orientation === "vertical" ? root.height : (root.reveal ? root.totalBarHeight : Math.max((Config.bar && Config.bar.hoverRegionHeight !== undefined ? Config.bar.hoverRegionHeight : 8), 4) + root.frameOffset)
-
-
+        width: {
+            if (root.orientation === "vertical") return root.reveal ? root.totalBarWidth : Math.max(root._effectiveHoverRegion, 2) + root.frameOffset;
+            // Dynamic mode: always wrap content, never full width
+            if (root.barMode === "dynamic") {
+                const contentW = root.contentImplicitWidth + 2 * root.barPadding + (root.shouldAutoHide ? 0 : root.frameOffset * 2);
+                return root.reveal ? contentW : Math.max(contentW, root._effectiveHoverRegion);
+            }
+            return root.width; // extended mode: full width
+        }
+        height: {
+            if (root.orientation === "horizontal") return root.reveal ? root.totalBarHeight : Math.max(root._effectiveHoverRegion, 2) + root.frameOffset;
+            // Dynamic mode: always wrap content, never full height
+            if (root.barMode === "dynamic") {
+                const contentH = root.contentImplicitHeight + 2 * root.barPadding + (root.shouldAutoHide ? 0 : root.frameOffset * 2);
+                return root.reveal ? contentH : Math.max(contentH, root._effectiveHoverRegion);
+            }
+            return root.height; // extended mode: full height
+        }
         // Position using x/y
         x: {
+            if (root.barMode === "dynamic" && root.orientation === "horizontal") {
+                // Dynamic horizontal: center in parent
+                return (parent.width - width) / 2;
+            }
             if (root.barPosition === "right") return parent.width - width;
             return 0;
         }
         y: {
+            if (root.barMode === "dynamic" && root.orientation === "vertical") {
+                // Dynamic vertical: center in parent
+                return (parent.height - height) / 2;
+            }
             if (root.barPosition === "bottom") return parent.height - height;
             return 0;
         }
-
         Behavior on x {
-            enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0 && root.orientation === "vertical"
+            enabled: Anim.animationsEnabled && root.orientation === "vertical"
             NumberAnimation {
-                duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 4
-                easing.type: Easing.OutCubic
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
         Behavior on y {
-            enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0 && root.orientation === "horizontal"
+            enabled: Anim.animationsEnabled && root.orientation === "horizontal"
             NumberAnimation {
-                duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 4
-                easing.type: Easing.OutCubic
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
-
         Behavior on width {
-            enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0 && root.orientation === "vertical"
+            enabled: Anim.animationsEnabled && root.orientation === "vertical"
             NumberAnimation {
-                duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 4
-                easing.type: Easing.OutCubic
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
         Behavior on height {
-            enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0 && root.orientation === "horizontal"
+            enabled: Anim.animationsEnabled && root.orientation === "horizontal"
             NumberAnimation {
-                duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 4
-                easing.type: Easing.OutCubic
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
-
         // Bar content inside MouseArea (clicks pass through to children)
         Item {
             id: bar
-
             anchors {
                 top: (root.barPosition === "top" || root.orientation === "vertical") ? parent.top : undefined
                 bottom: (root.barPosition === "bottom" || root.orientation === "vertical") ? parent.bottom : undefined
                 left: (root.barPosition === "left" || root.orientation === "horizontal") ? parent.left : undefined
                 right: (root.barPosition === "right" || root.orientation === "horizontal") ? parent.right : undefined
-
                 topMargin: (root.barPosition === "top" || root.orientation === "vertical") ? (root.frameOffset + root.topOuterMargin) : 0
                 bottomMargin: (root.barPosition === "bottom" || root.orientation === "vertical") ? (root.frameOffset + root.bottomOuterMargin) : 0
                 leftMargin: (root.barPosition === "left" || root.orientation === "horizontal") ? (root.frameOffset + root.leftOuterMargin) : 0
                 rightMargin: (root.barPosition === "right" || root.orientation === "horizontal") ? (root.frameOffset + root.rightOuterMargin) : 0
             }
-
-
             // layer.enabled: true
             // layer.effect: Shadow {}
-
-            // Opacity animation
-            opacity: root.reveal ? 1 : 0
+            // Opacity — hide bar when island mode is active (notch IS the bar)
+            readonly property bool islandModeActive: root.barMode === "dynamic" && (Config.notchTheme || "default") === "island" && root.barPosition === (Config.notchPosition || "top")
+            opacity: islandModeActive ? 0 : (root.reveal ? 1 : 0)
+            enabled: !islandModeActive
             Behavior on opacity {
-                enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 2
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                    easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
-
             // Slide animation
             transform: Translate {
                 x: {
@@ -297,21 +343,22 @@ Item {
                     return 0;
                 }
                 Behavior on x {
-                    enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.spatialFast
+                        easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                     }
                 }
                 Behavior on y {
-                    enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.spatialFast
+                        easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                     }
                 }
             }
-
             states: [
                 State {
                     name: "top"
@@ -347,85 +394,133 @@ Item {
                 }
             ]
 
+
             BarBg {
                 id: barBg
                 anchors.fill: parent
                 position: root.barPosition
-
                 Loader {
                     id: horizontalLoader
                     active: root.orientation === "horizontal"
                     anchors.fill: parent
                     sourceComponent: RowLayout {
                         spacing: 4
-
                         // Obtener referencia al notch de esta pantalla
                         readonly property var notchContainer: Visibilities.getNotchForScreen(root.screen.name)
+                        // Island condition for inline loader
+                        readonly property bool _islandCondition: root.barMode === "dynamic" && (Config.notchTheme || "default") === "island" && root.barPosition === (Config.notchPosition || "top")
+                        
+                        // Spacers and island only in island mode — use Item with width: 0 when inactive
+                        Item {
+                            Layout.fillWidth: _islandCondition
+                            Layout.preferredWidth: _islandCondition ? -1 : 0
+                            visible: _islandCondition
+                        }
+
+                        Loader {
+                            id: inlineIslandLoader
+                            visible: active
+                            Layout.alignment: Qt.AlignVCenter
+                            asynchronous: true
+                            source: Qt.resolvedUrl("IslandContent.qml")
+                            z: 0
+                            active: _islandCondition
+
+                            opacity: active ? 1 : 0
+                            scale: active ? 1 : 0.9
+                            Behavior on opacity {
+                                enabled: Anim.animationsEnabled
+                                NumberAnimation {
+                                    duration: Anim.emphasizedNormal
+                                    easing.type: Anim.easing("emphasized").type
+                                    easing.bezierCurve: Anim.easing("emphasized").bezierCurve
+                                }
+                            }
+                            Behavior on scale {
+                                enabled: Anim.animationsEnabled
+                                NumberAnimation {
+                                    duration: Anim.emphasizedNormal
+                                    easing.type: Anim.springSnappy().type
+                                    easing.bezierCurve: Anim.springSnappy().bezierCurve
+                                }
+                            }
+
+                            MouseArea {
+                                anchors.fill: parent
+                                anchors.margins: -4
+                                cursorShape: Qt.PointingHandCursor
+                                onClicked: {
+                                    var v = Visibilities.getForScreen(root.screen.name);
+                                    if (v) v.launcher = !v.launcher;
+                                }
+                            }
+                        }
+
+                        Item {
+                            Layout.fillWidth: _islandCondition
+                            Layout.preferredWidth: _islandCondition ? -1 : 0
+                            visible: _islandCondition
+                        }
 
                         LauncherButton {
                             id: launcherButton
+                            visible: !Config.bar.hiddenIcons.includes("launcher")
                             startRadius: root.outerRadius
                             endRadius: root.innerRadius
                             enableShadow: root.shadowsEnabled
+                            Layout.alignment: Qt.AlignVCenter
                         }
-
                         Workspaces {
+                            visible: !Config.bar.hiddenIcons.includes("workspaces")
                             orientation: root.orientation
                             bar: QtObject {
                                 property var screen: root.screen
                             }
                             startRadius: root.innerRadius
                             endRadius: root.innerRadius
+                            Layout.alignment: Qt.AlignVCenter
                         }
-
                         LayoutSelectorButton {
+            visible: !Config.bar.hiddenIcons.includes("layout")
                             id: layoutSelectorButton
                             bar: root
                             layerEnabled: root.shadowsEnabled
                             startRadius: root.innerRadius
                             endRadius: (root.pinButtonVisible) ? root.innerRadius : (root.dockAtStart ? root.innerRadius : root.outerRadius)
+                            Layout.alignment: Qt.AlignVCenter
                         }
-
                         // Pin button (horizontal)
                         Loader {
                             active: (Config.bar && Config.bar.showPinButton !== undefined ? Config.bar.showPinButton : true)
                             visible: active
                             Layout.alignment: Qt.AlignVCenter
-
                             sourceComponent: Button {
                                 id: pinButton
                                 implicitWidth: 36
                                 implicitHeight: 36
-
                                 background: StyledRect {
                                     id: pinButtonBg
                                     variant: root.pinned ? "primary" : "bg"
                                     enableShadow: root.shadowsEnabled
-                                    
-                                    // PinButton is typically last in group 1 (unless IntegratedDock follows at start)
                                     property real startRadius: root.innerRadius
                                     property real endRadius: root.dockAtStart ? root.innerRadius : root.outerRadius
-                                    
                                     topLeftRadius: startRadius
                                     bottomLeftRadius: startRadius
                                     topRightRadius: endRadius
                                     bottomRightRadius: endRadius
-
                                     Rectangle {
                                         anchors.fill: parent
                                         color: Styling.srItem("overprimary")
                                         opacity: root.pinned ? 0 : (pinButton.pressed ? 0.5 : (pinButton.hovered ? 0.25 : 0))
                                         radius: (parent.radius !== undefined ? parent.radius : 0)
-
                                         Behavior on opacity {
-                                            enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0
+                                            enabled: Anim.animationsEnabled
                                             NumberAnimation {
-                                                duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 2
+                                                duration: Anim.standardSmall
                                             }
                                         }
                                     }
                                 }
-
                                 contentItem: Text {
                                     text: Icons.pin
                                     font.family: Icons.font
@@ -433,327 +528,310 @@ Item {
                                     color: root.pinned ? pinButtonBg.item : (pinButton.pressed ? Colors.background : (Styling.srItem("overprimary") || Colors.foreground))
                                     horizontalAlignment: Text.AlignHCenter
                                     verticalAlignment: Text.AlignVCenter
-
                                     rotation: root.pinned ? 0 : 45
                                     Behavior on rotation {
-                                        enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 2
+                                            duration: Anim.standardSmall
                                         }
                                     }
-
                                     Behavior on color {
-                                        enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 2
+                                            duration: Anim.standardSmall
                                         }
                                     }
                                 }
-
                                 onClicked: root.pinned = !root.pinned
-
                                 StyledToolTip {
                                     show: pinButton.hovered
                                     tooltipText: root.pinned ? "Unpin bar" : "Pin bar"
                                 }
                             }
                         }
-
                         Item {
                             Layout.fillWidth: true
                             Layout.fillHeight: true
                             visible: root.orientation === "horizontal" && integratedDockEnabled
-
                             Bar.IntegratedDock {
                                 bar: root
                                 orientation: root.orientation
                                 anchors.verticalCenter: parent.verticalCenter
                                 enableShadow: root.shadowsEnabled
-
                                 // Connect to left/right groups if at start/end
                                 startRadius: root.dockAtStart ? root.innerRadius : root.outerRadius
                                 endRadius: root.dockAtEnd ? root.innerRadius : root.outerRadius
-
                                 // Calculate target position based on config
                                 property real targetX: {
                                     if (integratedDockPosition === "start")
                                         return 0;
                                     if (integratedDockPosition === "end")
                                         return parent.width - width;
-
                                     // Center logic (reactive using parent.x + margin offset)
                                     // RowLayout has anchors.margins: 4, so offset is 4
                                     return (bar.width - width) / 2 - (parent.x + 4);
                                 }
-
                                 // Clamp the x position so it never leaves the container (preventing overlap)
                                 x: Math.max(0, Math.min(parent.width - width, targetX))
-
                                 width: Math.min(implicitWidth, parent.width)
                                 height: implicitHeight
                             }
                         }
-
                         Item {
                             Layout.fillWidth: true
                             visible: !(root.orientation === "horizontal" && integratedDockEnabled)
                         }
-
                         PresetsButton {
                             id: presetsButton
+                            visible: !Config.bar.hiddenIcons.includes("presets")
                             startRadius: root.dockAtEnd ? root.innerRadius : root.outerRadius
                             endRadius: root.innerRadius
                             enableShadow: root.shadowsEnabled
+                            Layout.alignment: Qt.AlignVCenter
                         }
-
                         ToolsButton {
+            visible: !Config.bar.hiddenIcons.includes("tools")
                             id: toolsButton
                             startRadius: root.innerRadius
                             endRadius: root.innerRadius
                             enableShadow: root.shadowsEnabled
+                            Layout.alignment: Qt.AlignVCenter
                         }
-
                         SysTray {
+                            visible: !Config.bar.hiddenIcons.includes("systray")
                             bar: root
                             enableShadow: root.shadowsEnabled
                             startRadius: root.innerRadius
                             endRadius: root.innerRadius
+                            Layout.alignment: Qt.AlignVCenter
+                        }
+                        TaskTray {
+                            visible: !Config.bar.hiddenIcons.includes("tasktray")
+                            bar: root
+                            startRadius: root.innerRadius
+                            endRadius: root.innerRadius
+                            Layout.alignment: Qt.AlignVCenter
                         }
-
                         ControlsButton {
+            visible: !Config.bar.hiddenIcons.includes("controls")
                             id: controlsButton
                             bar: root
                             layerEnabled: root.shadowsEnabled
                             startRadius: root.innerRadius
                             endRadius: root.innerRadius
+                            Layout.alignment: Qt.AlignVCenter
                         }
-
                         Bar.BatteryIndicator {
+            visible: !Config.bar.hiddenIcons.includes("battery")
                             id: batteryIndicator
                             bar: root
                             layerEnabled: root.shadowsEnabled
                             startRadius: root.innerRadius
                             endRadius: root.innerRadius
+                            Layout.alignment: Qt.AlignVCenter
                         }
-
                         Clock {
                             id: clockComponent
+                            visible: !Config.bar.hiddenIcons.includes("clock")
                             bar: root
                             layerEnabled: root.shadowsEnabled
                             startRadius: root.innerRadius
                             endRadius: root.innerRadius
+                            Layout.alignment: Qt.AlignVCenter
                         }
-
                         PowerButton {
                             id: powerButton
+                            visible: !Config.bar.hiddenIcons.includes("power")
                             startRadius: root.innerRadius
                             endRadius: root.outerRadius
                             enableShadow: root.shadowsEnabled
+                            Layout.alignment: Qt.AlignVCenter
                         }
                     }
                 }
-
                 Loader {
                     id: verticalLoader
                     active: root.orientation === "vertical"
                     anchors.fill: parent
                     sourceComponent: ColumnLayout {
                         spacing: 4
-
                         LauncherButton {
                             id: launcherButtonVert
+                            visible: !Config.bar.hiddenIcons.includes("launcher")
                             Layout.preferredHeight: 36
+                            Layout.fillWidth: true
                             startRadius: root.outerRadius
                             endRadius: root.innerRadius
                             vertical: true
                             enableShadow: root.shadowsEnabled
                         }
-
                         SysTray {
+                            visible: !Config.bar.hiddenIcons.includes("systray")
                             bar: root
                             enableShadow: root.shadowsEnabled
                             startRadius: root.innerRadius
                             endRadius: root.innerRadius
+                            Layout.preferredHeight: 36
+                            Layout.fillWidth: true
+                        }
+                        TaskTray {
+                            visible: !Config.bar.hiddenIcons.includes("tasktray")
+                            bar: root
+                            startRadius: root.innerRadius
+                            endRadius: root.innerRadius
+                            Layout.preferredHeight: 36
+                            Layout.fillWidth: true
                         }
-
                         ToolsButton {
                             id: toolsButtonVert
+                            visible: !Config.bar.hiddenIcons.includes("tools")
                             startRadius: root.innerRadius
                             endRadius: root.innerRadius
                             vertical: true
                             enableShadow: root.shadowsEnabled
+                            Layout.preferredHeight: 36
+                            Layout.fillWidth: true
                         }
-
                         PresetsButton {
                             id: presetsButtonVert
+                            visible: !Config.bar.hiddenIcons.includes("presets")
                             startRadius: root.innerRadius
                             endRadius: root.outerRadius
                             vertical: true
                             enableShadow: root.shadowsEnabled
+                            Layout.preferredHeight: 36
+                            Layout.fillWidth: true
                         }
+                        // Vertical spacer before center group
+                        Item { Layout.fillHeight: true; Layout.fillWidth: true }
 
-                        // Center Group Container
-                        Item {
-                            Layout.fillHeight: true
+                        LayoutSelectorButton {
+                            id: layoutSelectorButtonVert
+                            visible: !Config.bar.hiddenIcons.includes("layout")
+                            bar: root
+                            layerEnabled: root.shadowsEnabled
                             Layout.fillWidth: true
-
-                            ColumnLayout {
-                                anchors.horizontalCenter: parent.horizontalCenter
-
-                                // Calculate target position to be absolutely centered in the bar (vertically)
-                                property real targetY: {
-                                    if (!parent || !bar)
-                                        return 0;
-
-                                    // Force re-evaluation when parent moves
-                                    var _trigger = parent.y;
-
-                                    var parentPos = parent.mapToItem(bar, 0, 0);
-                                    return (bar.height - height) / 2 - parentPos.y;
-                                }
-
-                                // Clamp y position
-                                y: Math.max(0, Math.min(parent.height - height, targetY))
-
-                                height: Math.min(parent.height, implicitHeight)
-                                width: parent.width
-                                spacing: 4
-
-                                LayoutSelectorButton {
-                                    id: layoutSelectorButtonVert
-                                    bar: root
-                                    layerEnabled: root.shadowsEnabled
-                                    Layout.alignment: Qt.AlignHCenter
-                                    startRadius: root.outerRadius
-                                    endRadius: root.innerRadius
-                                    vertical: true
-                                }
-
-                                Workspaces {
-                                    id: workspacesVert
-                                    orientation: root.orientation
-                                    bar: QtObject {
-                                        property var screen: root.screen
-                                    }
-                                    Layout.alignment: Qt.AlignHCenter
-                                    startRadius: root.innerRadius
-                                    endRadius: root.innerRadius
-                                }
-
-                                // Pin button (vertical)
-                                Loader {
-                                    active: (Config.bar && Config.bar.showPinButton !== undefined ? Config.bar.showPinButton : true)
-                                    visible: active
-                                    Layout.alignment: Qt.AlignHCenter
-                            
-                                    sourceComponent: Button {
-                                        id: pinButtonV
-                                        implicitWidth: 36
-                                        implicitHeight: 36
-                            
-                                        background: StyledRect {
-                                            id: pinButtonVBg
-                                            variant: root.pinned ? "primary" : "bg"
-                                            enableShadow: root.shadowsEnabled
-                                        
-                                            property real startRadius: root.innerRadius
-                                            // In vertical, dock is always appended to this group if enabled
-                                            property real endRadius: root.integratedDockEnabled ? root.innerRadius : root.outerRadius
-                                        
-                                            topLeftRadius: startRadius
-                                            topRightRadius: startRadius
-                                            bottomLeftRadius: endRadius
-                                            bottomRightRadius: endRadius
-
-                                            Rectangle {
-                                                anchors.fill: parent
-                                                color: Styling.srItem("overprimary")
-                                                opacity: root.pinned ? 0 : (pinButtonV.pressed ? 0.5 : (pinButtonV.hovered ? 0.25 : 0))
-                                                radius: (parent.radius !== undefined ? parent.radius : 0)
-
-                                                Behavior on opacity {
-                                                    enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0
-                                                    NumberAnimation {
-                                                        duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 2
-                                                    }
-                                                }
+                            startRadius: root.outerRadius
+                            endRadius: root.innerRadius
+                            vertical: true
+                        }
+                        Workspaces {
+                            id: workspacesVert
+                            visible: !Config.bar.hiddenIcons.includes("workspaces")
+                            orientation: root.orientation
+                            bar: QtObject {
+                                property var screen: root.screen
+                            }
+                            Layout.fillWidth: true
+                            startRadius: root.innerRadius
+                            endRadius: root.innerRadius
+                        }
+                        // Pin button (vertical)
+                        Loader {
+                            active: (Config.bar && Config.bar.showPinButton !== undefined ? Config.bar.showPinButton : true)
+                            visible: active
+                            Layout.fillWidth: true
+                            Layout.alignment: Qt.AlignHCenter
+                            sourceComponent: Button {
+                                id: pinButtonV
+                                implicitWidth: 36
+                                implicitHeight: 36
+                                background: StyledRect {
+                                    id: pinButtonVBg
+                                    variant: root.pinned ? "primary" : "bg"
+                                    enableShadow: root.shadowsEnabled
+                                    property real startRadius: root.innerRadius
+                                    property real endRadius: root.integratedDockEnabled ? root.innerRadius : root.outerRadius
+                                    topLeftRadius: startRadius
+                                    topRightRadius: startRadius
+                                    bottomLeftRadius: endRadius
+                                    bottomRightRadius: endRadius
+                                    Rectangle {
+                                        anchors.fill: parent
+                                        color: Styling.srItem("overprimary")
+                                        opacity: root.pinned ? 0 : (pinButtonV.pressed ? 0.5 : (pinButtonV.hovered ? 0.25 : 0))
+                                        radius: (parent.radius !== undefined ? parent.radius : 0)
+                                        Behavior on opacity {
+                                            enabled: Anim.animationsEnabled
+                                            NumberAnimation {
+                                                duration: Anim.standardSmall
                                             }
                                         }
-
-                                        contentItem: Text {
-                                            text: Icons.pin
-                                            font.family: Icons.font
-                                            font.pixelSize: 18
-                                            color: root.pinned ? pinButtonVBg.item : (pinButtonV.pressed ? Colors.background : (Styling.srItem("overprimary") || Colors.foreground))
-                                            horizontalAlignment: Text.AlignHCenter
-                                            verticalAlignment: Text.AlignVCenter
-
-                                            rotation: root.pinned ? 0 : 45
-                                            Behavior on rotation {
-                                                enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0
-                                                NumberAnimation {
-                                                    duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 2
-                                                }
-                                            }
-
-                                            Behavior on color {
-                                                enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0
-                                                ColorAnimation {
-                                                    duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 2
-                                                }
-                                            }
+                                    }
+                                }
+                                contentItem: Text {
+                                    text: Icons.pin
+                                    font.family: Icons.font
+                                    font.pixelSize: 18
+                                    color: root.pinned ? pinButtonVBg.item : (pinButtonV.pressed ? Colors.background : (Styling.srItem("overprimary") || Colors.foreground))
+                                    horizontalAlignment: Text.AlignHCenter
+                                    verticalAlignment: Text.AlignVCenter
+                                    rotation: root.pinned ? 0 : 45
+                                    Behavior on rotation {
+                                        enabled: Anim.animationsEnabled
+                                        NumberAnimation {
+                                            duration: Anim.standardSmall
                                         }
-
-                                        onClicked: root.pinned = !root.pinned
-
-                                        StyledToolTip {
-                                            show: pinButtonV.hovered
-                                            tooltipText: root.pinned ? "Unpin bar" : "Pin bar"
+                                    }
+                                    Behavior on color {
+                                        enabled: Anim.animationsEnabled
+                                        ColorAnimation {
+                                            duration: Anim.standardSmall
                                         }
                                     }
                                 }
-                            }
-
-                            Bar.IntegratedDock {
-                                bar: root
-                                orientation: root.orientation
-                                visible: integratedDockEnabled
-                                Layout.fillHeight: true
-                                Layout.fillWidth: true
-                                enableShadow: root.shadowsEnabled
-                                
-                                startRadius: root.innerRadius
-                                endRadius: root.outerRadius
+                                onClicked: root.pinned = !root.pinned
+                                StyledToolTip {
+                                    show: pinButtonV.hovered
+                                    tooltipText: root.pinned ? "Unpin bar" : "Pin bar"
+                                }
                             }
                         }
-
+                        // Vertical spacer after center group (pushes center items up)
+                        Item { Layout.fillHeight: true; Layout.fillWidth: true; visible: !integratedDockEnabled }
+                        // Integrated dock fills space when enabled
+                        Bar.IntegratedDock {
+                            bar: root
+                            orientation: root.orientation
+                            visible: integratedDockEnabled
+                            Layout.fillHeight: true
+                            Layout.fillWidth: true
+                            enableShadow: root.shadowsEnabled
+                            startRadius: root.innerRadius
+                            endRadius: root.outerRadius
+                        }
                         ControlsButton {
                             id: controlsButtonVert
+                            visible: !Config.bar.hiddenIcons.includes("controls")
                             bar: root
                             layerEnabled: root.shadowsEnabled
                             startRadius: root.outerRadius
                             endRadius: root.innerRadius
+                            Layout.fillWidth: true
                         }
-
                         Bar.BatteryIndicator {
+            visible: !Config.bar.hiddenIcons.includes("battery")
                             id: batteryIndicatorVert
                             bar: root
                             layerEnabled: root.shadowsEnabled
                             startRadius: root.innerRadius
                             endRadius: root.innerRadius
+                            Layout.fillWidth: true
                         }
-
                         Clock {
                             id: clockComponentVert
+                            visible: !Config.bar.hiddenIcons.includes("clock")
                             bar: root
                             layerEnabled: root.shadowsEnabled
                             startRadius: root.innerRadius
                             endRadius: root.innerRadius
+                            Layout.fillWidth: true
                         }
-
                         PowerButton {
                             id: powerButtonVert
+                            visible: !Config.bar.hiddenIcons.includes("power")
                             Layout.preferredHeight: 36
+                            Layout.fillWidth: true
                             startRadius: root.innerRadius
                             endRadius: root.outerRadius
                             vertical: true
diff --git a/modules/bar/BatteryIndicator.qml b/modules/bar/BatteryIndicator.qml
old mode 100644
new mode 100755
index a4b3fae1..0bd044ea
--- a/modules/bar/BatteryIndicator.qml
+++ b/modules/bar/BatteryIndicator.qml
@@ -68,9 +68,9 @@ Item {
             radius: parent.radius ?? 0
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
         }
@@ -143,10 +143,11 @@ Item {
             }
 
             Behavior on angle {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
                     duration: 400
-                    easing.type: Easing.OutCubic
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
@@ -158,12 +159,12 @@ Item {
             text: Battery.available ? (Battery.isPluggedIn ? Icons.plug : Icons.lightning) : PowerProfile.getProfileIcon(PowerProfile.currentProfile)
             font.family: Icons.font
             font.pixelSize: Battery.available ? 14 : 18
-            color: root.popupOpen ? buttonBg.item : Colors.overBackground
+            color: root.popupOpen ? buttonBg.item : Styling.srItem("overprimary")
 
             Behavior on color {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 ColorAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
 
diff --git a/modules/bar/BrightnessSlider.qml b/modules/bar/BrightnessSlider.qml
old mode 100644
new mode 100755
index a14d34fa..48bc0ded
--- a/modules/bar/BrightnessSlider.qml
+++ b/modules/bar/BrightnessSlider.qml
@@ -31,17 +31,19 @@ Item {
     }
 
     Behavior on iconRotation {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
             duration: 400
-            easing.type: Easing.OutCubic
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
     Behavior on iconScale {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
             duration: 400
-            easing.type: Easing.OutCubic
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -73,8 +75,9 @@ Item {
     transitions: Transition {
         NumberAnimation {
             properties: "implicitWidth,implicitHeight,Layout.preferredWidth,Layout.preferredHeight"
-            duration: 200
-            easing.type: Easing.OutCubic
+            duration: Anim.standardSmall
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -99,9 +102,9 @@ Item {
             radius: parent.radius ?? 0
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
         }
@@ -133,12 +136,12 @@ Item {
             smoothDrag: true
             value: 0
             resizeParent: false
-            wavy: true
+            wavy: false
             scroll: root.isExpanded
             iconClickable: root.isExpanded
             sliderVisible: root.isExpanded || isDragging || root.externalBrightnessChange
-            wavyAmplitude: (root.isExpanded || isDragging || root.externalBrightnessChange) ? (1.5 * value) : 0
-            wavyFrequency: (root.isExpanded || isDragging || root.externalBrightnessChange) ? (8.0 * value) : 0
+            wavyAmplitude: 0
+            wavyFrequency: 0
             iconPos: root.vertical ? "end" : "start"
             icon: Icons.sun
             iconRotation: root.iconRotation
@@ -153,8 +156,10 @@ Item {
 
             onIconClicked: {}
 
+            // FIX: Guard enabled to prevent segfault when monitor is destroyed mid-incubation
             Connections {
                 target: currentMonitor
+                enabled: currentMonitor !== null
                 ignoreUnknownSignals: true
                 function onBrightnessChanged() {
                     root.updateSliderFromMonitor(true);
diff --git a/modules/bar/ControlSliderRow.qml b/modules/bar/ControlSliderRow.qml
old mode 100644
new mode 100755
index f157e401..13e81fb4
--- a/modules/bar/ControlSliderRow.qml
+++ b/modules/bar/ControlSliderRow.qml
@@ -29,31 +29,35 @@ Item {
 
     // Animate wavy properties
     Behavior on _animatedWavyAmplitude {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
     Behavior on _animatedWavyFrequency {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
     Behavior on _animatedIconRotation {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
             duration: 400
-            easing.type: Easing.OutCubic
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
     Behavior on _animatedIconScale {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
             duration: 400
-            easing.type: Easing.OutCubic
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -87,9 +91,9 @@ Item {
                 scale: root._animatedIconScale
 
                 Behavior on color {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     ColorAnimation {
-                        duration: Config.animDuration / 2
+                        duration: Anim.standardSmall
                     }
                 }
             }
@@ -114,10 +118,11 @@ Item {
             property real animatedProgress: root.sliderValue
 
             Behavior on animatedProgress {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
@@ -127,14 +132,14 @@ Item {
                 anchors.leftMargin: 4
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
-                height: 4
+                height: 6
                 radius: Styling.radius(0) / 4
-                color: Colors.surfaceBright
+                color: Colors.overSecondaryFixedVariant
             }
 
             // Progress fill (wavy or solid)
             Loader {
-                active: root.wavy
+                active: false
                 anchors.left: parent.left
                 anchors.right: dragHandle.left
                 anchors.rightMargin: 4
@@ -157,10 +162,10 @@ Item {
                 anchors.right: dragHandle.left
                 anchors.rightMargin: 4
                 anchors.verticalCenter: parent.verticalCenter
-                height: 4
+                height: 6
                 radius: Styling.radius(0) / 4
                 color: root.progressColor
-                visible: !root.wavy
+                visible: true
                 z: 1
             }
 
@@ -176,17 +181,19 @@ Item {
                 z: 2
 
                 Behavior on width {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on height {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
diff --git a/modules/bar/ControlsButton.qml b/modules/bar/ControlsButton.qml
old mode 100644
new mode 100755
index 687f077b..cff52f58
--- a/modules/bar/ControlsButton.qml
+++ b/modules/bar/ControlsButton.qml
@@ -56,9 +56,9 @@ Item {
             radius: parent.radius ?? 0
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
         }
@@ -125,9 +125,9 @@ Item {
                 }
                 sliderValue: Audio.sink?.audio?.volume ?? 0
                 progressColor: Audio.sink?.audio?.muted ? Colors.outline : Styling.srItem("overprimary")
-                wavy: true
-                wavyAmplitude: Audio.sink?.audio?.muted ? 0.5 : 1.5 * sliderValue
-                wavyFrequency: Audio.sink?.audio?.muted ? 1.0 : 8.0 * sliderValue
+                wavy: false
+                wavyAmplitude: 0
+                wavyFrequency: 0
 
                 onValueChanged: newValue => {
                     if (Audio.sink?.audio) {
@@ -141,8 +141,10 @@ Item {
                     }
                 }
 
+                // FIX: Guard enabled to prevent segfault when PipeWire node is destroyed mid-incubation
                 Connections {
                     target: Audio.sink?.audio ?? null
+                    enabled: Audio.sink?.audio !== null
                     ignoreUnknownSignals: true
                     function onVolumeChanged() {
                         if (Audio.sink?.audio) {
@@ -162,9 +164,9 @@ Item {
                 icon: Audio.source?.audio?.muted ? Icons.micSlash : Icons.mic
                 sliderValue: Audio.source?.audio?.volume ?? 0
                 progressColor: Audio.source?.audio?.muted ? Colors.outline : Styling.srItem("overprimary")
-                wavy: true
-                wavyAmplitude: Audio.source?.audio?.muted ? 0.5 : 1.5 * sliderValue
-                wavyFrequency: Audio.source?.audio?.muted ? 1.0 : 8.0 * sliderValue
+                wavy: false
+                wavyAmplitude: 0
+                wavyFrequency: 0
 
                 onValueChanged: newValue => {
                     if (Audio.source?.audio) {
@@ -178,8 +180,10 @@ Item {
                     }
                 }
 
+                // FIX: Guard enabled to prevent segfault when PipeWire node is destroyed mid-incubation
                 Connections {
                     target: Audio.source?.audio ?? null
+                    enabled: Audio.source?.audio !== null
                     ignoreUnknownSignals: true
                     function onVolumeChanged() {
                         if (Audio.source?.audio) {
@@ -201,9 +205,9 @@ Item {
                 icon: Icons.sun
                 sliderValue: currentMonitor?.brightness ?? 0.5
                 progressColor: Styling.srItem("overprimary")
-                wavy: true
-                wavyAmplitude: 1.5 * sliderValue
-                wavyFrequency: 8.0 * sliderValue
+                wavy: false
+                wavyAmplitude: 0
+                wavyFrequency: 0
                 iconRotation: (sliderValue / 1.0) * 180
                 iconScale: 0.8 + (sliderValue / 1.0) * 0.2
 
@@ -222,8 +226,10 @@ Item {
 
                 onIconClicked: {}
 
+                // FIX: Guard enabled to prevent segfault when monitor is destroyed mid-incubation
                 Connections {
                     target: brightnessRow.currentMonitor ?? null
+                    enabled: brightnessRow.currentMonitor !== null
                     ignoreUnknownSignals: true
                     function onBrightnessChanged() {
                         if (brightnessRow.currentMonitor) {
diff --git a/modules/bar/IntegratedDock.qml b/modules/bar/IntegratedDock.qml
old mode 100644
new mode 100755
diff --git a/modules/bar/IntegratedDockAppButton.qml b/modules/bar/IntegratedDockAppButton.qml
old mode 100644
new mode 100755
index 0387f080..1e3607cf
--- a/modules/bar/IntegratedDockAppButton.qml
+++ b/modules/bar/IntegratedDockAppButton.qml
@@ -47,15 +47,15 @@ Button {
             opacity: root.pressed ? 1 : (root.appIsActive ? 0.3 : 0.7)
 
             Behavior on color {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 ColorAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
         }
@@ -128,9 +128,9 @@ Button {
                             color: root.appIsActive ? Styling.srItem("overprimary") : Qt.rgba(Colors.overBackground.r, Colors.overBackground.g, Colors.overBackground.b, 0.4)
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
+                                    duration: Anim.standardSmall
                                 }
                             }
                         }
@@ -155,9 +155,9 @@ Button {
                             color: root.appIsActive ? Styling.srItem("overprimary") : Qt.rgba(Colors.overBackground.r, Colors.overBackground.g, Colors.overBackground.b, 0.4)
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
+                                    duration: Anim.standardSmall
                                 }
                             }
                         }
diff --git a/modules/bar/IslandContent.qml b/modules/bar/IslandContent.qml
new file mode 100644
index 00000000..fa8cabc4
--- /dev/null
+++ b/modules/bar/IslandContent.qml
@@ -0,0 +1,29 @@
+import QtQuick
+import QtQuick.Layouts
+import qs.modules.theme
+import qs.modules.widgets.defaultview
+
+/*!
+    IslandContent.qml — The Dynamic Island compact view rendered inside the bar.
+
+    Shows the same DefaultView content (clock, user info, media, metrics)
+    that the notch normally shows, but as a compact pill inside the bar's
+    RowLayout. Loaded lazily by BarContent when dynamic mode + island is active.
+*/
+Item {
+    id: root
+
+    implicitWidth: islandContentLoader.implicitWidth
+    implicitHeight: islandContentLoader.implicitHeight + 4
+
+    Loader {
+        id: islandContentLoader
+        anchors.centerIn: parent
+        sourceComponent: DefaultView {
+            notchHovered: false
+            parentHoverActive: false
+        }
+        active: true
+        asynchronous: true
+    }
+}
diff --git a/modules/bar/LayoutSelector.qml b/modules/bar/LayoutSelector.qml
old mode 100644
new mode 100755
index 2abb7236..343a6958
--- a/modules/bar/LayoutSelector.qml
+++ b/modules/bar/LayoutSelector.qml
@@ -26,18 +26,20 @@ StyledRect {
     Layout.preferredHeight: orientation === "vertical" ? (totalButtons * buttonSize + (totalButtons - 1) * spacing + padding * 2) : 36
 
     Behavior on Layout.preferredWidth {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
     Behavior on Layout.preferredHeight {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -112,10 +114,11 @@ StyledRect {
                         verticalAlignment: Text.AlignVCenter
 
                         Behavior on color {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             ColorAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
@@ -166,10 +169,11 @@ StyledRect {
                         verticalAlignment: Text.AlignVCenter
 
                         Behavior on color {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             ColorAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
diff --git a/modules/bar/LayoutSelectorButton.qml b/modules/bar/LayoutSelectorButton.qml
old mode 100644
new mode 100755
index 0fc92509..f10b7d30
--- a/modules/bar/LayoutSelectorButton.qml
+++ b/modules/bar/LayoutSelectorButton.qml
@@ -79,9 +79,9 @@ Item {
             radius: parent.radius ?? 0
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
         }
diff --git a/modules/bar/MicSlider.qml b/modules/bar/MicSlider.qml
old mode 100644
new mode 100755
index 092ae532..ec897ea9
--- a/modules/bar/MicSlider.qml
+++ b/modules/bar/MicSlider.qml
@@ -49,8 +49,9 @@ Item {
     transitions: Transition {
         NumberAnimation {
             properties: "Layout.preferredWidth,Layout.preferredHeight"
-            duration: Config.animDuration
-            easing.type: Easing.OutCubic
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
     Layout.fillWidth: root.vertical
@@ -70,9 +71,9 @@ Item {
             radius: parent.radius ?? 0
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
         }
@@ -105,12 +106,12 @@ Item {
             smoothDrag: true
             value: 0
             resizeParent: false
-            wavy: true
+            wavy: false
             scroll: root.isExpanded
             iconClickable: root.isExpanded
             sliderVisible: root.isExpanded || micSlider.isDragging || root.externalVolumeChange
-            wavyAmplitude: (root.isExpanded || micSlider.isDragging || root.externalVolumeChange) ? (Audio.source?.audio?.muted ? 0.5 : 1.5 * value) : 0
-            wavyFrequency: (root.isExpanded || micSlider.isDragging || root.externalVolumeChange) ? (Audio.source?.audio?.muted ? 1.0 : 8.0 * value) : 0
+            wavyAmplitude: 0
+            wavyFrequency: 0
             iconPos: root.vertical ? "end" : "start"
             icon: Audio.source?.audio?.muted ? Icons.micSlash : Icons.mic
             progressColor: Audio.source?.audio?.muted ? Colors.outline : Styling.srItem("overprimary")
@@ -127,8 +128,10 @@ Item {
                 }
             }
 
+            // FIX: Guard enabled to prevent segfault when PipeWire node is destroyed mid-incubation
             Connections {
                 target: Audio.source?.audio ?? null
+                enabled: Audio.source?.audio !== null
                 ignoreUnknownSignals: true
                 function onVolumeChanged() {
                     if (Audio.source?.audio) {
diff --git a/modules/bar/PowerProfileSelector.qml b/modules/bar/PowerProfileSelector.qml
old mode 100644
new mode 100755
index 3d4be1cb..74dc2152
--- a/modules/bar/PowerProfileSelector.qml
+++ b/modules/bar/PowerProfileSelector.qml
@@ -29,26 +29,29 @@ StyledRect {
     visible: opacity > 0
 
     Behavior on opacity {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
     Behavior on Layout.preferredWidth {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
     Behavior on Layout.preferredHeight {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -87,18 +90,20 @@ StyledRect {
             y: orientation === "vertical" ? currentIndex * (buttonSize + spacing) : 0
 
             Behavior on x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
             Behavior on y {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
@@ -146,10 +151,11 @@ StyledRect {
                         verticalAlignment: Text.AlignVCenter
 
                         Behavior on color {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             ColorAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
@@ -200,10 +206,11 @@ StyledRect {
                         verticalAlignment: Text.AlignVCenter
 
                         Behavior on color {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             ColorAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
diff --git a/modules/bar/ToolsButton.qml b/modules/bar/ToolsButton.qml
old mode 100644
new mode 100755
diff --git a/modules/bar/VolumeSlider.qml b/modules/bar/VolumeSlider.qml
old mode 100644
new mode 100755
index e7e52a82..4c453083
--- a/modules/bar/VolumeSlider.qml
+++ b/modules/bar/VolumeSlider.qml
@@ -51,8 +51,9 @@ Item {
     transitions: Transition {
         NumberAnimation {
             properties: "implicitWidth,implicitHeight,Layout.preferredWidth,Layout.preferredHeight"
-            duration: Config.animDuration
-            easing.type: Easing.OutCubic
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
     Layout.fillWidth: root.vertical
@@ -72,9 +73,9 @@ Item {
             radius: parent.radius ?? 0
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
         }
@@ -107,12 +108,12 @@ Item {
             smoothDrag: true
             value: 0
             resizeParent: false
-            wavy: true
+            wavy: false
             scroll: root.isExpanded
             iconClickable: root.isExpanded
             sliderVisible: root.isExpanded || volumeSlider.isDragging || root.externalVolumeChange
-            wavyAmplitude: (root.isExpanded || volumeSlider.isDragging || root.externalVolumeChange) ? (Audio.sink?.audio?.muted ? 0.5 : 1.5 * value) : 0
-            wavyFrequency: (root.isExpanded || volumeSlider.isDragging || root.externalVolumeChange) ? (Audio.sink?.audio?.muted ? 1.0 : 8.0 * value) : 0
+            wavyAmplitude: 0
+            wavyFrequency: 0
             iconPos: root.vertical ? "end" : "start"
             icon: {
                 if (Audio.sink?.audio?.muted)
@@ -140,8 +141,10 @@ Item {
                 }
             }
 
+            // FIX: Guard enabled to prevent segfault when PipeWire node is destroyed mid-incubation
             Connections {
                 target: Audio.sink?.audio ?? null
+                enabled: Audio.sink?.audio !== null
                 ignoreUnknownSignals: true
                 function onVolumeChanged() {
                     if (Audio.sink?.audio) {
diff --git a/modules/bar/clock/Clock.qml b/modules/bar/clock/Clock.qml
old mode 100644
new mode 100755
index 1cad557d..1020b34a
--- a/modules/bar/clock/Clock.qml
+++ b/modules/bar/clock/Clock.qml
@@ -59,9 +59,9 @@ Item {
             radius: parent.radius ?? 0
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
         }
@@ -637,8 +637,12 @@ Item {
         scheduleNextDayUpdate();
     }
 
+    // ⚡ Adaptive timer: 30s idle vs 1s when popup is open.
+    // The display format is hh:mm (no seconds), so 30s is sufficient
+    // to catch minute transitions. When the user is looking at the
+    // clock popup, we poll every second for responsive updates.
     Timer {
-        interval: 1000
+        interval: root.popupOpen ? 1000 : 30000
         running: !SuspendManager.isSuspending
         repeat: true
         onTriggered: {
diff --git a/modules/bar/clock/ClockIndicator.qml b/modules/bar/clock/ClockIndicator.qml
old mode 100644
new mode 100755
diff --git a/modules/bar/clock/Pomodoro.qml b/modules/bar/clock/Pomodoro.qml
old mode 100644
new mode 100755
index 5f64c1a4..12c3c990
--- a/modules/bar/clock/Pomodoro.qml
+++ b/modules/bar/clock/Pomodoro.qml
@@ -21,7 +21,7 @@ Item {
     
     // --- IPC & Notifications ---
     IpcHandler {
-        target: "pomodoro"
+        target: "ambxst-pomodoro-clock"
         function check() {
             root.requestPopupOpen();
         }
@@ -348,7 +348,7 @@ Item {
                 
                 Rectangle {
                     height: parent.height
-                    width: root.visualProgress * parent.width
+                    width: parent ? (root.visualProgress || 0) * parent.width : 0
                     radius: parent.radius
                     color: Styling.srItem("overprimary")
                 }
@@ -436,7 +436,9 @@ Item {
                             x: Config.system.pomodoro.autoStart ? parent.width - 18 : 2
                             y: 2; width: 16; height: 16; radius: 8
                             color: Colors.background
-                            Behavior on x { NumberAnimation { duration: 200; easing.type: Easing.OutQuart } }
+                            Behavior on x { NumberAnimation { duration: Anim.standardSmall;
+                easing.type: Anim.easing("emphasized").type;
+                easing.bezierCurve: Anim.easing("emphasized").bezierCurve } }
                         }
                     }
                     MouseArea {
@@ -466,7 +468,9 @@ Item {
                             x: Config.system.pomodoro.syncSpotify ? parent.width - 18 : 2
                             y: 2; width: 16; height: 16; radius: 8
                             color: Colors.background
-                            Behavior on x { NumberAnimation { duration: 200; easing.type: Easing.OutQuart } }
+                            Behavior on x { NumberAnimation { duration: Anim.standardSmall;
+                easing.type: Anim.easing("emphasized").type;
+                easing.bezierCurve: Anim.easing("emphasized").bezierCurve } }
                         }
                     }
                     MouseArea {
diff --git a/modules/bar/clock/PomodoroSound.qml b/modules/bar/clock/PomodoroSound.qml
old mode 100644
new mode 100755
diff --git a/modules/bar/clock/Weather.qml b/modules/bar/clock/Weather.qml
old mode 100644
new mode 100755
diff --git a/modules/bar/clock/qmldir b/modules/bar/clock/qmldir
new file mode 100644
index 00000000..b8e7020d
--- /dev/null
+++ b/modules/bar/clock/qmldir
@@ -0,0 +1,6 @@
+module qs.modules.bar.clock
+Clock 1.0 Clock.qml
+ClockIndicator 1.0 ClockIndicator.qml
+Weather 1.0 Weather.qml
+Pomodoro 1.0 Pomodoro.qml
+PomodoroSound 1.0 PomodoroSound.qml
diff --git a/modules/bar/qmldir b/modules/bar/qmldir
new file mode 100644
index 00000000..5b48ce73
--- /dev/null
+++ b/modules/bar/qmldir
@@ -0,0 +1,17 @@
+module qs.modules.bar
+Bar 1.0 Bar.qml
+BarBg 1.0 BarBg.qml
+BarBgShadow 1.0 BarBgShadow.qml
+BarContent 1.0 BarContent.qml
+BatteryIndicator 1.0 BatteryIndicator.qml
+BrightnessSlider 1.0 BrightnessSlider.qml
+ControlsButton 1.0 ControlsButton.qml
+ControlSliderRow 1.0 ControlSliderRow.qml
+IntegratedDock 1.0 IntegratedDock.qml
+IntegratedDockAppButton 1.0 IntegratedDockAppButton.qml
+LayoutSelector 1.0 LayoutSelector.qml
+LayoutSelectorButton 1.0 LayoutSelectorButton.qml
+MicSlider 1.0 MicSlider.qml
+PowerProfileSelector 1.0 PowerProfileSelector.qml
+ToolsButton 1.0 ToolsButton.qml
+VolumeSlider 1.0 VolumeSlider.qml
diff --git a/modules/bar/systray/SysTray.qml b/modules/bar/systray/SysTray.qml
old mode 100644
new mode 100755
index 83464b58..40a2378e
--- a/modules/bar/systray/SysTray.qml
+++ b/modules/bar/systray/SysTray.qml
@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell.Services.SystemTray
 import qs.modules.theme
+import qs.config
 import qs.modules.components
 
     StyledRect {
@@ -24,13 +25,35 @@ import qs.modules.components
 
     // Orientación derivada de la barra
     property bool vertical: bar.orientation === "vertical"
+    property bool isExpanded: true
+
+    // Filtered tray items (UntypedObjectModel doesn't support .filter())
+    readonly property var filteredItems: {
+        var result = [];
+        var items = SystemTray.items;
+        var hidden = Config.bar.hiddenIcons;
+        for (var i = 0; i < items.length; i++) {
+            var item = items[i];
+            var title = (item.title || item.tooltipTitle || "").toLowerCase();
+            var hide = false;
+            for (var j = 0; j < hidden.length; j++) {
+                if (title.includes(hidden[j].toLowerCase())) {
+                    hide = true;
+                    break;
+                }
+            }
+            if (!hide) result.push(item);
+        }
+        return result;
+    }
 
     // Hide completely when empty - check both orientations
-    readonly property bool hasItems: rowRepeater.count > 0 || columnRepeater.count > 0
+    readonly property bool hasItems: SystemTray.items.length > 0
 
     // Ajustes de tamaño dinámicos según orientación
     height: vertical ? implicitHeight : parent.height
     Layout.preferredWidth: hasItems ? ((vertical ? columnLayout.implicitWidth : rowLayout.implicitWidth) + 16) : 0
+    Layout.preferredHeight: vertical ? (hasItems ? (columnLayout.implicitHeight + 16) : 0) : 36
     implicitWidth: hasItems ? ((vertical ? columnLayout.implicitWidth : rowLayout.implicitWidth) + 16) : 0
     implicitHeight: hasItems ? ((vertical ? columnLayout.implicitHeight : rowLayout.implicitHeight) + 16) : 0
 
@@ -41,9 +64,27 @@ import qs.modules.components
         anchors.margins: 8
         spacing: 8
 
+        MouseArea {
+            id: toggleBtnRow
+            Layout.alignment: Qt.AlignCenter
+            implicitWidth: 20
+            implicitHeight: 20
+            hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
+            onClicked: root.isExpanded = !root.isExpanded
+
+            Text {
+                anchors.centerIn: parent
+                text: root.isExpanded ? Icons.caretLeft : Icons.caretRight
+                font.family: Icons.font
+                font.pixelSize: Styling.fontSize(-1)
+                color: toggleBtnRow.containsMouse ? Colors.primary : Colors.onSurfaceVariant
+            }
+        }
+
         Repeater {
             id: rowRepeater
-            model: SystemTray.items
+            model: root.isExpanded ? root.filteredItems : []
 
             SysTrayItem {
                 required property SystemTrayItem modelData
@@ -60,9 +101,27 @@ import qs.modules.components
         anchors.margins: 8
         spacing: 8
 
+        MouseArea {
+            id: toggleBtnCol
+            Layout.alignment: Qt.AlignCenter
+            implicitWidth: 20
+            implicitHeight: 20
+            hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
+            onClicked: root.isExpanded = !root.isExpanded
+
+            Text {
+                anchors.centerIn: parent
+                text: root.isExpanded ? Icons.caretUp : Icons.caretDown
+                font.family: Icons.font
+                font.pixelSize: Styling.fontSize(-1)
+                color: toggleBtnCol.containsMouse ? Colors.primary : Colors.onSurfaceVariant
+            }
+        }
+
         Repeater {
             id: columnRepeater
-            model: SystemTray.items
+            model: root.isExpanded ? root.filteredItems : []
 
             SysTrayItem {
                 required property SystemTrayItem modelData
diff --git a/modules/bar/systray/SysTrayItem.qml b/modules/bar/systray/SysTrayItem.qml
old mode 100644
new mode 100755
index 0b725b1a..e80b86fb
--- a/modules/bar/systray/SysTrayItem.qml
+++ b/modules/bar/systray/SysTrayItem.qml
@@ -5,7 +5,6 @@ import Quickshell
 import Quickshell.Services.SystemTray
 import Quickshell.Widgets
 import qs.modules.theme
-import qs.modules.services
 import qs.modules.components
 import qs.config
 
@@ -23,132 +22,54 @@ MouseArea {
     implicitWidth: trayItemSize
     implicitHeight: trayItemSize
 
+    // Popup de prueba para verificar clicks
+    Popup {
+        id: testPopup
+        x: popupX; y: popupY
+        width: 200; height: 150
+
+        background: Rectangle {
+            color: Colors.background
+            border.color: Colors.surfaceBright
+            border.width: 2
+            radius: 8
+        }
+
+        Column {
+            anchors.centerIn: parent
+            spacing: 10
+            Text { text: "RIGHT CLICK WORKS!"; color: Colors.overPrimary; font.bold: true }
+            Button {
+                text: "Cerrar"
+                onClicked: testPopup.close()
+            }
+        }
+    }
+
+    property real popupX: 0
+    property real popupY: 0
+
     onClicked: event => {
         switch (event.button) {
         case Qt.LeftButton:
             item.activate();
             break;
         case Qt.RightButton:
-            if (item.hasMenu) {
-                systrayPopup.toggle();
-            }
+            popupX = event.x;
+            popupY = event.y;
+            testPopup.open();
             break;
         }
         event.accepted = true;
     }
 
-    BarPopup {
-        id: systrayPopup
-        anchorItem: root
-        bar: root.bar
-
-        // Use a reasonable width for the menu
-        contentWidth: 220
-        // Height adapts to content, with a max limit if needed.
-        // Must include vertical padding (8 top + 8 bottom = 16)
-        contentHeight: Math.min(itemsColumn.implicitHeight + 16, 400)
-
-        popupPadding: 8
-        // 8px standard margin + 8px SysTray container padding to ensure correct offset from the main bar
-        visualMargin: 16
-
-        // Using QsMenuOpener to access menu items
-        QsMenuOpener {
-            id: menuOpener
-            menu: root.item.menu
-        }
-
-        ScrollView {
-            anchors.fill: parent
-            contentWidth: availableWidth
-            clip: true
-
-            ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
-
-            ColumnLayout {
-                id: itemsColumn
-                width: parent.width
-                spacing: 2
-
-                Repeater {
-                    model: menuOpener.children ? menuOpener.children.values : []
-
-                    delegate: ColumnLayout {
-                        required property var modelData
-
-                        Layout.fillWidth: true
-                        spacing: 2
-
-                        property bool submenuExpanded: false
-
-                        SystrayMenuItem {
-                            Layout.fillWidth: true
-
-                            textStr: modelData.text || ""
-                            iconSource: modelData.icon || ""
-                            isImageIcon: iconSource.indexOf("/") !== -1 || iconSource.indexOf(".") !== -1
-                            isSeparator: modelData.isSeparator || false
-                            hasSubmenu: modelData.hasChildren || false
-                            expanded: parent.submenuExpanded
-                            buttonType: modelData.buttonType || 0
-                            checkState: modelData.checkState || 0
-
-                            onClicked: {
-                                if (modelData.hasChildren) {
-                                    parent.submenuExpanded = !parent.submenuExpanded;
-                                } else {
-                                    if (modelData.triggered) {
-                                        modelData.triggered();
-                                    } else if (modelData.activate) {
-                                        modelData.activate();
-                                    }
-                                    systrayPopup.close();
-                                }
-                            }
-                        }
-
-                        // Submenu children — uses its own QsMenuOpener to trigger lazy loading
-                        ColumnLayout {
-                            visible: submenuExpanded && modelData.hasChildren
-                            Layout.fillWidth: true
-                            spacing: 2
-
-                            QsMenuOpener {
-                                id: subMenuOpener
-                                menu: modelData.hasChildren ? modelData : null
-                            }
-
-                            Repeater {
-                                model: subMenuOpener.children ? subMenuOpener.children.values : []
-
-                                delegate: SystrayMenuItem {
-                                    required property var modelData
-
-                                    Layout.fillWidth: true
-                                    depth: 1
-
-                                    textStr: modelData.text || ""
-                                    iconSource: modelData.icon || ""
-                                    isImageIcon: iconSource.indexOf("/") !== -1 || iconSource.indexOf(".") !== -1
-                                    isSeparator: modelData.isSeparator || false
-                                    buttonType: modelData.buttonType || 0
-                                    checkState: modelData.checkState || 0
-
-                                    onClicked: {
-                                        if (modelData.triggered) {
-                                            modelData.triggered();
-                                        } else if (modelData.activate) {
-                                            modelData.activate();
-                                        }
-                                        systrayPopup.close();
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
+    // DEBUG: borde rojo para confirmar que este código está cargado
+    Rectangle {
+        anchors.fill: parent
+        color: "transparent"
+        border.color: "red"
+        border.width: 2
+        radius: 4
     }
 
     IconImage {
diff --git a/modules/bar/systray/SystrayMenuItem.qml b/modules/bar/systray/SystrayMenuItem.qml
old mode 100644
new mode 100755
index 6bc474d7..d657af8f
--- a/modules/bar/systray/SystrayMenuItem.qml
+++ b/modules/bar/systray/SystrayMenuItem.qml
@@ -1,22 +1,20 @@
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 import qs.modules.theme
 import qs.config
 
-Button {
+Item {
     id: root
 
+    signal clicked()
+
     property string textStr: ""
 
-    // Clean text logic from ContextMenu.qml
     readonly property string cleanText: {
         let t = textStr;
         if (!t) return "";
         t = String(t);
-        if (t.startsWith(":/// ")) {
-            t = t.substring(5);
-        }
+        var m = t.match(/^:\/\/+\s*/); if (m) t = t.substring(m[0].length);
         return t.trim();
     }
 
@@ -26,25 +24,32 @@ Button {
     property bool hasSubmenu: false
     property bool expanded: false
     property int depth: 0
-    // 0 = None, 1 = CheckBox, 2 = RadioButton
     property int buttonType: 0
-    // Qt.Unchecked = 0, Qt.PartiallyChecked = 1, Qt.Checked = 2
     property int checkState: 0
 
     implicitWidth: 200
     implicitHeight: isSeparator ? 10 : 36
-    enabled: !isSeparator
-
-    // Reset default styling
-    padding: 0
-    background: Rectangle {
-        color: {
-            if (root.isSeparator) return "transparent"
-            return root.hovered ? Styling.srItem("overprimary") : "transparent"
+
+    // Capturar clics directamente sin Button
+    MouseArea {
+        id: clickArea
+        anchors.fill: parent
+        enabled: !root.isSeparator
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+
+        onClicked: {
+            if (root.isSeparator) return;
+            root.clicked();
         }
+    }
+
+    // Fondo
+    Rectangle {
+        anchors.fill: parent
+        color: isSeparator ? "transparent" : (clickArea.containsMouse ? Styling.srItem("overprimary") : "transparent")
         radius: Styling.radius(0)
 
-        // Separator line
         Rectangle {
             visible: root.isSeparator
             height: 1
@@ -54,11 +59,10 @@ Button {
         }
     }
 
-    contentItem: RowLayout {
+    // Contenido
+    RowLayout {
         spacing: 8
         visible: !root.isSeparator
-
-        // Add margins for content
         anchors.fill: parent
         anchors.leftMargin: 8 + root.depth * 12
         anchors.rightMargin: 8
@@ -69,74 +73,51 @@ Button {
             Layout.preferredWidth: 16
             Layout.preferredHeight: 16
 
-            // Checkbox
             Rectangle {
                 visible: root.buttonType === 1
-                anchors.centerIn: parent
-                width: 14
-                height: 14
-                radius: 3
+                anchors.centerIn: parent; width: 14; height: 14; radius: 3
                 color: root.checkState === Qt.Unchecked ? "transparent" : Colors.primary
                 border.color: root.checkState === Qt.Unchecked ? Colors.outline : Colors.primary
                 border.width: 1.5
-
                 Text {
                     anchors.centerIn: parent
                     visible: root.checkState !== Qt.Unchecked
                     text: root.checkState === Qt.PartiallyChecked ? "\u2212" : "\u2713"
-                    color: Colors.overPrimary
-                    font.pixelSize: 10
-                    font.bold: true
+                    color: Colors.overPrimary; font.pixelSize: 10; font.bold: true
                 }
             }
 
-            // RadioButton
             Rectangle {
                 visible: root.buttonType === 2
-                anchors.centerIn: parent
-                width: 14
-                height: 14
-                radius: 7
+                anchors.centerIn: parent; width: 14; height: 14; radius: 7
                 color: "transparent"
                 border.color: root.checkState === Qt.Checked ? Colors.primary : Colors.outline
                 border.width: 1.5
-
                 Rectangle {
-                    anchors.centerIn: parent
-                    visible: root.checkState === Qt.Checked
-                    width: 7
-                    height: 7
-                    radius: 4
-                    color: Colors.primary
+                    anchors.centerIn: parent; visible: root.checkState === Qt.Checked
+                    width: 7; height: 7; radius: 4; color: Colors.primary
                 }
             }
         }
 
         // Icon
         Loader {
-            Layout.preferredWidth: 16
-            Layout.preferredHeight: 16
+            Layout.preferredWidth: 16; Layout.preferredHeight: 16
             visible: root.iconSource !== "" && root.buttonType === 0
             sourceComponent: root.isImageIcon ? imageIcon : fontIcon
-
             Component {
                 id: fontIcon
                 Text {
                     text: root.iconSource
-                    font.family: Icons.font
-                    font.pixelSize: 14
-                    color: root.hovered ? Colors.overPrimary : Colors.overBackground
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
+                    font.family: Icons.font; font.pixelSize: 14
+                    color: clickArea.containsMouse ? Colors.overPrimary : Colors.overBackground
                 }
             }
-
             Component {
                 id: imageIcon
                 Image {
                     source: root.iconSource
-                    fillMode: Image.PreserveAspectFit
-                    mipmap: true
+                    fillMode: Image.PreserveAspectFit; mipmap: true
                 }
             }
         }
@@ -145,20 +126,17 @@ Button {
         Text {
             Layout.fillWidth: true
             text: root.cleanText
-            color: root.hovered ? Colors.overPrimary : Colors.overBackground
-            font.family: Config.theme.font
-            font.pixelSize: Styling.fontSize(0)
-            elide: Text.ElideRight
-            verticalAlignment: Text.AlignVCenter
+            color: clickArea.containsMouse ? Colors.overPrimary : Colors.overBackground
+            font.family: Config.theme.font; font.pixelSize: Styling.fontSize(0)
+            elide: Text.ElideRight; verticalAlignment: Text.AlignVCenter
         }
 
         // Submenu chevron
         Text {
             visible: root.hasSubmenu
             text: root.expanded ? "\u25BE" : "\u25B8"
-            color: root.hovered ? Colors.overPrimary : Colors.overBackground
-            font.pixelSize: Styling.fontSize(0)
-            verticalAlignment: Text.AlignVCenter
+            color: clickArea.containsMouse ? Colors.overPrimary : Colors.overBackground
+            font.pixelSize: Styling.fontSize(0); verticalAlignment: Text.AlignVCenter
         }
     }
 }
diff --git a/modules/bar/systray/qmldir b/modules/bar/systray/qmldir
new file mode 100644
index 00000000..10ef1c1d
--- /dev/null
+++ b/modules/bar/systray/qmldir
@@ -0,0 +1,4 @@
+module qs.modules.bar.systray
+SysTray 1.0 SysTray.qml
+SysTrayItem 1.0 SysTrayItem.qml
+SystrayMenuItem 1.0 SystrayMenuItem.qml
diff --git a/modules/bar/tasktray/TaskTray.qml b/modules/bar/tasktray/TaskTray.qml
new file mode 100644
index 00000000..3b6f8d81
--- /dev/null
+++ b/modules/bar/tasktray/TaskTray.qml
@@ -0,0 +1,407 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Services.SystemTray
+import Quickshell.Widgets
+import qs.modules.theme
+import qs.modules.services
+import qs.modules.components
+import qs.config
+
+Item {
+    id: root
+
+    required property var bar
+    property bool vertical: bar.orientation === "vertical"
+    property bool isHovered: false
+    property bool layerEnabled: true
+    property real radius: 0
+    property real startRadius: radius
+    property real endRadius: radius
+    property bool expanded: false
+    property var _ctxItem: null
+    property var _hid: []
+
+    function _key(i, it) {
+        return i + "_" + (it.title || it.tooltipTitle || it.id || "t" + i);
+    }
+
+    property int _vc: 0
+    function _recalc() {
+        try {
+            if (!SystemTray || !SystemTray.items) { _vc = 0; return; }
+            var len = SystemTray.items && SystemTray.items.length;
+            if (!len) { _vc = 0; return; }
+            if (_hid.length === 0) { _vc = len; return; }
+            var n = 0;
+            for (var i = 0; i < len; i++) {
+                var it = SystemTray.items[i];
+                if (it && _hid.indexOf(root._key(i, it)) < 0) n++;
+            }
+            _vc = n;
+        } catch(e) {
+            console.warn('_recalc:', e);
+            _vc = 0;
+        }
+    }
+    function _toggle(k) {
+        var a = _hid.slice();
+        var i = a.indexOf(k);
+        if (i >= 0) a.splice(i, 1); else a.push(k);
+        _hid = a;
+        _recalc();
+    }
+
+    property int _dockN: dockRep ? dockRep.count : 0
+    property int _setN: setRep ? setRep.count : 0
+
+    Connections { target: dockRep; function onCountChanged() { _dockN = dockRep.count; _setN = setRep.count; _recalc(); } }
+    Connections { target: setRep; function onCountChanged() { _setN = setRep.count; _recalc(); } }
+    Component.onCompleted: _recalc()
+
+    readonly property int _dw: expanded && dockRep.count > 0 ? Math.max(40, Math.min(dockRep.count, 10) * 40 + 10) : 0
+
+    Layout.preferredWidth: root.vertical ? 36 : (36 + (expanded ? 2 + _dw : 0))
+    Layout.preferredHeight: root.vertical ? (36 + (expanded ? 2 + _dw : 0)) : 36
+    Layout.fillWidth: vertical
+    Layout.fillHeight: !vertical
+    clip: true
+
+    Behavior on Layout.preferredHeight {
+        enabled: root.vertical && Anim.animationsEnabled
+        NumberAnimation { duration: Anim.standardSmall; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
+    }
+
+    Behavior on Layout.preferredWidth {
+        enabled: !root.vertical && Anim.animationsEnabled
+        NumberAnimation { duration: Anim.standardSmall; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
+    }
+
+    HoverHandler { onHoveredChanged: root.isHovered = hovered }
+
+    StyledRect {
+        anchors.fill: parent
+        variant: "bg"
+        enableShadow: root.layerEnabled && Config.showBackground
+        topLeftRadius: root.vertical ? root.startRadius : root.startRadius
+        topRightRadius: root.endRadius
+        bottomLeftRadius: root.vertical ? root.endRadius : root.startRadius
+        bottomRightRadius: root.endRadius
+
+        Rectangle {
+            anchors.fill: parent
+            color: Styling.srItem("overprimary")
+            opacity: root.isHovered && !root.expanded ? 0.25 : 0
+            radius: parent.radius ?? 0
+            Behavior on opacity {
+                enabled: Anim.animationsEnabled
+                NumberAnimation { duration: Anim.standardSmall }
+            }
+        }
+    }
+
+    Text {
+        x: 9; y: 9
+        text: Icons.dotsThree; font.family: Icons.font; font.pixelSize: 18
+        color: Styling.srItem("overprimary")
+        rotation: root.expanded ? 90 : 0
+        Behavior on rotation {
+            enabled: Anim.animationsEnabled
+            NumberAnimation { duration: Anim.standardSmall; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent; z: 20; cursorShape: Qt.PointingHandCursor
+        onClicked: event => { root.expanded = !root.expanded; }
+    }
+
+    StyledToolTip {
+        visible: root.isHovered && !root.expanded
+        tooltipText: _vc > 0 ? _vc + " visible" : "No icons"
+    }
+
+    RowLayout {
+        visible: !root.vertical
+        opacity: expanded ? 1.0 : 0.0
+        Behavior on opacity { enabled: Anim.animationsEnabled; NumberAnimation { duration: Anim.standardSmall } }
+        anchors.left: root.vertical ? undefined : parent.left
+        anchors.leftMargin: root.vertical ? 0 : 40
+        anchors.verticalCenter: root.vertical ? undefined : parent.verticalCenter
+        anchors.top: root.vertical ? parent.top : undefined
+        anchors.topMargin: root.vertical ? 40 : 0
+        anchors.horizontalCenter: root.vertical ? parent.horizontalCenter : undefined
+        spacing: 4
+            Repeater {
+                id: dockRep
+                model: SystemTray && SystemTray.items ? SystemTray.items : []
+                delegate: Item {
+                    required property SystemTrayItem modelData
+                    required property int index
+                    width: 36; height: 36
+                    readonly property string _k: root._key(index, modelData)
+                    visible: root._hid.indexOf(_k) < 0
+                    property bool hov: false
+                    HoverHandler { onHoveredChanged: hov = hovered }
+                    StyledRect {
+                        anchors.fill: parent; anchors.margins: 1; radius: 4
+                        variant: "bg"; opacity: hov ? 0.5 : 0.0
+                        Behavior on opacity { NumberAnimation { duration: 80 } }
+                    }
+                    IconImage {
+                        anchors.centerIn: parent; width: 18; height: 18
+                        source: modelData.icon; smooth: true
+                    }
+                    MouseArea {
+                        anchors.fill: parent; cursorShape: Qt.PointingHandCursor
+                        acceptedButtons: Qt.LeftButton | Qt.RightButton
+                        onClicked: event => {
+                            if (event.button === Qt.LeftButton) modelData.activate();
+                            else if (event.button === Qt.RightButton && modelData.hasMenu) {
+                                root._ctxItem = modelData; ctxPopup.open();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+    ColumnLayout {
+        opacity: expanded ? 1.0 : 0.0
+        Behavior on opacity { enabled: Anim.animationsEnabled; NumberAnimation { duration: Anim.standardSmall } }
+        anchors.top: parent.top; anchors.topMargin: 40
+        anchors.horizontalCenter: parent.horizontalCenter
+        spacing: 4
+        visible: root.vertical && dockRep.count > 0
+
+        Repeater {
+            id: dockRepVert
+            model: dockRep.model
+            delegate: Item {
+                required property SystemTrayItem modelData
+                required property int index
+                width: 36; height: 36
+                visible: true
+                StyledRect {
+                    anchors.fill: parent; anchors.margins: 1; radius: 4
+                    variant: "bg"
+                    opacity: 0
+                }
+                IconImage {
+                    anchors.centerIn: parent; width: 18; height: 18
+                    source: modelData.icon; smooth: true
+                }
+                MouseArea {
+                    anchors.fill: parent; cursorShape: Qt.PointingHandCursor
+                    acceptedButtons: Qt.LeftButton | Qt.RightButton
+                    onClicked: event => {
+                        if (event.button === Qt.LeftButton) modelData.activate();
+                        else if (event.button === Qt.RightButton) {
+                            root._ctxItem = modelData; ctxPopup.open();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // ── Context menu ──
+    BarPopup {
+        id: ctxPopup; anchorItem: root; bar: root.bar
+        contentWidth: 240
+        contentHeight: Math.min(ctxCol.implicitHeight + 16, 400)
+        popupPadding: 6; visualMargin: 16
+
+        QsMenuOpener { id: mo; menu: root._ctxItem ? root._ctxItem.menu : null }
+
+        ScrollView {
+            anchors.fill: parent; clip: true
+            ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+
+            ColumnLayout {
+                id: ctxCol; width: parent.width; spacing: 2
+
+                Repeater {
+                    model: mo.children
+
+                    delegate: Item {
+                        required property QsMenuHandle modelData
+                        Layout.fillWidth: true
+                        Layout.preferredHeight: 32
+
+                        // Separador
+                        Rectangle {
+                            anchors.left: parent.left; anchors.right: parent.right
+                            anchors.verticalCenter: parent.verticalCenter
+                            height: 1; color: Colors.surfaceBright
+                            visible: modelData.isSeparator
+                            anchors.leftMargin: 8; anchors.rightMargin: 8
+                        }
+
+                        readonly property bool _isCheck: modelData.buttonType === 1
+                        readonly property bool _isRadio: modelData.buttonType === 2
+                        property bool _hover: false
+
+                        // Check/Radio
+                        Item {
+                            x: 8; y: 8; width: 16; height: 16
+                            visible: !modelData.isSeparator && modelData.buttonType !== 0
+                            Rectangle {
+                                anchors.centerIn: parent; width: 14; height: 14
+                                radius: _isRadio ? 7 : 3
+                                color: modelData.checkState !== 0 ? Colors.primary : "transparent"
+                                border.color: modelData.checkState !== 0 ? Colors.primary : Colors.outline
+                                border.width: 1.5
+                                Text {
+                                    anchors.centerIn: parent
+                                    visible: modelData.checkState !== 0 && !_isRadio
+                                    text: modelData.checkState === 1 ? "\u2212" : "\u2713"
+                                    color: Colors.overPrimary; font.pixelSize: 10; font.bold: true
+                                }
+                                Rectangle {
+                                    anchors.centerIn: parent
+                                    visible: modelData.checkState !== 0 && _isRadio
+                                    width: 7; height: 7; radius: 4; color: Colors.primary
+                                }
+                            }
+                        }
+
+                        // Icono
+                        Text {
+                            x: modelData.buttonType !== 0 ? 30 : 10
+                            y: 8; width: 16; height: 16
+                            visible: !modelData.isSeparator && modelData.icon !== "" && modelData.buttonType === 0
+                            text: modelData.icon; font.family: Icons.font; font.pixelSize: 14
+                            color: _hover ? Colors.overPrimary : Colors.overBackground
+                            verticalAlignment: Text.AlignVCenter
+                        }
+
+                        // Texto
+                        Text {
+                            readonly property real _ix: modelData.buttonType !== 0 ? 30 : (modelData.icon !== "" && modelData.buttonType === 0 ? 30 : 10)
+                            x: _ix; y: 6; height: 20
+                            width: parent.width - _ix - 22
+                            visible: !modelData.isSeparator
+                            text: {
+                                var t = modelData.text || "";
+                                var m = t.match(/^:\/\/+\s*/); if (m) t = t.substring(m[0].length);
+                                return t.trim();
+                            }
+                            color: _hover ? Colors.overPrimary : Colors.overBackground
+                            font.family: Config.theme.font
+                            font.pixelSize: Styling.fontSize(0)
+                            elide: Text.ElideRight
+                            verticalAlignment: Text.AlignVCenter
+                        }
+
+                        // Chevron submenu
+                        Text {
+                            x: parent.width - 20; y: 8; width: 12; height: 16
+                            visible: !modelData.isSeparator && modelData.hasChildren
+                            text: "\u25B8"; font.pixelSize: Styling.fontSize(0)
+                            color: _hover ? Colors.overPrimary : Colors.overBackground
+                            verticalAlignment: Text.AlignVCenter
+                        }
+
+                        // Fondo hover
+                        Rectangle {
+                            anchors.fill: parent; anchors.margins: 2
+                            radius: Styling.radius(0)
+                            visible: _hover && !modelData.isSeparator
+                            color: Styling.srItem("overprimary")
+                        }
+
+                        MouseArea {
+                            anchors.fill: parent
+                            hoverEnabled: true; cursorShape: Qt.PointingHandCursor
+                            enabled: !modelData.isSeparator
+                            onEntered: _hover = true
+                            onExited: _hover = false
+                            onClicked: {
+                                if (!modelData.isSeparator) {
+                                    modelData.triggered();
+                                    ctxPopup.close();
+                                    Qt.callLater(() => { root._ctxItem = null; });
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // ── Settings popup ──
+    BarPopup {
+        id: setPopup; anchorItem: root; bar: root.bar
+        contentWidth: setCol.implicitWidth + 16
+        contentHeight: Math.min(setCol.implicitHeight + 16, 400)
+        ColumnLayout {
+            id: setCol
+            anchors.fill: parent; anchors.margins: 6; spacing: 4
+            Text {
+                text: "Tray (" + _vc + "/" + _setN + ")"
+                font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); font.bold: true
+                color: Colors.overBackground
+                Layout.fillWidth: true; Layout.bottomMargin: 4; leftPadding: 4
+            }
+            Repeater {
+                id: setRep
+                model: SystemTray && SystemTray.items ? SystemTray.items : []
+                delegate: Item {
+                    required property SystemTrayItem modelData
+                    required property int index
+                    Layout.fillWidth: true; Layout.preferredHeight: 34
+                    readonly property string _k: root._key(index, modelData)
+
+                    MouseArea {
+                        id: rowMA
+                        anchors.fill: parent; hoverEnabled: true; cursorShape: Qt.PointingHandCursor
+                        acceptedButtons: Qt.LeftButton | Qt.RightButton
+                        onClicked: event => {
+                            if (event.button === Qt.LeftButton) { modelData.activate(); setPopup.close(); }
+                            else if (event.button === Qt.RightButton && modelData.hasMenu) {
+                                root._ctxItem = modelData; ctxPopup.open();
+                            }
+                        }
+                    }
+
+                    StyledRect {
+                        anchors.fill: parent; radius: 4
+                        variant: rowMA.containsMouse ? "focus" : "bg"
+                        opacity: rowMA.containsMouse ? 1.0 : 0.7
+                    }
+
+                    RowLayout {
+                        anchors.fill: parent; anchors.leftMargin: 6; anchors.rightMargin: 6; spacing: 8
+                        Text {
+                            text: root._hid.indexOf(_k) >= 0 ? Icons.circleNotch : Icons.circle
+                            font.family: Icons.font; font.pixelSize: 16
+                            color: root._hid.indexOf(_k) >= 0 ? Colors.outline : Styling.srItem("primary")
+                            Layout.alignment: Qt.AlignVCenter
+                            MouseArea {
+                                anchors.fill: parent; anchors.margins: -4
+                                cursorShape: Qt.PointingHandCursor
+                                onClicked: event => { root._toggle(_k); event.accepted = true; }
+                            }
+                        }
+                        IconImage { width: 20; height: 20; source: modelData.icon; smooth: true; Layout.alignment: Qt.AlignVCenter }
+                        Text {
+                            text: modelData.tooltipTitle || modelData.title || "App #" + (index + 1)
+                            font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-2)
+                            color: Colors.overBackground; elide: Text.ElideRight
+                            Layout.fillWidth: true; Layout.alignment: Qt.AlignVCenter
+                        }
+                    }
+                }
+            }
+            Item { Layout.fillHeight: true }
+        }
+    }
+}
diff --git a/modules/bar/tasktray/qmldir b/modules/bar/tasktray/qmldir
new file mode 100644
index 00000000..4210fb47
--- /dev/null
+++ b/modules/bar/tasktray/qmldir
@@ -0,0 +1,2 @@
+module qs.modules.bar.tasktray
+TaskTray 1.0 TaskTray.qml
diff --git a/modules/bar/workspaces/CompositorData.qml b/modules/bar/workspaces/CompositorData.qml
old mode 100644
new mode 100755
index 3772995d..269f68b8
--- a/modules/bar/workspaces/CompositorData.qml
+++ b/modules/bar/workspaces/CompositorData.qml
@@ -20,6 +20,36 @@ Singleton {
         // No-op: state is now pushed inline via axctl subscribe events
     }
 
+    // Force refresh from hyprctl (used by overview after drag-and-drop)
+    property Process _refreshProcess: Process {
+        command: ["hyprctl", "clients", "-j"]
+        stdout: StdioCollector {
+            onStreamFinished: {
+                try {
+                    var raw = JSON.parse(text);
+                    if (raw && raw.length > 0)
+                        root.refreshFromJson(raw);
+                } catch (e) {}
+            }
+        }
+    }
+
+    function refreshFromHyprctl() {
+        _refreshProcess.running = true;
+    }
+
+    function refreshFromJson(raw) {
+        root.windowList = raw;
+        let tempWinByAddress = {}
+        for (var i = 0; i < root.windowList.length; ++i) {
+            var win = root.windowList[i]
+            tempWinByAddress[win.address] = win
+        }
+        root.windowByAddress = tempWinByAddress
+        root.addresses = root.windowList.map((win) => win.address)
+        updateMaps()
+    }
+
     function updateMaps() {
         let occupationMap = {}
         let windowsMap = {}
diff --git a/modules/bar/workspaces/Workspaces.qml b/modules/bar/workspaces/Workspaces.qml
old mode 100644
new mode 100755
index 48f68cdd..79ce5df8
--- a/modules/bar/workspaces/Workspaces.qml
+++ b/modules/bar/workspaces/Workspaces.qml
@@ -40,7 +40,7 @@ Item {
     function updateWorkspaceOccupied() {
         if (Config.workspaces.dynamic) {
             // Get occupied workspace IDs using the precomputed occupation map, sorted and limited by 'shown'
-            const occupiedIds = AxctlService.workspaces.values.filter(ws => CompositorData.workspaceOccupationMap[ws.id]).map(ws => ws.id).sort((a, b) => a - b).slice(0, Config.workspaces.shown);
+            const occupiedIds = AxctlService.workspaces.values.filter(ws => CompositorData && CompositorData.workspaceOccupationMap ? !!CompositorData.workspaceOccupationMap[ws.id] : false).map(ws => ws.id).sort((a, b) => a - b).slice(0, Config.workspaces.shown);
 
             // Always include active workspace, even if empty
             const activeId = (monitor && monitor.activeWorkspace ? monitor.activeWorkspace.id : undefined) || 1;
@@ -55,13 +55,13 @@ Item {
             dynamicWorkspaceIds = occupiedIds;
             workspaceOccupied = Array.from({
                 length: dynamicWorkspaceIds.length
-            }, (_, i) => CompositorData.workspaceOccupationMap[dynamicWorkspaceIds[i]]);
+            }, (_, i) => (CompositorData && CompositorData.workspaceOccupationMap ? CompositorData.workspaceOccupationMap[dynamicWorkspaceIds[i]] : false));
         } else {
             workspaceOccupied = Array.from({
                 length: Config.workspaces.shown
             }, (_, i) => {
                 const wsId = workspaceGroup * Config.workspaces.shown + i + 1;
-                return CompositorData.workspaceOccupationMap[wsId];
+                return CompositorData && CompositorData.workspaceOccupationMap ? CompositorData.workspaceOccupationMap[wsId] : false;
             });
         }
         updateOccupiedRanges();
@@ -152,6 +152,11 @@ Item {
 
     readonly property bool effectiveContainBar: Config.bar.containBar && ((Config.bar.frameEnabled !== undefined ? Config.bar.frameEnabled : false))
 
+    // Process for workspace switching
+    property Process wsProcess: Process {
+        running: false
+    }
+
     StyledRect {
         id: bgRect
         variant: "bg"
@@ -166,17 +171,20 @@ Item {
 
     WheelHandler {
         onWheel: event => {
-            if (event.angleDelta.y < 0)
-                AxctlService.dispatch(`workspace r+1`);
-            else if (event.angleDelta.y > 0)
-                AxctlService.dispatch(`workspace r-1`);
+            if (event.angleDelta.y < 0) {
+                wsProcess.command = ["hyprctl", "dispatch", "workspace", "+1"];
+                wsProcess.running = true;
+            } else if (event.angleDelta.y > 0) {
+                wsProcess.command = ["hyprctl", "dispatch", "workspace", "-1"];
+                wsProcess.running = true;
+            }
         }
         acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad
     }
 
     MouseArea {
         anchors.fill: parent
-        acceptedButtons: Qt.BackButton
+        acceptedButtons: Qt.NoButton
         onPressed: event => {
             if (event.button === Qt.BackButton) {
                 AxctlService.dispatch(`togglespecialworkspace`);
@@ -211,23 +219,23 @@ Item {
                 y: 0
 
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Math.max(0, Config.animDuration - 100)
+                        duration: Anim.standardNormal
                         easing.type: Easing.OutQuad
                     }
                 }
                 Behavior on x {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Math.max(0, Config.animDuration - 100)
+                        duration: Anim.standardNormal
                         easing.type: Easing.OutQuad
                     }
                 }
                 Behavior on width {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Math.max(0, Config.animDuration - 100)
+                        duration: Anim.standardNormal
                         easing.type: Easing.OutQuad
                     }
                 }
@@ -262,23 +270,23 @@ Item {
                 y: modelData.start * workspaceButtonWidth
 
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Math.max(0, Config.animDuration - 100)
+                        duration: Anim.standardNormal
                         easing.type: Easing.OutQuad
                     }
                 }
                 Behavior on y {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Math.max(0, Config.animDuration - 100)
+                        duration: Anim.standardNormal
                         easing.type: Easing.OutQuad
                     }
                 }
                 Behavior on height {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Math.max(0, Config.animDuration - 100)
+                        duration: Anim.standardNormal
                         easing.type: Easing.OutQuad
                     }
                 }
@@ -302,7 +310,7 @@ Item {
 
         radius: {
             const activeWorkspaceId = (monitor && monitor.activeWorkspace ? monitor.activeWorkspace.id : undefined) || 1;
-            const currentWorkspaceHasWindows = CompositorData.workspaceOccupationMap[activeWorkspaceId];
+            const occMap = CompositorData ? CompositorData.workspaceOccupationMap : null; const currentWorkspaceHasWindows = occMap ? occMap[activeWorkspaceId] : false;
             if (workspacesWidget.radius === 0)
                 return 0;
             return currentWorkspaceHasWindows ? workspacesWidget.radius > 0 ? Math.max(workspacesWidget.radius - parent.widgetPadding - activeWorkspaceMargin, 0) : 0 : implicitHeight / 2;
@@ -315,29 +323,31 @@ Item {
 
         Behavior on activeWorkspaceMargin {
 
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
 
             NumberAnimation {
-                duration: Config.animDuration / 2
+                duration: Anim.standardSmall
                 easing.type: Easing.OutQuad
             }
         }
         Behavior on idx1 {
 
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
 
             NumberAnimation {
-                duration: Config.animDuration / 3
-                easing.type: Easing.OutSine
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
             }
         }
         Behavior on idx2 {
 
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
 
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutSine
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
             }
         }
     }
@@ -358,7 +368,7 @@ Item {
 
         radius: {
             const activeWorkspaceId = (monitor && monitor.activeWorkspace ? monitor.activeWorkspace.id : undefined) || 1;
-            const currentWorkspaceHasWindows = CompositorData.workspaceOccupationMap[activeWorkspaceId];
+            const occMap = CompositorData ? CompositorData.workspaceOccupationMap : null; const currentWorkspaceHasWindows = occMap ? occMap[activeWorkspaceId] : false;
             if (workspacesWidget.radius === 0)
                 return 0;
             return currentWorkspaceHasWindows ? workspacesWidget.radius > 0 ? Math.max(workspacesWidget.radius - parent.widgetPadding - activeWorkspaceMargin, 0) : 0 : implicitWidth / 2;
@@ -371,29 +381,31 @@ Item {
 
         Behavior on activeWorkspaceMargin {
 
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
 
             NumberAnimation {
-                duration: Config.animDuration / 2
+                duration: Anim.standardSmall
                 easing.type: Easing.OutQuad
             }
         }
         Behavior on idx1 {
 
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
 
             NumberAnimation {
-                duration: Config.animDuration / 3
-                easing.type: Easing.OutSine
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
             }
         }
         Behavior on idx2 {
 
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
 
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutSine
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
             }
         }
     }
@@ -411,19 +423,33 @@ Item {
         Repeater {
             model: effectiveWorkspaceCount
 
-            Button {
+            Item {
                 id: button
                 property int workspaceValue: getWorkspaceId(index)
+                property bool hovered: btnMouse.containsMouse
                 Layout.fillHeight: true
-                onPressed: AxctlService.dispatch(`workspace ${workspaceValue}`)
                 width: workspaceButtonWidth
+                implicitWidth: workspaceButtonWidth
+
+                MouseArea {
+                    id: btnMouse
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: {
+                        console.log("Workspace click:", button.workspaceValue);
+                        wsProcess.command = ["hyprctl", "dispatch", "workspace", String(button.workspaceValue)];
+                        wsProcess.running = true;
+                    }
+                }
+
 
-                background: Item {
+                Item {
                     id: workspaceButtonBackground
                     implicitWidth: workspaceButtonWidth
                     implicitHeight: workspaceButtonWidth
                     property var focusedWindow: {
-                        const windowsInThisWorkspace = CompositorData.workspaceWindowsMap[button.workspaceValue] || [];
+                        const wsMap = CompositorData ? CompositorData.workspaceWindowsMap : null; const windowsInThisWorkspace = wsMap ? (wsMap[button.workspaceValue] || []) : [];
                         if (windowsInThisWorkspace.length === 0)
                             return null;
                         // Get the window with the lowest focusHistoryID (most recently focused)
@@ -452,12 +478,12 @@ Item {
                         font.pixelSize: workspaceLabelFontSize(text)
                         text: `${button.workspaceValue}`
                         elide: Text.ElideRight
-                        color: ((monitor && monitor.activeWorkspace ? monitor.activeWorkspace.id : undefined) == button.workspaceValue) ? Styling.srItem("primary") : (workspaceOccupied[index] ? Colors.overBackground : Colors.overSecondaryFixedVariant)
+                        color: ((monitor && monitor.activeWorkspace ? monitor.activeWorkspace.id : undefined) == button.workspaceValue) ? Styling.srItem("primary") : button.hovered ? Colors.overBackground : (workspaceOccupied[index] ? Colors.overBackground : Colors.overSecondaryFixedVariant)
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: 150
+                                duration: Anim.spatialFast
                                 easing.type: Easing.OutQuad
                             }
                         }
@@ -469,12 +495,12 @@ Item {
                         width: workspaceButtonWidth * 0.2
                         height: width
                         radius: width / 2
-                        color: ((monitor && monitor.activeWorkspace ? monitor.activeWorkspace.id : undefined) == button.workspaceValue) ? Styling.srItem("primary") : Colors.overBackground
+                        color: ((monitor && monitor.activeWorkspace ? monitor.activeWorkspace.id : undefined) == button.workspaceValue) ? Styling.srItem("primary") : button.hovered ? Styling.srItem("primary") : Colors.overBackground
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: 150
+                                duration: Anim.spatialFast
                                 easing.type: Easing.OutQuad
                             }
                         }
@@ -496,30 +522,30 @@ Item {
                             implicitSize: (!Config.workspaces.alwaysShowNumbers && Config.workspaces.showAppIcons) ? workspaceIconSize : workspaceIconSizeShrinked
 
                             Behavior on opacity {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: 150
+                                    duration: Anim.spatialFast
                                     easing.type: Easing.OutQuad
                                 }
                             }
                             Behavior on anchors.bottomMargin {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: 150
+                                    duration: Anim.spatialFast
                                     easing.type: Easing.OutQuad
                                 }
                             }
                             Behavior on anchors.rightMargin {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: 150
+                                    duration: Anim.spatialFast
                                     easing.type: Easing.OutQuad
                                 }
                             }
                             Behavior on implicitSize {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: 150
+                                    duration: Anim.spatialFast
                                     easing.type: Easing.OutQuad
                                 }
                             }
@@ -548,19 +574,32 @@ Item {
         Repeater {
             model: effectiveWorkspaceCount
 
-            Button {
+            Item {
                 id: buttonVert
                 property int workspaceValue: getWorkspaceId(index)
+                property bool hovered: btnVertMouse.containsMouse
                 Layout.fillWidth: true
-                onPressed: AxctlService.dispatch(`workspace ${workspaceValue}`)
                 height: workspaceButtonWidth
+                implicitHeight: workspaceButtonWidth
+
+                MouseArea {
+                    id: btnVertMouse
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: {
+                        console.log("Workspace click:", workspaceValue);
+                        wsProcess.command = ["hyprctl", "dispatch", "workspace", String(workspaceValue)];
+                        wsProcess.running = true;
+                    }
+                }
 
-                background: Item {
+                Item {
                     id: workspaceButtonBackgroundVert
                     implicitWidth: workspaceButtonWidth
                     implicitHeight: workspaceButtonWidth
                     property var focusedWindow: {
-                        const windowsInThisWorkspace = CompositorData.workspaceWindowsMap[buttonVert.workspaceValue] || [];
+                        const wsMap = CompositorData ? CompositorData.workspaceWindowsMap : null; const windowsInThisWorkspace = wsMap ? (wsMap[buttonVert.workspaceValue] || []) : [];
                         if (windowsInThisWorkspace.length === 0)
                             return null;
                         // Get the window with the lowest focusHistoryID (most recently focused)
@@ -589,12 +628,12 @@ Item {
                         font.pixelSize: workspaceLabelFontSize(text)
                         text: `${buttonVert.workspaceValue}`
                         elide: Text.ElideRight
-                        color: ((monitor && monitor.activeWorkspace ? monitor.activeWorkspace.id : undefined) == buttonVert.workspaceValue) ? Styling.srItem("primary") : (workspaceOccupied[index] ? Colors.overBackground : Colors.overSecondaryFixedVariant)
+                        color: ((monitor && monitor.activeWorkspace ? monitor.activeWorkspace.id : undefined) == buttonVert.workspaceValue) ? Styling.srItem("primary") : buttonVert.hovered ? Colors.overBackground : (workspaceOccupied[index] ? Colors.overBackground : Colors.overSecondaryFixedVariant)
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: 150
+                                duration: Anim.spatialFast
                                 easing.type: Easing.OutQuad
                             }
                         }
@@ -609,9 +648,9 @@ Item {
                         color: ((monitor && monitor.activeWorkspace ? monitor.activeWorkspace.id : undefined) == buttonVert.workspaceValue) ? Styling.srItem("primary") : Colors.overBackground
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: 150
+                                duration: Anim.spatialFast
                                 easing.type: Easing.OutQuad
                             }
                         }
@@ -633,30 +672,30 @@ Item {
                             implicitSize: (!Config.workspaces.alwaysShowNumbers && Config.workspaces.showAppIcons) ? workspaceIconSize : workspaceIconSizeShrinked
 
                             Behavior on opacity {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: 150
+                                    duration: Anim.spatialFast
                                     easing.type: Easing.OutQuad
                                 }
                             }
                             Behavior on anchors.bottomMargin {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: 150
+                                    duration: Anim.spatialFast
                                     easing.type: Easing.OutQuad
                                 }
                             }
                             Behavior on anchors.rightMargin {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: 150
+                                    duration: Anim.spatialFast
                                     easing.type: Easing.OutQuad
                                 }
                             }
                             Behavior on implicitSize {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: 150
+                                    duration: Anim.spatialFast
                                     easing.type: Easing.OutQuad
                                 }
                             }
diff --git a/modules/bar/workspaces/qmldir b/modules/bar/workspaces/qmldir
new file mode 100644
index 00000000..d838f2f6
--- /dev/null
+++ b/modules/bar/workspaces/qmldir
@@ -0,0 +1,3 @@
+module qs.modules.bar.workspaces
+Workspaces 1.0 Workspaces.qml
+CompositorData 1.0 CompositorData.qml
diff --git a/modules/components/AGENTS.md b/modules/components/AGENTS.md
old mode 100644
new mode 100755
diff --git a/modules/components/ActionGrid.qml b/modules/components/ActionGrid.qml
old mode 100644
new mode 100755
index 9073d04c..dffea81d
--- a/modules/components/ActionGrid.qml
+++ b/modules/components/ActionGrid.qml
@@ -117,31 +117,35 @@ FocusScope {
             property real t1h: th
 
             Behavior on t1x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 3
-                    easing.type: Easing.OutSine
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                 }
             }
             Behavior on t1y {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 3
-                    easing.type: Easing.OutSine
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                 }
             }
             Behavior on t1w {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 3
-                    easing.type: Easing.OutSine
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                 }
             }
             Behavior on t1h {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 3
-                    easing.type: Easing.OutSine
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                 }
             }
 
@@ -152,31 +156,35 @@ FocusScope {
             property real t2h: th
 
             Behavior on t2x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutSine
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                 }
             }
             Behavior on t2y {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutSine
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                 }
             }
             Behavior on t2w {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutSine
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                 }
             }
             Behavior on t2h {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutSine
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                 }
             }
 
@@ -271,10 +279,11 @@ FocusScope {
                                 verticalAlignment: Text.AlignVCenter
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -294,10 +303,11 @@ FocusScope {
                                 verticalAlignment: Text.AlignVCenter
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
diff --git a/modules/components/BarPopup.qml b/modules/components/BarPopup.qml
old mode 100644
new mode 100755
index bfd417f3..c1a45d18
--- a/modules/components/BarPopup.qml
+++ b/modules/components/BarPopup.qml
@@ -116,18 +116,20 @@ PopupWindow {
 
     // Animation behaviors
     Behavior on popupOpacity {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutCubic
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
     Behavior on popupScale {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutCubic
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
diff --git a/modules/components/BgShadow.qml b/modules/components/BgShadow.qml
old mode 100644
new mode 100755
diff --git a/modules/components/CarouselProgress.qml b/modules/components/CarouselProgress.qml
old mode 100644
new mode 100755
diff --git a/modules/components/CircularControl.qml b/modules/components/CircularControl.qml
old mode 100644
new mode 100755
index 94d1830e..49e87198
--- a/modules/components/CircularControl.qml
+++ b/modules/components/CircularControl.qml
@@ -184,10 +184,11 @@ StyledRect {
         }
 
         Behavior on angle {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
                 duration: 200
-                easing.type: Easing.OutCubic
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
     }
@@ -202,26 +203,29 @@ StyledRect {
         scale: root.iconScale
 
         Behavior on color {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             ColorAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutQuart
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
         Behavior on rotation {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
                 duration: 400
-                easing.type: Easing.OutCubic
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
         Behavior on scale {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
                 duration: 400
-                easing.type: Easing.OutCubic
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
     }
diff --git a/modules/components/CircularSeekBar.qml b/modules/components/CircularSeekBar.qml
old mode 100644
new mode 100755
index e246f012..c048ac56
--- a/modules/components/CircularSeekBar.qml
+++ b/modules/components/CircularSeekBar.qml
@@ -46,8 +46,10 @@ Item {
     // Handle Animation
     property real animatedHandleOffset: isDragging ? 9 : 6
     property real animatedHandleWidth: isDragging ? lineWidth * 0.5 : lineWidth
-    Behavior on animatedHandleOffset { NumberAnimation { duration: 200; easing.type: Easing.OutCubic } }
-    Behavior on animatedHandleWidth { NumberAnimation { duration: 200; easing.type: Easing.OutCubic } }
+    Behavior on animatedHandleOffset { NumberAnimation { duration: 200; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve } }
+    Behavior on animatedHandleWidth { NumberAnimation { duration: 200; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve } }
 
     // Dash Configuration (Matches CarouselProgress logic)
     property real dotSize: lineWidth
@@ -61,8 +63,8 @@ Item {
     property real currentDashLen: dashedActive ? baseDashLength : (baseDashLength + targetSpacing)
     property real currentGapLen: dashedActive ? targetSpacing : 0
     
-    Behavior on currentDashLen { NumberAnimation { duration: Config.animDuration; easing.type: Easing.InOutQuad } }
-    Behavior on currentGapLen { NumberAnimation { duration: Config.animDuration; easing.type: Easing.InOutQuad } }
+    Behavior on currentDashLen { NumberAnimation { duration: Anim.standardNormal; easing.type: Easing.InOutQuad } }
+    Behavior on currentGapLen { NumberAnimation { duration: Anim.standardNormal; easing.type: Easing.InOutQuad } }
 
     // Marquee Animation
     property real phase: 0
diff --git a/modules/components/CircularWavyProgress.qml b/modules/components/CircularWavyProgress.qml
old mode 100644
new mode 100755
index d67a7827..cd79f9ad
--- a/modules/components/CircularWavyProgress.qml
+++ b/modules/components/CircularWavyProgress.qml
@@ -1,167 +1,41 @@
 import QtQuick
 
-Item {
+// GPU-native CircularWavyProgress — renderizado 100% GPU via ShaderEffect.
+// Las propiedades SON los uniforms del shader (ubuf.{} en circular_wavy.frag).
+// Animación via NumberAnimation, sin Timer, sin requestPaint, sin grabToImage.
+ShaderEffect {
     id: root
-    
-    // -- Geometry (Normalized 0.0 - 1.0 relative to width/height) --
-    property real radius: 0.45
-    property real startAngleRad: Math.PI // Default 180 deg (left side)
-    property real progressAngleRad: Math.PI // Default 180 deg span
-    
-    // -- Wave --
-    property real amplitude: 0.01  // Normalized to radius
+
+    // ── Uniformes del shader (nombres exactos = ubuf.{nombre}) ──
+    property real radius: 0.45              // Normalizado 0.0-0.5 en UV space
+    property real startAngle: Math.PI       // Radianes, 180° = lado izquierdo
+    property real progressAngle: Math.PI    // Span en radianes
+    property real amplitude: 0.01           // Normalizado al radio
     property real frequency: 20
-    property real phase: 0.0
-    property real thickness: 0.02  // Normalized stroke width
-    property color color: "white"
-    
-    // -- Animation control --
+    property real thickness: 0.02           // Normalizado en UV space
+    property real pixelSize: 1.0 / Math.max(1, Math.min(width, height))
+    property vector4d color: Qt.vector4d(1, 1, 1, 1)
+
+    // ── Control de animación ──
     property bool animating: false
-    property real animationSpeed: 1.0 // Radians per second
-    
-    // Effective running state
-    readonly property bool shouldAnimate: animating && visible && opacity > 0 && width > 0
-    
-    // Internal computed values
-    readonly property real centerX: width / 2
-    readonly property real centerY: height / 2
-    readonly property real baseRadius: Math.min(width, height) * radius
-    readonly property real strokeWidth: Math.min(width, height) * thickness
-    readonly property real waveAmp: baseRadius * amplitude
-    
-    property real _phase: phase
-    
-    // Animation timer - only runs when shouldAnimate
-    Timer {
-        id: animTimer
-        interval: 50
-        running: root.shouldAnimate
-        repeat: true
-        onTriggered: {
-            let dt = interval / 1000.0;
-            root._phase = (root._phase + root.animationSpeed * dt) % (Math.PI * 2);
-            canvas.requestPaint();
-        }
-    }
-    
-    // Sync internal phase with external when not animating
-    onPhaseChanged: if (!shouldAnimate) { _phase = phase; _updateStatic(); }
+    property real animationSpeed: 1.0       // radianes/s
 
-    // =========================================================================
-    // Static Image - shown when NOT animating (no GPU activity)
-    // =========================================================================
-    Image {
-        mipmap: true
-        id: staticImage
-        anchors.fill: parent
-        visible: !root.shouldAnimate && source !== ""
-        cache: true
-        asynchronous: false
-    }
-    
-    onShouldAnimateChanged: {
-        if (!shouldAnimate && width > 0 && height > 0) {
-            canvas.visible = true;
-            canvas.requestPaint();
-            canvas.grabToImage(function(result) {
-                staticImage.source = result.url;
-                canvas.visible = false;
-            });
-        } else if (shouldAnimate) {
-            canvas.visible = true;
-        }
-    }
-    
-    function _updateStatic() {
-        if (!shouldAnimate && width > 0 && height > 0) {
-            canvas.visible = true;
-            canvas.requestPaint();
-            grabTimer.restart();
-        }
-    }
-    
-    Timer {
-        id: grabTimer
-        interval: 16
-        onTriggered: {
-            canvas.grabToImage(function(result) {
-                staticImage.source = result.url;
-                if (!root.shouldAnimate) canvas.visible = false;
-            });
-        }
-    }
-    
-    onColorChanged: _updateStatic()
-    onThicknessChanged: _updateStatic()
-    onRadiusChanged: _updateStatic()
-    onStartAngleRadChanged: _updateStatic()
-    onProgressAngleRadChanged: _updateStatic()
-    onAmplitudeChanged: _updateStatic()
-    onFrequencyChanged: _updateStatic()
-    onWidthChanged: _updateStatic()
-    onHeightChanged: _updateStatic()
-    
-    Component.onCompleted: {
-        if (!shouldAnimate && width > 0 && height > 0) {
-            _updateStatic();
-        }
-    }
+    readonly property bool _shouldAnimate: animating && visible && width > 0 && height > 0
+
+    // ── Fase animada — cuando running=false, respeta el valor externo ──
+    property real phase: 0.0
 
-    // =========================================================================
-    // Canvas - only visible during animation
-    // =========================================================================
-    Canvas {
-        id: canvas
-        anchors.fill: parent
-        visible: root.shouldAnimate
-        
-        renderStrategy: Canvas.Threaded
-        renderTarget: Canvas.Image
-        
-        onPaint: {
-            let ctx = getContext("2d");
-            ctx.reset();
-            
-            let w = root.width;
-            let h = root.height;
-            if (w <= 0 || h <= 0) return;
-            
-            let cx = root.centerX;
-            let cy = root.centerY;
-            let r = root.baseRadius;
-            let amp = root.waveAmp;
-            let freq = root.frequency;
-            let phase = root._phase;
-            let startAngle = root.startAngleRad;
-            let progressAngle = root.progressAngleRad;
-            
-            let arcLength = r * Math.abs(progressAngle);
-            let pointCount = Math.max(Math.floor(arcLength / 6), 12);
-            pointCount = Math.min(pointCount, 100);
-            
-            ctx.strokeStyle = root.color;
-            ctx.lineWidth = root.strokeWidth;
-            ctx.lineCap = "round";
-            ctx.lineJoin = "round";
-            
-            ctx.beginPath();
-            
-            for (let i = 0; i < pointCount; i++) {
-                let t = i / (pointCount - 1);
-                let angle = startAngle + t * progressAngle;
-                let wavyRadius = r + Math.sin(angle * freq + phase) * amp;
-                
-                let x = cx + Math.cos(angle) * wavyRadius;
-                let y = cy + Math.sin(angle) * wavyRadius;
-                
-                if (i === 0) {
-                    ctx.moveTo(x, y);
-                } else {
-                    ctx.lineTo(x, y);
-                }
-            }
-            
-            ctx.stroke();
+    NumberAnimation on phase {
+        from: 0
+        to: Math.PI * 2
+        duration: {
+            var period = Math.PI * 2 / Math.max(0.001, root.animationSpeed);
+            return Math.max(1, period * 1000);
         }
+        loops: Animation.Infinite
+        running: root._shouldAnimate
     }
+
+    vertexShader: "circular_wavy.vert.qsb"
+    fragmentShader: "circular_wavy.frag.qsb"
 }
diff --git a/modules/components/ContextMenu.qml b/modules/components/ContextMenu.qml
old mode 100644
new mode 100755
diff --git a/modules/components/DiagonalStripePattern.qml b/modules/components/DiagonalStripePattern.qml
old mode 100644
new mode 100755
diff --git a/modules/components/OptionsMenu.qml b/modules/components/OptionsMenu.qml
old mode 100644
new mode 100755
index ddf0d0df..0f99d066
--- a/modules/components/OptionsMenu.qml
+++ b/modules/components/OptionsMenu.qml
@@ -136,26 +136,29 @@ Menu {
             }
 
             Behavior on y {
-                enabled: root.previousHoveredIndex !== -1 && root.hoveredIndex !== -1 && Config.animDuration > 0
+                enabled: root.previousHoveredIndex !== -1 && root.hoveredIndex !== -1 && Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
             Behavior on color {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 ColorAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
@@ -248,10 +251,11 @@ Menu {
                                 textFormat: Text.RichText
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -294,10 +298,11 @@ Menu {
                         width: root.menuWidth - 32 - iconLoader.width - (root.hasIcons ? parent.spacing : 0)
 
                         Behavior on color {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             ColorAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
diff --git a/modules/components/Outline.qml b/modules/components/Outline.qml
old mode 100644
new mode 100755
diff --git a/modules/components/PaneRect.qml b/modules/components/PaneRect.qml
old mode 100644
new mode 100755
diff --git a/modules/components/PositionSlider.qml b/modules/components/PositionSlider.qml
old mode 100644
new mode 100755
index 8f135b4d..227703c5
--- a/modules/components/PositionSlider.qml
+++ b/modules/components/PositionSlider.qml
@@ -39,7 +39,7 @@ Item {
         value: root.length > 0 ? Math.min(1.0, root.position / root.length) : 0
         progressColor: root.useCustomColors ? root.customProgressColor : Styling.srItem("overprimary")
         backgroundColor: root.useCustomColors ? root.customBackgroundColor : Colors.shadow
-        wavy: true // Always use CarouselProgress logic
+        wavy: false // Always use CarouselProgress logic
         playing: root.isPlaying // Control animation state via playing property
         wavyAmplitude: root.isPlaying ? 1 : 0.0
         wavyFrequency: root.isPlaying ? 8 : 0
diff --git a/modules/components/RegionPicker.qml b/modules/components/RegionPicker.qml
new file mode 100644
index 00000000..9e2cd7c2
--- /dev/null
+++ b/modules/components/RegionPicker.qml
@@ -0,0 +1,276 @@
+pragma ComponentBehavior: Bound
+import QtQuick
+import QtQuick.Shapes
+import Quickshell
+import Quickshell.Wayland
+import Quickshell.Io
+import qs.modules.theme
+import qs.modules.components
+
+/*!
+    RegionPicker.qml — Screen region selection overlay.
+
+    Shows a fullscreen semi-transparent overlay where the user can drag
+    to select a rectangular region. On selection, captures the region
+    via grim and copies to clipboard or saves to file.
+
+    Usage:
+        RegionPicker {
+            id: picker
+            onRegionSelected: (x, y, w, h) => {
+                console.log("Selected:", x, y, w, h);
+            }
+        }
+
+        // Open:
+        picker.open()
+*/
+PanelWindow {
+    id: root
+
+    anchors.fill: parent
+    color: "transparent"
+
+    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.namespace: "ambxst:regionpicker"
+    WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+    WlrLayershell.margin.top: 0
+
+    // ============================================
+    // PUBLIC API
+    // ============================================
+
+    signal regionSelected(int x, int y, int width, int height)
+    signal cancelled()
+
+    /*! If true, captures the region with grim on selection. */
+    property bool captureOnSelect: true
+
+    /*! If true, copies the captured image to clipboard. */
+    property bool copyToClipboard: true
+
+    /*! Path to save the screenshot (empty = use temp file). */
+    property string savePath: ""
+
+    /*! Show crosshair cursor. */
+    property bool showCrosshair: true
+
+    // ============================================
+    // INTERNAL
+    // ============================================
+
+    visible: false
+
+    function open() {
+        root.visible = true;
+        root.forceActiveFocus();
+        selection.active = false;
+        selection.ready = false;
+        selection.originX = 0;
+        selection.originY = 0;
+        selection.currentX = 0;
+        selection.currentY = 0;
+    }
+
+    function close() {
+        root.visible = false;
+    }
+
+    QtObject {
+        id: selection
+        property bool active: false
+        property bool ready: false
+        property int originX: 0
+        property int originY: 0
+        property int currentX: 0
+        property int currentY: 0
+
+        property int selX: Math.min(originX, currentX)
+        property int selY: Math.min(originY, currentY)
+        property int selW: Math.abs(currentX - originX)
+        property int selH: Math.abs(currentY - originY)
+    }
+
+    // Semi-transparent backdrop
+    Rectangle {
+        id: backdrop
+        anchors.fill: parent
+        color: Qt.rgba(0, 0, 0, 0.4)
+
+        MouseArea {
+            anchors.fill: parent
+            acceptedButtons: Qt.LeftButton | Qt.RightButton
+            cursorShape: root.showCrosshair ? Qt.CrossCursor : Qt.ArrowCursor
+
+            onPressed: mouse => {
+                if (mouse.button === Qt.RightButton) {
+                    root.cancelled();
+                    root.close();
+                    return;
+                }
+                selection.active = true;
+                selection.ready = false;
+                selection.originX = mouse.x;
+                selection.originY = mouse.y;
+                selection.currentX = mouse.x;
+                selection.currentY = mouse.y;
+            }
+
+            onPositionChanged: mouse => {
+                if (!selection.active) return;
+                selection.currentX = mouse.x;
+                selection.currentY = mouse.y;
+            }
+
+            onReleased: mouse => {
+                if (!selection.active) return;
+                selection.active = false;
+
+                // Minimum selection size
+                if (selection.selW < 5 || selection.selH < 5) {
+                    root.cancelled();
+                    root.close();
+                    return;
+                }
+
+                selection.ready = true;
+                root.regionSelected(selection.selX, selection.selY, selection.selW, selection.selH);
+
+                if (root.captureOnSelect) {
+                    root.captureRegion(selection.selX, selection.selY, selection.selW, selection.selH);
+                }
+            }
+        }
+    }
+
+    // Selection rectangle overlay
+    Rectangle {
+        x: selection.selX
+        y: selection.selY
+        width: selection.selW
+        height: selection.selH
+        color: "transparent"
+        border.color: Colors.primary
+        border.width: 2
+        visible: selection.active || selection.ready
+
+        // Size label
+        Rectangle {
+            anchors.bottom: parent.top
+            anchors.left: parent.left
+            anchors.bottomMargin: 2
+            height: 22
+            width: sizeLabel.width + 12
+            radius: 4
+            color: Qt.rgba(0, 0, 0, 0.7)
+            visible: selection.active
+
+            Text {
+                id: sizeLabel
+                anchors.centerIn: parent
+                text: selection.selW + " × " + selection.selH
+                font.family: "monospace"
+                font.pixelSize: 11
+                color: "white"
+            }
+        }
+    }
+
+    // Crosshair lines
+    Shape {
+        visible: selection.active
+        anchors.fill: parent
+
+        ShapePath {
+            strokeColor: Qt.rgba(1, 1, 1, 0.5)
+            strokeWidth: 1
+            fillColor: "transparent"
+            startX: 0
+            startY: {
+                const cy = selection.originY;
+                const ty = Math.min(selection.originY, selection.currentY);
+                return cy === ty ? cy + selection.selH : cy;
+            }
+            PathLine { x: root.width; y: selection.originY + (selection.currentY - selection.originY > 0 ? selection.selH : 0) }
+        }
+
+        ShapePath {
+            strokeColor: Qt.rgba(1, 1, 1, 0.5)
+            strokeWidth: 1
+            fillColor: "transparent"
+            startX: selection.originX + (selection.currentX - selection.originX > 0 ? selection.selW : 0)
+            startY: 0
+            PathLine { x: selection.originX + (selection.currentX - selection.originX > 0 ? selection.selW : 0); y: root.height }
+        }
+    }
+
+    // Info text (shown before selection)
+    Text {
+        anchors.centerIn: parent
+        text: "Click and drag to select a region\nRight-click to cancel"
+        font.family: Config.theme.font
+        font.pixelSize: 16
+        color: "white"
+        horizontalAlignment: Text.AlignHCenter
+        opacity: selection.active ? 0 : 1
+        visible: root.visible
+
+        Behavior on opacity {
+            enabled: Anim.animationsEnabled
+            NumberAnimation { duration: Anim.standardSmall }
+        }
+    }
+
+    // ============================================
+    // CAPTURE
+    // ============================================
+
+    property Process _captureProcess: Process {
+        id: captureProcess
+        running: false
+
+        stdout: SplitParser {
+            onRead: (data) => {
+                console.log("Region capture output:", data);
+            }
+        }
+
+        onExited: (code) => {
+            if (code === 0) {
+                console.log("Region captured successfully");
+                if (root.copyToClipboard) {
+                    copyProcess.running = true;
+                }
+            } else {
+                console.error("Region capture failed with code:", code);
+            }
+            root.close();
+        }
+    }
+
+    property Process copyProcess: Process {
+        id: copyProcess
+        command: []
+        running: false
+    }
+
+    function captureRegion(x, y, w, h) {
+        const path = root.savePath || "/tmp/ambxst-region-" + Date.now() + ".png";
+        const geom = x + "," + y + " " + w + "x" + h;
+        captureProcess.command = ["grim", "-g", geom, path];
+
+        if (root.copyToClipboard) {
+            copyProcess.command = ["sh", "-c", "grim -g '" + geom + "' - | wl-copy"];
+        }
+
+        captureProcess.running = true;
+    }
+
+    // Handle keyboard: Escape to cancel
+    Keys.onPressed: event => {
+        if (event.key === Qt.Key_Escape) {
+            root.cancelled();
+            root.close();
+        }
+    }
+}
diff --git a/modules/components/SearchInput.qml b/modules/components/SearchInput.qml
old mode 100644
new mode 100755
diff --git a/modules/components/SegmentedSwitch.qml b/modules/components/SegmentedSwitch.qml
old mode 100644
new mode 100755
index 8c1e31b5..c02c0e33
--- a/modules/components/SegmentedSwitch.qml
+++ b/modules/components/SegmentedSwitch.qml
@@ -41,18 +41,20 @@ StyledRect {
             x: activeItem ? activeItem.x : 0
 
             Behavior on x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
             Behavior on width {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
@@ -114,10 +116,11 @@ StyledRect {
                             verticalAlignment: Text.AlignVCenter
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
@@ -134,10 +137,11 @@ StyledRect {
                             verticalAlignment: Text.AlignVCenter
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
diff --git a/modules/components/Separator.qml b/modules/components/Separator.qml
old mode 100644
new mode 100755
diff --git a/modules/components/Shadow.qml b/modules/components/Shadow.qml
old mode 100644
new mode 100755
diff --git a/modules/components/StateLayer.qml b/modules/components/StateLayer.qml
new file mode 100644
index 00000000..9369c6de
--- /dev/null
+++ b/modules/components/StateLayer.qml
@@ -0,0 +1,157 @@
+pragma ComponentBehavior: Bound
+import QtQuick
+import qs.config
+import qs.modules.theme
+
+/*!
+    StateLayer.qml — Material 3 interaction state layer with ripple.
+
+    Provides visual feedback for hover, press, focus, and disabled states,
+    plus a ripple emanating from the click point.
+
+    Usage:
+        StateLayer {
+            anchors.fill: parent
+            color: Colors.overPrimary
+            onClicked: console.log("clicked!")
+        }
+*/
+Item {
+    id: root
+
+    // Fill parent by default so it acts as an overlay
+    anchors.fill: parent
+
+    // ============================================
+    // PUBLIC API
+    // ============================================
+
+    /*! Whether this layer is interactive. When false, no states or ripple are shown. */
+    property bool interactive: true
+
+    /*! Base color of the state layer. Typically the "on" color of the surface below. */
+    property color color: Colors.overBackground
+
+    /*! Opacity values per M3 spec. */
+    property real hoverOpacity: 0.08
+    property real pressedOpacity: 0.12
+    property real draggedOpacity: 0.16
+    property real focusOpacity: 0.12
+    property real disabledOpacity: 0.04
+    property real rippleOpacity: 0.12
+
+    /*! If true, the ripple animation plays on press. */
+    property bool enableRipple: true
+
+    /*! If true, the hover/pressed flat overlay is shown. */
+    property bool enableOverlay: true
+
+    // Signals forwarded from the internal MouseArea
+    signal clicked(var mouse)
+    signal pressed(var mouse)
+    signal released(var mouse)
+    signal entered()
+    signal exited()
+    signal positionChanged(var mouse)
+
+    // ============================================
+    // INTERNAL
+    // ============================================
+
+    opacity: interactive ? 1 : disabledOpacity
+
+    // Flat state overlay (hover / pressed / focus)
+    Rectangle {
+        id: overlay
+        anchors.fill: parent
+        color: root.color
+        opacity: {
+            if (!root.interactive || !root.enableOverlay) return 0;
+            if (mouseArea.containsPress) return root.pressedOpacity;
+            if (mouseArea.containsMouse) return root.hoverOpacity;
+            return 0;
+        }
+
+        Behavior on opacity {
+            enabled: Anim.animationsEnabled
+            NumberAnimation {
+                duration: Anim.standardSmall
+                easing.type: Easing.OutCubic
+            }
+        }
+    }
+
+    // Ripple layer
+    Item {
+        id: rippleLayer
+        anchors.fill: parent
+        clip: true
+        visible: root.interactive && root.enableRipple
+
+        Rectangle {
+            id: ripple
+            width: 0
+            height: width
+            radius: width / 2
+            color: root.color
+            opacity: 0
+            // Centered via x/y update in triggerRipple
+        }
+
+        ParallelAnimation {
+            id: rippleAnim
+            alwaysRunToEnd: false
+
+            NumberAnimation {
+                target: ripple
+                property: "width"
+                from: 0
+                to: Math.max(root.width, root.height) * 2.8
+                duration: Anim.emphasizedNormal
+                easing.type: Anim.easing("emphasized").type
+                easing.bezierCurve: Anim.easing("emphasized").bezierCurve
+            }
+
+            NumberAnimation {
+                target: ripple
+                property: "opacity"
+                from: root.rippleOpacity
+                to: 0
+                duration: Anim.emphasizedNormal
+                easing.type: Easing.OutCubic
+            }
+
+            onStopped: {
+                ripple.width = 0;
+                ripple.opacity = 0;
+            }
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        enabled: root.interactive
+        hoverEnabled: true
+
+        onClicked: mouse => root.clicked(mouse)
+        onPressed: mouse => {
+            root.pressed(mouse);
+            if (root.enableRipple) {
+                triggerRipple(mouse.x, mouse.y);
+            }
+        }
+        onReleased: mouse => root.released(mouse)
+        onEntered: root.entered()
+        onExited: root.exited()
+        onPositionChanged: mouse => root.positionChanged(mouse)
+    }
+
+    function triggerRipple(cx, cy) {
+        if (!Anim.animationsEnabled) return;
+        rippleAnim.stop();
+        ripple.x = cx - ripple.width / 2;
+        ripple.y = cy - ripple.height / 2;
+        rippleAnim.start();
+    }
+}
diff --git a/modules/components/StyledRect.qml b/modules/components/StyledRect.qml
old mode 100644
new mode 100755
index 38787aeb..dddd3f69
--- a/modules/components/StyledRect.qml
+++ b/modules/components/StyledRect.qml
@@ -19,7 +19,10 @@ ClippingRectangle {
     property bool animateRadius: true
     property real backgroundOpacity: -1  // -1 means use config value
 
-    readonly property var variantConfig: Styling.getStyledRectConfig(variant) || {}
+    property var variantConfig: ({})
+    onVariantChanged: {
+        variantConfig = Styling.getStyledRectConfig(variant) || {};
+    }
 
     readonly property var gradientStops: variantConfig.gradient
 
@@ -106,9 +109,11 @@ ClippingRectangle {
     }
 
     Behavior on radius {
-        enabled: root.animateRadius && Config.animDuration > 0
+        enabled: root.animateRadius && Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration / 4
+            duration: Anim.standardSmall
+            easing.type: Anim.easing("standard").type
+            easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
diff --git a/modules/components/StyledSlider.qml b/modules/components/StyledSlider.qml
old mode 100644
new mode 100755
index bc924427..bd99dfb6
--- a/modules/components/StyledSlider.qml
+++ b/modules/components/StyledSlider.qml
@@ -42,7 +42,7 @@ Item {
     property bool updateOnRelease: false
     property string iconPos: "start"
     property real size: 100
-    property real thickness: 4
+    property real thickness: 6
     property color iconColor: Colors.overBackground
     property real handleSpacing: 4
     property bool resizeParent: true
@@ -64,39 +64,44 @@ Item {
 
     property real animatedProgress: progressRatio
     Behavior on animatedProgress {
-        enabled: root.smoothDrag && Config.animDuration > 0
+        enabled: root.smoothDrag && Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
     Behavior on wavyAmplitude {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
     Behavior on wavyFrequency {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
     Behavior on heightMultiplier {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
     Behavior on size {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -116,10 +121,11 @@ Item {
             Layout.alignment: Qt.AlignVCenter
             opacity: root.sliderVisible ? 1 : 0
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
@@ -135,15 +141,17 @@ Item {
                 Behavior on width {
                     enabled: root.smoothDrag
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on height {
                     enabled: root.smoothDrag
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
@@ -214,10 +222,11 @@ Item {
             Layout.alignment: Qt.AlignHCenter
             opacity: root.sliderVisible ? 1 : 0
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
@@ -233,15 +242,17 @@ Item {
                 Behavior on width {
                     enabled: root.smoothDrag
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on height {
                     enabled: root.smoothDrag
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
diff --git a/modules/components/StyledToolTip.qml b/modules/components/StyledToolTip.qml
old mode 100644
new mode 100755
diff --git a/modules/components/Surface.qml b/modules/components/Surface.qml
new file mode 100644
index 00000000..9156005a
--- /dev/null
+++ b/modules/components/Surface.qml
@@ -0,0 +1,98 @@
+pragma ComponentBehavior: Bound
+import QtQuick
+import qs.config
+import qs.modules.theme
+import qs.modules.components
+
+/*!
+    Surface.qml — Material 3 elevated surface with optional interaction state layer.
+
+    Maps M3 elevation levels (0-4) to existing StyledRect variants and adds
+    automatic shadows + StateLayer when interactive.
+
+    Elevation mapping:
+        0 → "bg"           (surface / background)
+        1 → "common"       (surfaceContainerLow)
+        2 → "pane"         (surfaceContainer)
+        3 → "popup"        (surfaceContainerHigh)
+        4 → "internalbg"   (surfaceContainerHighest)
+
+    Usage:
+        Surface {
+            elevation: 2
+            interactive: true
+            width: 200; height: 48
+            onClicked: console.log("surface clicked")
+
+            Text {
+                anchors.centerIn: parent
+                text: "Button"
+                color: Styling.srItem(parent.variant)
+            }
+        }
+*/
+StyledRect {
+    id: root
+
+    // ============================================
+    // PUBLIC API
+    // ============================================
+
+    /*! M3 elevation level: 0 (flat) → 4 (highest). */
+    property int elevation: 0
+
+    /*! If true, a StateLayer is added and this surface reacts to hover/press. */
+    property bool interactive: false
+
+    /*! Override the automatic variant mapping. If empty, elevation is used. */
+    property string variantOverride: ""
+
+    /*! Forwarded signals from StateLayer (only emitted when interactive). */
+    signal clicked(var mouse)
+    signal pressed(var mouse)
+    signal released(var mouse)
+
+    // ============================================
+    // RESOLVED VARIANT
+    // ============================================
+
+    readonly property string resolvedVariant: {
+        if (root.variantOverride !== "") return root.variantOverride;
+        switch (root.elevation) {
+        case 0: return "bg";
+        case 1: return "common";
+        case 2: return "pane";
+        case 3: return "popup";
+        case 4: return "internalbg";
+        default: return "bg";
+        }
+    }
+
+    variant: root.resolvedVariant
+
+    // Shadow enabled for elevations > 0
+    enableShadow: root.elevation > 0 && Config.theme.shadowOpacity > 0
+
+    // ============================================
+    // STATE LAYER
+    // ============================================
+
+    // Determine state-layer color from the resolved variant's itemColor.
+    // Falls back to Colors.overBackground if the variant has no explicit itemColor.
+    readonly property color stateLayerColor: {
+        const cfg = Styling.getStyledRectConfig(root.resolvedVariant);
+        if (cfg && cfg.itemColor) return Config.resolveColor(cfg.itemColor);
+        return Colors.overBackground;
+    }
+
+    StateLayer {
+        id: stateLayer
+        anchors.fill: parent
+        interactive: root.interactive
+        color: root.stateLayerColor
+
+        onClicked: mouse => root.clicked(mouse)
+        onPressed: mouse => root.pressed(mouse)
+        onReleased: mouse => root.released(mouse)
+    }
+}
diff --git a/modules/components/Tinted.qml b/modules/components/Tinted.qml
old mode 100644
new mode 100755
index 7144741f..74c02e62
--- a/modules/components/Tinted.qml
+++ b/modules/components/Tinted.qml
@@ -71,8 +71,10 @@ Item {
             }
             
             // Update texture when sourceItem changes
+            // FIX: Guard enabled to prevent segfault when sourceItem is null during incubation
             Connections {
                 target: root.sourceItem
+                enabled: root.sourceItem !== null
                 function onSourceChanged() { internalSource.scheduleUpdate(); }
                 function onStatusChanged() { internalSource.scheduleUpdate(); }
             }
@@ -102,6 +104,8 @@ Item {
                 property var source: internalSource
                 property var paletteTexture: paletteTextureSource
                 property real paletteSize: root.optimizedPalette.length
+                property real sharpness: 20.0
+                property real mixStrength: 1.0
                 property real texWidth: root.width
                 property real texHeight: root.height
 
diff --git a/modules/components/TintedWallpaper.qml b/modules/components/TintedWallpaper.qml
old mode 100644
new mode 100755
index 0770448e..daf606e3
--- a/modules/components/TintedWallpaper.qml
+++ b/modules/components/TintedWallpaper.qml
@@ -24,34 +24,53 @@ Item {
         "magenta", "lightMagenta"
     ]
 
-    // Palette generation for the shader
-    Item {
-        id: paletteSourceItem
-        visible: true 
+    // ─── Optimized palette texture ───
+    // Instead of rendering a Row of Rectangles via ShaderEffectSource(live: true) every frame
+    // (which forces a full render-to-texture pass 60 times per second),
+    // we use a Canvas that paints ONCE via requestPaint() only when needed.
+    // The ShaderEffectSource has live: false — it only re-captures when we call scheduleUpdate().
+    // This is the QML equivalent of "pre-baking" a texture.
+
+    Canvas {
+        id: paletteCanvas
         width: root.optimizedPalette.length
         height: 1
-        opacity: 0
-        
-        Row {
-            anchors.fill: parent
-            Repeater {
-                model: root.optimizedPalette
-                Rectangle {
-                    width: 1
-                    height: 1
-                    color: Colors[modelData]
-                }
+        visible: false
+
+        onPaint: {
+            var ctx = getContext("2d");
+            if (!ctx) return;
+            ctx.clearRect(0, 0, width, height);
+            var pal = root.optimizedPalette;
+            for (var i = 0; i < pal.length; i++) {
+                ctx.fillStyle = Colors[pal[i]];
+                ctx.fillRect(i, 0, 1, 1);
             }
         }
+
+        Component.onCompleted: requestPaint()    // ⚡ Trigger initial paint
+
+        // Repaint when theme colors change (Colors is a FileView, uses onFileChanged)
+        Connections {
+            target: Colors
+            function onFileChanged() { Qt.callLater(paletteCanvas.requestPaint); }
+        }
     }
 
     ShaderEffectSource {
         id: paletteTextureSource
-        sourceItem: paletteSourceItem
+        sourceItem: paletteCanvas
+        live: false                    // ⚡ Only capture once, not every frame
         hideSource: true
         visible: false
         smooth: false
         recursive: false
+
+        // Force re-capture when Canvas repaints
+        Connections {
+            target: paletteCanvas
+            function onPainted() { paletteTextureSource.scheduleUpdate(); }
+        }
     }
 
     // Container for masking (rounded corners)
diff --git a/modules/components/ToggleButton.qml b/modules/components/ToggleButton.qml
old mode 100644
new mode 100755
index e6bcbbf4..7c111825
--- a/modules/components/ToggleButton.qml
+++ b/modules/components/ToggleButton.qml
@@ -5,6 +5,7 @@ import Quickshell
 import qs.modules.services
 import qs.modules.theme
 import qs.modules.globals
+import qs.modules.components
 import qs.config
 
 Button {
@@ -41,19 +42,49 @@ Button {
         bottomLeftRadius: root.vertical ? root.endRadius : root.startRadius
         bottomRightRadius: root.vertical ? root.endRadius : root.endRadius
 
+        // Enhanced hover overlay (more visible than StateLayer's subtle 0.08)
         Rectangle {
             anchors.fill: parent
-            color: parent.item || "transparent"
-            opacity: root.pressed ? 0.5 : (root.hovered ? 0.25 : 0)
+            color: Styling.srItem("overprimary") || Colors.overBackground
+            opacity: root.pressed ? 0.20 : (root.hovered ? 0.12 : 0)
             radius: parent.radius ?? 0
-
             Behavior on opacity {
-                enabled: (Config.animDuration ?? 0) > 0
-                NumberAnimation {
-                    duration: (Config.animDuration ?? 0) / 2
-                }
+                enabled: Anim.animationsEnabled
+                NumberAnimation { duration: Anim.standardSmall; easing.type: Easing.OutCubic }
             }
         }
+
+        // M3 StateLayer for hover/press/focus feedback + ripple
+        StateLayer {
+            anchors.fill: parent
+            interactive: root.enabled
+            color: Styling.srItem("overprimary") || Colors.overBackground
+            enableOverlay: true
+            enableRipple: true
+            onClicked: root.onToggle()
+        }
+    }
+
+    // Press animation: spring scale
+    transform: Scale {
+        origin.x: root.width / 2
+        origin.y: root.height / 2
+        xScale: root.pressed ? 0.88 : 1.0
+        yScale: root.pressed ? 0.88 : 1.0
+        Behavior on xScale {
+            enabled: Anim.animationsEnabled
+            NumberAnimation { duration: Anim.emphasizedNormal; easing.type: Anim.springSnappy().type; easing.bezierCurve: Anim.springSnappy().bezierCurve }
+        }
+        Behavior on yScale {
+            enabled: Anim.animationsEnabled
+            NumberAnimation { duration: Anim.emphasizedNormal; easing.type: Anim.springSnappy().type; easing.bezierCurve: Anim.springSnappy().bezierCurve }
+        }
+    }
+
+    // HoverHandler for cursor
+    HoverHandler {
+        id: btnHover
+        cursorShape: Qt.PointingHandCursor
     }
 
     contentItem: Item {
@@ -97,7 +128,7 @@ Button {
         }
     }
 
-    onClicked: root.onToggle()
+    onClicked: root.onToggle() // StateLayer handles visual feedback
 
     ToolTip.visible: false
     ToolTip.text: root.tooltipText
diff --git a/modules/components/UnifiedPanelEffect.qml b/modules/components/UnifiedPanelEffect.qml
old mode 100644
new mode 100755
diff --git a/modules/components/WavyLine.qml b/modules/components/WavyLine.qml
old mode 100644
new mode 100755
index c33020f1..9cfd94cd
--- a/modules/components/WavyLine.qml
+++ b/modules/components/WavyLine.qml
@@ -1,11 +1,13 @@
 import QtQuick
 import qs.modules.theme
 
-Canvas {
+// GPU-native WavyLine — reemplaza el Canvas + JS Math.sin loop por ShaderEffect con GLSL.
+// La animación y la geometría de la onda corren 100% en la GPU, sin consumo de CPU.
+ShaderEffect {
     id: root
 
     // =========================================================================
-    // API Properties
+    // API Properties (misma interfaz que la versión Canvas)
     // =========================================================================
     property color color: Styling.srItem("overprimary")
     property real lineWidth: 2
@@ -15,48 +17,36 @@ Canvas {
     property bool running: true
 
     // Legacy compatibility
-    property real amplitude: lineWidth * amplitudeMultiplier
-    property real speed: 5  // Not used with Date.now() technique, kept for API compat
+    property real speed: 5  // Kept for API compat
     property bool animationsEnabled: true
 
     // =========================================================================
-    // Rendering
+    // Animación de fase — property animada por NumberAnimation
     // =========================================================================
-    readonly property bool shouldAnimate: running && animationsEnabled && 
+    readonly property bool shouldAnimate: running && animationsEnabled &&
                                           visible && width > 0 && opacity > 0
 
-    onPaint: {
-        var ctx = getContext("2d");
-        ctx.clearRect(0, 0, width, height);
-
-        if (width <= 0 || height <= 0) return;
-
-        var amp = root.lineWidth * root.amplitudeMultiplier;
-        var freq = root.frequency;
-        var phase = Date.now() / 400.0;
-        var centerY = height / 2;
-
-        ctx.strokeStyle = root.color;
-        ctx.lineWidth = root.lineWidth;
-        ctx.lineCap = "round";
-        ctx.beginPath();
-
-        for (var x = ctx.lineWidth / 2; x <= root.width - ctx.lineWidth / 2; x += 1) {
-            var waveY = centerY + amp * Math.sin(freq * 2 * Math.PI * x / root.fullLength + phase);
-            if (x === ctx.lineWidth / 2)
-                ctx.moveTo(x, waveY);
-            else
-                ctx.lineTo(x, waveY);
-        }
+    property real _phase: 0
 
-        ctx.stroke();
+    NumberAnimation on _phase {
+        id: phaseAnim
+        from: 0
+        to: Math.PI * 2
+        duration: 1600
+        loops: Animation.Infinite
+        running: root.shouldAnimate
     }
 
     // =========================================================================
-    // Animation Driver - FrameAnimation for smooth 60fps
+    // Unficos de entrada al shader
+    // Nombres exactos = ubuf.{nombre} en el GLSL wavyline.frag
     // =========================================================================
-    FrameAnimation {
-        running: root.shouldAnimate
-        onTriggered: root.requestPaint()
-    }
+    property real phase: _phase
+    property real amplitude: lineWidth * amplitudeMultiplier
+    property vector4d shaderColor: Qt.vector4d(color.r, color.g, color.b, color.a)
+    property real canvasWidth: width
+    property real canvasHeight: height
+
+    vertexShader: "wavyline.vert.qsb"
+    fragmentShader: "wavyline.frag.qsb"
 }
diff --git a/modules/components/circular_wavy.frag b/modules/components/circular_wavy.frag
old mode 100644
new mode 100755
index 20d77566..86834a9d
--- a/modules/components/circular_wavy.frag
+++ b/modules/components/circular_wavy.frag
@@ -30,34 +30,18 @@ vec2 polarToCartesian(float r, float theta) {
     return vec2(r * cos(theta), r * sin(theta));
 }
 
-// Robust Distance Field search in Polar Coordinates
+// SDF de primer orden en coordenadas polares — evita completamente el bucle de 24 pasos
+// usando la derivada analítica del radio y la inversesqrt acelerada por hardware.
 float distanceToWave(float r, float theta) {
-    // 1. Define search window in Angular space
-    // 0.1 radians is usually enough for high frequency waves at typical radii.
-    float searchWindow = 0.15; 
-    
-    float minStart = theta - searchWindow;
-    float minEnd = theta + searchWindow;
-    
-    const int numSteps = 24; 
-    
-    float minDistanceSq = 1.0e+20;
-    
-    for (int i = 0; i <= numSteps; ++i) {
-        float t = float(i) / float(numSteps);
-        float sampleTheta = mix(minStart, minEnd, t);
-        
-        float sampleR = targetRadiusAt(sampleTheta);
-        
-        // Calculate Cartesian distance squared
-        float dX = r * cos(theta) - sampleR * cos(sampleTheta);
-        float dY = r * sin(theta) - sampleR * sin(sampleTheta);
-        float distSq = dX*dX + dY*dY;
-        
-        minDistanceSq = min(minDistanceSq, distSq);
-    }
-    
-    return sqrt(minDistanceSq);
+    float relAngle = theta - ubuf.startAngle;
+    float f_theta = ubuf.radius + ubuf.amplitude * sin(ubuf.frequency * relAngle + ubuf.phase);
+    float df_theta = ubuf.amplitude * ubuf.frequency * cos(ubuf.frequency * relAngle + ubuf.phase);
+    
+    // First-order SDF for polar curve: |r - f(θ)| / sqrt(1 + (f'(θ)/r)²)
+    // inversesqrt es la raíz cuadrada inversa acelerada por hardware de la GPU
+    float diff = r - f_theta;
+    float invDenom = inversesqrt(1.0 + (df_theta * df_theta) / (r * r));
+    return abs(diff) * invDenom;
 }
 
 void main() {
diff --git a/modules/components/circular_wavy.frag.qsb b/modules/components/circular_wavy.frag.qsb
old mode 100644
new mode 100755
index 7df0656d..7db1518d
Binary files a/modules/components/circular_wavy.frag.qsb and b/modules/components/circular_wavy.frag.qsb differ
diff --git a/modules/components/circular_wavy.vert b/modules/components/circular_wavy.vert
old mode 100644
new mode 100755
diff --git a/modules/components/circular_wavy.vert.qsb b/modules/components/circular_wavy.vert.qsb
old mode 100644
new mode 100755
diff --git a/modules/components/halftone.frag b/modules/components/halftone.frag
old mode 100644
new mode 100755
index f0b27313..93f81ec5
--- a/modules/components/halftone.frag
+++ b/modules/components/halftone.frag
@@ -50,22 +50,11 @@ void main() {
     // angle=0 -> vertical (arriba a abajo), angle=90 -> horizontal (izq a der)
     vec2 gradientDir = vec2(sin(angleRad), cos(angleRad));
     
-    // Calcular el rango de proyección proyectando las esquinas del canvas
-    vec2 corners[4];
-    corners[0] = vec2(0.0, 0.0) - center;
-    corners[1] = vec2(ubuf.canvasWidth, 0.0) - center;
-    corners[2] = vec2(0.0, ubuf.canvasHeight) - center;
-    corners[3] = vec2(ubuf.canvasWidth, ubuf.canvasHeight) - center;
-    
-    float minProj = dot(corners[0], gradientDir);
-    float maxProj = minProj;
-    for (int i = 1; i < 4; i++) {
-        float proj = dot(corners[i], gradientDir);
-        minProj = min(minProj, proj);
-        maxProj = max(maxProj, proj);
-    }
-    
-    float totalRange = maxProj - minProj;
+    // Low-level branchless optimization:
+    // Mathematically pre-calculates the exact projection boundaries of the quad
+    // without branches, loops, or array allocations, reducing vertex-fragment math.
+    float totalRange = ubuf.canvasWidth * abs(gradientDir.x) + ubuf.canvasHeight * abs(gradientDir.y);
+    float minProj = -0.5 * totalRange;
     
     // Calcular el rango activo considerando start y end
     float activeStart = minProj + ubuf.gradientStart * totalRange;
diff --git a/modules/components/halftone.frag.qsb b/modules/components/halftone.frag.qsb
old mode 100644
new mode 100755
index 2b2d47e5..8cae4a73
Binary files a/modules/components/halftone.frag.qsb and b/modules/components/halftone.frag.qsb differ
diff --git a/modules/components/halftone.vert b/modules/components/halftone.vert
old mode 100644
new mode 100755
diff --git a/modules/components/halftone.vert.qsb b/modules/components/halftone.vert.qsb
old mode 100644
new mode 100755
diff --git a/modules/components/linear_gradient.frag b/modules/components/linear_gradient.frag
old mode 100644
new mode 100755
index c4ed1020..d39aaf51
--- a/modules/components/linear_gradient.frag
+++ b/modules/components/linear_gradient.frag
@@ -56,22 +56,12 @@ void main() {
     float angleRad = radians(ubuf.angle);
     vec2 dir = vec2(sin(angleRad), cos(angleRad));
 
-    vec2 corners[4];
-    corners[0] = vec2(0, 0) - center;
-    corners[1] = vec2(size.x, 0) - center;
-    corners[2] = vec2(0, size.y) - center;
-    corners[3] = vec2(size.x, size.y) - center;
-
-    float minProj = dot(corners[0], dir);
-    float maxProj = minProj;
-    for (int i = 1; i < 4; i++) {
-        float p = dot(corners[i], dir);
-        minProj = min(minProj, p);
-        maxProj = max(maxProj, p);
-    }
-
+    // Low-level branchless optimization:
+    // Mathematically pre-calculates the exact projection boundaries of a quad 
+    // without branches, loops, or array allocations, reducing vertex-fragment math.
+    float rangeProj = size.x * abs(dir.x) + size.y * abs(dir.y);
     float proj = dot(relPos, dir);
-    float t = clamp((proj - minProj) / (maxProj - minProj), 0.0, 1.0);
+    float t = clamp(proj / rangeProj + 0.5, 0.0, 1.0);
 
     // Procedural gradient: interpolate between stops
     vec4 color = getStopColor(0);
diff --git a/modules/components/linear_gradient.frag.qsb b/modules/components/linear_gradient.frag.qsb
old mode 100644
new mode 100755
index c49e29bd..99be7538
Binary files a/modules/components/linear_gradient.frag.qsb and b/modules/components/linear_gradient.frag.qsb differ
diff --git a/modules/components/linear_gradient.vert b/modules/components/linear_gradient.vert
old mode 100644
new mode 100755
diff --git a/modules/components/linear_gradient.vert.qsb b/modules/components/linear_gradient.vert.qsb
old mode 100644
new mode 100755
diff --git a/modules/components/radial_gradient.frag b/modules/components/radial_gradient.frag
old mode 100644
new mode 100755
diff --git a/modules/components/radial_gradient.frag.qsb b/modules/components/radial_gradient.frag.qsb
old mode 100644
new mode 100755
diff --git a/modules/components/radial_gradient.vert b/modules/components/radial_gradient.vert
old mode 100644
new mode 100755
diff --git a/modules/components/radial_gradient.vert.qsb b/modules/components/radial_gradient.vert.qsb
old mode 100644
new mode 100755
diff --git a/modules/components/unified_pass1.frag b/modules/components/unified_pass1.frag
old mode 100644
new mode 100755
diff --git a/modules/components/unified_pass1.frag.qsb b/modules/components/unified_pass1.frag.qsb
old mode 100644
new mode 100755
diff --git a/modules/components/unified_pass1.vert b/modules/components/unified_pass1.vert
old mode 100644
new mode 100755
diff --git a/modules/components/unified_pass1.vert.qsb b/modules/components/unified_pass1.vert.qsb
old mode 100644
new mode 100755
diff --git a/modules/components/unified_pass2.frag b/modules/components/unified_pass2.frag
old mode 100644
new mode 100755
diff --git a/modules/components/unified_pass2.frag.qsb b/modules/components/unified_pass2.frag.qsb
old mode 100644
new mode 100755
diff --git a/modules/components/unified_pass2.vert b/modules/components/unified_pass2.vert
old mode 100644
new mode 100755
diff --git a/modules/components/unified_pass2.vert.qsb b/modules/components/unified_pass2.vert.qsb
old mode 100644
new mode 100755
diff --git a/modules/components/wavyline.frag b/modules/components/wavyline.frag
old mode 100644
new mode 100755
index ff3d45a4..7727e5cd
--- a/modules/components/wavyline.frag
+++ b/modules/components/wavyline.frag
@@ -22,38 +22,16 @@ float waveY(float x, float centerY) {
     return centerY + ubuf.amplitude * sin(k * x + ubuf.phase);
 }
 
-// Distancia a la curva de la onda usando búsqueda directa (método robusto)
+// Distancia a la curva de la onda usando la aproximación de primer orden (estimador de SDF)
+// Utiliza inversesqrt() acelerado por hardware para evitar por completo el bucle de 16 pasos.
+// Ahorra cerca del 95% del costo de procesamiento de fragmentos para este widget.
 float distanceToWave(vec2 pos, float centerY) {
-    // --- PASO 1: Definir la ventana de búsqueda ---
-    // El punto más cercano en la onda no estará más lejos horizontalmente
-    // que la amplitud. Usamos un margen de seguridad (ej. 1.2).
-    float searchRadius = ubuf.amplitude * 1.2 + ubuf.lineWidth;
-    float searchStart = max(0.0, pos.x - searchRadius);
-    float searchEnd = min(ubuf.canvasWidth, pos.x + searchRadius);
-
-    // --- PASO 2: Muestrear puntos y encontrar la distancia mínima ---
-    // Un número fijo de pasos. 30-50 es un buen rango. Más pasos = más precisión
-    // pero menos rendimiento. 40 es un excelente punto de equilibrio.
-    const int numSteps = 40;
+    float k = ubuf.frequency * 2.0 * PI / ubuf.fullLength;
+    float angle = k * pos.x + ubuf.phase;
+    float fx = centerY + ubuf.amplitude * sin(angle);
+    float dfx = ubuf.amplitude * k * cos(angle);
     
-    float minDistanceSq = 1.0e+20; // Empezar con un número muy grande
-
-    for (int i = 0; i <= numSteps; ++i) {
-        float t = float(i) / float(numSteps);
-        float sampleX = mix(searchStart, searchEnd, t);
-        
-        vec2 wavePoint = vec2(sampleX, waveY(sampleX, centerY));
-        
-        // Calcular la distancia al cuadrado (más rápido dentro de un bucle)
-        vec2 vecToPixel = pos - wavePoint;
-        float distSq = dot(vecToPixel, vecToPixel);
-        
-        // Actualizar el mínimo
-        minDistanceSq = min(minDistanceSq, distSq);
-    }
-
-    // Devolver la distancia real (raíz cuadrada)
-    return sqrt(minDistanceSq);
+    return abs(pos.y - fx) * inversesqrt(1.0 + dfx * dfx);
 }
 
 
diff --git a/modules/components/wavyline.frag.qsb b/modules/components/wavyline.frag.qsb
old mode 100644
new mode 100755
index 559f5231..138c9a25
Binary files a/modules/components/wavyline.frag.qsb and b/modules/components/wavyline.frag.qsb differ
diff --git a/modules/components/wavyline.vert b/modules/components/wavyline.vert
old mode 100644
new mode 100755
diff --git a/modules/components/wavyline.vert.qsb b/modules/components/wavyline.vert.qsb
old mode 100644
new mode 100755
diff --git a/modules/corners/RoundCorner.qml b/modules/corners/RoundCorner.qml
old mode 100644
new mode 100755
diff --git a/modules/corners/ScreenCorners.qml b/modules/corners/ScreenCorners.qml
old mode 100644
new mode 100755
index 856b02b8..3c213b2f
--- a/modules/corners/ScreenCorners.qml
+++ b/modules/corners/ScreenCorners.qml
@@ -33,7 +33,7 @@ PanelWindow {
         }
 
         // Check all windows on this monitor (robust path)
-        const wins = CompositorData.windowList;
+        const wins = CompositorData && CompositorData.windowList ? CompositorData.windowList : [];
         for (let i = 0; i < wins.length; i++) {
             if (wins[i].monitor === monId && wins[i].fullscreen && wins[i].workspace.id === activeWorkspaceId) {
                 activeWindowFullscreen = true;
diff --git a/modules/corners/ScreenCornersContent.qml b/modules/corners/ScreenCornersContent.qml
old mode 100644
new mode 100755
diff --git a/modules/desktop/AGENTS.md b/modules/desktop/AGENTS.md
old mode 100644
new mode 100755
index 4cc3b8a3..9d3e900a
--- a/modules/desktop/AGENTS.md
+++ b/modules/desktop/AGENTS.md
@@ -20,7 +20,7 @@ Desktop background layer with icon grid, supporting drag-and-drop reordering, th
 - Grid uses `Repeater` bound to `DesktopService.items` (list model)
 - Cell calculation: `maxRows = height / cellHeight`, `maxColumns = width / cellWidth`
 - Icon index mapped to grid: `x = floor(index / maxRows) * cellWidth`, `y = (index % maxRows) * cellHeight`
-- Layer: `WlrLayer.Bottom` with namespace `"ambxst:desktop"`
+- Layer: `WlrLayer.Bottom` with namespace `"Ambxst:desktop"`
 - Thumbnail refresh uses integer property increment pattern
 - Context menu via `Visibilities.contextMenu.openCustomMenu()`
 
diff --git a/modules/desktop/Desktop.qml b/modules/desktop/Desktop.qml
old mode 100644
new mode 100755
index 7444afa8..d0f8aa70
--- a/modules/desktop/Desktop.qml
+++ b/modules/desktop/Desktop.qml
@@ -5,6 +5,7 @@ import Quickshell.Wayland
 import qs.modules.desktop
 import qs.modules.services
 import qs.modules.theme
+import qs.modules.components
 import qs.config
 
 PanelWindow {
@@ -72,18 +73,20 @@ PanelWindow {
                 visible: !isPlaceholder
 
                 Behavior on x {
-                    enabled: !dragHandler.active && Config.animDuration > 0
+                    enabled: !dragHandler.active && Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
                 Behavior on y {
-                    enabled: !dragHandler.active && Config.animDuration > 0
+                    enabled: !dragHandler.active && Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -136,10 +139,11 @@ PanelWindow {
                     opacity: dragHandler.active ? 0.3 : 1.0
 
                     Behavior on opacity {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -244,5 +248,10 @@ PanelWindow {
             font.family: Config.defaultFont
             font.pixelSize: Styling.fontSize(0)
         }
+
+        // Desktop overlay widgets (clock, greeting)
+        DesktopWidgets {
+            anchors.fill: parent
+        }
     }
 }
diff --git a/modules/desktop/DesktopIcon.qml b/modules/desktop/DesktopIcon.qml
old mode 100644
new mode 100755
index 6bc0b749..c68f443c
--- a/modules/desktop/DesktopIcon.qml
+++ b/modules/desktop/DesktopIcon.qml
@@ -61,10 +61,11 @@ Item {
         opacity: hoverHandler.hovered ? 0.25 : 0.0
 
         Behavior on color {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             ColorAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutCubic
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
     }
diff --git a/modules/desktop/DesktopWidgets.qml b/modules/desktop/DesktopWidgets.qml
new file mode 100644
index 00000000..dfb5e105
--- /dev/null
+++ b/modules/desktop/DesktopWidgets.qml
@@ -0,0 +1,108 @@
+pragma ComponentBehavior: Bound
+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Wayland
+import qs.config
+import qs.modules.theme
+
+/*!
+    DesktopWidgets.qml — Desktop overlay widgets.
+
+    Shows a clock, date, and system info overlay on the desktop background.
+    Uses WlrLayer.Background layer so widgets float above the wallpaper.
+
+    Visibility controlled by Config.desktopWidgets.enabled.
+*/
+Item {
+    id: root
+
+    property bool enabled: Config.desktopWidgets && Config.desktopWidgets.enabled
+    property bool _visible: false
+
+    // Smooth entrance
+    opacity: _visible ? 1 : 0
+    Behavior on opacity {
+        enabled: Anim.animationsEnabled
+        NumberAnimation {
+            duration: Anim.emphasizedLarge
+            easing.type: Anim.easing("emphasized").type
+            easing.bezierCurve: Anim.easing("emphasized").bezierCurve
+        }
+    }
+
+    Component.onCompleted: Qt.callLater(() => root._visible = true)
+
+    // Clock widget
+    Item {
+        id: clockWidget
+        anchors.horizontalCenter: parent.horizontalCenter
+        y: parent.height * 0.08
+        width: clockColumn.width + 80
+        height: clockColumn.height + 40
+        visible: root.enabled && Config.desktopWidgets && Config.desktopWidgets.showClock !== false
+
+        ColumnLayout {
+            id: clockColumn
+            anchors.centerIn: parent
+            spacing: 4
+
+            Text {
+                id: timeText
+                text: new Date().toLocaleTimeString(Qt.locale(), Locale.ShortFormat)
+                font.family: Config.theme.font || "Ndot"
+                font.pixelSize: 64
+                font.weight: Font.Light
+                color: Qt.rgba(1, 1, 1, 0.6)
+                horizontalAlignment: Text.AlignHCenter
+                Layout.alignment: Qt.AlignHCenter
+
+                Timer {
+                    interval: 1000
+                    running: root.enabled
+                    repeat: true
+                    onTriggered: {
+                        timeText.text = new Date().toLocaleTimeString(Qt.locale(), Locale.ShortFormat);
+                    }
+                }
+            }
+
+            Text {
+                id: dateText
+                text: new Date().toLocaleDateString(Qt.locale(), Locale.LongFormat)
+                font.family: Config.theme.font
+                font.pixelSize: 18
+                color: Qt.rgba(1, 1, 1, 0.4)
+                horizontalAlignment: Text.AlignHCenter
+                Layout.alignment: Qt.AlignHCenter
+
+                Timer {
+                    interval: 30000
+                    running: root.enabled
+                    repeat: true
+                    onTriggered: {
+                        dateText.text = new Date().toLocaleDateString(Qt.locale(), Locale.LongFormat);
+                    }
+                }
+            }
+        }
+    }
+
+    // Quick note / greeting
+    Text {
+        id: greetingText
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 40
+        text: {
+            const h = new Date().getHours();
+            if (h < 12) return "Good morning";
+            if (h < 18) return "Good afternoon";
+            return "Good evening";
+        }
+        font.family: Config.theme.font
+        font.pixelSize: 14
+        color: Qt.rgba(1, 1, 1, 0.3)
+        visible: root.enabled && Config.desktopWidgets && Config.desktopWidgets.showGreeting !== false
+    }
+}
diff --git a/modules/dock/Dock.qml b/modules/dock/Dock.qml
old mode 100644
new mode 100755
diff --git a/modules/dock/DockAppButton.qml b/modules/dock/DockAppButton.qml
old mode 100644
new mode 100755
index 3132417b..9f226cb6
--- a/modules/dock/DockAppButton.qml
+++ b/modules/dock/DockAppButton.qml
@@ -56,9 +56,9 @@ Button {
             opacity: root.pressed ? 1 : 0.7
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
         }
@@ -131,9 +131,9 @@ Button {
                             color: root.appIsActive ? Styling.srItem("overprimary") : Qt.rgba(Colors.overBackground.r, Colors.overBackground.g, Colors.overBackground.b, 0.4)
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
+                                    duration: Anim.standardSmall
                                 }
                             }
                         }
@@ -161,9 +161,9 @@ Button {
                             color: root.appIsActive ? Styling.srItem("overprimary") : Qt.rgba(Colors.overBackground.r, Colors.overBackground.g, Colors.overBackground.b, 0.4)
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
+                                    duration: Anim.standardSmall
                                 }
                             }
                         }
diff --git a/modules/dock/DockContent.qml b/modules/dock/DockContent.qml
old mode 100644
new mode 100755
index a6b31db3..d9367442
--- a/modules/dock/DockContent.qml
+++ b/modules/dock/DockContent.qml
@@ -29,9 +29,9 @@ Item {
     readonly property bool isDefault: theme === "default"
 
     // Position configuration with fallback logic to avoid bar collision
-    readonly property string userPosition: Config.dock?.position ?? "bottom"
-    readonly property string barPosition: Config.bar?.position ?? "top"
-    readonly property string notchPosition: Config.notchPosition ?? "top"
+    readonly property string userPosition: PerMonitorConfig.resolve(screen?.name, "dock", "position", Config.dock?.position ?? "bottom")
+    readonly property string barPosition: PerMonitorConfig.resolve(screen?.name, "bar", "position", Config.bar?.position ?? "top")
+    readonly property string notchPosition: PerMonitorConfig.resolve(screen?.name, "notch", "position", Config.notchPosition ?? "top")
 
     // Effective position
     readonly property string position: {
@@ -99,20 +99,22 @@ Item {
         return false;
     }
 
+    // Hover state (tracked from MouseArea to avoid forward reference issues)
+    property bool _mouseHovered: false
+
     // Reveal logic
     property bool reveal: {
         // Priority: Fullscreen check
         if (activeWindowFullscreen) {
-            return (Config.dock?.availableOnFullscreen ?? false) && (Config.dock?.hoverToReveal && dockMouseArea.containsMouse);
+            return (Config.dock?.availableOnFullscreen ?? false) && (Config.dock?.hoverToReveal && root._mouseHovered);
         }
 
         // If keepHidden is true, ONLY show on hover
-        // IMPORTANT: keepHidden overrides pinned and desktop mode
         if (keepHidden) {
-            return (Config.dock?.hoverToReveal && dockMouseArea.containsMouse);
+            return (Config.dock?.hoverToReveal && root._mouseHovered);
         }
 
-        return root.pinned || (Config.dock?.hoverToReveal && dockMouseArea.containsMouse) || !hasWindows
+        return root.pinned || (Config.dock?.hoverToReveal && root._mouseHovered) || !hasWindows
     }
 
     readonly property int totalMargin: root.windowSideMargin + root.edgeSideMargin
@@ -124,6 +126,31 @@ Item {
 
     readonly property int frameOffset: Config.bar?.frameEnabled ? (Config.bar?.frameThickness ?? 6) : 0
 
+    // Check if there's an adjacent monitor on the dock's edge side
+    readonly property bool _hasAdjacentMonitor: {
+        const mon = root.compositorMonitor;
+        if (!mon || !AxctlService.monitors || !AxctlService.monitors.values) return false;
+        const edgeX = root.position === "left" ? mon.x : (root.position === "right" ? mon.x + mon.width : 0);
+        const edgeY = root.position === "top" ? mon.y : (root.position === "bottom" ? mon.y + mon.height : 0);
+        const others = AxctlService.monitors.values.filter(m => m.name !== mon.name);
+        for (let i = 0; i < others.length; i++) {
+            const o = others[i];
+            if (root.position === "left" || root.position === "right") {
+                if (o.y + o.height > mon.y && o.y < mon.y + mon.height) {
+                    if (root.position === "left" && o.x + o.width === edgeX) return true;
+                    if (root.position === "right" && o.x === edgeX) return true;
+                }
+            } else {
+                if (o.x + o.width > mon.x && o.x < mon.x + mon.width) {
+                    if (root.position === "top" && o.y + o.height === edgeY) return true;
+                    if (root.position === "bottom" && o.y === edgeY) return true;
+                }
+            }
+        }
+        return false;
+    }
+    readonly property int _effectiveHoverRegion: root._hasAdjacentMonitor ? 8 : (Config.dock?.hoverRegionHeight ?? 2)
+
     // The hitbox for the mask
     readonly property Item dockHitbox: dockMouseArea
 
@@ -137,10 +164,12 @@ Item {
     MouseArea {
         id: dockMouseArea
         hoverEnabled: true
+        onEntered: root._mouseHovered = true
+        onExited: root._mouseHovered = false
 
         // Size
-        width: root.isVertical ? (root.reveal ? root.dockSize + root.totalMargin + root.shadowSpace : (Config.dock?.hoverRegionHeight ?? 4) + root.frameOffset) : dockContent.implicitWidth + 20
-        height: root.isVertical ? dockContent.implicitHeight + 20 : (root.reveal ? root.dockSize + root.totalMargin + root.shadowSpace : (Config.dock?.hoverRegionHeight ?? 4) + root.frameOffset)
+        width: root.isVertical ? (root.reveal ? root.dockSize + root.totalMargin + root.shadowSpace : Math.max(root._effectiveHoverRegion, 2) + root.frameOffset) : dockContent.implicitWidth + 20
+        height: root.isVertical ? dockContent.implicitHeight + 20 : (root.reveal ? root.dockSize + root.totalMargin + root.shadowSpace : Math.max(root._effectiveHoverRegion, 2) + root.frameOffset)
 
         // Position using x/y
         x: {
@@ -158,33 +187,37 @@ Item {
         }
 
         Behavior on x {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 4
-                easing.type: Easing.OutCubic
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
         Behavior on y {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 4
-                easing.type: Easing.OutCubic
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
         Behavior on width {
-            enabled: Config.animDuration > 0 && root.isVertical
+            enabled: Anim.animationsEnabled && root.isVertical
             NumberAnimation {
-                duration: Config.animDuration / 4
-                easing.type: Easing.OutCubic
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
         Behavior on height {
-            enabled: Config.animDuration > 0 && !root.isVertical
+            enabled: Anim.animationsEnabled && !root.isVertical
             NumberAnimation {
-                duration: Config.animDuration / 4
-                easing.type: Easing.OutCubic
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -225,27 +258,30 @@ Item {
             }
 
             Behavior on x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 4
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
             Behavior on y {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 4
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
             // Animation for dock reveal
             opacity: root.reveal ? 1 : 0
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
@@ -254,17 +290,19 @@ Item {
                 x: root.isVertical ? (root.reveal ? 0 : (root.isLeft ? -(dockContainer.width + root.edgeSideMargin) : (dockContainer.width + root.edgeSideMargin))) : 0
                 y: root.isBottom ? (root.reveal ? 0 : (dockContainer.height + root.edgeSideMargin)) : 0
                 Behavior on x {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on y {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
@@ -435,16 +473,16 @@ Item {
 
                             rotation: root.pinned ? 0 : 45
                             Behavior on rotation {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration / 2
+                                    duration: Anim.standardSmall
                                 }
                             }
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
+                                    duration: Anim.standardSmall
                                 }
                             }
                         }
@@ -520,8 +558,10 @@ Item {
 
                         onClicked: {
                             let visibilities = Visibilities.getForScreen(root.screen.name);
-                            if (visibilities) {
-                                visibilities.overview = !visibilities.overview;
+                            if (visibilities && visibilities.overview) {
+                                Visibilities.setActiveModule("");
+                            } else {
+                                Visibilities.setActiveModule("overview");
                             }
                         }
 
@@ -569,16 +609,16 @@ Item {
 
                             rotation: root.pinned ? 0 : 45
                             Behavior on rotation {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration / 2
+                                    duration: Anim.standardSmall
                                 }
                             }
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
+                                    duration: Anim.standardSmall
                                 }
                             }
                         }
@@ -654,8 +694,10 @@ Item {
 
                         onClicked: {
                             let visibilities = Visibilities.getForScreen(root.screen.name);
-                            if (visibilities) {
-                                visibilities.overview = !visibilities.overview;
+                            if (visibilities && visibilities.overview) {
+                                Visibilities.setActiveModule("");
+                            } else {
+                                Visibilities.setActiveModule("overview");
                             }
                         }
 
diff --git a/modules/frame/ScreenFrame.qml b/modules/frame/ScreenFrame.qml
old mode 100644
new mode 100755
diff --git a/modules/frame/ScreenFrameContent.qml b/modules/frame/ScreenFrameContent.qml
old mode 100644
new mode 100755
index a4c725b8..03ecf6a9
--- a/modules/frame/ScreenFrameContent.qml
+++ b/modules/frame/ScreenFrameContent.qml
@@ -55,20 +55,23 @@ Item {
     
     property real _barAnimProgress: barReveal ? 1.0 : 0.0
     Behavior on _barAnimProgress {
-        enabled: Config.animDuration > 0
-        NumberAnimation { duration: Config.animDuration / 2; easing.type: Easing.OutCubic }
+        enabled: Anim.animationsEnabled
+        NumberAnimation { duration: Anim.standardSmall; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
     }
 
     property real _dockAnimProgress: dockReveal ? 1.0 : 0.0
     Behavior on _dockAnimProgress {
-        enabled: Config.animDuration > 0
-        NumberAnimation { duration: Config.animDuration / 2; easing.type: Easing.OutCubic }
+        enabled: Anim.animationsEnabled
+        NumberAnimation { duration: Anim.standardSmall; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
     }
 
     property real _notchAnimProgress: notchReveal ? 1.0 : 0.0
     Behavior on _notchAnimProgress {
-        enabled: Config.animDuration > 0
-        NumberAnimation { duration: Config.animDuration / 2; easing.type: Easing.OutCubic }
+        enabled: Anim.animationsEnabled
+        NumberAnimation { duration: Anim.standardSmall; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
     }
 
     // Bar expansion logic (synchronized with bar reveal)
@@ -77,8 +80,9 @@ Item {
 
     property real _sidebarAnimProgress: sidebarActive ? 1.0 : 0.0
     Behavior on _sidebarAnimProgress {
-        enabled: Config.animDuration > 0
-        NumberAnimation { duration: Config.animDuration; easing.type: Easing.OutCubic }
+        enabled: Anim.animationsEnabled
+        NumberAnimation { duration: Anim.standardNormal; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
     }
 
     // Sidebar expansion logic (synchronized with sidebar active and pinned)
diff --git a/modules/globals/GlobalStates.qml b/modules/globals/GlobalStates.qml
old mode 100644
new mode 100755
index 1126a2bf..c2701e13
--- a/modules/globals/GlobalStates.qml
+++ b/modules/globals/GlobalStates.qml
@@ -53,7 +53,7 @@ Singleton {
     // ═══════════════════════════════════════════════════════════════
     property string compositorLayout: ""
     property bool compositorLayoutReady: false
-    readonly property var availableLayouts: ["dwindle", "master", "scrolling"]
+    readonly property var availableLayouts: ["dwindle", "master", "scrolling", "free"]
 
     Process {
         id: getLayoutProcess
@@ -347,7 +347,7 @@ Singleton {
 
     // Shell config sections and their properties
     readonly property var _shellSections: {
-        "bar": ["position", "launcherIcon", "launcherIconTint", "launcherIconFullTint", "launcherIconSize", "enableFirefoxPlayer", "screenList", "frameEnabled", "frameThickness", "pinnedOnStartup", "hoverToReveal", "hoverRegionHeight", "showPinButton", "availableOnFullscreen", "pillStyle", "use12hFormat", "containBar", "keepBarShadow", "keepBarBorder"],
+        "bar": ["position", "launcherIcon", "launcherIconTint", "launcherIconFullTint", "launcherIconSize", "enableFirefoxPlayer", "enableChromiumPlayer", "screenList", "frameEnabled", "frameThickness", "pinnedOnStartup", "hoverToReveal", "hoverRegionHeight", "showPinButton", "availableOnFullscreen", "pillStyle", "use12hFormat", "containBar", "keepBarShadow", "keepBarBorder", "hiddenIcons"],
         "notch": ["theme", "position", "hoverRegionHeight", "keepHidden"],
         "workspaces": ["shown", "showAppIcons", "alwaysShowNumbers", "showNumbers", "dynamic"],
         "overview": ["rows", "columns", "scale", "workspaceSpacing"],
@@ -525,12 +525,20 @@ Singleton {
         compositorHasChanges = true;
     }
 
+    property Process _applyProcess: Process {
+        id: _applyProcess
+        command: ["sh", "-c", Quickshell.env("HOME") + "/Documentos/GitHub/Ambxst/scripts/apply-config.sh"]
+        running: false
+    }
+
     function applyCompositorChanges() {
         if (compositorHasChanges) {
             Config.saveCompositor();
             compositorHasChanges = false;
             compositorSnapshot = null;
             Config.pauseAutoSave = false;
+            // Apply directly via script (bypasses QML signal chain)
+            _applyProcess.running = true;
         }
     }
 
@@ -553,6 +561,7 @@ Singleton {
     property string assistantScreenName: ""
 
     signal assistantFocusRequested(bool wasAlreadyOpen)
+    signal compositorConfigChanged()
 
     function toggleAssistant() {
         if (assistantVisible) {
diff --git a/modules/lockscreen/AGENTS.md b/modules/lockscreen/AGENTS.md
old mode 100644
new mode 100755
index c31b4f6a..4031e5f0
--- a/modules/lockscreen/AGENTS.md
+++ b/modules/lockscreen/AGENTS.md
@@ -7,7 +7,7 @@ Lock screen UI with PAM authentication via WlSessionLockSurface.
 ```
 modules/lockscreen/
 ├── LockScreen.qml       # Main component (750 lines)
-├── ambxst-auth          # Helper script (if any)
+├── Ambxst-auth          # Helper script (if any)
 └── config/pam/          # PAM configuration
     └── password.conf    # Custom PAM rules for lockscreen
 ```
diff --git a/modules/lockscreen/LockScreen.qml b/modules/lockscreen/LockScreen.qml
old mode 100644
new mode 100755
index e3f48446..be0ee1fe
--- a/modules/lockscreen/LockScreen.qml
+++ b/modules/lockscreen/LockScreen.qml
@@ -47,9 +47,9 @@ WlSessionLockSurface {
         visible: true
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration * 2
+                duration: Anim.standardNormal * 2
                 easing.type: Easing.OutQuint
             }
         }
@@ -72,9 +72,9 @@ WlSessionLockSurface {
         }
 
         Behavior on zoomScale {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration * 2
+                duration: Anim.standardNormal * 2
                 easing.type: Easing.OutExpo
             }
         }
@@ -100,9 +100,9 @@ WlSessionLockSurface {
         }
 
         Behavior on zoomScale {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration * 2
+                duration: Anim.standardNormal * 2
                 easing.type: Easing.OutExpo
             }
         }
@@ -126,17 +126,17 @@ WlSessionLockSurface {
         }
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration * 2
+                duration: Anim.standardNormal * 2
                 easing.type: Easing.OutQuint
             }
         }
 
         Behavior on zoomScale {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration * 2
+                duration: Anim.standardNormal * 2
                 easing.type: Easing.OutExpo
             }
         }
@@ -176,17 +176,17 @@ WlSessionLockSurface {
                 layer.effect: BgShadow {}
 
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration * 2
+                        duration: Anim.standardNormal * 2
                         easing.type: Easing.OutExpo
                     }
                 }
 
                 Behavior on slideOffset {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration * 2
+                        duration: Anim.standardNormal * 2
                         easing.type: Easing.OutExpo
                     }
                 }
@@ -214,17 +214,17 @@ WlSessionLockSurface {
                 layer.effect: BgShadow {}
 
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration * 2
+                        duration: Anim.standardNormal * 2
                         easing.type: Easing.OutExpo
                     }
                 }
 
                 Behavior on slideOffset {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration * 2
+                        duration: Anim.standardNormal * 2
                         easing.type: Easing.OutExpo
                     }
                 }
@@ -252,17 +252,17 @@ WlSessionLockSurface {
                 layer.effect: BgShadow {}
 
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration * 2
+                        duration: Anim.standardNormal * 2
                         easing.type: Easing.OutExpo
                     }
                 }
 
                 Behavior on slideOffset {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration * 2
+                        duration: Anim.standardNormal * 2
                         easing.type: Easing.OutExpo
                     }
                 }
@@ -298,17 +298,17 @@ WlSessionLockSurface {
         opacity: startAnim ? 1 : 0
 
         Behavior on anchors.leftMargin {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration * 2
+                duration: Anim.standardNormal * 2
                 easing.type: Easing.OutExpo
             }
         }
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration * 2
+                duration: Anim.standardNormal * 2
                 easing.type: Easing.OutQuad
             }
         }
@@ -340,35 +340,35 @@ WlSessionLockSurface {
         scale: startAnim ? 1 : 0.92
 
         Behavior on anchors.topMargin {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration * 2
+                duration: Anim.standardNormal * 2
                 easing.type: Easing.OutExpo
             }
         }
 
         Behavior on anchors.bottomMargin {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration * 2
+                duration: Anim.standardNormal * 2
                 easing.type: Easing.OutExpo
             }
         }
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration * 2
+                duration: Anim.standardNormal * 2
                 easing.type: Easing.OutQuad
             }
         }
 
         Behavior on scale {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration * 2
-                easing.type: Easing.OutBack
-                easing.overshoot: 1.2
+                duration: Anim.standardNormal * 2
+                easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
             }
         }
 
@@ -411,6 +411,8 @@ WlSessionLockSurface {
                         fillMode: Image.PreserveAspectCrop
                         smooth: true
                         asynchronous: true
+                        sourceSize.width: 64
+                        sourceSize.height: 64
                         visible: status === Image.Ready
 
                         layer.enabled: true
@@ -466,10 +468,11 @@ WlSessionLockSurface {
                             rotation: 0
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
@@ -506,17 +509,18 @@ WlSessionLockSurface {
                             enabled: !authenticating
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
                             Behavior on placeholderTextColor {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration
+                                    duration: Anim.standardNormal
                                     easing.type: Easing.OutQuad
                                 }
                             }
diff --git a/modules/notch/AGENTS.md b/modules/notch/AGENTS.md
old mode 100644
new mode 100755
diff --git a/modules/notch/Notch.qml b/modules/notch/Notch.qml
old mode 100644
new mode 100755
index 557c3261..60cea029
--- a/modules/notch/Notch.qml
+++ b/modules/notch/Notch.qml
@@ -13,6 +13,26 @@ Item {
 
     property bool unifiedEffectActive: false
     z: 1000
+    clip: true
+
+    // Scale applied via transform, not layout, to keep edge alignment
+    transform: Scale {
+        id: notchScale
+        origin.x: notchContainer.width / 2
+        origin.y: notchContainer.position === "top" ? 0 : notchContainer.height
+        xScale: 1.0
+        yScale: animScale
+    }
+
+    property real animScale: screenNotchOpen ? 1.0 : 0.9
+    Behavior on animScale {
+        enabled: Anim.animationsEnabled
+        NumberAnimation {
+            duration: Anim.standardNormal
+            easing.type: Anim.springSnappy().type
+            easing.bezierCurve: Anim.springSnappy().bezierCurve
+        }
+    }
 
     property Component defaultViewComponent
     property Component launcherViewComponent
@@ -46,32 +66,61 @@ Item {
     readonly property bool hasActiveNotifications: Notifications.popupList.length > 0
 
     property int defaultHeight: Config.showBackground ? (screenNotchOpen || hasActiveNotifications ? Math.max(stackContainer.height, 44) : 44) : (screenNotchOpen || hasActiveNotifications ? Math.max(stackContainer.height, 40) : 40)
-    property int islandHeight: screenNotchOpen || hasActiveNotifications ? Math.max(stackContainer.height, 36) : 36
+    property int compactHeight: 36
+    property int islandHeight: screenNotchOpen || hasActiveNotifications ? Math.max(stackContainer.height, compactHeight) : compactHeight
+
+    // Force exact button height in island mode when idle
+    readonly property bool _forceCompact: Config.notchTheme === "island" && !screenNotchOpen && !hasActiveNotifications
 
     readonly property string position: Config.notchPosition ?? "top"
+    // Bar position for merging island with bar
+    readonly property string barPosition: (Config.bar && Config.bar.position !== undefined) ? Config.bar.position : "top"
+    // When island theme and same position as bar, offset from bar edge instead of screen edge
+    readonly property bool mergeWithBar: Config.notchTheme === "island" && root.position === root.barPosition && (Config.bar && Config.bar.barMode === "dynamic")
 
     // Corner size calculation for dynamic width (only for default theme)
     readonly property int cornerSize: Config.roundness > 0 ? Config.roundness + 4 : 0
     readonly property int totalCornerWidth: Config.notchTheme === "default" ? cornerSize * 2 : 0
 
-    implicitWidth: screenNotchOpen ? Math.max(stackContainer.width + totalCornerWidth, 290) : stackContainer.width + totalCornerWidth
-    implicitHeight: Config.notchTheme === "default" ? defaultHeight : (Config.notchTheme === "island" ? islandHeight : defaultHeight)
+    // Island theme: centered on the bar like Dynamic Island
+    anchors.horizontalCenter: Config.notchTheme === "island" ? parent.horizontalCenter : undefined
+
+    implicitWidth: {
+        let w = screenNotchOpen ? Math.max(stackContainer.width + totalCornerWidth, 290) : stackContainer.width + totalCornerWidth;
+        // When merged with bar, cap width to not overflow bar bounds
+        if (root.mergeWithBar && root.maxIslandWidth > 0) {
+            w = Math.min(w, root.maxIslandWidth);
+        }
+        return w;
+    }
+    implicitHeight: Config.notchTheme === "default" ? defaultHeight
+        : (Config.notchTheme === "island" ? (_forceCompact ? compactHeight : islandHeight)
+        : defaultHeight)
+    // When island merges with bar: notch IS part of the bar
+    // Position at bar level with margins to not overlap buttons
+    y: root.mergeWithBar ? (root.position === "top" ? 2 : parent.height - root.implicitHeight - 2) : 0
+    // Match bar size when merged
+    readonly property int maxIslandWidth: root.mergeWithBar ? (parent ? Math.min(parent.width, 400) : 400) : (parent ? Math.min(parent.width * 0.85, 600) : 600)
+    // When merged, make the background transparent so bar bg shows through
+    readonly property bool sectionInvisible: root.mergeWithBar && !root.screenNotchOpen && !root.hasActiveNotifications
 
     Behavior on implicitWidth {
-        enabled: (screenNotchOpen || stackViewInternal.busy) && Config.animDuration > 0
+        enabled: (screenNotchOpen || stackViewInternal.busy) && Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: isExpanded ? Easing.OutBack : Easing.OutQuart
-            easing.overshoot: isExpanded ? 1.2 : 1.0
+            property var _ease: isExpanded ? Anim.springSnappy() : Anim.easing("standard")
+            duration: isExpanded ? Anim.emphasizedNormal : Anim.standardNormal
+            easing.type: _ease.type
+            easing.bezierCurve: _ease.bezierCurve
         }
     }
 
     Behavior on implicitHeight {
-        enabled: (screenNotchOpen || stackViewInternal.busy) && Config.animDuration > 0
+        enabled: (screenNotchOpen || stackViewInternal.busy) && Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: isExpanded ? Easing.OutBack : Easing.OutQuart
-            easing.overshoot: isExpanded ? 1.2 : 1.0
+            property var _ease: isExpanded ? Anim.springSnappy() : Anim.easing("standard")
+            duration: isExpanded ? Anim.emphasizedNormal : Anim.standardNormal
+            easing.type: _ease.type
+            easing.bezierCurve: _ease.bezierCurve
         }
     }
 
@@ -95,38 +144,42 @@ Item {
         bottomRightRadius: notchContainer.position === "top" ? defaultRadius : 0
 
         Behavior on bottomLeftRadius {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: screenNotchOpen || hasActiveNotifications ? Easing.OutBack : Easing.OutQuart
-                easing.overshoot: screenNotchOpen || hasActiveNotifications ? 1.2 : 1.0
+                property var _ease: screenNotchOpen || hasActiveNotifications ? Anim.easing("emphasized") : Anim.easing("standard")
+                duration: Anim.standardNormal
+                easing.type: _ease.type
+                easing.bezierCurve: _ease.bezierCurve
             }
         }
 
         Behavior on bottomRightRadius {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: screenNotchOpen || hasActiveNotifications ? Easing.OutBack : Easing.OutQuart
-                easing.overshoot: screenNotchOpen || hasActiveNotifications ? 1.2 : 1.0
+                property var _ease: screenNotchOpen || hasActiveNotifications ? Anim.easing("emphasized") : Anim.easing("standard")
+                duration: Anim.standardNormal
+                easing.type: _ease.type
+                easing.bezierCurve: _ease.bezierCurve
             }
         }
 
         Behavior on topLeftRadius {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: screenNotchOpen || hasActiveNotifications ? Easing.OutBack : Easing.OutQuart
-                easing.overshoot: screenNotchOpen || hasActiveNotifications ? 1.2 : 1.0
+                property var _ease: screenNotchOpen || hasActiveNotifications ? Anim.easing("emphasized") : Anim.easing("standard")
+                duration: Anim.standardNormal
+                easing.type: _ease.type
+                easing.bezierCurve: _ease.bezierCurve
             }
         }
 
         Behavior on topRightRadius {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: screenNotchOpen || hasActiveNotifications ? Easing.OutBack : Easing.OutQuart
-                easing.overshoot: screenNotchOpen || hasActiveNotifications ? 1.2 : 1.0
+                property var _ease: screenNotchOpen || hasActiveNotifications ? Anim.easing("emphasized") : Anim.easing("standard")
+                duration: Anim.standardNormal
+                easing.type: _ease.type
+                easing.bezierCurve: _ease.bezierCurve
             }
         }
 
@@ -248,38 +301,42 @@ Item {
             bottomRightRadius: parent.bottomRightRadius
 
             Behavior on topLeftRadius {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: screenNotchOpen || hasActiveNotifications ? Easing.OutBack : Easing.OutQuart
-                    easing.overshoot: screenNotchOpen || hasActiveNotifications ? 1.2 : 1.0
+                    property var _ease: screenNotchOpen || hasActiveNotifications ? Anim.easing("emphasized") : Anim.easing("standard")
+                    duration: Anim.standardNormal
+                    easing.type: _ease.type
+                    easing.bezierCurve: _ease.bezierCurve
                 }
             }
 
             Behavior on topRightRadius {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: screenNotchOpen || hasActiveNotifications ? Easing.OutBack : Easing.OutQuart
-                    easing.overshoot: screenNotchOpen || hasActiveNotifications ? 1.2 : 1.0
+                    property var _ease: screenNotchOpen || hasActiveNotifications ? Anim.easing("emphasized") : Anim.easing("standard")
+                    duration: Anim.standardNormal
+                    easing.type: _ease.type
+                    easing.bezierCurve: _ease.bezierCurve
                 }
             }
 
             Behavior on bottomLeftRadius {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: screenNotchOpen || hasActiveNotifications ? Easing.OutBack : Easing.OutQuart
-                    easing.overshoot: screenNotchOpen || hasActiveNotifications ? 1.2 : 1.0
+                    property var _ease: screenNotchOpen || hasActiveNotifications ? Anim.easing("emphasized") : Anim.easing("standard")
+                    duration: Anim.standardNormal
+                    easing.type: _ease.type
+                    easing.bezierCurve: _ease.bezierCurve
                 }
             }
 
             Behavior on bottomRightRadius {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: screenNotchOpen || hasActiveNotifications ? Easing.OutBack : Easing.OutQuart
-                    easing.overshoot: screenNotchOpen || hasActiveNotifications ? 1.2 : 1.0
+                    property var _ease: screenNotchOpen || hasActiveNotifications ? Anim.easing("emphasized") : Anim.easing("standard")
+                    duration: Anim.standardNormal
+                    easing.type: _ease.type
+                    easing.bezierCurve: _ease.bezierCurve
                 }
             }
         }
@@ -294,11 +351,30 @@ Item {
             }
         }
 
-        Item {
+        Rectangle {
             id: stackContainer
             anchors.centerIn: parent
-            width: stackViewInternal.currentItem ? stackViewInternal.currentItem.implicitWidth + (screenNotchOpen ? 32 : 0) : (screenNotchOpen ? 32 : 0)
-            height: stackViewInternal.currentItem ? stackViewInternal.currentItem.implicitHeight + (screenNotchOpen ? 32 : 0) : (screenNotchOpen ? 32 : 0)
+            color: "transparent"
+            radius: Config.roundness > 0 ? (screenNotchOpen || hasActiveNotifications ? Config.roundness + 20 : Config.roundness + 4) : 0
+            Behavior on radius {
+                enabled: Anim.animationsEnabled
+                NumberAnimation {
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("standard").type
+                    easing.bezierCurve: Anim.easing("standard").bezierCurve
+                }
+            }
+            property real animMargin: screenNotchOpen ? 16 : 0
+            Behavior on animMargin {
+                enabled: Anim.animationsEnabled
+                NumberAnimation {
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("standard").type
+                    easing.bezierCurve: Anim.easing("standard").bezierCurve
+                }
+            }
+            width: stackViewInternal.currentItem ? stackViewInternal.currentItem.implicitWidth + animMargin * 2 : animMargin * 2
+            height: _forceCompact ? compactHeight : (stackViewInternal.currentItem ? stackViewInternal.currentItem.implicitHeight + animMargin * 2 : animMargin * 2)
             clip: true
 
             // Propiedad para controlar el blur durante las transiciones
@@ -319,14 +395,15 @@ Item {
                 property: "transitionBlur"
                 from: 1.0
                 to: 0.0
-                duration: Config.animDuration
-                easing.type: Easing.OutQuart
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("standard").type
+                easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
 
             StackView {
                 id: stackViewInternal
                 anchors.fill: parent
-                anchors.margins: screenNotchOpen ? 16 : 0
+                anchors.margins: stackContainer.animMargin
                 initialItem: defaultViewComponent
 
                 onCurrentItemChanged: {
@@ -351,16 +428,17 @@ Item {
                         property: "opacity"
                         from: 0
                         to: 1
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("decelerate").type
+                        easing.bezierCurve: Anim.easing("decelerate").bezierCurve
                     }
                     PropertyAnimation {
                         property: "scale"
-                        from: 0.8
+                        from: 0.85
                         to: 1
-                        duration: Config.animDuration
-                        easing.type: Easing.OutBack
-                        easing.overshoot: 1.2
+                        duration: Anim.emphasizedNormal
+                        easing.type: Anim.springSnappy().type
+                        easing.bezierCurve: Anim.springSnappy().bezierCurve
                     }
                 }
 
@@ -369,15 +447,17 @@ Item {
                         property: "opacity"
                         from: 1
                         to: 0
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                     PropertyAnimation {
                         property: "scale"
                         from: 1
-                        to: 1.05
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        to: 1.04
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -386,15 +466,17 @@ Item {
                         property: "opacity"
                         from: 0
                         to: 1
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("decelerate").type
+                        easing.bezierCurve: Anim.easing("decelerate").bezierCurve
                     }
                     PropertyAnimation {
                         property: "scale"
-                        from: 1.05
+                        from: 1.04
                         to: 1
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.springSnappy().type
+                        easing.bezierCurve: Anim.springSnappy().bezierCurve
                     }
                 }
 
@@ -403,15 +485,17 @@ Item {
                         property: "opacity"
                         from: 1
                         to: 0
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.emphasizedLarge
+                        easing.type: Anim.easing("emphasized", "exit").type
+                        easing.bezierCurve: Anim.easing("emphasized", "exit").bezierCurve
                     }
                     PropertyAnimation {
                         property: "scale"
                         from: 1
-                        to: 0.95
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        to: 0.94
+                        duration: Anim.emphasizedLarge
+                        easing.type: Anim.easing("emphasized", "exit").type
+                        easing.bezierCurve: Anim.easing("emphasized", "exit").bezierCurve
                     }
                 }
 
@@ -420,16 +504,17 @@ Item {
                         property: "opacity"
                         from: 0
                         to: 1
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("decelerate").type
+                        easing.bezierCurve: Anim.easing("decelerate").bezierCurve
                     }
                     PropertyAnimation {
                         property: "scale"
-                        from: 0.8
+                        from: 0.85
                         to: 1
-                        duration: Config.animDuration
-                        easing.type: Easing.OutBack
-                        easing.overshoot: 1.2
+                        duration: Anim.emphasizedNormal
+                        easing.type: Anim.springSnappy().type
+                        easing.bezierCurve: Anim.springSnappy().bezierCurve
                     }
                 }
 
@@ -438,15 +523,17 @@ Item {
                         property: "opacity"
                         from: 1
                         to: 0
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                     PropertyAnimation {
                         property: "scale"
                         from: 1
-                        to: 1.05
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        to: 1.04
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
diff --git a/modules/notch/NotchAnimationBehavior.qml b/modules/notch/NotchAnimationBehavior.qml
old mode 100644
new mode 100755
index 1e57e3e8..e7d06fd6
--- a/modules/notch/NotchAnimationBehavior.qml
+++ b/modules/notch/NotchAnimationBehavior.qml
@@ -1,5 +1,6 @@
 import QtQuick
 import qs.config
+import qs.modules.theme
 
 // Comportamiento estándar para animaciones de elementos que aparecen en el notch
 Item {
@@ -14,19 +15,20 @@ Item {
     visible: opacity > 0
 
     Behavior on scale {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutBack
-            easing.overshoot: 1.2
+            duration: Anim.emphasizedNormal
+            easing.type: Anim.easing("emphasized").type
+            easing.bezierCurve: Anim.easing("emphasized").bezierCurve
         }
     }
 
     Behavior on opacity {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+            easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 }
diff --git a/modules/notch/NotchContent.qml b/modules/notch/NotchContent.qml
old mode 100644
new mode 100755
index d68db000..df3bbc1e
--- a/modules/notch/NotchContent.qml
+++ b/modules/notch/NotchContent.qml
@@ -1,5 +1,7 @@
 import QtQuick
+import QtQuick.Controls
 import QtQuick.Effects
+import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 import Quickshell.Wayland
@@ -13,6 +15,11 @@ import qs.modules.services
 import qs.modules.components
 import qs.modules.widgets.launcher
 import qs.modules.bar.workspaces
+import qs.modules.bar.clock
+import qs.modules.bar.systray
+import qs.modules.bar.tasktray
+import qs.modules.bar
+import qs.modules.widgets.presets
 import qs.config
 import "./NotchNotificationView.qml"
 
@@ -33,9 +40,42 @@ Item {
     // Check if there are any windows on the current monitor and workspace
     readonly property bool hasWindows: toplevels.length > 0
 
+    // Check if notch island is merged with bar (same position + island theme)
+    readonly property bool islandMergedWithBar: {
+        const theme = Config.notchTheme || "default";
+        const bp = root.barPosition;
+        const barMode = (Config.bar && Config.bar.barMode) || "extended";
+        return theme === "island" && root.notchPosition === bp && barMode === "dynamic";
+    }
+    
+    // Frame offset for positioning
+    readonly property int frameOffset: (Config.bar && Config.bar.frameEnabled && !root.activeWindowFullscreen) ? ((Config.bar.frameThickness !== undefined) ? Config.bar.frameThickness : 6) : 0
+
+    // In island mode: always enabled (buttons need to work)
+    enabled: root.islandMergedWithBar ? true : !root._mergedHidden
+
+    // Dock joins island bar if same position
+    readonly property bool dockSamePosition: {
+        if (!Config.dock || !Config.dock.enabled) return false;
+        var dp = Config.dock.position || "center";
+        if (dp === "center") return root.barPosition === "top" || root.barPosition === "bottom";
+        return dp === root.barPosition;
+    }
+
+    // In island mode: root always visible, children animate their own hide.
+    // In normal mode: hide when merged+idle.
+    readonly property bool _mergedHidden: !root.reveal
+    opacity: root.islandMergedWithBar ? 1.0 : (root._mergedHidden ? 0.0 : 1.0)
+    Behavior on opacity {
+        enabled: Anim.animationsEnabled
+        NumberAnimation { duration: Anim.emphasizedNormal; easing.type: Anim.easing("decelerate").type; easing.bezierCurve: Anim.easing("decelerate").bezierCurve }
+    }
+    
     // Get the bar position for this screen
-    readonly property string barPosition: (Config.bar && Config.bar.position !== undefined) ? Config.bar.position : "top"
-    readonly property string notchPosition: Config.notchPosition !== undefined ? Config.notchPosition : "top"
+    readonly property string barPosition: PerMonitorConfig.resolve(screen.name, "bar", "position",
+        (Config.bar && Config.bar.position !== undefined) ? Config.bar.position : "top")
+    readonly property string notchPosition: PerMonitorConfig.resolve(screen.name, "notch", "position",
+        Config.notchPosition !== undefined ? Config.notchPosition : "top")
 
     // Get the bar panel for this screen to check its state
     readonly property var barPanelRef: Visibilities.barPanels[screen.name]
@@ -87,68 +127,172 @@ Item {
     // Check if the bar for this screen is vertical
     readonly property bool isBarVertical: barPosition === "left" || barPosition === "right"
 
+    // Island button sizing: square buttons matching notch compact height
+    readonly property int islandButtonSize: {
+        const configured = (Config.notch && Config.notch.islandButtonSize) || 36;
+        return Math.max(28, Math.min(52, configured));
+    }
+
+    // Comprehensive bar proxy for island-mode buttons (mirrors BarContent root)
+    readonly property var islandBarProxy: QtObject {
+        property var screen: root.screen
+        property string orientation: "horizontal"
+        property string barPosition: root.barPosition
+        property string barMode: "dynamic"
+        property bool shadowsEnabled: false
+    }
+
+    // Dock apps visible in island mode — only if dock shares position with bar/notch
+    readonly property bool islandDockEnabled: (Config.notch?.showDockInIsland ?? true) && Config.dock && Config.dock.enabled && Config.dock.theme !== "integrated" && root.dockSamePosition
+
     // Notch state properties
     readonly property bool screenNotchOpen: screenVisibilities ? (screenVisibilities.launcher || screenVisibilities.dashboard || screenVisibilities.powermenu || screenVisibilities.tools) : false
     readonly property bool hasActiveNotifications: Notifications.popupList.length > 0
 
+    // Pin state for island mode — when pinned, island stays visible
+    property bool notchPinned: (Config.notch && Config.notch.pinnedOnStartup !== undefined) ? Config.notch.pinnedOnStartup : true
+    onNotchPinnedChanged: {
+        if (Config.notch && Config.notch.pinnedOnStartup !== notchPinned) {
+            Config.notch.pinnedOnStartup = notchPinned;
+        }
+    }
+
     // Hover state with delay to prevent flickering
     property bool hoverActive: false
 
+    // Hover tracking for buttons — keeps island visible in auto-hide
+    property bool islandButtonsHovered: false
+    onIslandButtonsHoveredChanged: {
+        if (islandButtonsHovered) { hideDelayTimer.stop(); hoverActive = true; }
+        else if (!isMouseOverNotch) { hideDelayTimer.restart(); }
+    }
+
     // Track if mouse is over any notch-related area
     readonly property bool isMouseOverNotch: notchMouseAreaHover.hovered || notchRegionHover.hovered
 
+    // Includes button hover so island stays visible when interacting with buttons
+    readonly property bool isMouseOverIsland: isMouseOverNotch || islandButtonsHovered
+
+    // Island mode auto-hide: pinned (always show) or auto (hide when idle)
+    readonly property bool islandAutoHide: !root.notchPinned && root.islandMergedWithBar
+
     // Reveal logic:
     readonly property bool reveal: {
-        // If keepHidden is true, ONLY show on interaction
-        // UNLESS notch and bar are on same side (e.g. both top), then keepHidden is IGNORED for sync consistency
-        if (((Config.notch && Config.notch.keepHidden !== undefined) ? Config.notch.keepHidden : false) && barPosition !== notchPosition) {
-            return (screenNotchOpen || hasActiveNotifications || hoverActive || barHoverActive);
-        }
-
-        // If fullscreen and bar is NOT available on fullscreen, hard-hide the notch too
-        // This prevents barHoverActive from leaking through when the bar itself is hidden
+        // If fullscreen and bar is NOT available on fullscreen, hard-hide
         if (activeWindowFullscreen && !(Config.bar && Config.bar.availableOnFullscreen !== undefined ? Config.bar.availableOnFullscreen : false)) {
             return false;
         }
 
+        // If metrics overlay is active, always show the notch
+        if (Config.notch && Config.notch.showMetrics === true) {
+            return true;
+        }
+
+        // Island mode: pinned = always show, otherwise show on interaction
+        if (root.islandMergedWithBar) {
+            if (root.notchPinned) return true;
+            return screenNotchOpen || hasActiveNotifications || hoverActive || barHoverActive;
+        }
+
+        // If keepHidden is true and NOT merged with bar, ONLY show on interaction
+        if (((Config.notch && Config.notch.keepHidden !== undefined) ? Config.notch.keepHidden : false) && barPosition !== notchPosition) {
+            return (screenNotchOpen || hasActiveNotifications || hoverActive || barHoverActive);
+        }
+
         // If not auto-hiding (pinned and not fullscreen), always show
         if (!shouldAutoHide) return true;
-        
+
         // Show on interaction (hover, open, notifications)
-        // This works even in fullscreen, ensuring hover always works
         if (screenNotchOpen || hasActiveNotifications || hoverActive || barHoverActive) {
             return true;
         }
-        
+
         return false;
     }
 
+    // Check if there's an adjacent monitor on the notch's edge side
+    readonly property bool _hasAdjacentMonitor: {
+        const mon = root.compositorMonitor;
+        if (!mon || !AxctlService.monitors || !AxctlService.monitors.values) return false;
+        const edgeX = root.notchPosition === "left" ? mon.x : (root.notchPosition === "right" ? mon.x + mon.width : 0);
+        const edgeY = root.notchPosition === "top" ? mon.y : (root.notchPosition === "bottom" ? mon.y + mon.height : 0);
+        const others = AxctlService.monitors.values.filter(m => m.name !== mon.name);
+        for (let i = 0; i < others.length; i++) {
+            const o = others[i];
+            if (root.notchPosition === "left" || root.notchPosition === "right") {
+                if (o.y + o.height > mon.y && o.y < mon.y + mon.height) {
+                    if (root.notchPosition === "left" && o.x + o.width === edgeX) return true;
+                    if (root.notchPosition === "right" && o.x === edgeX) return true;
+                }
+            } else {
+                if (o.x + o.width > mon.x && o.x < mon.x + mon.width) {
+                    if (root.notchPosition === "top" && o.y + o.height === edgeY) return true;
+                    if (root.notchPosition === "bottom" && o.y === edgeY) return true;
+                }
+            }
+        }
+        return false;
+    }
+    readonly property int _effectiveHoverRegion: root._hasAdjacentMonitor ? 8 : (Config.notch && Config.notch.hoverRegionHeight !== undefined ? Config.notch.hoverRegionHeight : 2)
+
+    // Show delay timer — requires hovering edge for 200ms (400ms in island mode)
+    property bool _mousePending: false
+    Timer {
+        id: showDelayTimer
+        interval: root.islandMergedWithBar ? 400 : 200
+        repeat: false
+        onTriggered: {
+            if (root.isMouseOverIsland) {
+                root.hoverActive = true;
+            }
+            root._mousePending = false;
+        }
+    }
+
     // Timer to delay hiding the notch after mouse leaves
     Timer {
         id: hideDelayTimer
-        interval: 1000
+        interval: 800
         repeat: false
         onTriggered: {
-            if (!root.isMouseOverNotch) {
+            if (!root.isMouseOverIsland && !root._mousePending) {
                 root.hoverActive = false;
             }
         }
     }
 
-    // Watch for mouse state changes
-    onIsMouseOverNotchChanged: {
-        if (isMouseOverNotch) {
-            // Immediately show when mouse enters any notch area
+    // Watch for mouse state changes — island mode includes button hover
+    onIsMouseOverIslandChanged: {
+        if (isMouseOverIsland) {
             hideDelayTimer.stop();
-            hoverActive = true;
+            root._mousePending = true;
+            showDelayTimer.restart();
         } else {
-            // Delay hiding when mouse leaves
+            showDelayTimer.stop();
+            root._mousePending = false;
             hideDelayTimer.restart();
         }
     }
 
-    // The hitbox for the mask
-    readonly property Item notchHitbox: root.reveal ? notchRegionContainer : notchHoverRegion
+    // The hitbox for the mask — includes island buttons when visible
+    readonly property Item notchHitbox: root.islandMergedWithBar ? notchIslandContainer : (root.reveal ? notchRegionContainer : notchHoverRegion)
+    // Hover region (always exposed for mask — needed for edge detection)
+    readonly property Item notchHoverRegionRef: notchHoverRegion
+    // The pill/button area when active
+    readonly property Item notchActiveRegion: root.islandMergedWithBar ? notchIslandContainer : notchRegionContainer
+
+    // Combined container for island mode: notch pill + flanking buttons
+    // Combined container for island mode: notch pill + flanking buttons
+    // Spans full width at the top edge to cover all button areas
+    Item {
+        id: notchIslandContainer
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+        height: Math.max(islandLeftButtons.height, notchRegionContainer.height, islandRightButtons.height) + root.frameOffset + 8
+    }
 
     // Default view component - user@host text
     Component {
@@ -193,18 +337,20 @@ Item {
     Item {
         id: notchHoverRegion
 
-        // Width follows the notch, height is small hover region when hidden
-        width: notchRegionContainer.width + 20
-        height: root.reveal ? notchRegionContainer.height : Math.max((Config.notch && Config.notch.hoverRegionHeight !== undefined) ? Config.notch.hoverRegionHeight : 8, 8)
+        // In island mode: centered strip near the notch pill, not full-width
+        // In normal mode: centered below the notch position
+        width: root.islandMergedWithBar ? Math.min(parent.width, notchRegionContainer.width + 120) : (notchRegionContainer.width + 20)
+        height: root.reveal ? notchRegionContainer.height : Math.max(root._effectiveHoverRegion, 2)
 
-        x: (parent.width - width) / 2
+        x: root.islandMergedWithBar ? (parent.width - width) / 2 : (parent.width - width) / 2
         y: root.notchPosition === "top" ? 0 : parent.height - height
 
         Behavior on height {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 4
-                easing.type: Easing.OutCubic
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -215,6 +361,218 @@ Item {
         }
     }
 
+    // ── Island-mode buttons ──
+    // Fixed to screen top edge, flanking the centered notch.
+    // Both sides have equal total width for visual balance.
+    // Hover on buttons keeps the island revealed.
+
+    // Left group — compact, balanced with right
+    Row {
+        id: islandLeftButtons
+        z: 5001
+        height: root.islandButtonSize
+        anchors.top: root.top
+        anchors.topMargin: root.frameOffset + 4
+        anchors.right: root.horizontalCenter
+        anchors.rightMargin: notchContainer.width / 2 + 12
+        spacing: 0
+        visible: root.islandMergedWithBar
+
+        // Smooth show/hide — uses opacity+scale, NOT visible, so hide animates
+        opacity: root.reveal ? 1 : 0
+        scale: root.reveal ? 1 : 0.9
+        transformOrigin: Item.Right
+        Behavior on opacity {
+            enabled: Anim.animationsEnabled
+            NumberAnimation { duration: Anim.emphasizedNormal; easing.type: Anim.easing("decelerate").type; easing.bezierCurve: Anim.easing("decelerate").bezierCurve }
+        }
+        Behavior on scale {
+            enabled: Anim.animationsEnabled
+            NumberAnimation { duration: Anim.emphasizedNormal; easing.type: Anim.easing("emphasized").type; easing.bezierCurve: Anim.easing("emphasized").bezierCurve }
+        }
+
+        HoverHandler { enabled: root.reveal; onHoveredChanged: root.islandButtonsHovered = hovered }
+
+        LauncherButton {
+            visible: !Config.bar.hiddenIcons.includes("launcher")
+            startRadius: Styling.radius(3); endRadius: Styling.radius(3); enableShadow: false
+            implicitWidth: root.islandButtonSize; implicitHeight: root.islandButtonSize
+        }
+        Workspaces {
+            visible: !Config.bar.hiddenIcons.includes("workspaces")
+            orientation: "horizontal"; bar: root.islandBarProxy
+            startRadius: Styling.radius(3); endRadius: Styling.radius(3)
+            implicitHeight: root.islandButtonSize
+        }
+        LayoutSelectorButton {
+            visible: !Config.bar.hiddenIcons.includes("layout")
+            bar: root.islandBarProxy; layerEnabled: false
+            startRadius: Styling.radius(3); endRadius: Styling.radius(3)
+            implicitWidth: root.islandButtonSize; implicitHeight: root.islandButtonSize
+        }
+        Button {
+            id: islandPinBtn
+            implicitWidth: root.islandButtonSize; implicitHeight: root.islandButtonSize
+            visible: root.islandMergedWithBar
+            background: StyledRect {
+                variant: "bg"; enableShadow: false
+                radius: Styling.radius(3)
+                // Filled background when pinned
+                Rectangle {
+                    anchors.fill: parent
+                    color: Colors.primary
+                    radius: parent.radius ?? 0
+                    opacity: root.notchPinned ? 0.15 : 0
+                    Behavior on opacity {
+                        enabled: Anim.animationsEnabled
+                        NumberAnimation { duration: Anim.standardSmall; easing.type: Easing.OutCubic }
+                    }
+                }
+                // Hover overlay
+                Rectangle {
+                    anchors.fill: parent
+                    color: Styling.srItem("overprimary") || Colors.overBackground
+                    opacity: root.notchPinned ? 0 : (islandPinBtn.hovered ? 0.12 : (islandPinBtn.pressed ? 0.20 : 0))
+                    radius: parent.radius ?? 0
+                    Behavior on opacity {
+                        enabled: Anim.animationsEnabled
+                        NumberAnimation { duration: Anim.standardSmall; easing.type: Easing.OutCubic }
+                    }
+                }
+            }
+            contentItem: Text {
+                text: Icons.pin; font.family: Icons.font
+                font.pixelSize: Math.round(root.islandButtonSize * 0.5)
+                color: root.notchPinned ? Colors.primary : (Styling.srItem("overprimary") || Colors.foreground)
+                horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter
+                rotation: root.notchPinned ? 0 : 45
+                Behavior on rotation {
+                    enabled: Anim.animationsEnabled
+                    NumberAnimation { duration: Anim.standardSmall; easing.type: Easing.OutCubic }
+                }
+                Behavior on color {
+                    enabled: Anim.animationsEnabled
+                    ColorAnimation { duration: Anim.standardSmall }
+                }
+            }
+            onClicked: root.notchPinned = !root.notchPinned
+            HoverHandler { cursorShape: Qt.PointingHandCursor }
+        }
+    }
+
+    // Right group — dock, tools, system, clock, power
+    Row {
+        id: islandRightButtons
+        z: 5001
+        height: root.islandButtonSize
+        anchors.top: root.top
+        anchors.topMargin: root.frameOffset + 4
+        anchors.left: root.horizontalCenter
+        anchors.leftMargin: notchContainer.width / 2 + 12
+        spacing: 0
+        visible: root.islandMergedWithBar
+
+        // Smooth show/hide — uses opacity+scale, NOT visible, so hide animates
+        opacity: root.reveal ? 1 : 0
+        scale: root.reveal ? 1 : 0.9
+        transformOrigin: Item.Left
+        Behavior on opacity {
+            enabled: Anim.animationsEnabled
+            NumberAnimation { duration: Anim.emphasizedNormal; easing.type: Anim.easing("decelerate").type; easing.bezierCurve: Anim.easing("decelerate").bezierCurve }
+        }
+        Behavior on scale {
+            enabled: Anim.animationsEnabled
+            NumberAnimation { duration: Anim.emphasizedNormal; easing.type: Anim.easing("emphasized").type; easing.bezierCurve: Anim.easing("emphasized").bezierCurve }
+        }
+
+        HoverHandler { enabled: root.reveal; onHoveredChanged: root.islandButtonsHovered = hovered }
+
+        // Dock apps with unified background — same size as other buttons
+        Repeater {
+            model: root.islandDockEnabled && !Config.bar.hiddenIcons.includes("dock") && TaskbarApps.apps.length > 0 ? TaskbarApps.apps : []
+            Rectangle {
+                id: dockAppBg
+                width: root.islandButtonSize; height: root.islandButtonSize
+                radius: Styling.radius(3); color: Colors.surfaceContainer
+                
+                // Hover overlay
+                Rectangle {
+                    anchors.fill: parent
+                    radius: parent.radius
+                    color: Colors.overBackground
+                    opacity: dockAppBgMa.containsMouse ? 0.12 : 0
+                    Behavior on opacity {
+                        enabled: Anim.animationsEnabled
+                        NumberAnimation { duration: Anim.standardSmall; easing.type: Easing.OutCubic }
+                    }
+                }
+                
+                MouseArea {
+                    id: dockAppBgMa
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: {
+                        var v = Visibilities.getForScreen(root.screen.name);
+                        if (v && !v.dashboard) v.dashboard = true;
+                    }
+                }
+                
+                IntegratedDockAppButton {
+                    anchors.centerIn: parent
+                    appToplevel: modelData; orientation: "horizontal"
+                    iconSize: root.islandButtonSize - 10
+                }
+            }
+        }
+        PresetsButton {
+            visible: !Config.bar.hiddenIcons.includes("presets")
+            startRadius: Styling.radius(3); endRadius: Styling.radius(3); enableShadow: false
+            implicitWidth: root.islandButtonSize; implicitHeight: root.islandButtonSize
+        }
+        ToolsButton {
+            visible: !Config.bar.hiddenIcons.includes("tools")
+            startRadius: Styling.radius(3); endRadius: Styling.radius(3); enableShadow: false
+            implicitWidth: root.islandButtonSize; implicitHeight: root.islandButtonSize
+        }
+        SysTray {
+            visible: !Config.bar.hiddenIcons.includes("systray")
+            bar: root.islandBarProxy; enableShadow: false
+            startRadius: Styling.radius(3); endRadius: Styling.radius(3)
+            implicitHeight: root.islandButtonSize
+        }
+        TaskTray {
+            visible: !Config.bar.hiddenIcons.includes("tasktray")
+            bar: root.islandBarProxy
+            startRadius: Styling.radius(3); endRadius: Styling.radius(3)
+            implicitHeight: root.islandButtonSize
+        }
+        ControlsButton {
+            visible: !Config.bar.hiddenIcons.includes("controls")
+            bar: root.islandBarProxy; layerEnabled: false
+            startRadius: Styling.radius(3); endRadius: Styling.radius(3)
+            implicitWidth: root.islandButtonSize; implicitHeight: root.islandButtonSize
+        }
+        BatteryIndicator {
+            visible: !Config.bar.hiddenIcons.includes("battery")
+            bar: root.islandBarProxy; layerEnabled: false
+            startRadius: Styling.radius(3); endRadius: Styling.radius(3)
+            implicitWidth: root.islandButtonSize; implicitHeight: root.islandButtonSize
+        }
+        Clock {
+            visible: !Config.bar.hiddenIcons.includes("clock")
+            bar: root.islandBarProxy; layerEnabled: false
+            startRadius: Styling.radius(3); endRadius: Styling.radius(3)
+            implicitHeight: root.islandButtonSize
+        }
+        PowerButton {
+            id: islandPowerBtn
+            visible: !Config.bar.hiddenIcons.includes("power")
+            startRadius: Styling.radius(3); endRadius: Styling.radius(3); enableShadow: false
+            implicitWidth: root.islandButtonSize; implicitHeight: root.islandButtonSize
+        }
+    }
+
     Item {
         id: notchRegionContainer
         
@@ -240,19 +598,36 @@ Item {
             width: notchContainer.width
             height: notchContainer.height + (root.notchPosition === "top" ? notchContainer.anchors.topMargin : notchContainer.anchors.bottomMargin)
 
-            // Opacity animation
+            // ── Island mode: bloom from center ──
+            // Normal mode: slide from off-screen
+            // All island elements share same duration for synchronized show/hide.
             opacity: root.reveal ? 1 : 0
+            scale: root.islandMergedWithBar ? (root.reveal ? 1 : 0.7) : 1
+            transformOrigin: root.islandMergedWithBar
+                ? (root.notchPosition === "top" ? Item.Top : Item.Bottom)
+                : Item.Center
+
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
+                NumberAnimation {
+                    duration: Anim.emphasizedNormal
+                    easing.type: Anim.easing("decelerate").type
+                    easing.bezierCurve: Anim.easing("decelerate").bezierCurve
+                }
+            }
+            Behavior on scale {
+                enabled: Anim.animationsEnabled && root.islandMergedWithBar
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutCubic
+                    duration: Anim.emphasizedNormal
+                    easing.type: Anim.easing("emphasized").type
+                    easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                 }
             }
 
-            // Slide animation (slide up when hidden)
+            // Slide (only for non-island mode)
             transform: Translate {
                 y: {
+                    if (root.islandMergedWithBar) return 0;
                     if (root.reveal) return 0;
                     if (root.notchPosition === "top")
                         return -(Math.max(notchContainer.height, 50) + 16);
@@ -260,10 +635,11 @@ Item {
                         return (Math.max(notchContainer.height, 50) + 16);
                 }
                 Behavior on y {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled && !root.islandMergedWithBar
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.spatialFast
+                        easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                     }
                 }
             }
@@ -277,6 +653,8 @@ Item {
                 anchors.top: root.notchPosition === "top" ? parent.top : undefined
                 anchors.bottom: root.notchPosition === "bottom" ? parent.bottom : undefined
 
+                compactHeight: root.islandButtonSize
+
                 readonly property int frameOffset: (Config.bar && Config.bar.frameEnabled && !root.activeWindowFullscreen) ? ((Config.bar.frameThickness !== undefined) ? Config.bar.frameThickness : 6) : 0
 
                 anchors.topMargin: (root.notchPosition === "top" ? (Config.notchTheme === "default" ? 0 : (Config.notchTheme === "island" ? 4 : 0)) : 0) + (root.notchPosition === "top" ? frameOffset : 0)
@@ -320,18 +698,35 @@ Item {
             z: 999
             radius: Styling.radius(20)
 
-            // Apply same reveal animation as notch
+            // ── Island mode: scale+fade from island ──
+            // Normal mode: slide from off-screen
+            // All elements share same duration for sync.
             opacity: root.reveal ? 1 : 0
+            scale: root.islandMergedWithBar ? (root.reveal ? 1 : 0.85) : 1
+            transformOrigin: root.islandMergedWithBar
+                ? (root.notchPosition === "top" ? Item.Top : Item.Bottom)
+                : Item.Center
+
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
+                NumberAnimation {
+                    duration: Anim.emphasizedNormal
+                    easing.type: Anim.easing("decelerate").type
+                    easing.bezierCurve: Anim.easing("decelerate").bezierCurve
+                }
+            }
+            Behavior on scale {
+                enabled: Anim.animationsEnabled && root.islandMergedWithBar
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutCubic
+                    duration: Anim.emphasizedNormal
+                    easing.type: Anim.easing("emphasized").type
+                    easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                 }
             }
 
             transform: Translate {
                 y: {
+                    if (root.islandMergedWithBar) return 0;
                     if (root.reveal) return 0;
                     if (root.notchPosition === "top")
                         return -(notchContainer.height + 16);
@@ -339,10 +734,11 @@ Item {
                         return (notchContainer.height + 16);
                 }
                 Behavior on y {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled && !root.islandMergedWithBar
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.spatialFast
+                        easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                     }
                 }
             }
@@ -367,19 +763,20 @@ Item {
             }
 
             Behavior on width {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutBack
-                    easing.overshoot: 1.2
+                    duration: Anim.emphasizedNormal
+                    easing.type: Anim.easing("emphasized").type
+                    easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                 }
             }
 
             Behavior on height {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("standard").type
+                    easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
@@ -401,10 +798,11 @@ Item {
                 notchHovered: notificationPopupContainer.popupHovered
 
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
diff --git a/modules/notch/NotchNotificationView.qml b/modules/notch/NotchNotificationView.qml
old mode 100644
new mode 100755
index ad4028aa..a381c54a
--- a/modules/notch/NotchNotificationView.qml
+++ b/modules/notch/NotchNotificationView.qml
@@ -19,11 +19,11 @@ Item {
     implicitHeight: mainColumn.implicitHeight
 
     Behavior on implicitWidth {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutBack
-            easing.overshoot: 1.2
+            duration: Anim.emphasizedNormal
+            easing.type: Anim.easing("emphasized").type
+            easing.bezierCurve: Anim.easing("emphasized").bezierCurve
         }
     }
 
@@ -93,7 +93,7 @@ Item {
     // Timer para mantener hover durante navegación
     Timer {
         id: navigationHoverTimer
-        interval: Config.animDuration + 50
+        interval: Anim.standardNormal + 50
         repeat: false
         onTriggered: {
             root.isNavigating = false;
@@ -297,15 +297,17 @@ Item {
                             property: "y"
                             from: notificationStack.height
                             to: 0
-                            duration: Config.animDuration
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                         PropertyAnimation {
                             property: "opacity"
                             from: 0
                             to: 1
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -314,15 +316,17 @@ Item {
                             property: "y"
                             from: 0
                             to: -notificationStack.height
-                            duration: Config.animDuration
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                         PropertyAnimation {
                             property: "opacity"
                             from: 1
                             to: 0
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -331,15 +335,17 @@ Item {
                             property: "y"
                             from: -notificationStack.height
                             to: 0
-                            duration: Config.animDuration
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                         PropertyAnimation {
                             property: "opacity"
                             from: 0
                             to: 1
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -348,15 +354,17 @@ Item {
                             property: "y"
                             from: 0
                             to: notificationStack.height
-                            duration: Config.animDuration
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                         PropertyAnimation {
                             property: "opacity"
                             from: 1
                             to: 0
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
@@ -377,11 +385,11 @@ Item {
                             spacing: hovered ? 8 : 0
 
                             Behavior on spacing {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutBack
-                                    easing.overshoot: 1.2
+                                    duration: Anim.emphasizedSmall
+                                    easing.type: Anim.easing("emphasized").type
+                                    easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                                 }
                             }
 
@@ -392,10 +400,11 @@ Item {
                                 implicitHeight: mainContentRow.implicitHeight + (criticalMargins * 2)
 
                                 Behavior on criticalMargins {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     NumberAnimation {
-                                        duration: Config.animDuration
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardNormal
+                                        easing.type: Anim.easing("standard").type
+                                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
 
@@ -438,10 +447,11 @@ Item {
                                             urgency: notification ? notification.urgency : NotificationUrgency.Normal
 
                                             Behavior on iconSize {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 NumberAnimation {
-                                                    duration: Config.animDuration
-                                                    easing.type: Easing.OutQuart
+                                                    duration: Anim.standardNormal
+                                                    easing.type: Anim.easing("standard").type
+                                                    easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
                                         }
@@ -611,10 +621,11 @@ Item {
                                         z: 200
 
                                         Behavior on buttonSize {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             NumberAnimation {
-                                                duration: Config.animDuration
-                                                easing.type: Easing.OutQuart
+                                                duration: Anim.standardNormal
+                                                easing.type: Anim.easing("standard").type
+                                                easing.bezierCurve: Anim.easing("standard").bezierCurve
                                             }
                                         }
 
@@ -639,9 +650,9 @@ Item {
                                                         radius: Styling.radius(4)
 
                                                         Behavior on color {
-                                                            enabled: Config.animDuration > 0
+                                                            enabled: Anim.animationsEnabled
                                                             ColorAnimation {
-                                                                duration: Config.animDuration
+                                                                duration: Anim.standardNormal
                                                             }
                                                         }
                                                     }
@@ -715,9 +726,9 @@ Item {
                                                     radius: Styling.radius(4)
 
                                                     Behavior on color {
-                                                        enabled: Config.animDuration > 0
+                                                        enabled: Anim.animationsEnabled
                                                         ColorAnimation {
-                                                            duration: Config.animDuration
+                                                            duration: Anim.standardNormal
                                                         }
                                                     }
                                                 }
@@ -762,10 +773,11 @@ Item {
                 clip: true
 
                 Behavior on Layout.preferredWidth {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -798,10 +810,11 @@ Item {
                     }
 
                     Behavior on y {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutCubic
+                            duration: Anim.spatialDefault
+                            easing.type: Anim.easing("spatial").type
+                            easing.bezierCurve: Anim.easing("spatial").bezierCurve
                         }
                     }
 
@@ -816,10 +829,11 @@ Item {
                             color: isCritical ? Colors.criticalRed : (index === root.currentIndex ? Styling.srItem("overprimary") : Colors.surfaceBright)
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                                    easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
@@ -827,10 +841,11 @@ Item {
                             scale: index === root.currentIndex ? 1.0 : 0.5
 
                             Behavior on scale {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                                    easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
diff --git a/modules/notch/NotchWindow.qml b/modules/notch/NotchWindow.qml
old mode 100644
new mode 100755
diff --git a/modules/notifications/AGENTS.md b/modules/notifications/AGENTS.md
old mode 100644
new mode 100755
diff --git a/modules/notifications/NotificationActionButtons.qml b/modules/notifications/NotificationActionButtons.qml
old mode 100644
new mode 100755
index 2d64cabf..b894daff
--- a/modules/notifications/NotificationActionButtons.qml
+++ b/modules/notifications/NotificationActionButtons.qml
@@ -47,9 +47,9 @@ Item {
                         radius: Styling.radius(4)
 
                         Behavior on color {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             ColorAnimation {
-                                duration: Config.animDuration
+                                duration: Anim.standardNormal
                             }
                         }
                     }
@@ -72,9 +72,9 @@ Item {
                     elide: Text.ElideRight
 
                     Behavior on color {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         ColorAnimation {
-                            duration: Config.animDuration
+                            duration: Anim.standardNormal
                         }
                     }
                 }
diff --git a/modules/notifications/NotificationAnimation.qml b/modules/notifications/NotificationAnimation.qml
old mode 100644
new mode 100755
index fe7cfc9b..fec92926
--- a/modules/notifications/NotificationAnimation.qml
+++ b/modules/notifications/NotificationAnimation.qml
@@ -1,5 +1,6 @@
 import QtQuick
 import qs.config
+import qs.modules.theme
 
 Item {
     id: root
@@ -22,9 +23,9 @@ Item {
             target: root.targetItem?.anchors
             property: "leftMargin"
             to: root.parentWidth / 8 + root.dismissOvershoot
-            duration: Config.animDuration
-            easing.type: Easing.OutBack
-            easing.overshoot: 1.1
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
         }
 
         NumberAnimation {
@@ -32,8 +33,9 @@ Item {
             property: "scale"
             from: 1.0
             to: 0.8
-            duration: Config.animDuration
-            easing.type: Easing.OutQuad
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("emphasized", "exit").type
+            easing.bezierCurve: Anim.easing("emphasized", "exit").bezierCurve
         }
 
         NumberAnimation {
@@ -41,8 +43,9 @@ Item {
             property: "opacity"
             from: 1.0
             to: 0.0
-            duration: Config.animDuration
-            easing.type: Easing.OutQuad
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("emphasized", "exit").type
+            easing.bezierCurve: Anim.easing("emphasized", "exit").bezierCurve
         }
 
         onFinished: {
diff --git a/modules/notifications/NotificationAppIcon.qml b/modules/notifications/NotificationAppIcon.qml
old mode 100644
new mode 100755
diff --git a/modules/notifications/NotificationDelegate.qml b/modules/notifications/NotificationDelegate.qml
old mode 100644
new mode 100755
index 82848296..8b4447bb
--- a/modules/notifications/NotificationDelegate.qml
+++ b/modules/notifications/NotificationDelegate.qml
@@ -83,10 +83,11 @@ Item {
             visible: root.isValid
 
             Behavior on height {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
@@ -432,9 +433,9 @@ Item {
                                 radius: Styling.radius(4)
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration
+                                        duration: Anim.standardNormal
                                     }
                                 }
                             }
diff --git a/modules/notifications/NotificationDismissButton.qml b/modules/notifications/NotificationDismissButton.qml
old mode 100644
new mode 100755
index 58811a63..745b8b96
--- a/modules/notifications/NotificationDismissButton.qml
+++ b/modules/notifications/NotificationDismissButton.qml
@@ -25,9 +25,9 @@ Button {
             radius: Styling.radius(4)
 
             Behavior on color {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 ColorAnimation {
-                    duration: Config.animDuration
+                    duration: Anim.standardNormal
                 }
             }
         }
diff --git a/modules/notifications/NotificationGroup.qml b/modules/notifications/NotificationGroup.qml
old mode 100644
new mode 100755
index 22701ddd..bfcd42c3
--- a/modules/notifications/NotificationGroup.qml
+++ b/modules/notifications/NotificationGroup.qml
@@ -147,10 +147,11 @@ Item {
         anchors.leftMargin: root.xOffset
 
         Behavior on anchors.leftMargin {
-            enabled: !dragManager.dragging && Config.animDuration > 0
+            enabled: !dragManager.dragging && Anim.animationsEnabled
             NumberAnimation {
                 duration: 300
-                easing.type: Easing.OutCubic
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -158,10 +159,11 @@ Item {
         implicitHeight: expanded ? row.implicitHeight + padding * 2 : Math.max(56 + padding * 2, row.implicitHeight + padding * 2)
 
         Behavior on implicitHeight {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutBack
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
             }
         }
 
@@ -178,10 +180,11 @@ Item {
                 spacing: root.notificationCount === 1 ? 0 : (root.expanded ? 8 : 4)
 
                 Behavior on spacing {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -266,10 +269,11 @@ Item {
                     reuseItems: true
 
                     Behavior on spacing {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
diff --git a/modules/notifications/NotificationGroupExpandButton.qml b/modules/notifications/NotificationGroupExpandButton.qml
old mode 100644
new mode 100755
diff --git a/modules/notifications/NotificationListView.qml b/modules/notifications/NotificationListView.qml
old mode 100644
new mode 100755
index b1b6f000..3e232001
--- a/modules/notifications/NotificationListView.qml
+++ b/modules/notifications/NotificationListView.qml
@@ -11,6 +11,32 @@ ListView {
 
     spacing: 8
 
+    // Organic entry and displacement animations for notifications
+    add: Transition {
+        NumberAnimation {
+            property: "opacity"
+            from: 0; to: 1
+            duration: Anim.emphasizedNormal
+            easing.type: Anim.easing("decelerate").type
+            easing.bezierCurve: Anim.easing("decelerate").bezierCurve
+        }
+        NumberAnimation {
+            property: "scale"
+            from: 0.92; to: 1
+            duration: Anim.emphasizedNormal
+            easing.type: Anim.springSnappy().type
+            easing.bezierCurve: Anim.springSnappy().bezierCurve
+        }
+    }
+    displaced: Transition {
+        NumberAnimation {
+            properties: "y"
+            duration: Anim.standardNormal
+            easing.type: Anim.springSnappy().type
+            easing.bezierCurve: Anim.springSnappy().bezierCurve
+        }
+    }
+
     // Mostrar todas las notificaciones individuales en lugar de grupos
     model: root.popup ? Notifications.popupNotifications : Notifications.notifications
 
diff --git a/modules/notifications/NotificationPopup.qml b/modules/notifications/NotificationPopup.qml
old mode 100644
new mode 100755
diff --git a/modules/notifications/notification_utils.js b/modules/notifications/notification_utils.js
old mode 100644
new mode 100755
diff --git a/modules/services/AGENTS.md b/modules/services/AGENTS.md
old mode 100644
new mode 100755
diff --git a/modules/services/Ai.qml b/modules/services/Ai.qml
old mode 100644
new mode 100755
index 5e540dc2..b5a6a5cd
--- a/modules/services/Ai.qml
+++ b/modules/services/Ai.qml
@@ -102,6 +102,7 @@ Singleton {
     property GroqApiStrategy groqStrategy: GroqApiStrategy {}
     property OllamaApiStrategy ollamaStrategy: OllamaApiStrategy {}
     property MiniMaxApiStrategy minimaxStrategy: MiniMaxApiStrategy {}
+    property DeepSeekApiStrategy deepseekStrategy: DeepSeekApiStrategy {}
 
     property ApiStrategy currentStrategy: openaiStrategy
 
@@ -114,7 +115,7 @@ Singleton {
         case "groq": return groqStrategy;
         case "ollama": return ollamaStrategy;
         case "minimax": return minimaxStrategy;
-        case "custom": return openaiStrategy; // custom endpoints use OpenAI-compatible format by default
+        case "deepseek": return deepseekStrategy;
         default: return openaiStrategy;
         }
     }
@@ -778,6 +779,11 @@ for f in files:
             fetchProcessMiniMax.running = true;
         }
 
+        // DeepSeek — always show models, key can be added later
+        pendingFetches++;
+        fetchProcessDeepSeek.command = ["bash", "-c", "echo 'done'"];
+        fetchProcessDeepSeek.running = true;
+
         if (pendingFetches === 0) {
             fetchingModels = false;
         }
@@ -1047,6 +1053,39 @@ for f in files:
         }
     }
 
+    property Process fetchProcessDeepSeek: Process {
+        running: false
+        stdout: SplitParser {}
+        onExited: exitCode => {
+            if (exitCode === 0) {
+                let newModels = [];
+                
+                let models = [
+                    { name: "DeepSeek-V3", model: "deepseek-chat", description: "Latest DeepSeek model, SOTA reasoning & coding", endpoint: "https://api.deepseek.com" },
+                    { name: "DeepSeek-R1", model: "deepseek-reasoner", description: "DeepSeek reasoning model with chain-of-thought", endpoint: "https://api.deepseek.com" }
+                ];
+                
+                for (let i = 0; i < models.length; i++) {
+                    let item = models[i];
+                    let m = aiModelFactory.createObject(root, {
+                        name: item.name,
+                        icon: Qt.resolvedUrl("../../../assets/aiproviders/deepseek.svg"),
+                        description: item.description,
+                        endpoint: item.endpoint,
+                        model: item.model,
+                        provider: "deepseek",
+                        requires_key: true,
+                        key_id: "DEEPSEEK_API_KEY"
+                    });
+                    if (m) newModels.push(m);
+                }
+                
+                mergeModels(newModels);
+            }
+            checkFetchCompletion();
+        }
+    }
+
 
     function checkFetchCompletion() {
         pendingFetches--;
diff --git a/modules/services/AppSearch.qml b/modules/services/AppSearch.qml
old mode 100644
new mode 100755
index 8829155f..f224489b
--- a/modules/services/AppSearch.qml
+++ b/modules/services/AppSearch.qml
@@ -55,6 +55,12 @@ Singleton {
 
         for (let i = 0; i < list.length; i++) {
             const app = list[i];
+            // Match StartupWMClass — the .desktop field designed exactly for this
+            // (e.g. brave-browser.desktop has StartupWMClass=brave-browser but
+            // Exec=brave and Name=Brave, so the other matches below miss it).
+            if (app.startupClass && app.startupClass.toLowerCase() === normalizedClassName) {
+                return app.icon || "application-x-executable";
+            }
             if (app.command && app.command.length > 0) {
                 const executableLower = app.command[0].toLowerCase();
                 if (executableLower === normalizedClassName) {
@@ -195,7 +201,16 @@ Singleton {
             }
 
             if (safeArgs.length > 0) {
-                runInActiveWorkspace(safeArgs.join(" "));
+                const cmdString = safeArgs.join(" ");
+                // Wrap Terminal=true entries via xdg-terminal-exec (freedesktop default-terminal-spec).
+                // Users must have xdg-terminal-exec installed and ~/.config/xdg-terminals.list configured.
+                const wrapped = app.runInTerminal
+                    ? "xdg-terminal-exec " + cmdString
+                    : cmdString;
+                const p = Qt.createQmlObject('import Quickshell.Io; Process { }', root);
+                // Run in background, detached, from HOME
+                p.command = ["bash", "-c", "cd ~ && setsid " + wrapped + " > /dev/null 2>&1 &"];
+                p.running = true;
                 return;
             }
         }
diff --git a/modules/services/Audio.qml b/modules/services/Audio.qml
old mode 100644
new mode 100755
index 05571624..7e291c26
--- a/modules/services/Audio.qml
+++ b/modules/services/Audio.qml
@@ -49,8 +49,11 @@ Singleton {
     }
 
     // Volume signals for OSD
+    // FIX: Guard enabled to prevent segfault in Qt 6.11 when PipeWire nodes
+    // get destroyed/recreated while QML is finalizing Connections during incubation
     Connections {
         target: root.sink?.audio ?? null
+        enabled: root.sink?.audio !== null
         ignoreUnknownSignals: true
         function onVolumeChanged() {
             if (root.sink?.ready) {
@@ -64,8 +67,11 @@ Singleton {
         }
     }
 
+    // FIX: Guard enabled to prevent segfault in Qt 6.11 when PipeWire nodes
+    // get destroyed/recreated while QML is finalizing Connections during incubation
     Connections {
         target: root.source?.audio ?? null
+        enabled: root.source?.audio !== null
         ignoreUnknownSignals: true
         function onVolumeChanged() {
             if (root.source?.ready) {
diff --git a/modules/services/AxctlService.qml b/modules/services/AxctlService.qml
old mode 100644
new mode 100755
index bade7b38..8f5d0fed
--- a/modules/services/AxctlService.qml
+++ b/modules/services/AxctlService.qml
@@ -26,6 +26,10 @@ Singleton {
     }
 
     signal rawEvent(var event)
+    signal monitorsUpdated()
+    signal subscribeReady()
+    signal subscribeFailed()
+    signal configReloaded()
 
     // Config path for axctl daemon
     property string configPath: (Quickshell.env("XDG_DATA_HOME") || (Quickshell.env("HOME") + "/.local/share")) + "/ambxst/axctl.toml"
@@ -51,23 +55,41 @@ Singleton {
         } else if (action === "focuswindow") {
             cmdArgs = ["window", "focus", getAddr(rawArgs)];
         } else if (action === "movetoworkspacesilent") {
+            // axctl v0.0.19 bug: move-to-workspace-silent returns Success but does nothing.
+            // Direct hyprctl dispatch works, so we bypass axctl entirely.
             let subParts = rawArgs.split(',');
-            cmdArgs = ["window", "move-to-workspace-silent", subParts[0].trim()];
-            if (subParts.length > 1) {
-                cmdArgs.push(getAddr(subParts[1]));
-            }
+            let ws = subParts[0].trim();
+            let addr = subParts.length > 1 ? getAddr(subParts[1]) : "";
+            let hyprProc = Qt.createQmlObject('import Quickshell.Io; Process { stderr: StdioCollector {} }', root);
+            hyprProc.command = ["hyprctl", "dispatch", "movetoworkspacesilent", ws + ",address:" + addr];
+            hyprProc.onExited.connect((code) => {
+                if (code !== 0) {
+                    console.warn("AxctlService hyprctl dispatch error:", hyprProc.command.join(' '), "→", hyprProc.stderr.text);
+                }
+                hyprProc.destroy();
+            });
+            hyprProc.running = true;
+            return;
         } else if (action === "togglespecialworkspace") {
             cmdArgs = ["workspace", "toggle-special"];
             if (rawArgs) cmdArgs.push(rawArgs);
+        } else if (action === "monitor") {
+            // Monitor commands go directly to hyprctl dispatch
+            cmdArgs = ["system", "execute", "hyprctl dispatch " + command];
         } else {
             cmdArgs = ["system", "execute", command];
         }
 
-        let finalCommand = ["axctl"].concat(cmdArgs.filter(x => x !== "" && x !== undefined));
+        let finalCommand = ["axctl", "-c", root.configPath].concat(cmdArgs.filter(x => x !== "" && x !== undefined));
 
-        let proc = Qt.createQmlObject('import Quickshell.Io; Process {}', root);
+        let proc = Qt.createQmlObject('import Quickshell.Io; Process { stderr: StdioCollector {} }', root);
         proc.command = finalCommand;
-        proc.onExited.connect(() => proc.destroy());
+        proc.onExited.connect((code) => {
+            if (code !== 0 && proc.stderr.text) {
+                console.warn("AxctlService dispatch error:", finalCommand.join(' '), "→", proc.stderr.text);
+            }
+            proc.destroy();
+        });
         proc.running = true;
     }
 
@@ -141,6 +163,9 @@ Singleton {
                 height: mon.height,
                 refreshRate: mon.refresh_rate,
                 scale: mon.scale,
+                x: mon.metadata ? parseInt(mon.metadata.x) || 0 : 0,
+                y: mon.metadata ? parseInt(mon.metadata.y) || 0 : 0,
+                transform: mon.metadata ? parseInt(mon.metadata.transform) || 0 : 0,
                 activeWorkspace: { id: parseInt(mon.metadata ? mon.metadata.active_workspace : 0) || 0, name: mon.metadata ? mon.metadata.active_workspace : "" }
             }));
             root.monitors.values = mappedMonitors;
@@ -148,6 +173,7 @@ Singleton {
             if (focused !== root.focusedMonitor) {
                 root.focusedMonitor = focused;
             }
+            root.monitorsUpdated();
         }
     }
 
@@ -177,16 +203,62 @@ Singleton {
         onTriggered: axctlSubscribe.running = true
     }
 
+    // Track subscribe failures to detect daemon death
+    property int _subscribeFailCount: 0
+    property int _subscribeSuccessCount: 0
+    property Timer healthCheckTimer: Timer {
+        interval: 5000
+        repeat: true
+        running: false
+        onTriggered: {
+            // If subscribe has been running a while, reset fail counter
+            if (_subscribeSuccessCount > 0) {
+                _subscribeFailCount = 0;
+            }
+        }
+    }
+
+    // Force-reset the subscribe connection
+    function restartSubscribe() {
+        console.log("AxctlService: Restarting subscribe connection...");
+        reconnectTimer.stop();
+        axctlSubscribe.running = false;
+        Qt.callLater(() => {
+            axctlSubscribe.running = true;
+        });
+    }
+
+    // Health check: if daemon is dead, restart it
+    function ensureDaemonRunning() {
+        if (!axctlProcess.running) {
+            console.warn("AxctlService: Daemon not running, restarting...");
+            axctlProcess.running = true;
+        }
+    }
+
     // Auto-reconnect on unexpected subscribe exit
     Timer {
         id: reconnectTimer
-        interval: 1000
-        onTriggered: axctlSubscribe.running = true
+        interval: 500  // Reduced from 1000ms for faster recovery
+        onTriggered: {
+            // Check daemon health before reconnecting
+            if (!axctlProcess.running) {
+                console.warn("AxctlService: Daemon not running, starting it...");
+                axctlProcess.running = true;
+                Qt.callLater(() => {
+                    // Wait a bit for daemon to start
+                    root.restartSubscribe();
+                });
+            } else {
+                axctlSubscribe.running = true;
+            }
+        }
     }
 
     property Process axctlSubscribe: Process {
         command: ["axctl", "subscribe"]
         running: false
+
         stdout: SplitParser {
             onRead: (data) => {
                 if (!data) return;
@@ -201,14 +273,49 @@ Singleton {
                     // Emit raw event for consumers
                     parsedJson.name = parsedJson.method ? parsedJson.method.split('.').pop().toLowerCase() : "";
                     parsedJson.data = parsedJson.params;
+
+                    // Detect config reload and emit dedicated signal
+                    if (parsedJson.name === "configreloaded") {
+                        console.log("AxctlService: Detected config reload event");
+                        root.configReloaded();
+                    }
+
                     root.rawEvent(parsedJson);
                 } catch (e) {
                     console.error("AxctlService subscribe JSON parse error:", e);
                 }
             }
         }
+
+        // Track process start for health monitoring
+        onStarted: {
+            _subscribeFailCount = 0;
+            _subscribeSuccessCount++;
+            healthCheckTimer.running = true;
+            root.subscribeReady();
+            console.log("AxctlService: Subscribe connected successfully");
+        }
+
         onExited: (code) => {
-            console.warn("axctl subscribe exited:", code);
+            healthCheckTimer.running = false;
+
+            if (code !== 0) {
+                _subscribeFailCount++;
+                console.warn("axctl subscribe exited (code " + code + "), fail #" + _subscribeFailCount);
+
+                // If subscribe keeps dying, daemon is likely dead — restart it
+                if (_subscribeFailCount >= 3) {
+                    console.warn("AxctlService: Subscribe failed 3 times, restarting daemon...");
+                    _subscribeFailCount = 0;
+                    axctlProcess.running = false;
+                    Qt.callLater(() => {
+                        axctlProcess.running = true;
+                    });
+                }
+                root.subscribeFailed();
+            } else {
+                console.log("axctl subscribe exited cleanly");
+            }
             reconnectTimer.restart();
         }
     }
diff --git a/modules/services/Battery.qml b/modules/services/Battery.qml
old mode 100644
new mode 100755
index 320d7433..b2bfd734
--- a/modules/services/Battery.qml
+++ b/modules/services/Battery.qml
@@ -1,6 +1,7 @@
 pragma Singleton
 
 import QtQuick
+import Quickshell.Io
 import Quickshell
 import Quickshell.Services.Notifications
 import Quickshell.Services.UPower
@@ -18,6 +19,10 @@ Singleton {
     readonly property int chargeState: available ? primaryDevice.state : UPowerDevice.Unknown
     property int lastBatteryAlertThreshold: 0
 
+    property Process powerSaveProcess: Process {
+        running: false
+    }
+
     // Add some helpful descriptive properties if needed
     readonly property string timeToEmpty: available && primaryDevice.timeToEmpty > 0 ? formatTime(primaryDevice.timeToEmpty) : ""
     readonly property string timeToFull: available && primaryDevice.timeToFull > 0 ? formatTime(primaryDevice.timeToFull) : ""
@@ -42,13 +47,35 @@ Singleton {
     }
 
     function evaluateBatteryAlert() {
-        if (!available || isPluggedIn) {
+        if (!available) return;
+
+        const cfg = Config.system.batteryNotifications;
+        if (!cfg || !cfg.enabled) return;
+
+        const roundedPercentage = Math.floor(percentage);
+
+        // ── Charge limit suggestion ──
+        if (cfg.chargeLimitEnabled && cfg.chargeLimit > 0 && isPluggedIn) {
+            if (roundedPercentage >= cfg.chargeLimit && lastBatteryAlertThreshold !== cfg.chargeLimit) {
+                sendChargeLimitAlert(roundedPercentage, cfg.chargeLimit);
+                lastBatteryAlertThreshold = cfg.chargeLimit;
+            }
+            return; // Don't fire low battery alerts while charging
+        }
+
+        if (isPluggedIn) {
             lastBatteryAlertThreshold = 0;
             return;
         }
 
-        const roundedPercentage = Math.floor(percentage);
-        const threshold = roundedPercentage <= 10 ? 10 : (roundedPercentage <= 20 ? 20 : 0);
+        // ── Auto power-save ──
+        if (cfg.autoPowerSave && roundedPercentage <= cfg.powerSaveThreshold) {
+            enablePowerSave();
+        }
+
+        // ── Low battery alerts ──
+        const threshold = roundedPercentage <= cfg.criticalThreshold ? cfg.criticalThreshold :
+                         (roundedPercentage <= cfg.lowThreshold ? cfg.lowThreshold : 0);
         if (threshold === 0) {
             lastBatteryAlertThreshold = 0;
             return;
@@ -62,6 +89,26 @@ Singleton {
         lastBatteryAlertThreshold = threshold;
     }
 
+    function enablePowerSave() {
+        if (Quickshell.env("XDG_CURRENT_DESKTOP")?.toLowerCase().includes("hyprland")) {
+            // Lower refresh rate, dim screen, reduce brightness
+            powerSaveProcess.command = ["bash", "-c", "hyprctl keyword misc:vfr 1; hyprctl keyword decoration:dim_inactive true; hyprctl keyword decoration:dim_strength 0.5; brightnessctl set 30% 2>/dev/null || true"];
+            powerSaveProcess.running = true;
+        }
+    }
+
+    function sendChargeLimitAlert(roundedPercentage, limit) {
+        Notifications.notifyInternal({
+            "appName": "Battery",
+            "summary": "Charge limit reached",
+            "body": "Battery at " + roundedPercentage + "%. Unplug to preserve battery health (limit: " + limit + "%).",
+            "urgency": NotificationUrgency.Normal,
+            "historyPriority": 80,
+            "replaceKey": "battery-charge-limit",
+            "expireTimeout": 15000
+        });
+    }
+
     function sendBatteryAlert(threshold, roundedPercentage) {
         const isCritical = threshold <= 10;
         Notifications.notifyInternal({
diff --git a/modules/services/BatteryAlertService.qml b/modules/services/BatteryAlertService.qml
new file mode 100644
index 00000000..34c13d27
--- /dev/null
+++ b/modules/services/BatteryAlertService.qml
@@ -0,0 +1,158 @@
+pragma Singleton
+
+import QtQuick
+import QtMultimedia
+import Quickshell
+import Quickshell.Io
+import qs.config
+
+Singleton {
+    id: root
+
+    readonly property var settings: Config.system && Config.system.batteryNotifications ? Config.system.batteryNotifications : null
+    readonly property bool enabled: settings && settings.enabled !== undefined ? settings.enabled : true
+    readonly property int lowThreshold: settings && settings.lowThreshold !== undefined ? settings.lowThreshold : 20
+    readonly property int criticalThreshold: settings && settings.criticalThreshold !== undefined ? settings.criticalThreshold : 10
+
+    property bool lowNotified: false
+    property bool criticalNotified: false
+
+    function resetNotificationState() {
+        lowNotified = false;
+        criticalNotified = false;
+    }
+
+    function sendNotification(summary, body, urgency) {
+        notificationProcess.running = false;
+        notificationProcess.command = [
+            "notify-send",
+            "-u", urgency,
+            "-i", "battery-caution",
+            summary,
+            body
+        ];
+        notificationProcess.running = true;
+        warningSound.play();
+    }
+
+    function checkBatteryState() {
+        if (!enabled || !Battery.available || SuspendManager.isSuspending) {
+            return;
+        }
+
+        if (Battery.isPluggedIn || Battery.isCharging) {
+            resetNotificationState();
+            return;
+        }
+
+        const low = Math.max(lowThreshold, criticalThreshold);
+        const critical = Math.min(lowThreshold, criticalThreshold);
+        const percentage = Math.round(Battery.percentage);
+        const timeRemaining = Battery.timeToEmpty !== "" ? ` About ${Battery.timeToEmpty} remaining.` : "";
+
+        if (percentage > low) {
+            resetNotificationState();
+            return;
+        }
+
+        if (percentage <= critical) {
+            if (!criticalNotified) {
+                sendNotification(
+                    `Battery critical (${percentage}%)`,
+                    `Plug in your charger now.${timeRemaining}`,
+                    "critical"
+                );
+                criticalNotified = true;
+            }
+            lowNotified = true;
+            return;
+        }
+
+        if (!lowNotified) {
+            sendNotification(
+                `Battery low (${percentage}%)`,
+                `Battery is getting low.${timeRemaining}`,
+                "normal"
+            );
+            lowNotified = true;
+        }
+    }
+
+    Process {
+        id: notificationProcess
+        running: false
+        command: []
+    }
+
+    SoundEffect {
+        id: warningSound
+        source: Quickshell.shellDir + "/assets/sound/polite-warning-tone.wav"
+        volume: 1.0
+    }
+
+    Connections {
+        target: Battery
+        function onPercentageChanged() {
+            root.checkBatteryState();
+        }
+        function onIsPluggedInChanged() {
+            root.checkBatteryState();
+        }
+        function onIsChargingChanged() {
+            root.checkBatteryState();
+        }
+        function onAvailableChanged() {
+            root.checkBatteryState();
+        }
+    }
+
+    Connections {
+        target: root.settings
+        ignoreUnknownSignals: true
+        function onEnabledChanged() {
+            if (!root.enabled) {
+                root.resetNotificationState();
+            } else {
+                root.checkBatteryState();
+            }
+        }
+        function onLowThresholdChanged() {
+            root.resetNotificationState();
+            root.checkBatteryState();
+        }
+        function onCriticalThresholdChanged() {
+            root.resetNotificationState();
+            root.checkBatteryState();
+        }
+    }
+
+    Connections {
+        target: SuspendManager
+        function onWakingUp() {
+            wakeCheckTimer.restart();
+        }
+    }
+
+    Timer {
+        id: startupCheckTimer
+        interval: 5000
+        running: true
+        repeat: false
+        onTriggered: root.checkBatteryState()
+    }
+
+    Timer {
+        id: wakeCheckTimer
+        interval: 3000
+        repeat: false
+        onTriggered: root.checkBatteryState()
+    }
+
+    Timer {
+        id: pollTimer
+        interval: 60000
+        running: true
+        repeat: true
+        onTriggered: root.checkBatteryState()
+    }
+}
diff --git a/modules/services/BluetoothDevice.qml b/modules/services/BluetoothDevice.qml
old mode 100644
new mode 100755
index 8c8055b8..051d0040
--- a/modules/services/BluetoothDevice.qml
+++ b/modules/services/BluetoothDevice.qml
@@ -17,21 +17,20 @@ QtObject {
 
     signal infoUpdated()
 
-    // Connect (auto-trust new devices)
+    readonly property string helperPath: BluetoothService.helperPath
+
     function connect() {
         connecting = true;
         let p;
         if (!trusted) {
-            // Trust first, then connect
-            p = BluetoothService.runAsync(["bluetoothctl", "trust", address]).then(() => {
-                return BluetoothService.runAsync(["bluetoothctl", "connect", address]);
+            p = BluetoothService.runAsync(["python3", helperPath, "trust", address]).then(() => {
+                return BluetoothService.runAsync(["python3", helperPath, "connect", address]);
             });
         } else {
             p = BluetoothService.connectDevice(address);
         }
-
         return p.catch(e => {
-            console.error(`Failed to connect to ${address}: ${e}`);
+            console.warn("BluetoothDevice: connect failed for " + address + ":", e);
         }).finally(() => {
             connecting = false;
             updateInfo();
@@ -39,47 +38,28 @@ QtObject {
     }
 
     function updateInfo() {
-        return BluetoothService.runAsync(["bluetoothctl", "info", address]).then(text => {
+        return BluetoothService.runAsync(["python3", helperPath, "info", address]).then(text => {
             Qt.callLater(() => {
-                const lines = text.split("\n");
-                for (const line of lines) {
-                    const trimmed = line.trim();
-                    if (trimmed.startsWith("Paired:")) {
-                        root.paired = trimmed.includes("yes");
-                    } else if (trimmed.startsWith("Connected:")) {
-                        root.connected = trimmed.includes("yes");
-                        if (root.connected) root.connecting = false;
-                    } else if (trimmed.startsWith("Trusted:")) {
-                        root.trusted = trimmed.includes("yes");
-                    } else if (trimmed.startsWith("Icon:")) {
-                        root.icon = trimmed.split(":")[1]?.trim() || "bluetooth";
-                    } else if (trimmed.startsWith("Battery Percentage:")) {
-                        const match = trimmed.match(/\((\d+)\)/);
-                        if (match) {
-                            root.battery = parseInt(match[1]) || -1;
-                        }
-                    }
+                try {
+                    var info = JSON.parse(text);
+                    root.name = info.name || info.alias || root.name;
+                    root.paired = info.paired || false;
+                    root.connected = info.connected || false;
+                    root.trusted = info.trusted || false;
+                    root.icon = info.icon || "bluetooth";
+                    if (root.connected) root.connecting = false;
+                    root.infoUpdated();
+                } catch (e) {
+                    console.warn("BluetoothDevice: info parse failed for " + address);
                 }
-                root.infoUpdated();
             });
         }).catch(e => {
-            console.error(`Failed to get info for ${address}: ${e}`);
+            console.warn("BluetoothDevice: info failed for " + address + ":", e);
         });
     }
 
-    function disconnect() {
-        BluetoothService.disconnectDevice(address);
-    }
-
-    function pair() {
-        BluetoothService.pairDevice(address);
-    }
-
-    function trust() {
-        BluetoothService.trustDevice(address);
-    }
-
-    function forget() {
-        BluetoothService.removeDevice(address);
-    }
+    function disconnect() { BluetoothService.disconnectDevice(address); }
+    function pair() { BluetoothService.pairDevice(address); }
+    function trust() { BluetoothService.trustDevice(address); }
+    function forget() { BluetoothService.removeDevice(address); }
 }
diff --git a/modules/services/BluetoothService.qml b/modules/services/BluetoothService.qml
old mode 100644
new mode 100755
index de25678a..3f58b371
--- a/modules/services/BluetoothService.qml
+++ b/modules/services/BluetoothService.qml
@@ -146,11 +146,14 @@ Singleton {
         });
     }
 
+    // Helper script path — uses project's scripts directory
+    readonly property string helperPath: Quickshell.shellDir + "/scripts/bluetooth_helper.py"
+
     // Control functions
     function setEnabled(value: bool): void {
         if (SuspendManager.isSuspending) return;
         isUpdating = true;
-        runAsync(["bluetoothctl", "power", value ? "on" : "off"]).then(() => {
+        runAsync(["python3", root.helperPath, "power", value ? "on" : "off"]).then(() => {
             updateStatus();
             if (value) updateDevices();
             isUpdating = false;
@@ -166,24 +169,73 @@ Singleton {
     function startDiscovery(): void {
         if (enabled && !SuspendManager.isSuspending) {
             discovering = true;
-            runAsync(["bluetoothctl", "scan", "on"]).then(() => {
-                scanTimer.restart();
-            }).catch(e => {
-                discovering = false;
-            });
+            // Use interactive scan that captures [NEW] Device events
+            scanProcess.running = true;
+            scanTimer.restart();
         }
     }
 
     function stopDiscovery(): void {
         discovering = false;
-        runAsync(["bluetoothctl", "scan", "off"]).then(() => {
-            scanTimer.stop();
+        if (scanProcess.running) {
+            scanProcess.running = false;
+        }
+        scanTimer.stop();
+        runAsync(["python3", root.helperPath, "scan", "off"]).then(() => {
+            Qt.callLater(() => root.updateDevices());
         }).catch(e => {});
     }
 
+    // Dedicated scan process with interactive bluetoothctl
+    property Process scanProcess: Process {
+        command: ["python3", root.helperPath, "scan", "find", "12"]
+        running: false
+        property string buffer: ""
+        stdout: SplitParser {
+            onRead: data => { scanProcess.buffer += data; }
+        }
+        onExited: exitCode => {
+            root.discovering = false;
+            var text = scanProcess.buffer.trim();
+            scanProcess.buffer = "";
+            if (exitCode === 0 && text) {
+                // Parse discovered devices from scan
+                try {
+                    var devices = JSON.parse(text);
+                    if (Array.isArray(devices) && devices.length > 0) {
+                        // Merge into existing device list
+                        const rDevices = root.devices;
+                        for (var i = 0; i < devices.length; i++) {
+                            var d = devices[i];
+                            var existingArr = Array.from(rDevices);
+                            var existing = existingArr.find(function(ex) { return ex.address === d.address; });
+                            if (existing) {
+                                existing.name = d.name || existing.name;
+                                existing.connected = d.connected || false;
+                            } else {
+                                var newDev = deviceComp.createObject(root, {
+                                    address: d.address,
+                                    name: d.name || d.alias || "Unknown",
+                                    paired: d.paired || false,
+                                    connected: d.connected || false,
+                                    trusted: d.trusted || false,
+                                    icon: d.icon || "bluetooth"
+                                });
+                                rDevices.push(newDev);
+                            }
+                        }
+                        root.updateFriendlyList();
+                    }
+                } catch (e) {
+                    console.warn("BluetoothService: scan parse failed:", e);
+                }
+            }
+        }
+    }
+
     function connectDevice(address: string): void {
         isUpdating = true;
-        runAsync(["bluetoothctl", "connect", address]).then(() => {
+        runAsync(["python3", root.helperPath, "connect", address]).then(() => {
             updateDevices();
             isUpdating = false;
         }).catch(e => {
@@ -193,7 +245,7 @@ Singleton {
 
     function disconnectDevice(address: string): void {
         isUpdating = true;
-        runAsync(["bluetoothctl", "disconnect", address]).then(() => {
+        runAsync(["python3", root.helperPath, "disconnect", address]).then(() => {
             updateDevices();
             isUpdating = false;
         }).catch(e => {
@@ -203,7 +255,7 @@ Singleton {
 
     function pairDevice(address: string): void {
         isUpdating = true;
-        runAsync(["bluetoothctl", "pair", address]).then(() => {
+        runAsync(["python3", root.helperPath, "pair", address]).then(() => {
             updateDevices();
             isUpdating = false;
         }).catch(e => {
@@ -212,12 +264,12 @@ Singleton {
     }
 
     function trustDevice(address: string): void {
-        runAsync(["bluetoothctl", "trust", address]).catch(e => {});
+        runAsync(["python3", root.helperPath, "trust", address]).catch(e => {});
     }
 
     function removeDevice(address: string): void {
         isUpdating = true;
-        runAsync(["bluetoothctl", "remove", address]).then(() => {
+        runAsync(["python3", root.helperPath, "remove", address]).then(() => {
             updateDevices();
             isUpdating = false;
         }).catch(e => {
@@ -263,35 +315,60 @@ Singleton {
     // Processes
     Process {
         id: checkPowerProcess
-        command: ["bash", "-c", "bluetoothctl show | grep 'Powered:' | awk '{print $2}'"]
+        command: ["python3", root.helperPath, "power", "status"]
         running: false
+        property string buffer: ""
         stdout: SplitParser {
-            onRead: (data) => {
-                const output = data ? data.trim() : "";
-                root.enabled = output === "yes";
-                
-                if (root.enabled) {
-                    checkConnectedProcess.running = true;
-                } else {
-                    root.connected = false;
-                    root.connectedDevices = 0;
-                    root.discovering = false;
-                    root.isUpdating = false;
+            onRead: data => { checkPowerProcess.buffer += data; }
+        }
+        onExited: exitCode => {
+            var text = checkPowerProcess.buffer.trim();
+            checkPowerProcess.buffer = "";
+            if (exitCode === 0 && text) {
+                try {
+                    var result = JSON.parse(text);
+                    root.enabled = result.powered === true;
+                } catch (e) {
+                    console.warn("BluetoothService: power parse failed:", e);
+                    root.enabled = false;
                 }
+            } else {
+                root.enabled = false;
+            }
+            if (root.enabled) {
+                checkConnectedProcess.running = true;
+            } else {
+                root.connected = false;
+                root.connectedDevices = 0;
+                root.discovering = false;
+                root.isUpdating = false;
             }
         }
     }
 
     Process {
         id: checkConnectedProcess
-        command: ["bash", "-c", "bluetoothctl devices Connected | wc -l"]
+        command: ["python3", root.helperPath, "devices"]
         running: false
+        property string buffer: ""
         stdout: SplitParser {
-            onRead: (data) => {
-                const output = data ? data.trim() : "0";
-                root.connectedDevices = parseInt(output) || 0;
-                root.connected = root.connectedDevices > 0;
-                root.isUpdating = false;
+            onRead: data => { checkConnectedProcess.buffer += data; }
+        }
+        onExited: exitCode => {
+            root.isUpdating = false;
+            var text = checkConnectedProcess.buffer.trim();
+            checkConnectedProcess.buffer = "";
+            if (exitCode !== 0 || !text) return;
+            try {
+                var devices = JSON.parse(text);
+                var connected = 0;
+                for (var i = 0; i < devices.length; i++) {
+                    if (devices[i].connected) connected++;
+                }
+                root.connectedDevices = connected;
+                root.connected = connected > 0;
+            } catch (e) {
+                console.warn("BluetoothService: connected parse failed:", e);
             }
         }
     }
@@ -302,68 +379,68 @@ Singleton {
 
     Process {
         id: getDevicesProcess
-        command: ["bash", "-c", "bluetoothctl devices"]
+        command: ["python3", root.helperPath, "devices"]
         running: false
         property string buffer: ""
-        environment: ({
-            LANG: "C.UTF-8",
-            LC_ALL: "C.UTF-8"
-        })
         stdout: SplitParser {
-            onRead: data => {
-                getDevicesProcess.buffer += data + "\n";
-            }
+            onRead: data => { getDevicesProcess.buffer += data; }
         }
         onExited: (exitCode, exitStatus) => {
-            const text = getDevicesProcess.buffer;
-            getDevicesProcess.buffer = "";
-            
+            if (exitCode !== 0) {
+                root.updateFriendlyList();
+                return;
+            }
             Qt.callLater(() => {
-                const deviceLines = text.trim().split("\n").filter(l => l.startsWith("Device "));
-                const deviceDataList = [];
-                for (let i = 0; i < deviceLines.length; i++) {
-                    const line = deviceLines[i];
-                    const parts = line.split(" ");
-                    if (parts.length < 2) continue;
-                    deviceDataList.push({
-                        address: parts[1],
-                        name: parts.slice(2).join(" ") || "Unknown"
-                    });
+                var deviceDataList = [];
+                try {
+                    var jsonText = getDevicesProcess.buffer.trim();
+                    getDevicesProcess.buffer = "";
+                    if (jsonText) {
+                        deviceDataList = JSON.parse(jsonText);
+                        if (!Array.isArray(deviceDataList)) deviceDataList = [];
+                    }
+                } catch (e) {
+                    console.warn("BluetoothService: devices parse failed:", e);
+                    getDevicesProcess.buffer = "";
                 }
 
                 const rDevices = root.devices;
                 
-                // 1. Remove gone devices
+                // Remove gone devices
                 for (let i = rDevices.length - 1; i >= 0; i--) {
                     const rd = rDevices[i];
-                    if (!deviceDataList.find(d => d.address === rd.address)) {
+                    if (!deviceDataList.some(function(d) { return d.address === rd.address; })) {
                         rDevices.splice(i, 1);
                         rd.destroy();
                     }
                 }
                 
-                // 2. Add or update devices
+                // Add or update devices (with full info from JSON)
                 for (let i = 0; i < deviceDataList.length; i++) {
                     const data = deviceDataList[i];
-                    const existing = rDevices.find(d => d.address === data.address);
+                    const existingArr = Array.from(rDevices);
+                    const existing = existingArr.find(function(d) { return d.address === data.address; });
                     if (existing) {
-                        if (existing.name !== data.name) {
-                            existing.name = data.name;
-                        }
-                        root.queueInfoUpdate(existing);
+                        existing.name = data.name || data.alias || existing.name;
+                        existing.paired = data.paired || false;
+                        existing.connected = data.connected || false;
+                        existing.trusted = data.trusted || false;
+                        existing.battery = data.battery || -1;
                     } else {
                         const newDevice = deviceComp.createObject(root, {
                             address: data.address,
-                            name: data.name
+                            name: data.name || data.alias || "Unknown",
+                            paired: data.paired || false,
+                            connected: data.connected || false,
+                            trusted: data.trusted || false,
+                            icon: data.icon || "bluetooth",
+                            battery: data.battery || -1
                         });
                         rDevices.push(newDevice);
-                        root.queueInfoUpdate(newDevice);
                     }
                 }
                 
-                if (deviceDataList.length === 0) {
-                    root.updateFriendlyList();
-                }
+                root.updateFriendlyList();
             });
         }
     }
diff --git a/modules/services/Brightness.qml b/modules/services/Brightness.qml
old mode 100644
new mode 100755
diff --git a/modules/services/CaffeineService.qml b/modules/services/CaffeineService.qml
old mode 100644
new mode 100755
diff --git a/modules/services/Calculator.qml b/modules/services/Calculator.qml
new file mode 100644
index 00000000..581f5957
--- /dev/null
+++ b/modules/services/Calculator.qml
@@ -0,0 +1,62 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+/*!
+    Calculator.qml — Math calculation via libqalculate (qalc CLI).
+
+    Evaluates mathematical expressions and returns formatted results.
+
+    Usage:
+        Calculator.evaluate("2 + 2")
+        // result via onResultReady signal
+
+    Requires: libqalculate (provides 'qalc' command)
+*/
+Singleton {
+    id: root
+
+    signal resultReady(string expression, string result)
+    signal error(string expression, string error)
+
+    property bool isAvailable: false
+
+    property Process _checkProcess: Process {
+        command: ["sh", "-c", "command -v qalc"]
+        running: true
+        onExited: (code) => {
+            root.isAvailable = code === 0;
+        }
+    }
+
+    function evaluate(expression) {
+        if (!expression || expression.trim() === "") return;
+        if (!root.isAvailable) {
+            root.error(expression, "qalc not installed");
+            return;
+        }
+
+        calcProcess.command = ["qalc", "-nocolor", "-t", expression];
+        calcProcess.running = true;
+        _pendingExpr = expression;
+    }
+
+    property string _pendingExpr: ""
+
+    property Process calcProcess: Process {
+        running: false
+        stdout: SplitParser {
+            onRead: (data) => {
+                if (data) {
+                    const result = data.trim().replace(/\n/g, " → ");
+                    if (result && result !== root._pendingExpr) {
+                        root.resultReady(root._pendingExpr, result);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/modules/services/ClipboardService.qml b/modules/services/ClipboardService.qml
old mode 100644
new mode 100755
diff --git a/modules/services/CompositorConfig.qml b/modules/services/CompositorConfig.qml
index 86c0a9be..b74375c7 100644
--- a/modules/services/CompositorConfig.qml
+++ b/modules/services/CompositorConfig.qml
@@ -11,6 +11,7 @@ QtObject {
     id: root
 
     property Process compositorProcess: Process {}
+    property string _lastBatchCmd: ""
 
     property var currentAnimationConfig: null
     property Process readAnimationsProcess: Process {
@@ -18,13 +19,13 @@ QtObject {
         stdout: StdioCollector {
             onStreamFinished: {
                 try {
+                    if (!text || text.trim().length === 0) { return; }
                     const parsed = JSON.parse(text);
                     if (Array.isArray(parsed) && parsed.length > 0) {
-                        // axctl config get-animations returns [animations, beziers]
                         currentAnimationConfig = parsed;
                     }
                 } catch (e) {
-                    console.error("CompositorConfig: Error parsing animations:", e);
+                    // Silently ignore - axctl returns non-JSON when no custom animations
                 }
             }
         }
@@ -75,7 +76,7 @@ QtObject {
         applyTimer.restart();
     }
 
-    function applyCompositorConfigInternal() {
+    function applyCompositorConfigInternal(writeFile = true) {
         // Ensure adapters are loaded before applying config.
         if (!Config.loader.loaded) {
             console.log("CompositorConfig: Esperando que se cargue Config...");
@@ -171,14 +172,23 @@ QtObject {
         batchCommand += ` ; keyword general:col.active_border ${activeColorFormatted}`;
         batchCommand += ` ; keyword general:col.inactive_border ${inactiveColorFormatted}`;
         if (GlobalStates.compositorLayout) {
-            batchCommand += ` ; keyword general:layout ${GlobalStates.compositorLayout}`;
+            if (GlobalStates.compositorLayout === "free") {
+                // Free layout: NOT a real hyprland layout
+                // Apply windowrule for new windows
+                batchCommand += ` ; keyword windowrule match:class .*, float on`;
+                // Float all existing windows via external command
+                floatAllProcess.running = true;
+            } else {
+                // Leaving Free layout: re-tile all floating windows
+                tileAllProcess.running = true;
+                // Regular tiling layouts
+                batchCommand += ` ; keyword general:layout ${GlobalStates.compositorLayout}`;
+            }
         }
         batchCommand += ` ; keyword decoration:rounding ${Config.compositorRounding}`;
         batchCommand += ` ; keyword decoration:shadow:enabled ${Config.compositor.shadowEnabled}`;
         batchCommand += ` ; keyword decoration:shadow:range ${Config.compositor.shadowRange}`;
         batchCommand += ` ; keyword decoration:shadow:render_power ${Config.compositor.shadowRenderPower}`;
-        batchCommand += ` ; keyword decoration:shadow:sharp ${Config.compositor.shadowSharp}`;
-        batchCommand += ` ; keyword decoration:shadow:ignore_window ${Config.compositor.shadowIgnoreWindow}`;
         batchCommand += ` ; keyword decoration:shadow:color ${shadowColorFormatted}`;
         batchCommand += ` ; keyword decoration:shadow:color_inactive ${shadowColorInactiveFormatted}`;
         batchCommand += ` ; keyword decoration:shadow:offset ${Config.compositor.shadowOffset}`;
@@ -199,7 +209,137 @@ QtObject {
         batchCommand += ` ; keyword decoration:blur:popups_ignorealpha ${Config.compositor.blurPopupsIgnorealpha}`;
         batchCommand += ` ; keyword decoration:blur:input_methods ${Config.compositor.blurInputMethods}`;
         batchCommand += ` ; keyword decoration:blur:input_methods_ignorealpha ${Config.compositor.blurInputMethodsIgnorealpha}`;
-        batchCommand += ` ; keyword bezier myBezier,0.4,0.0,0.2,1.0`;
+
+        // Opacity
+        batchCommand += ` ; keyword decoration:active_opacity ${Config.compositor.activeOpacity.toFixed(2)}`;
+        batchCommand += ` ; keyword decoration:inactive_opacity ${Config.compositor.inactiveOpacity.toFixed(2)}`;
+        batchCommand += ` ; keyword decoration:fullscreen_opacity ${Config.compositor.fullscreenOpacity.toFixed(2)}`;
+
+        // Dim
+        batchCommand += ` ; keyword decoration:dim_inactive ${Config.compositor.dimInactive}`;
+        batchCommand += ` ; keyword decoration:dim_strength ${Config.compositor.dimStrength.toFixed(2)}`;
+        batchCommand += ` ; keyword decoration:dim_around ${Config.compositor.dimAround.toFixed(2)}`;
+        batchCommand += ` ; keyword decoration:dim_special ${Config.compositor.dimSpecial.toFixed(2)}`;
+
+        // Rounding power
+        batchCommand += ` ; keyword decoration:rounding_power ${Config.compositor.roundingPower.toFixed(1)}`;
+
+        // General extras
+        batchCommand += ` ; keyword general:allow_tearing ${Config.compositor.allowTearing}`;
+        batchCommand += ` ; keyword general:resize_on_border ${Config.compositor.resizeOnBorder}`;
+        batchCommand += ` ; keyword general:extend_border_grab_area ${Config.compositor.extendBorderGrabArea}`;
+        batchCommand += ` ; keyword general:hover_icon_on_border ${Config.compositor.hoverIconOnBorder}`;
+
+        // Snap
+        batchCommand += ` ; keyword general:snap:enabled ${Config.compositor.snapEnabled}`;
+        batchCommand += ` ; keyword general:snap:window_gap ${Config.compositor.snapWindowGap}`;
+        batchCommand += ` ; keyword general:snap:monitor_gap ${Config.compositor.snapMonitorGap}`;
+        batchCommand += ` ; keyword general:snap:border_overlap ${Config.compositor.snapBorderOverlap}`;
+        batchCommand += ` ; keyword general:snap:respect_gaps ${Config.compositor.snapRespectGaps}`;
+
+        // Animations
+        batchCommand += ` ; keyword animations:enabled ${Config.compositor.animationsEnabled}`;
+
+        // Input: Keyboard
+        batchCommand += ` ; keyword input:kb_layout ${Config.compositor.kbLayout}`;
+        if (Config.compositor.kbVariant) batchCommand += ` ; keyword input:kb_variant ${Config.compositor.kbVariant}`;
+        if (Config.compositor.kbOptions) batchCommand += ` ; keyword input:kb_options ${Config.compositor.kbOptions}`;
+        batchCommand += ` ; keyword input:numlock_by_default ${Config.compositor.numlockByDefault}`;
+        batchCommand += ` ; keyword input:repeat_rate ${Config.compositor.repeatRate}`;
+        batchCommand += ` ; keyword input:repeat_delay ${Config.compositor.repeatDelay}`;
+
+        // Input: Mouse
+        batchCommand += ` ; keyword input:sensitivity ${Config.compositor.mouseSensitivity.toFixed(2)}`;
+        if (Config.compositor.mouseAccelProfile) batchCommand += ` ; keyword input:accel_profile ${Config.compositor.mouseAccelProfile}`;
+        batchCommand += ` ; keyword input:follow_mouse ${Config.compositor.followMouse}`;
+        batchCommand += ` ; keyword input:natural_scroll ${Config.compositor.mouseNaturalScroll}`;
+        batchCommand += ` ; keyword input:scroll_factor ${Config.compositor.mouseScrollFactor.toFixed(1)}`;
+        batchCommand += ` ; keyword input:left_handed ${Config.compositor.mouseLeftHanded}`;
+        batchCommand += ` ; keyword input:mouse_refocus ${Config.compositor.mouseRefocus}`;
+        batchCommand += ` ; keyword input:float_switch_override_focus ${Config.compositor.floatSwitchOverrideFocus}`;
+
+        // Input: Touchpad
+        batchCommand += ` ; keyword input:touchpad:disable_while_typing ${Config.compositor.touchpadDisableWhileTyping}`;
+        batchCommand += ` ; keyword input:touchpad:natural_scroll ${Config.compositor.touchpadNaturalScroll}`;
+        batchCommand += ` ; keyword input:touchpad:clickfinger_behavior ${Config.compositor.touchpadClickfingerBehavior}`;
+        if (Config.compositor.touchpadTapButtonMap) batchCommand += ` ; keyword input:touchpad:tap_button_map ${Config.compositor.touchpadTapButtonMap}`;
+        batchCommand += ` ; keyword input:touchpad:middle_button_emulation ${Config.compositor.touchpadMiddleButtonEmulation}`;
+        batchCommand += ` ; keyword input:touchpad:drag_lock ${Config.compositor.touchpadDragLock}`;
+        batchCommand += ` ; keyword input:touchpad:scroll_factor ${Config.compositor.touchpadScrollFactor.toFixed(1)}`;
+
+        // Cursor
+        batchCommand += ` ; keyword cursor:no_hardware_cursors ${Config.compositor.noHardwareCursors}`;
+        batchCommand += ` ; keyword cursor:enable_hyprcursor ${Config.compositor.enableHyprcursor}`;
+        batchCommand += ` ; keyword cursor:no_warps ${Config.compositor.noWarps}`;
+        batchCommand += ` ; keyword cursor:persistent_warps ${Config.compositor.persistentWarps}`;
+        batchCommand += ` ; keyword cursor:warp_on_change_workspace ${Config.compositor.warpOnChangeWorkspace}`;
+        batchCommand += ` ; keyword cursor:zoom_factor ${Config.compositor.cursorZoomFactor.toFixed(1)}`;
+        batchCommand += ` ; keyword cursor:inactive_timeout ${Config.compositor.cursorInactiveTimeout}`;
+        batchCommand += ` ; keyword cursor:hide_on_key_press ${Config.compositor.cursorHideOnKeyPress}`;
+        batchCommand += ` ; keyword cursor:hide_on_touch ${Config.compositor.cursorHideOnTouch}`;
+        batchCommand += ` ; keyword cursor:hide_on_tablet ${Config.compositor.cursorHideOnTablet}`;
+
+        // Gestures
+        batchCommand += ` ; keyword gestures:workspace_swipe_create_new ${Config.compositor.workspaceSwipeCreateNew}`;
+        batchCommand += ` ; keyword gestures:workspace_swipe_forever ${Config.compositor.workspaceSwipeForever}`;
+        batchCommand += ` ; keyword gestures:workspace_swipe_cancel_ratio ${Config.compositor.workspaceSwipeCancelRatio.toFixed(2)}`;
+        batchCommand += ` ; keyword gestures:workspace_swipe_min_speed_to_force ${Config.compositor.workspaceSwipeMinSpeedToForce}`;
+        batchCommand += ` ; keyword gestures:workspace_swipe_direction_lock ${Config.compositor.workspaceSwipeDirectionLock}`;
+        batchCommand += ` ; keyword gestures:workspace_swipe_use_r ${Config.compositor.workspaceSwipeUseR}`;
+        batchCommand += ` ; keyword gestures:workspace_swipe_distance ${Config.compositor.workspaceSwipeDistance}`;
+        batchCommand += ` ; keyword gestures:workspace_swipe_invert ${Config.compositor.workspaceSwipeInvert}`;
+        batchCommand += ` ; keyword gestures:workspace_swipe_touch ${Config.compositor.workspaceSwipeTouch}`;
+        batchCommand += ` ; keyword gestures:workspace_swipe_touch_invert ${Config.compositor.workspaceSwipeTouchInvert}`;
+
+        // Dwindle
+        batchCommand += ` ; keyword dwindle:preserve_split ${Config.compositor.dwindlePreserveSplit}`;
+        batchCommand += ` ; keyword dwindle:pseudotile ${Config.compositor.dwindlePseudotile}`;
+        batchCommand += ` ; keyword dwindle:force_split ${Config.compositor.dwindleForceSplit}`;
+        batchCommand += ` ; keyword dwindle:smart_split ${Config.compositor.dwindleSmartSplit}`;
+        batchCommand += ` ; keyword dwindle:default_split_ratio ${Config.compositor.dwindleDefaultSplitRatio.toFixed(2)}`;
+        batchCommand += ` ; keyword dwindle:split_width_multiplier ${Config.compositor.dwindleSplitWidthMultiplier.toFixed(1)}`;
+        batchCommand += ` ; keyword dwindle:permanent_direction_override ${Config.compositor.dwindlePermanentDirectionOverride}`;
+        batchCommand += ` ; keyword dwindle:use_active_for_splits ${Config.compositor.dwindleUseActiveForSplits}`;
+        batchCommand += ` ; keyword dwindle:smart_resizing ${Config.compositor.dwindleSmartResizing}`;
+        batchCommand += ` ; keyword dwindle:special_scale_factor ${Config.compositor.dwindleSpecialScaleFactor.toFixed(2)}`;
+
+        // Master
+        batchCommand += ` ; keyword master:orientation ${Config.compositor.masterOrientation}`;
+        batchCommand += ` ; keyword master:mfact ${Config.compositor.masterMfact.toFixed(2)}`;
+        batchCommand += ` ; keyword master:new_status ${Config.compositor.masterNewStatus}`;
+        batchCommand += ` ; keyword master:new_on_top ${Config.compositor.masterNewOnTop}`;
+        batchCommand += ` ; keyword master:new_on_active ${Config.compositor.masterNewOnActive}`;
+        batchCommand += ` ; keyword master:smart_resizing ${Config.compositor.masterSmartResizing}`;
+        batchCommand += ` ; keyword master:special_scale_factor ${Config.compositor.masterSpecialScaleFactor.toFixed(2)}`;
+        batchCommand += ` ; keyword master:allow_small_split ${Config.compositor.masterAllowSmallSplit}`;
+
+        // Scrolling
+        batchCommand += ` ; keyword scrolling:column_width ${Config.compositor.scrollingColumnWidth.toFixed(2)}`;
+        if (Config.compositor.scrollingExplicitColumnWidths) batchCommand += ` ; keyword scrolling:explicit_column_widths ${Config.compositor.scrollingExplicitColumnWidths}`;
+        batchCommand += ` ; keyword scrolling:direction ${Config.compositor.scrollingDirection}`;
+        batchCommand += ` ; keyword scrolling:fullscreen_on_one_column ${Config.compositor.scrollingFullscreenOnOneColumn}`;
+        batchCommand += ` ; keyword scrolling:focus_fit_method ${Config.compositor.scrollingFocusFitMethod}`;
+        batchCommand += ` ; keyword scrolling:follow_focus ${Config.compositor.scrollingFollowFocus}`;
+        batchCommand += ` ; keyword scrolling:follow_min_visible ${Config.compositor.scrollingFollowMinVisible.toFixed(2)}`;
+
+        // XWayland
+        batchCommand += ` ; keyword xwayland:enabled ${Config.compositor.xwaylandEnabled}`;
+        batchCommand += ` ; keyword xwayland:force_zero_scaling ${Config.compositor.xwaylandForceZeroScaling}`;
+        batchCommand += ` ; keyword xwayland:use_nearest_neighbor ${Config.compositor.xwaylandUseNearestNeighbor}`;
+
+        // Misc
+        batchCommand += ` ; keyword misc:vrr ${Config.compositor.vrr}`;
+        batchCommand += ` ; keyword misc:mouse_move_enables_dpms ${Config.compositor.mouseMoveEnablesDpms}`;
+        batchCommand += ` ; keyword misc:key_press_enables_dpms ${Config.compositor.keyPressEnablesDpms}`;
+        batchCommand += ` ; keyword misc:disable_autoreload ${Config.compositor.disableAutoreload}`;
+        batchCommand += ` ; keyword misc:focus_on_activate ${Config.compositor.focusOnActivate}`;
+        batchCommand += ` ; keyword misc:animate_manual_resizes ${Config.compositor.animateManualResizes}`;
+        batchCommand += ` ; keyword misc:animate_mouse_windowdragging ${Config.compositor.animateMouseWindowdragging}`;
+        batchCommand += ` ; keyword misc:disable_hyprland_logo ${Config.compositor.disableHyprlandLogo}`;
+        batchCommand += ` ; keyword misc:disable_splash_rendering ${Config.compositor.disableSplashRendering}`;
+        batchCommand += ` ; keyword misc:force_default_wallpaper ${Config.compositor.forceDefaultWallpaper}`;
+
+        // Animations and layer rules
         batchCommand += ` ; keyword animation windows,1,2.5,myBezier,popin 80%`;
         batchCommand += ` ; keyword animation border,1,2.5,myBezier`;
         batchCommand += ` ; keyword animation fade,1,2.5,myBezier`;
@@ -208,8 +348,15 @@ QtObject {
 
         console.log(`CompositorConfig: Applying ignorealpha: ${ignoreAlphaValue}, explicit: ${Config.compositor.blurExplicitIgnoreAlpha}`);
         batchCommand += ` ; keyword layerrule noanim,quickshell ; keyword layerrule blur,quickshell ; keyword layerrule blurpopups,quickshell ; keyword layerrule ignorealpha ${ignoreAlphaValue},quickshell`;
-        console.log("CompositorConfig: Refreshing TOML via CompositorTomlWriter");
-        CompositorTomlWriter.refresh();
+        console.log("CompositorConfig: Applying compositor batch command:", batchCommand);
+        root._lastBatchCmd = batchCommand;
+        compositorProcess.command = ["axctl", "config", "raw-batch", batchCommand];
+        compositorProcess.running = true;
+
+        // Also write to hyprland.conf for persistence
+        if (writeFile) {
+            root.writeConfigToFile(batchCommand);
+        }
     }
 
     property Connections configConnections: Connections {
@@ -348,6 +495,134 @@ QtObject {
         function onBlurInputMethodsIgnorealphaChanged() {
             applyCompositorConfig();
         }
+
+        // Opacity & Dim
+        function onActiveOpacityChanged() { applyCompositorConfig(); }
+        function onInactiveOpacityChanged() { applyCompositorConfig(); }
+        function onFullscreenOpacityChanged() { applyCompositorConfig(); }
+        function onDimInactiveChanged() { applyCompositorConfig(); }
+        function onDimStrengthChanged() { applyCompositorConfig(); }
+        function onDimAroundChanged() { applyCompositorConfig(); }
+        function onDimSpecialChanged() { applyCompositorConfig(); }
+        function onRoundingPowerChanged() { applyCompositorConfig(); }
+
+        // General extras
+        function onAllowTearingChanged() { applyCompositorConfig(); }
+        function onResizeOnBorderChanged() { applyCompositorConfig(); }
+        function onExtendBorderGrabAreaChanged() { applyCompositorConfig(); }
+        function onHoverIconOnBorderChanged() { applyCompositorConfig(); }
+
+        // Snap
+        function onSnapEnabledChanged() { applyCompositorConfig(); }
+        function onSnapWindowGapChanged() { applyCompositorConfig(); }
+        function onSnapMonitorGapChanged() { applyCompositorConfig(); }
+        function onSnapBorderOverlapChanged() { applyCompositorConfig(); }
+        function onSnapRespectGapsChanged() { applyCompositorConfig(); }
+
+        // Animations
+        function onAnimationsEnabledChanged() { applyCompositorConfig(); }
+
+        // Input: Keyboard
+        function onKbLayoutChanged() { applyCompositorConfig(); }
+        function onKbVariantChanged() { applyCompositorConfig(); }
+        function onKbOptionsChanged() { applyCompositorConfig(); }
+        function onNumlockByDefaultChanged() { applyCompositorConfig(); }
+        function onRepeatRateChanged() { applyCompositorConfig(); }
+        function onRepeatDelayChanged() { applyCompositorConfig(); }
+
+        // Input: Mouse
+        function onMouseSensitivityChanged() { applyCompositorConfig(); }
+        function onMouseAccelProfileChanged() { applyCompositorConfig(); }
+        function onFollowMouseChanged() { applyCompositorConfig(); }
+        function onMouseNaturalScrollChanged() { applyCompositorConfig(); }
+        function onMouseScrollFactorChanged() { applyCompositorConfig(); }
+        function onMouseLeftHandedChanged() { applyCompositorConfig(); }
+        function onMouseRefocusChanged() { applyCompositorConfig(); }
+        function onFloatSwitchOverrideFocusChanged() { applyCompositorConfig(); }
+
+        // Input: Touchpad
+        function onTouchpadDisableWhileTypingChanged() { applyCompositorConfig(); }
+        function onTouchpadNaturalScrollChanged() { applyCompositorConfig(); }
+        function onTouchpadTapToClickChanged() { applyCompositorConfig(); }
+        function onTouchpadClickfingerBehaviorChanged() { applyCompositorConfig(); }
+        function onTouchpadTapButtonMapChanged() { applyCompositorConfig(); }
+        function onTouchpadMiddleButtonEmulationChanged() { applyCompositorConfig(); }
+        function onTouchpadDragLockChanged() { applyCompositorConfig(); }
+        function onTouchpadScrollFactorChanged() { applyCompositorConfig(); }
+
+        // Cursor
+        function onNoHardwareCursorsChanged() { applyCompositorConfig(); }
+        function onEnableHyprcursorChanged() { applyCompositorConfig(); }
+        function onNoWarpsChanged() { applyCompositorConfig(); }
+        function onPersistentWarpsChanged() { applyCompositorConfig(); }
+        function onWarpOnChangeWorkspaceChanged() { applyCompositorConfig(); }
+        function onCursorZoomFactorChanged() { applyCompositorConfig(); }
+        function onCursorInactiveTimeoutChanged() { applyCompositorConfig(); }
+        function onCursorHideOnKeyPressChanged() { applyCompositorConfig(); }
+        function onCursorHideOnTouchChanged() { applyCompositorConfig(); }
+        function onCursorHideOnTabletChanged() { applyCompositorConfig(); }
+
+        // Gestures
+        function onWorkspaceSwipeCreateNewChanged() { applyCompositorConfig(); }
+        function onWorkspaceSwipeForeverChanged() { applyCompositorConfig(); }
+        function onWorkspaceSwipeCancelRatioChanged() { applyCompositorConfig(); }
+        function onWorkspaceSwipeMinSpeedToForceChanged() { applyCompositorConfig(); }
+        function onWorkspaceSwipeDirectionLockChanged() { applyCompositorConfig(); }
+        function onWorkspaceSwipeUseRChanged() { applyCompositorConfig(); }
+        function onWorkspaceSwipeDistanceChanged() { applyCompositorConfig(); }
+        function onWorkspaceSwipeInvertChanged() { applyCompositorConfig(); }
+        function onWorkspaceSwipeTouchChanged() { applyCompositorConfig(); }
+        function onWorkspaceSwipeTouchInvertChanged() { applyCompositorConfig(); }
+
+        // Dwindle
+        function onDwindlePreserveSplitChanged() { applyCompositorConfig(); }
+        function onDwindlePseudotileChanged() { applyCompositorConfig(); }
+        function onDwindleForceSplitChanged() { applyCompositorConfig(); }
+        function onDwindleSmartSplitChanged() { applyCompositorConfig(); }
+        function onDwindleDefaultSplitRatioChanged() { applyCompositorConfig(); }
+        function onDwindleSplitWidthMultiplierChanged() { applyCompositorConfig(); }
+        function onDwindlePermanentDirectionOverrideChanged() { applyCompositorConfig(); }
+        function onDwindleUseActiveForSplitsChanged() { applyCompositorConfig(); }
+        function onDwindleSmartResizingChanged() { applyCompositorConfig(); }
+        function onDwindleSpecialScaleFactorChanged() { applyCompositorConfig(); }
+
+        // Master
+        function onMasterOrientationChanged() { applyCompositorConfig(); }
+        function onMasterMfactChanged() { applyCompositorConfig(); }
+        function onMasterNewStatusChanged() { applyCompositorConfig(); }
+        function onMasterNewOnTopChanged() { applyCompositorConfig(); }
+        function onMasterNewOnActiveChanged() { applyCompositorConfig(); }
+        function onMasterSmartResizingChanged() { applyCompositorConfig(); }
+        function onMasterSpecialScaleFactorChanged() { applyCompositorConfig(); }
+        function onMasterAllowSmallSplitChanged() { applyCompositorConfig(); }
+
+        // Scrolling
+        function onScrollingColumnWidthChanged() { applyCompositorConfig(); }
+        function onScrollingExplicitColumnWidthsChanged() { applyCompositorConfig(); }
+        function onScrollingDirectionChanged() { applyCompositorConfig(); }
+        function onScrollingFullscreenOnOneColumnChanged() { applyCompositorConfig(); }
+        function onScrollingFocusFitMethodChanged() { applyCompositorConfig(); }
+        function onScrollingFollowFocusChanged() { applyCompositorConfig(); }
+        function onScrollingFollowMinVisibleChanged() { applyCompositorConfig(); }
+
+        // XWayland
+        function onXwaylandEnabledChanged() { applyCompositorConfig(); }
+        function onXwaylandForceZeroScalingChanged() { applyCompositorConfig(); }
+        function onXwaylandUseNearestNeighborChanged() { applyCompositorConfig(); }
+
+        // Misc
+        function onVrrChanged() { applyCompositorConfig(); }
+        function onVfrChanged() { applyCompositorConfig(); }
+        function onMouseMoveEnablesDpmsChanged() { applyCompositorConfig(); }
+        function onKeyPressEnablesDpmsChanged() { applyCompositorConfig(); }
+        function onDisableAutoreloadChanged() { applyCompositorConfig(); }
+        function onFocusOnActivateChanged() { applyCompositorConfig(); }
+        function onAnimateManualResizesChanged() { applyCompositorConfig(); }
+        function onAnimateMouseWindowdraggingChanged() { applyCompositorConfig(); }
+        function onDisableHyprlandLogoChanged() { applyCompositorConfig(); }
+        function onDisableSplashRenderingChanged() { applyCompositorConfig(); }
+        function onForceDefaultWallpaperChanged() { applyCompositorConfig(); }
+        function onNoUpdateNewsChanged() { applyCompositorConfig(); }
     }
 
     property Connections colorsConnections: Connections {
@@ -393,6 +668,107 @@ QtObject {
         }
     }
 
+    // Write config to hyprland.conf — reads values directly from Config.compositor
+    // No dependency on batchCommand, always gets current values
+        function writeConfigToFile(batchCmd) {
+        // Call the Python sync script which reads compositor.json directly
+        const scriptPath = Quickshell.env("HOME") + "/Documentos/GitHub/Ambxst/scripts/sync-hyprland-conf.py";
+        syncProcess.command = ["python3", scriptPath];
+        syncProcess.running = true;
+    }
+
+    property Process syncProcess: Process {
+        id: syncProcess
+        running: false
+        onExited: (code) => {
+            if (code === 0) {
+                console.log("Config written to hyprland.conf/lua via sync script");
+                // Reload axctl daemon so it picks up the new config
+                reloadProcess.command = ["axctl", "reload"];
+                reloadProcess.running = true;
+            } else {
+                console.error("sync-hyprland-conf.py failed, code:", code);
+            }
+        }
+    }
+
+    property Process reloadProcess: Process {
+        id: reloadProcess
+        running: false
+    }
+
+    property Process writeConfProcess: Process {
+        id: writeConfProcess
+        running: false
+        onExited: (code) => {
+            if (code === 0) {
+                console.log("Config written to hyprland.conf (auto-reload handles reload)");
+            } else {
+                console.error("Failed to write hyprland.conf, code:", code);
+            }
+        }
+    }
+
+    // Float all existing windows when switching to Free layout
+    property Process floatAllProcess: Process {
+        command: ["bash", "-c", "hyprctl -j clients | python3 -c 'import json,sys; cs=json.load(sys.stdin); [print(c[\"address\"]) for c in cs if not c[\"floating\"]]' | while read addr; do hyprctl dispatch togglefloating address:$addr; done"]
+        running: false
+        onExited: (code) => {
+            console.log("FloatAllProcess exited with code:", code);
+        }
+    }
+
+    // Tile all floating windows when leaving Free layout
+    property Process tileAllProcess: Process {
+        command: ["bash", "-c", "hyprctl -j clients | python3 -c 'import json,sys; cs=json.load(sys.stdin); [print(c[\"address\"]) for c in cs if c[\"floating\"]]' | while read addr; do hyprctl dispatch togglefloating address:$addr; done"]
+        running: false
+        onExited: (code) => {
+            console.log("TileAllProcess exited with code:", code);
+        }
+    }
+
+    // Force re-apply when Config.compositor adapter becomes available
+    // Also reassign the connections target (QML Connections may not rebind target)
+    property QtObject compWatch: Config.compositor
+    onCompWatchChanged: {
+        if (root.compWatch) {
+            root.applyCompositorConfig();
+        }
+        // Re-assign Connections target in case it was null during init
+        Qt.callLater(() => {
+            if (root.compWatch && !root.compositorConfigConnections.target) {
+                root.compositorConfigConnections.target = root.compWatch;
+            }
+        });
+    }
+
+    // Removed globalStateConnections - it was redundant.
+    // Every Config.compositor property already has its own handler
+    // (above in compositorConfigConnections) that calls applyCompositorConfig().
+    // That covers: dispatch + writeConfig + reload.
+    // This ADDITIONAL connection caused double dispatch, double file write,
+    // and double axctl reload on every property change.
+
+    // Re-apply settings when Hyprland config is reloaded (user edits hyprland.conf)
+    property Connections axctlConnections: Connections {
+        target: AxctlService
+        function onRawEvent(event) {
+            if (event && event.name === "configreloaded") {
+                console.log("CompositorConfig: Hyprland config reloaded, reapplying settings...");
+                applyCompositorConfigInternal(false);  // Don't write file (already correct)
+            }
+        }
+
+        function onConfigReloaded() {
+            console.log("CompositorConfig: Config reloaded signal, reapplying settings...");
+            applyCompositorConfigInternal(false);
+        }
+
+        function onSubscribeReady() {
+            console.log("CompositorConfig: Subscribe reconnected, reapplying settings...");
+            applyCompositorConfig();
+        }
+    }
 
     Component.onCompleted: {
         // Apply immediately if Config is already loaded.
diff --git a/modules/services/CompositorKeybinds.qml b/modules/services/CompositorKeybinds.qml
old mode 100644
new mode 100755
index c7c129ae..81217607
--- a/modules/services/CompositorKeybinds.qml
+++ b/modules/services/CompositorKeybinds.qml
@@ -9,7 +9,7 @@ QtObject {
 
     property Process compositorProcess: Process {}
 
-    property var previousAmbxstBinds: ({})
+    property var previousNothinglessBinds: ({})
     property var previousCustomBinds: []
     property bool hasPreviousBinds: false
 
@@ -48,7 +48,7 @@ QtObject {
         const ambxst = Config.keybindsLoader.adapter.ambxst;
 
         // Store ambxst core keybinds
-        previousAmbxstBinds = {
+        previousNothinglessBinds = {
             ambxst: {
                 launcher: cloneKeybind(ambxst.launcher),
                 dashboard: cloneKeybind(ambxst.dashboard),
@@ -163,29 +163,29 @@ QtObject {
         // First, unbind previous keybinds if we have them stored
         if (hasPreviousBinds) {
             // Unbind previous ambxst core keybinds
-            if (previousAmbxstBinds.ambxst) {
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.ambxst.launcher));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.ambxst.dashboard));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.ambxst.assistant));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.ambxst.clipboard));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.ambxst.emoji));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.ambxst.notes));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.ambxst.tmux));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.ambxst.wallpapers));
+            if (previousNothinglessBinds.ambxst) {
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.ambxst.launcher));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.ambxst.dashboard));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.ambxst.assistant));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.ambxst.clipboard));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.ambxst.emoji));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.ambxst.notes));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.ambxst.tmux));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.ambxst.wallpapers));
             }
 
             // Unbind previous ambxst system keybinds
-            if (previousAmbxstBinds.system) {
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.system.overview));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.system.powermenu));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.system.config));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.system.lockscreen));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.system.tools));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.system.screenshot));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.system.screenrecord));
-                payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.system.lens));
-                if (previousAmbxstBinds.system.reload) payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.system.reload));
-                if (previousAmbxstBinds.system.quit) payload.unbinds.push(makeUnbindTarget(previousAmbxstBinds.system.quit));
+            if (previousNothinglessBinds.system) {
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.system.overview));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.system.powermenu));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.system.config));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.system.lockscreen));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.system.tools));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.system.screenshot));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.system.screenrecord));
+                payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.system.lens));
+                if (previousNothinglessBinds.system.reload) payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.system.reload));
+                if (previousNothinglessBinds.system.quit) payload.unbinds.push(makeUnbindTarget(previousNothinglessBinds.system.quit));
             }
 
             // Unbind previous custom keybinds
@@ -234,9 +234,10 @@ QtObject {
         payload.unbinds.push(makeUnbindTarget(system.lens));
         if (system.reload) payload.unbinds.push(makeUnbindTarget(system.reload));
         if (system.quit) payload.unbinds.push(makeUnbindTarget(system.quit));
+        if (system["toggle-metrics"]) payload.unbinds.push(makeUnbindTarget(system["toggle-metrics"]));
 
         // Bind current system keybinds
-        [system.overview, system.powermenu, system.config, system.lockscreen, system.tools, system.screenshot, system.screenrecord, system.lens, system.reload, system.quit].forEach(bind => {
+        [system.overview, system.powermenu, system.config, system.lockscreen, system.tools, system.screenshot, system.screenrecord, system.lens, system.reload, system.quit, system["toggle-metrics"]].forEach(bind => {
             if (!bind) return;
             const resolved = makeBindFromCore(bind);
             if (resolved) payload.binds.push(resolved);
@@ -315,15 +316,34 @@ QtObject {
         }
     }
 
-    // property Connections compositorConnections: Connections {
-    //     target: AxctlService
-    //     function onRawEvent(event) {
-    //         if (event.name === "configreloaded") {
-    //             console.log("CompositorKeybinds: Detectado configreloaded, reaplicando keybindings...");
-    //             applyKeybinds();
-    //         }
-    //     }
-    // }
+    // Handle config reloads — from AxctlService rawEvent or dedicated signal
+    property Connections compositorConnections: Connections {
+        target: AxctlService
+        function onRawEvent(event) {
+            if (event && event.name === "configreloaded") {
+                console.log("CompositorKeybinds: Hyprland config reloaded, reapplying keybinds...");
+                applyKeybindsInternal();  // Direct — no 100ms timer delay
+            }
+        }
+    }
+
+    // Also react to dedicated configReloaded signal (fired by AxctlService on subscribe re-connect too)
+    property Connections axctlConnections: Connections {
+        target: AxctlService
+        function onConfigReloaded() {
+            console.log("CompositorKeybinds: Config reloaded signal, reapplying keybinds...");
+            applyKeybinds();
+        }
+    }
+
+    // When subscribe reconnects after a failure, re-apply everything
+    property Connections subscribeConnections: Connections {
+        target: AxctlService
+        function onSubscribeReady() {
+            console.log("CompositorKeybinds: Subscribe reconnected, reapplying keybinds...");
+            applyKeybinds();
+        }
+    }
 
     Component.onCompleted: {
         // Apply immediately if loader is ready.
diff --git a/modules/services/CompositorTomlWriter.qml b/modules/services/CompositorTomlWriter.qml
old mode 100644
new mode 100755
index 0d2a18b3..69092647
--- a/modules/services/CompositorTomlWriter.qml
+++ b/modules/services/CompositorTomlWriter.qml
@@ -221,33 +221,85 @@ Singleton {
         }
 
         toml += `rounding = ${Config.compositorRounding}\n`;
+        toml += `rounding_power = ${Config.compositor.roundingPower.toFixed(1)}\n`;
 
-        // Opacity - placeholder (not synced in current implementation)
+        // Opacity
         toml += "[appearance.opacity]\n";
-        toml += "active = 1.0\n";
-        toml += "inactive = 1.0\n";
+        toml += `active = ${Config.compositor.activeOpacity.toFixed(2)}\n`;
+        toml += `inactive = ${Config.compositor.inactiveOpacity.toFixed(2)}\n`;
+        toml += `fullscreen = ${Config.compositor.fullscreenOpacity.toFixed(2)}\n`;
+
+        // Dim
+        toml += "[appearance.dim]\n";
+        toml += `enabled = ${Config.compositor.dimInactive}\n`;
+        toml += `strength = ${Config.compositor.dimStrength.toFixed(2)}\n`;
+        toml += `around = ${Config.compositor.dimAround.toFixed(2)}\n`;
+        toml += `special = ${Config.compositor.dimSpecial.toFixed(2)}\n`;
 
         // Blur - all settings
         toml += "[appearance.blur]\n";
         toml += `enabled = ${Config.compositor.blurEnabled}\n`;
         toml += `size = ${Config.compositor.blurSize}\n`;
         toml += `passes = ${Config.compositor.blurPasses}\n`;
+        toml += `ignore_opacity = ${Config.compositor.blurIgnoreOpacity}\n`;
+        toml += `new_optimizations = ${Config.compositor.blurNewOptimizations}\n`;
+        toml += `xray = ${Config.compositor.blurXray}\n`;
+        toml += `noise = ${Config.compositor.blurNoise.toFixed(3)}\n`;
+        toml += `contrast = ${Config.compositor.blurContrast.toFixed(2)}\n`;
+        toml += `brightness = ${Config.compositor.blurBrightness.toFixed(2)}\n`;
+        toml += `vibrancy = ${Config.compositor.blurVibrancy.toFixed(2)}\n`;
+        toml += `vibrancy_darkness = ${Config.compositor.blurVibrancyDarkness.toFixed(2)}\n`;
+        toml += `special = ${Config.compositor.blurSpecial}\n`;
+        toml += `popups = ${Config.compositor.blurPopups}\n`;
 
         // Shadow - all settings
         toml += "[appearance.shadow]\n";
         toml += `enabled = ${Config.compositor.shadowEnabled}\n`;
-        toml += `size = ${Config.compositor.shadowRange}\n`;
+        toml += `range = ${Config.compositor.shadowRange}\n`;
+        toml += `render_power = ${Config.compositor.shadowRenderPower}\n`;
+        toml += `sharp = ${Config.compositor.shadowSharp}\n`;
+        toml += `ignore_window = ${Config.compositor.shadowIgnoreWindow}\n`;
+        toml += `offset = "${Config.compositor.shadowOffset}"\n`;
+        toml += `scale = ${Config.compositor.shadowScale.toFixed(2)}\n`;
         const shadowColorFormatted = formatShadowColors(Config.compositorShadowColor, Config.compositorShadowOpacity);
         toml += `color = "${shadowColorFormatted}"\n`;
+        const inactiveShadowColorFormatted = formatShadowColors(Config.compositor.shadowColorInactive, Config.compositorShadowOpacity);
+        toml += `color_inactive = "${inactiveShadowColorFormatted}"\n`;
 
         // Animations
         toml += "[appearance.animations]\n";
-        toml += "enabled = true\n";
+        toml += `enabled = ${Config.compositor.animationsEnabled}\n`;
 
-        // Layout (if set)
+        // General
+        toml += "\n[general]\n";
         if (GlobalStates.compositorLayout && GlobalStates.compositorLayout.length > 0) {
-            toml += "\n[general]\n";
-            toml += `layout = "${GlobalStates.compositorLayout}"\n`;
+            if (GlobalStates.compositorLayout !== "free") {
+                toml += `layout = "${GlobalStates.compositorLayout}"\n`;
+            }
+        }
+        toml += `allow_tearing = ${Config.compositor.allowTearing}\n`;
+        toml += `resize_on_border = ${Config.compositor.resizeOnBorder}\n`;
+        toml += `extend_border_grab_area = ${Config.compositor.extendBorderGrabArea}\n`;
+        toml += `hover_icon_on_border = ${Config.compositor.hoverIconOnBorder}\n`;
+
+        // Snap
+        toml += "\n[general.snap]\n";
+        toml += `enabled = ${Config.compositor.snapEnabled}\n`;
+        toml += `window_gap = ${Config.compositor.snapWindowGap}\n`;
+        toml += `monitor_gap = ${Config.compositor.snapMonitorGap}\n`;
+        toml += `border_overlap = ${Config.compositor.snapBorderOverlap}\n`;
+        toml += `respect_gaps = ${Config.compositor.snapRespectGaps}\n`;
+
+        // Free Layout (only when active)
+        if (GlobalStates.compositorLayout === "free") {
+            toml += "\n[general.free]\n";
+            toml += `grid_size = ${Config.compositor.freeGridSize}\n`;
+            toml += `snap_sensitivity = ${Config.compositor.freeSnapSensitivity}\n`;
+            toml += `snap_edges = ${Config.compositor.freeSnapEdges}\n`;
+            toml += `snap_center = ${Config.compositor.freeSnapCenter}\n`;
+            toml += `snap_gaps = ${Config.compositor.freeSnapGaps}\n`;
+            toml += `tile_by_default = ${Config.compositor.freeTileByDefault}\n`;
+            toml += `maximized_by_default = ${Config.compositor.freeMaximizedByDefault}\n`;
         }
 
         // Keybinds
@@ -291,6 +343,7 @@ Singleton {
                     pushCoreBind(ambxst.system.lens);
                     if (ambxst.system.reload) pushCoreBind(ambxst.system.reload);
                     if (ambxst.system.quit) pushCoreBind(ambxst.system.quit);
+                    if (ambxst.system && ambxst.system["toggle-metrics"]) pushCoreBind(ambxst.system["toggle-metrics"]);
                 }
             }
 
@@ -388,28 +441,172 @@ Singleton {
 
 
 
-        // Input section (placeholder for keyboard layout)
+        // Input section
         toml += "\n[input]\n";
         toml += "[input.keyboard]\n";
-        toml += 'layouts = ""\n';
-        toml += 'variants = ""\n';
+        toml += `layout = "${Config.compositor.kbLayout}"\n`;
+        if (Config.compositor.kbVariant) {
+            toml += `variant = "${Config.compositor.kbVariant}"\n`;
+        }
+        if (Config.compositor.kbOptions) {
+            toml += `options = "${Config.compositor.kbOptions}"\n`;
+        }
+        toml += `numlock_by_default = ${Config.compositor.numlockByDefault}\n`;
+        toml += `repeat_rate = ${Config.compositor.repeatRate}\n`;
+        toml += `repeat_delay = ${Config.compositor.repeatDelay}\n`;
+
+        toml += "\n[input.mouse]\n";
+        toml += `sensitivity = ${Config.compositor.mouseSensitivity.toFixed(2)}\n`;
+        if (Config.compositor.mouseAccelProfile) {
+            toml += `accel_profile = "${Config.compositor.mouseAccelProfile}"\n`;
+        }
+        toml += `follow_mouse = ${Config.compositor.followMouse}\n`;
+        toml += `natural_scroll = ${Config.compositor.mouseNaturalScroll}\n`;
+        toml += `scroll_factor = ${Config.compositor.mouseScrollFactor.toFixed(1)}\n`;
+        toml += `left_handed = ${Config.compositor.mouseLeftHanded}\n`;
+        toml += `mouse_refocus = ${Config.compositor.mouseRefocus}\n`;
+        toml += `float_switch_override_focus = ${Config.compositor.floatSwitchOverrideFocus}\n`;
+
+        toml += "\n[input.touchpad]\n";
+        toml += `disable_while_typing = ${Config.compositor.touchpadDisableWhileTyping}\n`;
+        toml += `natural_scroll = ${Config.compositor.touchpadNaturalScroll}\n`;
+        toml += `tap_to_click = ${Config.compositor.touchpadTapToClick}\n`;
+        toml += `clickfinger_behavior = ${Config.compositor.touchpadClickfingerBehavior}\n`;
+        if (Config.compositor.touchpadTapButtonMap) {
+            toml += `tap_button_map = "${Config.compositor.touchpadTapButtonMap}"\n`;
+        }
+        toml += `middle_button_emulation = ${Config.compositor.touchpadMiddleButtonEmulation}\n`;
+        toml += `drag_lock = ${Config.compositor.touchpadDragLock}\n`;
+        toml += `scroll_factor = ${Config.compositor.touchpadScrollFactor.toFixed(1)}\n`;
+
+        // Cursor
+        toml += "\n[cursor]\n";
+        toml += `no_hardware_cursors = ${Config.compositor.noHardwareCursors}\n`;
+        toml += `enable_hyprcursor = ${Config.compositor.enableHyprcursor}\n`;
+        toml += `no_warps = ${Config.compositor.noWarps}\n`;
+        toml += `persistent_warps = ${Config.compositor.persistentWarps}\n`;
+        toml += `warp_on_change_workspace = ${Config.compositor.warpOnChangeWorkspace}\n`;
+        toml += `zoom_factor = ${Config.compositor.cursorZoomFactor.toFixed(1)}\n`;
+        toml += `inactive_timeout = ${Config.compositor.cursorInactiveTimeout}\n`;
+        toml += `hide_on_key_press = ${Config.compositor.cursorHideOnKeyPress}\n`;
+        toml += `hide_on_touch = ${Config.compositor.cursorHideOnTouch}\n`;
+        toml += `hide_on_tablet = ${Config.compositor.cursorHideOnTablet}\n`;
+
+        // Gestures
+        toml += "\n[gestures]\n";
+        toml += "[gestures.workspace_swipe]\n";
+        toml += `create_new = ${Config.compositor.workspaceSwipeCreateNew}\n`;
+        toml += `forever = ${Config.compositor.workspaceSwipeForever}\n`;
+        toml += `cancel_ratio = ${Config.compositor.workspaceSwipeCancelRatio.toFixed(2)}\n`;
+        toml += `min_speed_to_force = ${Config.compositor.workspaceSwipeMinSpeedToForce}\n`;
+        toml += `direction_lock = ${Config.compositor.workspaceSwipeDirectionLock}\n`;
+        toml += `use_r = ${Config.compositor.workspaceSwipeUseR}\n`;
+        toml += `distance = ${Config.compositor.workspaceSwipeDistance}\n`;
+        toml += `invert = ${Config.compositor.workspaceSwipeInvert}\n`;
+        toml += `touch = ${Config.compositor.workspaceSwipeTouch}\n`;
+        toml += `touch_invert = ${Config.compositor.workspaceSwipeTouchInvert}\n`;
+
+        // Dwindle
+        toml += "\n[dwindle]\n";
+        toml += `preserve_split = ${Config.compositor.dwindlePreserveSplit}\n`;
+        toml += `pseudotile = ${Config.compositor.dwindlePseudotile}\n`;
+        toml += `force_split = ${Config.compositor.dwindleForceSplit}\n`;
+        toml += `smart_split = ${Config.compositor.dwindleSmartSplit}\n`;
+        toml += `default_split_ratio = ${Config.compositor.dwindleDefaultSplitRatio.toFixed(2)}\n`;
+        toml += `split_width_multiplier = ${Config.compositor.dwindleSplitWidthMultiplier.toFixed(1)}\n`;
+        toml += `permanent_direction_override = ${Config.compositor.dwindlePermanentDirectionOverride}\n`;
+        toml += `use_active_for_splits = ${Config.compositor.dwindleUseActiveForSplits}\n`;
+        toml += `smart_resizing = ${Config.compositor.dwindleSmartResizing}\n`;
+        toml += `special_scale_factor = ${Config.compositor.dwindleSpecialScaleFactor.toFixed(2)}\n`;
+
+        // Master
+        toml += "\n[master]\n";
+        toml += `orientation = "${Config.compositor.masterOrientation}"\n`;
+        toml += `mfact = ${Config.compositor.masterMfact.toFixed(2)}\n`;
+        toml += `new_status = "${Config.compositor.masterNewStatus}"\n`;
+        toml += `new_on_top = ${Config.compositor.masterNewOnTop}\n`;
+        toml += `new_on_active = "${Config.compositor.masterNewOnActive}"\n`;
+        toml += `smart_resizing = ${Config.compositor.masterSmartResizing}\n`;
+        toml += `special_scale_factor = ${Config.compositor.masterSpecialScaleFactor.toFixed(2)}\n`;
+        toml += `allow_small_split = ${Config.compositor.masterAllowSmallSplit}\n`;
+
+        // Scrolling
+        toml += "\n[scrolling]\n";
+        toml += `column_width = ${Config.compositor.scrollingColumnWidth.toFixed(2)}\n`;
+        if (Config.compositor.scrollingExplicitColumnWidths) {
+            toml += `explicit_column_widths = "${Config.compositor.scrollingExplicitColumnWidths}"\n`;
+        }
+        toml += `direction = "${Config.compositor.scrollingDirection}"\n`;
+        toml += `fullscreen_on_one_column = ${Config.compositor.scrollingFullscreenOnOneColumn}\n`;
+        toml += `focus_fit_method = "${Config.compositor.scrollingFocusFitMethod}"\n`;
+        toml += `follow_focus = ${Config.compositor.scrollingFollowFocus}\n`;
+        toml += `follow_min_visible = ${Config.compositor.scrollingFollowMinVisible.toFixed(2)}\n`;
+
+        // XWayland
+        toml += "\n[xwayland]\n";
+        toml += `enabled = ${Config.compositor.xwaylandEnabled}\n`;
+        toml += `force_zero_scaling = ${Config.compositor.xwaylandForceZeroScaling}\n`;
+        toml += `use_nearest_neighbor = ${Config.compositor.xwaylandUseNearestNeighbor}\n`;
+
+        // Misc
+        toml += "\n[misc]\n";
+        toml += `vrr = ${Config.compositor.vrr}\n`;
+        toml += `vfr = ${Config.compositor.vfr}\n`;
+        toml += `mouse_move_enables_dpms = ${Config.compositor.mouseMoveEnablesDpms}\n`;
+        toml += `key_press_enables_dpms = ${Config.compositor.keyPressEnablesDpms}\n`;
+        toml += `disable_autoreload = ${Config.compositor.disableAutoreload}\n`;
+        toml += `focus_on_activate = ${Config.compositor.focusOnActivate}\n`;
+        toml += `animate_manual_resizes = ${Config.compositor.animateManualResizes}\n`;
+        toml += `animate_mouse_windowdragging = ${Config.compositor.animateMouseWindowdragging}\n`;
+        toml += `disable_hyprland_logo = ${Config.compositor.disableHyprlandLogo}\n`;
+        toml += `disable_splash_rendering = ${Config.compositor.disableSplashRendering}\n`;
+        toml += `force_default_wallpaper = ${Config.compositor.forceDefaultWallpaper}\n`;
+        toml += `no_update_news = ${Config.compositor.noUpdateNews}\n`;
+
+        // Monitors removed from CompositorTomlWriter.
+        // monitors_writer.py handles [[monitors]] in axctl.toml directly
+        // with the correct data. This section was writing stale data that
+        // caused axctl auto-reload to overwrite user's monitor changes.
 
         return toml;
     }
 
     function writeTomlFile() {
-        const tomlContent = generateToml();
-        const escapedPath = root.outputPath.replace(/'/g, "'\\''");
-        const escapedContent = tomlContent.replace(/'/g, "'\\''");
-
-        writeProcess.command = ["bash", "-c", `mkdir -p "$(dirname '${escapedPath}')" && echo '${escapedContent}' > '${escapedPath}'`];
+        const newContent = generateToml();
+        const path = root.outputPath;
+        const escapedNew = newContent.replace(/'/g, "'\\''");
+
+        // Must preserve [[monitors]] written by monitors_writer.py.
+        // If we just overwrite the file, monitors get nuked.
+        writeProcess.command = ["python3", "-c", `
+import os, re
+path = "${root.outputPath}"
+template = '''${escapedNew}'''
+
+if os.path.isfile(path):
+    with open(path) as f:
+        content = f.read()
+    # Extract [[monitors]] sections from existing file
+    monitors = re.findall(r'\\n?(\\[\\[monitors\\]\\].*?)(?=\\n\\[|\\Z)', content, re.DOTALL)
+else:
+    monitors = []
+
+# Append preserved monitors
+if monitors:
+    template += '\\n' + '\\n'.join(monitors) + '\\n'
+
+os.makedirs(os.path.dirname(path) or '.', exist_ok=True)
+with open(path, 'w') as f:
+    f.write(template)
+print('Written TOML to', path)
+`];
         writeProcess.running = true;
-        console.log("CompositorTomlWriter: Written TOML to", root.outputPath);
     }
 
-    function refresh() {
-        writeTomlFile();
-    }
+    // Note: hyprland.conf is NOT generated here.
+    // It is created once by 'ambxst install hyprland' and stays static forever.
+    // Regenerating it would trigger Hyprland config reload and disrupt the session.
+    // All compositor settings go through axctl.toml (persist) and axctl raw-batch (live).
 
     Component.onCompleted: {
         Qt.callLater(() => {
@@ -439,14 +636,19 @@ Singleton {
         target: Config.compositor
         
         // Border settings
+        function onShowBorderChanged() { writeTomlFile(); }
         function onBorderSizeChanged() { writeTomlFile(); }
         function onRoundingChanged() { writeTomlFile(); }
+        function onRoundingPowerChanged() { writeTomlFile(); }
         function onGapsInChanged() { writeTomlFile(); }
         function onGapsOutChanged() { writeTomlFile(); }
         function onActiveBorderColorChanged() { writeTomlFile(); }
         function onInactiveBorderColorChanged() { writeTomlFile(); }
         function onBorderAngleChanged() { writeTomlFile(); }
         function onInactiveBorderAngleChanged() { writeTomlFile(); }
+        function onResizeOnBorderChanged() { writeTomlFile(); }
+        function onExtendBorderGrabAreaChanged() { writeTomlFile(); }
+        function onHoverIconOnBorderChanged() { writeTomlFile(); }
         
         // Sync settings that affect derived values
         function onSyncRoundnessChanged() { writeTomlFile(); }
@@ -454,6 +656,26 @@ Singleton {
         function onSyncBorderColorChanged() { writeTomlFile(); }
         function onSyncShadowOpacityChanged() { writeTomlFile(); }
         function onSyncShadowColorChanged() { writeTomlFile(); }
+
+        // Layout
+        function onLayoutChanged() { writeTomlFile(); }
+        function onAllowTearingChanged() { writeTomlFile(); }
+
+        // Snap
+        function onSnapEnabledChanged() { writeTomlFile(); }
+        function onSnapWindowGapChanged() { writeTomlFile(); }
+        function onSnapMonitorGapChanged() { writeTomlFile(); }
+        function onSnapBorderOverlapChanged() { writeTomlFile(); }
+        function onSnapRespectGapsChanged() { writeTomlFile(); }
+
+        // Opacity & Dim
+        function onActiveOpacityChanged() { writeTomlFile(); }
+        function onInactiveOpacityChanged() { writeTomlFile(); }
+        function onFullscreenOpacityChanged() { writeTomlFile(); }
+        function onDimInactiveChanged() { writeTomlFile(); }
+        function onDimStrengthChanged() { writeTomlFile(); }
+        function onDimAroundChanged() { writeTomlFile(); }
+        function onDimSpecialChanged() { writeTomlFile(); }
         
         // Shadow settings
         function onShadowEnabledChanged() { writeTomlFile(); }
@@ -486,6 +708,112 @@ Singleton {
         function onBlurPopupsIgnorealphaChanged() { writeTomlFile(); }
         function onBlurInputMethodsChanged() { writeTomlFile(); }
         function onBlurInputMethodsIgnorealphaChanged() { writeTomlFile(); }
+
+        // Animations
+        function onAnimationsEnabledChanged() { writeTomlFile(); }
+
+        // Input: Keyboard
+        function onKbLayoutChanged() { writeTomlFile(); }
+        function onKbVariantChanged() { writeTomlFile(); }
+        function onKbOptionsChanged() { writeTomlFile(); }
+        function onNumlockByDefaultChanged() { writeTomlFile(); }
+        function onRepeatRateChanged() { writeTomlFile(); }
+        function onRepeatDelayChanged() { writeTomlFile(); }
+
+        // Input: Mouse
+        function onMouseSensitivityChanged() { writeTomlFile(); }
+        function onMouseAccelProfileChanged() { writeTomlFile(); }
+        function onFollowMouseChanged() { writeTomlFile(); }
+        function onMouseNaturalScrollChanged() { writeTomlFile(); }
+        function onMouseScrollFactorChanged() { writeTomlFile(); }
+        function onMouseLeftHandedChanged() { writeTomlFile(); }
+        function onMouseRefocusChanged() { writeTomlFile(); }
+        function onFloatSwitchOverrideFocusChanged() { writeTomlFile(); }
+
+        // Input: Touchpad
+        function onTouchpadDisableWhileTypingChanged() { writeTomlFile(); }
+        function onTouchpadNaturalScrollChanged() { writeTomlFile(); }
+        function onTouchpadTapToClickChanged() { writeTomlFile(); }
+        function onTouchpadClickfingerBehaviorChanged() { writeTomlFile(); }
+        function onTouchpadTapButtonMapChanged() { writeTomlFile(); }
+        function onTouchpadMiddleButtonEmulationChanged() { writeTomlFile(); }
+        function onTouchpadDragLockChanged() { writeTomlFile(); }
+        function onTouchpadScrollFactorChanged() { writeTomlFile(); }
+
+        // Cursor
+        function onNoHardwareCursorsChanged() { writeTomlFile(); }
+        function onEnableHyprcursorChanged() { writeTomlFile(); }
+        function onNoWarpsChanged() { writeTomlFile(); }
+        function onPersistentWarpsChanged() { writeTomlFile(); }
+        function onWarpOnChangeWorkspaceChanged() { writeTomlFile(); }
+        function onCursorZoomFactorChanged() { writeTomlFile(); }
+        function onCursorInactiveTimeoutChanged() { writeTomlFile(); }
+        function onCursorHideOnKeyPressChanged() { writeTomlFile(); }
+        function onCursorHideOnTouchChanged() { writeTomlFile(); }
+        function onCursorHideOnTabletChanged() { writeTomlFile(); }
+
+        // Gestures
+        function onWorkspaceSwipeCreateNewChanged() { writeTomlFile(); }
+        function onWorkspaceSwipeForeverChanged() { writeTomlFile(); }
+        function onWorkspaceSwipeCancelRatioChanged() { writeTomlFile(); }
+        function onWorkspaceSwipeMinSpeedToForceChanged() { writeTomlFile(); }
+        function onWorkspaceSwipeDirectionLockChanged() { writeTomlFile(); }
+        function onWorkspaceSwipeUseRChanged() { writeTomlFile(); }
+        function onWorkspaceSwipeDistanceChanged() { writeTomlFile(); }
+        function onWorkspaceSwipeInvertChanged() { writeTomlFile(); }
+        function onWorkspaceSwipeTouchChanged() { writeTomlFile(); }
+        function onWorkspaceSwipeTouchInvertChanged() { writeTomlFile(); }
+
+        // Dwindle
+        function onDwindlePreserveSplitChanged() { writeTomlFile(); }
+        function onDwindlePseudotileChanged() { writeTomlFile(); }
+        function onDwindleForceSplitChanged() { writeTomlFile(); }
+        function onDwindleSmartSplitChanged() { writeTomlFile(); }
+        function onDwindleDefaultSplitRatioChanged() { writeTomlFile(); }
+        function onDwindleSplitWidthMultiplierChanged() { writeTomlFile(); }
+        function onDwindlePermanentDirectionOverrideChanged() { writeTomlFile(); }
+        function onDwindleUseActiveForSplitsChanged() { writeTomlFile(); }
+        function onDwindleSmartResizingChanged() { writeTomlFile(); }
+        function onDwindleSpecialScaleFactorChanged() { writeTomlFile(); }
+
+        // Master
+        function onMasterOrientationChanged() { writeTomlFile(); }
+        function onMasterMfactChanged() { writeTomlFile(); }
+        function onMasterNewStatusChanged() { writeTomlFile(); }
+        function onMasterNewOnTopChanged() { writeTomlFile(); }
+        function onMasterNewOnActiveChanged() { writeTomlFile(); }
+        function onMasterSmartResizingChanged() { writeTomlFile(); }
+        function onMasterSpecialScaleFactorChanged() { writeTomlFile(); }
+        function onMasterAllowSmallSplitChanged() { writeTomlFile(); }
+
+        // Scrolling
+        function onScrollingColumnWidthChanged() { writeTomlFile(); }
+        function onScrollingExplicitColumnWidthsChanged() { writeTomlFile(); }
+        function onScrollingDirectionChanged() { writeTomlFile(); }
+        function onScrollingFullscreenOnOneColumnChanged() { writeTomlFile(); }
+        function onScrollingFocusFitMethodChanged() { writeTomlFile(); }
+        function onScrollingFollowFocusChanged() { writeTomlFile(); }
+        function onScrollingFollowMinVisibleChanged() { writeTomlFile(); }
+
+        // XWayland
+        function onXwaylandEnabledChanged() { writeTomlFile(); }
+        function onXwaylandForceZeroScalingChanged() { writeTomlFile(); }
+        function onXwaylandUseNearestNeighborChanged() { writeTomlFile(); }
+
+        // Monitor Globals / Misc
+        function onVrrChanged() { writeTomlFile(); }
+        function onVfrChanged() { writeTomlFile(); }
+        function onMouseMoveEnablesDpmsChanged() { writeTomlFile(); }
+        function onKeyPressEnablesDpmsChanged() { writeTomlFile(); }
+        function onDisableAutoreloadChanged() { writeTomlFile(); }
+        function onFocusOnActivateChanged() { writeTomlFile(); }
+        function onAnimateManualResizesChanged() { writeTomlFile(); }
+        function onAnimateMouseWindowdraggingChanged() { writeTomlFile(); }
+        function onDisableHyprlandLogoChanged() { writeTomlFile(); }
+        function onDisableSplashRenderingChanged() { writeTomlFile(); }
+        function onForceDefaultWallpaperChanged() { writeTomlFile(); }
+        function onNoUpdateNewsChanged() { writeTomlFile(); }
+        function onEnforcePermissionsChanged() { writeTomlFile(); }
     }
 
     // Theme connections (for blur ignorealpha calculation and shadow color sync)
diff --git a/modules/services/DesktopService.qml b/modules/services/DesktopService.qml
old mode 100644
new mode 100755
diff --git a/modules/services/EasyEffectsService.qml b/modules/services/EasyEffectsService.qml
old mode 100644
new mode 100755
diff --git a/modules/services/FocusGrab.qml b/modules/services/FocusGrab.qml
old mode 100644
new mode 100755
diff --git a/modules/services/FocusGrabManager.qml b/modules/services/FocusGrabManager.qml
old mode 100644
new mode 100755
diff --git a/modules/services/GameModeService.qml b/modules/services/GameModeService.qml
old mode 100644
new mode 100755
diff --git a/modules/services/GlobalShortcuts.qml b/modules/services/GlobalShortcuts.qml
index 0f8d2be8..fa792dc6 100644
--- a/modules/services/GlobalShortcuts.qml
+++ b/modules/services/GlobalShortcuts.qml
@@ -2,18 +2,23 @@ pragma Singleton
 pragma ComponentBehavior: Bound
 
 import QtQuick
+import Quickshell
+import Quickshell.Io
 import qs.modules.globals
 import qs.modules.services
 import qs.config
 
-import Quickshell.Io
-
 QtObject {
     id: root
 
     readonly property string appId: "ambxst"
     readonly property string ipcPipe: "/tmp/ambxst_ipc.pipe"
 
+    property Process toggleMetricProcess: Process {
+        command: ["sh", "-c", Quickshell.shellDir + "/scripts/toggle-metrics.sh"]
+        running: false
+    }
+
     // High-performance Pipe Listener (Daemon mode)
     property Process pipeListener: Process {
         command: ["bash", "-c", "rm -f " + root.ipcPipe + "; mkfifo " + root.ipcPipe + "; tail -f " + root.ipcPipe]
@@ -29,6 +34,15 @@ QtObject {
         }
     }
 
+
+    function toggleMetrics() {
+        // Toggle the notch metrics overlay
+        if (Config.notch) {
+            Config.notch.showMetrics = !Config.notch.showMetrics;
+            console.log("Metrics overlay toggled:", Config.notch.showMetrics);
+        }
+    }
+
     function run(command) {
         console.log("IPC run command received:", command);
         switch (command) {
@@ -53,6 +67,10 @@ QtObject {
             case "overview": toggleSimpleModule("overview"); break;
             case "powermenu": toggleSimpleModule("powermenu"); break;
             case "tools": toggleSimpleModule("tools"); break;
+            case "toggle-metrics":
+                root.toggleMetrics();
+                console.log("Metrics toggled");
+                break;
             case "config": toggleSettings(); break;
             case "screenshot": Screenshot.initialize(); GlobalStates.screenshotToolVisible = true; break;
             case "screenrecord": ScreenRecorder.initialize(); GlobalStates.screenRecordToolVisible = true; break;
@@ -72,6 +90,17 @@ QtObject {
             case "media-next": MprisController.next(); break;
             case "media-prev": MprisController.previous(); break;
                 
+            // System toggles
+            case "caffeine": CaffeineService.toggleInhibit(); break;
+            case "gamemode": GameModeService.toggle(); break;
+            case "nightlight": NightLightService.toggle(); break;
+
+            // Audio
+            case "volume-up": Audio.incrementVolume(); break;
+            case "volume-down": Audio.decrementVolume(); break;
+            case "volume-mute": Audio.toggleMute(); break;
+            case "mic-mute": Audio.toggleMicMute(); break;
+
             default: console.warn("Unknown IPC command:", command);
         }
     }
diff --git a/modules/services/IdleInhibitor.qml b/modules/services/IdleInhibitor.qml
old mode 100644
new mode 100755
diff --git a/modules/services/IdleMonitor.qml b/modules/services/IdleMonitor.qml
old mode 100644
new mode 100755
diff --git a/modules/services/IdleService.qml b/modules/services/IdleService.qml
old mode 100644
new mode 100755
diff --git a/modules/services/IpcPool.qml b/modules/services/IpcPool.qml
new file mode 100644
index 00000000..dbf87ba2
--- /dev/null
+++ b/modules/services/IpcPool.qml
@@ -0,0 +1,100 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+/*!
+    IpcPool.qml — IPC call coalescer / debouncer.
+
+    Prevents multiple rapid hyprctl dispatches from overloading the compositor.
+    Batches calls within a window and fires once.
+
+    Usage:
+        IpcPool.dispatch("workspace 3");
+        IpcPool.dispatch("movewindow mon:DP-1");
+
+    If called multiple times within 50ms, only the last call fires.
+    Supports batch mode: IpcPool.dispatchBatch(["workspace 1", "focuswindow ..."]);
+*/
+Singleton {
+    id: root
+
+    property int debounceMs: 50
+
+    property var _pendingCommands: []
+    property Timer _flushTimer: Timer {
+        id: flushTimer
+        interval: root.debounceMs
+        repeat: false
+        onTriggered: root._flush()
+    }
+
+    function dispatch(command) {
+        root._pendingCommands.push(command);
+        if (!flushTimer.running) flushTimer.restart();
+        if (root._pendingCommands.length >= 10) {
+            flushTimer.stop();
+            root._flush();
+        }
+    }
+
+    function dispatchBatch(commands) {
+        if (!commands || commands.length === 0) return;
+        root._pendingCommands = root._pendingCommands.concat(commands);
+        if (!flushTimer.running) flushTimer.restart();
+    }
+
+    function _flush() {
+        if (root._pendingCommands.length === 0) return;
+
+        // Deduplicate: keep last occurrence of each unique command
+        const seen = {};
+        const unique = [];
+        for (let i = root._pendingCommands.length - 1; i >= 0; i--) {
+            const cmd = root._pendingCommands[i];
+            if (!seen[cmd]) {
+                seen[cmd] = true;
+                unique.unshift(cmd);
+            }
+        }
+
+        root._pendingCommands = [];
+
+        // Fire each command individually (hyprctl doesn't support batch natively)
+        for (const cmd of unique) {
+            const p = _processPool.getProcess();
+            p.command = ["hyprctl", "dispatch", cmd];
+            p.running = true;
+        }
+    }
+
+    // Process pool — reuse Process objects to avoid allocation
+    property QtObject _processPool: QtObject {
+        id: processPool
+
+        property var _pool: []
+        property int _maxSize: 8
+
+        function getProcess() {
+            if (_pool.length > 0) {
+                return _pool.pop();
+            }
+            const p = processComponent.createObject(root);
+            p.onExited.connect(() => {
+                if (processPool._pool.length < processPool._maxSize) {
+                    processPool._pool.push(p);
+                }
+            });
+            return p;
+        }
+
+        property Component processComponent: Component {
+            Process {
+                running: false
+                command: []
+            }
+        }
+    }
+}
diff --git a/modules/services/KeyStore.qml b/modules/services/KeyStore.qml
old mode 100644
new mode 100755
diff --git a/modules/services/LockscreenService.qml b/modules/services/LockscreenService.qml
old mode 100644
new mode 100755
diff --git a/modules/services/MonitorsWriter.qml b/modules/services/MonitorsWriter.qml
new file mode 100644
index 00000000..9bb967ae
--- /dev/null
+++ b/modules/services/MonitorsWriter.qml
@@ -0,0 +1,74 @@
+pragma Singleton
+
+import QtQuick
+import QtQml
+import Quickshell
+import Quickshell.Io
+
+Singleton {
+    id: root
+
+    readonly property string scriptPath: Qt.resolvedUrl("../../scripts/monitors_writer.py").toString().replace("file://", "")
+
+    signal syncFinished(bool success, string message)
+    signal monitorsListed(var monitors)
+
+    // ── List monitors ──
+
+    function listMonitors() {
+        listProc.running = false;
+        listProc.command = ["python3", root.scriptPath, "list"];
+        listProc.running = true;
+    }
+
+    property Process listProc: Process {
+        command: ["echo", ""]
+        stdout: StdioCollector { id: listOut }
+        running: false
+        onExited: exitCode => {
+            if (exitCode === 0) {
+                try {
+                    root.monitorsListed(JSON.parse(listOut.text));
+                } catch (e) {
+                    console.warn("MonitorsWriter list parse:", e);
+                    root.monitorsListed([]);
+                }
+            } else {
+                root.monitorsListed([]);
+            }
+        }
+    }
+
+    // ── Sync ──
+
+    function syncWithData(monitorData) {
+        if (!monitorData || monitorData.length === 0) return;
+        var jsonStr = JSON.stringify(monitorData);
+        syncProc.running = false;
+        syncProc.command = ["python3", root.scriptPath, "sync", "--data", jsonStr];
+        syncProc.running = true;
+    }
+
+    function sync() {
+        syncProc.running = false;
+        syncProc.command = ["python3", root.scriptPath, "sync"];
+        syncProc.running = true;
+    }
+
+    property Process syncProc: Process {
+        command: ["echo", ""]
+        stdout: StdioCollector { id: syncOut }
+        stderr: StdioCollector { id: syncErr }
+        running: false
+        onExited: exitCode => {
+            var out = (syncOut.text || "") + (syncErr.text || "");
+            var ok = exitCode === 0;
+            console.log("MonitorsWriter:", out.trim() || (ok ? "OK" : "FAIL"));
+            root.syncFinished(ok, ok ? "OK" : out.trim());
+            // Do NOT call CompositorTomlWriter.writeTomlFile() here.
+            // monitors_writer.py already writes [[monitors]] to axctl.toml.
+            // Calling writeTomlFile() would OVERWRITE the entire toml file,
+            // removing the [[monitors]] section that was just written.
+        }
+    }
+}
diff --git a/modules/services/MprisController.qml b/modules/services/MprisController.qml
old mode 100644
new mode 100755
index 53868ca0..e46a7888
--- a/modules/services/MprisController.qml
+++ b/modules/services/MprisController.qml
@@ -15,7 +15,7 @@ Singleton {
     property var filteredPlayers: {
         const filtered = Mpris.players.values.filter(player => {
             const dbusName = (player.dbusName || "").toLowerCase();
-            if (!Config.bar.enableFirefoxPlayer && dbusName.includes("firefox")) {
+            if (!Config.bar.enableFirefoxPlayer && dbusName.includes("firefox") || !Config.bar.enableChromiumPlayer && (dbusName.includes("chromium") || dbusName.includes("chrome"))) {
                 return false;
             }
             return true;
@@ -155,7 +155,7 @@ Singleton {
 
             Component.onCompleted: {
                 const dbusName = (modelData.dbusName || "").toLowerCase();
-                const shouldIgnore = !Config.bar.enableFirefoxPlayer && dbusName.includes("firefox");
+                const shouldIgnore = !Config.bar.enableFirefoxPlayer && dbusName.includes("firefox") || !Config.bar.enableChromiumPlayer && (dbusName.includes("chromium") || dbusName.includes("chrome"));
 
                 if (!shouldIgnore && (root.trackedPlayer == null || modelData.isPlaying)) {
                     root.trackedPlayer = modelData;
diff --git a/modules/services/MusicRecognizer.qml b/modules/services/MusicRecognizer.qml
new file mode 100644
index 00000000..a280b6ae
--- /dev/null
+++ b/modules/services/MusicRecognizer.qml
@@ -0,0 +1,100 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+/*!
+    MusicRecognizer.qml — Music recognition via SongRec (Shazam CLI).
+
+    Records audio from the default microphone and identifies the song
+    using Shazam's fingerprinting algorithm (via songrec).
+
+    Usage:
+        MusicRecognizer.identify()
+        // Result via onIdentificationComplete signal
+
+    Requires: songrec (https://github.com/marin-m/SongRec)
+*/
+Singleton {
+    id: root
+
+    signal identificationComplete(string title, string artist, string album, string coverUrl)
+    signal identificationError(string error)
+    signal listeningStarted()
+    signal listeningStopped()
+
+    property bool isListening: false
+    property bool isAvailable: false
+
+    property Process _checkProcess: Process {
+        command: ["sh", "-c", "command -v songrec"]
+        running: true
+        onExited: (code) => {
+            root.isAvailable = code === 0;
+            if (!root.isAvailable) {
+                console.warn("MusicRecognizer: songrec not found. Install with: yay -S songrec");
+            }
+        }
+    }
+
+    function identify() {
+        if (!root.isAvailable) {
+            root.identificationError("songrec not installed");
+            return;
+        }
+
+        root.isListening = true;
+        root.listeningStarted();
+
+        // songrec listens for ~5 seconds, then identifies
+        identifyProcess.running = true;
+    }
+
+    property Process identifyProcess: Process {
+        running: false
+        command: ["songrec", "listen"] // Records + identifies in one step
+
+        stdout: SplitParser {
+            onRead: (data) => {
+                if (!data) return;
+                try {
+                    // songrec outputs JSON with song info
+                    const result = JSON.parse(data);
+                    if (result && result.track) {
+                        root.identificationComplete(
+                            result.track.title || "Unknown",
+                            result.track.artist || "Unknown",
+                            result.track.album || "",
+                            result.track.cover || ""
+                        );
+                    } else if (result && result.error) {
+                        root.identificationError(result.error);
+                    }
+                } catch (e) {
+                    // Try to parse plain text output
+                    const lines = data.trim().split("\n");
+                    if (lines.length >= 2) {
+                        root.identificationComplete(lines[0], lines[1], "", "");
+                    } else {
+                        root.identificationError("Could not identify song");
+                    }
+                }
+            }
+        }
+
+        onExited: {
+            root.isListening = false;
+            root.listeningStopped();
+        }
+    }
+
+    function cancel() {
+        if (root.isListening) {
+            identifyProcess.running = false;
+            root.isListening = false;
+            root.listeningStopped();
+        }
+    }
+}
diff --git a/modules/services/NetworkService.qml b/modules/services/NetworkService.qml
old mode 100644
new mode 100755
diff --git a/modules/services/NightLightService.qml b/modules/services/NightLightService.qml
old mode 100644
new mode 100755
index 68c71859..586ca363
--- a/modules/services/NightLightService.qml
+++ b/modules/services/NightLightService.qml
@@ -3,11 +3,17 @@ pragma Singleton
 import QtQuick
 import Quickshell
 import Quickshell.Io
+import qs.config
 
 Singleton {
     id: root
 
     property bool active: StateService.get("nightLight", false)
+
+    // Auto light/dark mode when night light is active
+    // Uses sunset altitude from wlsunset to determine day/night
+    property bool autoThemeMode: StateService.get("autoThemeMode", false)
+    property bool isNightTime: false
     
     property Process wlsunsetProcess: Process {
         command: ["wlsunset", "-t", "4499", "-T", "4500"]
@@ -71,6 +77,42 @@ Singleton {
         if (StateService.initialized) {
             StateService.set("nightLight", active);
         }
+        if (active && root.autoThemeMode) {
+            // Start sunset time detection
+            themeCheckTimer.restart();
+        } else if (!active) {
+            themeCheckTimer.stop();
+        }
+    }
+
+    onAutoThemeModeChanged: {
+        if (StateService.initialized) {
+            StateService.set("autoThemeMode", autoThemeMode);
+        }
+        if (autoThemeMode && root.active) {
+            themeCheckTimer.restart();
+        } else if (!autoThemeMode) {
+            themeCheckTimer.stop();
+        }
+    }
+
+    /*! Toggle auto light/dark mode. When enabled, toggles Config.lightMode
+        based on time of day (before 7AM or after 7PM = dark mode). */
+    property Timer themeCheckTimer: Timer {
+        id: themeCheckTimer
+        interval: 60000 // Check every minute
+        repeat: true
+        running: false
+        onTriggered: {
+            if (!root.autoThemeMode || !root.active) return;
+            const hour = new Date().getHours();
+            const shouldBeDark = hour < 7 || hour >= 19;
+            if (root.isNightTime !== shouldBeDark) {
+                root.isNightTime = shouldBeDark;
+                Config.lightMode = !shouldBeDark;
+                console.log("AutoTheme:", shouldBeDark ? "dark mode" : "light mode");
+            }
+        }
     }
 
     Connections {
diff --git a/modules/services/Notifications.qml b/modules/services/Notifications.qml
old mode 100644
new mode 100755
index 959c2be0..63f364e5
--- a/modules/services/Notifications.qml
+++ b/modules/services/Notifications.qml
@@ -138,11 +138,45 @@ Singleton {
 
     property bool silent: false
     property list<Notif> list: []
-    property var popupList: list.filter(notif => notif.popup)
+
+    // Muted apps — their notifications won't show popups or add to history
+    property var mutedApps: StateService.get("mutedApps", [])
+
+    // Filtered lists (excluding muted apps)
+    property var popupList: list.filter(notif => notif.popup && !root.isMuted(notif.appName))
+    property var visibleNotifications: list.filter(notif => !root.isMuted(notif.appName))
+
     property bool popupInhibited: silent
     property var latestTimeForApp: ({})
     property var totalCounts: ({})  // Conteo total independiente del almacenamiento: {appName: {summary: count}}
 
+    function isMuted(appName) {
+        if (!appName || !root.mutedApps || root.mutedApps.length === 0) return false;
+        return root.mutedApps.indexOf(appName) >= 0;
+    }
+
+    function muteApp(appName) {
+        if (!appName || root.isMuted(appName)) return;
+        root.mutedApps = root.mutedApps.concat([appName]);
+        StateService.set("mutedApps", root.mutedApps);
+        console.log("Muted app:", appName);
+    }
+
+    function unmuteApp(appName) {
+        if (!appName) return;
+        root.mutedApps = root.mutedApps.filter(a => a !== appName);
+        StateService.set("mutedApps", root.mutedApps);
+        console.log("Unmuted app:", appName);
+    }
+
+    function toggleMuteApp(appName) {
+        if (root.isMuted(appName)) {
+            root.unmuteApp(appName);
+        } else {
+            root.muteApp(appName);
+        }
+    }
+
     Component {
         id: notifComponent
         Notif {}
diff --git a/modules/services/PerMonitorConfig.qml b/modules/services/PerMonitorConfig.qml
new file mode 100644
index 00000000..23da42dc
--- /dev/null
+++ b/modules/services/PerMonitorConfig.qml
@@ -0,0 +1,91 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.config
+
+/*!
+    PerMonitorConfig.qml — Per-monitor configuration overrides.
+
+    Reads ~/.config/ambxst/config/monitors.json for monitor-specific
+    overrides of global config values. Currently supports:
+    - bar.position
+    - notch.position
+    - dock.position
+
+    Example monitors.json:
+    {
+      "DP-1": {
+        "bar": { "position": "bottom" },
+        "notch": { "position": "bottom" }
+      },
+      "HDMI-A-1": {
+        "bar": { "position": "left" }
+      }
+    }
+*/
+Singleton {
+    id: root
+
+    property string configPath: (Quickshell.env("XDG_CONFIG_HOME") || (Quickshell.env("HOME") + "/.config")) + "/ambxst/config/monitors.json"
+
+    // Internal cache of the parsed JSON
+    property var _data: ({})
+    property bool _ready: false
+
+    FileView {
+        id: loader
+        path: root.configPath
+        watchChanges: true
+        onLoaded: {
+            root._parse(loader.text());
+        }
+        onFileChanged: {
+            loader.reload();
+        }
+    }
+
+    Component.onCompleted: {
+        // Delay init so FileView has a chance to load
+        Qt.callLater(() => {
+            if (!root._ready) {
+                root._parse(loader.text());
+            }
+        });
+    }
+
+    function _parse(text) {
+        if (!text || text.trim().length === 0) {
+            root._data = {};
+            root._ready = true;
+            return;
+        }
+        try {
+            root._data = JSON.parse(text);
+            root._ready = true;
+        } catch (e) {
+            console.warn("PerMonitorConfig: Failed to parse monitors.json:", e);
+            root._data = {};
+            root._ready = true;
+        }
+    }
+
+    /*! Resolve a per-monitor override.
+        @param screenName  Monitor name (e.g. "DP-1")
+        @param domain      Config domain (e.g. "bar", "notch", "dock")
+        @param key         Property key (e.g. "position")
+        @param defaultValue Fallback value if no override exists
+        @return The override value, or defaultValue if none exists.
+    */
+    function resolve(screenName, domain, key, defaultValue) {
+        if (!root._ready || !screenName) return defaultValue;
+        const monitor = root._data[screenName];
+        if (!monitor) return defaultValue;
+        const dom = monitor[domain];
+        if (!dom) return defaultValue;
+        const val = dom[key];
+        return val !== undefined ? val : defaultValue;
+    }
+}
diff --git a/modules/services/PowerProfile.qml b/modules/services/PowerProfile.qml
old mode 100644
new mode 100755
diff --git a/modules/services/PresetsService.qml b/modules/services/PresetsService.qml
old mode 100644
new mode 100755
index 4cc1369f..f6e38dc7
--- a/modules/services/PresetsService.qml
+++ b/modules/services/PresetsService.qml
@@ -117,20 +117,6 @@ Singleton {
             const jsonFile = configFile.replace('.js', '.json')
             if (root.excludedFiles.includes(jsonFile)) continue;
 
-            // The source is configDir (~/.config/Ambxst), NOT configDir/config
-            // But wait, the configDir property is defined as ~/.config/Ambxst below?
-            // Let's check the property definition.
-            // property string configDir: ... + "/Ambxst"
-            // But Config.qml says configDir is ... + "/Ambxst/config"
-            // We need to match Config.qml's path.
-            
-            // In Config.qml: property string configDir: ... + "/Ambxst/config"
-            // Here: readonly property string configDir: ... + "/Ambxst"
-            // This is a mismatch!
-            
-            // We should use the same path as Config.qml for reading/writing config files.
-            // Let's assume the files are in .../Ambxst/config based on Config.qml and ls output.
-            
             const srcPath = configDir + "/config/" + jsonFile 
             const dstPath = presetPath + "/" + jsonFile
             copyCmd += `cp "${srcPath}" "${dstPath}" && `
diff --git a/modules/services/ScreenRecorder.qml b/modules/services/ScreenRecorder.qml
old mode 100644
new mode 100755
diff --git a/modules/services/ScreenTranslation.qml b/modules/services/ScreenTranslation.qml
new file mode 100644
index 00000000..c5d41f39
--- /dev/null
+++ b/modules/services/ScreenTranslation.qml
@@ -0,0 +1,123 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+/*!
+    ScreenTranslation.qml — Screen translation service.
+
+    Translates selected text or screenshots using translate-shell (CLI)
+    with fallback to Google Translate API via curl.
+
+    Usage:
+        ScreenTranslation.translateText("Hello world", "es")
+        ScreenTranslation.translateRegion(x, y, w, h, "en")
+
+    Returns result via onTranslationComplete signal.
+*/
+Singleton {
+    id: root
+
+    signal translationComplete(string text, string fromLang, string toLang)
+    signal translationError(string error)
+
+    /*! Translate text using translate-shell. Falls back to Google API. */
+    function translateText(text, toLang, fromLang) {
+        if (!text || text.trim() === "") return;
+
+        if (root._hasTranslateShell) {
+            var args = ["translate", "-t", toLang];
+            if (fromLang) {
+                args.push("-f", fromLang);
+            }
+            args.push(text);
+            translateShellProcess.command = args;
+            translateShellProcess.running = true;
+        } else {
+            // Fallback: Google Translate API via curl
+            googleTranslateProcess.command = [
+                "curl", "-s",
+                "https://translate.googleapis.com/translate_a/single?client=gtx&sl=" +
+                (fromLang || "auto") + "&tl=" + toLang + "&dt=t&q=" +
+                encodeURIComponent(text)
+            ];
+            googleTranslateProcess.running = true;
+        }
+    }
+
+    /*! OCR and translate a screen region (requires tesseract). */
+    function translateRegion(x, y, w, h, toLang) {
+        ocrAndTranslateProcess.command = [
+            "sh", "-c",
+            "grim -g '" + x + "," + y + " " + w + "x" + h + "' - | tesseract stdin stdout 2>/dev/null | head -100"
+        ];
+        ocrAndTranslateProcess.running = true;
+        _pendingTargetLang = toLang;
+    }
+
+    property string _pendingTargetLang: "en"
+
+    property bool _hasTranslateShell: false
+
+    function hasTranslateShell() {
+        return root._hasTranslateShell;
+    }
+
+    // Check for translate-shell availability
+    property Process _checkProcess: Process {
+        command: ["sh", "-c", "command -v trans || command -v translate"]
+        running: true
+        onExited: (code) => {
+            root._hasTranslateShell = code === 0;
+        }
+    }
+
+    // translate-shell process
+    property Process translateShellProcess: Process {
+        running: false
+        stdout: SplitParser {
+            onRead: (data) => {
+                if (data) {
+                    root.translationComplete(data.trim(), "auto", "");
+                }
+            }
+        }
+    }
+
+    // Google Translate API fallback
+    property Process googleTranslateProcess: Process {
+        running: false
+        stdout: SplitParser {
+            onRead: (data) => {
+                try {
+                    const result = JSON.parse(data);
+                    if (result && result[0]) {
+                        const translated = result[0].map(s => s[0]).filter(s => s).join("");
+                        root.translationComplete(translated, result[2] || "auto", "");
+                    }
+                } catch (e) {
+                    root.translationError("Failed to parse translation response");
+                }
+            }
+        }
+    }
+
+    // OCR + translate
+    property Process ocrAndTranslateProcess: Process {
+        running: false
+        stdout: SplitParser {
+            onRead: (data) => {
+                if (data) {
+                    const text = data.trim();
+                    if (text) {
+                        root.translateText(text, root._pendingTargetLang);
+                    } else {
+                        root.translationError("No text found in region");
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/modules/services/Screenshot.qml b/modules/services/Screenshot.qml
old mode 100644
new mode 100755
diff --git a/modules/services/StateService.qml b/modules/services/StateService.qml
old mode 100644
new mode 100755
diff --git a/modules/services/SuspendManager.qml b/modules/services/SuspendManager.qml
old mode 100644
new mode 100755
diff --git a/modules/services/SystemResources.qml b/modules/services/SystemResources.qml
old mode 100644
new mode 100755
index c16ff085..2fb0100d
--- a/modules/services/SystemResources.qml
+++ b/modules/services/SystemResources.qml
@@ -8,70 +8,182 @@ pragma ComponentBehavior: Bound
 
 /**
  * System resource monitoring service
- * Optimized to be lightweight and avoid waking up dGPUs.
+ * Optimised to be lightweight and avoid waking up dGPUs.
  */
 Singleton {
     id: root
 
-    // CPU metrics
+    // ── Toggles (set by MetricsConfigPanel) ──
+    property bool cpuUsageEnabled: true
+    property bool cpuTempEnabled: true
+    property bool cpuPowerEnabled: false
+    property bool ramEnabled: true
+    property bool gpuUsageEnabled: true
+    property bool gpuTempEnabled: true
+    property bool gpuPowerEnabled: false
+    property bool diskEnabled: true
+    property bool fpsEnabled: true
+
+    // ── Metric colours (set by MetricsConfigPanel) ──
+    property color metricColorCpu: "#ffffff"
+    property color metricColorGpu: "#ffffff"
+    property color metricColorFps: "#ffffff"
+    property color metricColorRam: "#ffffff"
+    property color metricColorDisk: "#ffffff"
+
+    // ── CPU metrics ──
     property real cpuUsage: 0.0
     property string cpuModel: ""
     property int cpuTemp: -1
+    property real cpuPower: 0.0
 
-    // RAM metrics
+    // ── RAM metrics ──
     property real ramUsage: 0.0
     property real ramTotal: 0
     property real ramUsed: 0
     property real ramAvailable: 0
 
-    // GPU metrics
+    // ── GPU metrics ──
     property var gpuUsages: []
     property var gpuVendors: []
     property var gpuNames: []
     property int gpuCount: 0
     property bool gpuDetected: false
     property var gpuTemps: []
-    
-    // Legacy single GPU properties
+    property real gpuPower: 0.0
+
+    // Legacy single‑GPU convenience
     property real gpuUsage: gpuUsages.length > 0 ? gpuUsages[0] : 0.0
     property string gpuVendor: gpuVendors.length > 0 ? gpuVendors[0] : "unknown"
     property int gpuTemp: gpuTemps.length > 0 ? gpuTemps[0] : -1
 
-    // Disk metrics
+    // ── Disk ──
     property var diskUsage: ({})
     property var diskTypes: ({})
     property var validDisks: []
 
-    // History data
+    // ── FPS ──
+    property real fps: 0.0
+
+    // ── Version bump (triggers rebuildNotchMetrics) ──
+    property int notchVersion: 0
+
+    // ── Convenience ──
+    property bool metricsAvailable: true
+
+    // ── Config persistence ──
+    property string metricsConfigPath: Quickshell.env("HOME") + "/.config/ambxst/config/metrics.json"
+
+    function saveMetricsConfig() {
+        var config = JSON.stringify({
+            cpuUsageEnabled: cpuUsageEnabled,
+            cpuTempEnabled: cpuTempEnabled,
+            cpuPowerEnabled: cpuPowerEnabled,
+            ramEnabled: ramEnabled,
+            gpuUsageEnabled: gpuUsageEnabled,
+            gpuTempEnabled: gpuTempEnabled,
+            gpuPowerEnabled: gpuPowerEnabled,
+            fpsEnabled: fpsEnabled,
+            diskEnabled: diskEnabled,
+            metricColorCpu: metricColorCpu,
+            metricColorGpu: metricColorGpu,
+            metricColorFps: metricColorFps,
+            metricColorRam: metricColorRam,
+            metricColorDisk: metricColorDisk
+        });
+        var cmd = "mkdir -p $(dirname " + metricsConfigPath + ") && echo '" + config + "' > " + metricsConfigPath;
+        saveProcess.command = ["sh", "-c", cmd];
+        saveProcess.running = true;
+    }
+
+    function loadMetricsConfig() {
+        loadProcess.command = ["cat", metricsConfigPath];
+        loadProcess.running = true;
+    }
+
+    // ── Fast FPS watcher (tail -f /dev/shm/ambxst_fps) ──
+    property Process fpsWatcher: Process {
+        id: fpsWatcher
+        running: root.notchMetricsActive || (GlobalStates.dashboardOpen && GlobalStates.dashboardCurrentTab === 2)
+        command: ["bash", "-c", "tail -n0 -F /dev/shm/ambxst_fps 2>/dev/null || sleep 10"]
+        stdout: SplitParser {
+            onRead: data => {
+                var trimmed = data.trim();
+                if (trimmed.startsWith("fps=")) {
+                    var val = parseFloat(trimmed.split("=", 2)[1]);
+                    if (!isNaN(val) && val > 0) root.fps = val;
+                }
+            }
+        }
+    }
+
+    property Process saveProcess: Process {
+        running: false
+    }
+
+    property Process loadProcess: Process {
+        running: false
+        stdout: SplitParser {
+            onRead: data => {
+                try {
+                    var cfg = JSON.parse(data);
+                    if (cfg.cpuUsageEnabled !== undefined) root.cpuUsageEnabled = cfg.cpuUsageEnabled;
+                    if (cfg.cpuTempEnabled !== undefined) root.cpuTempEnabled = cfg.cpuTempEnabled;
+                    if (cfg.cpuPowerEnabled !== undefined) root.cpuPowerEnabled = cfg.cpuPowerEnabled;
+                    if (cfg.ramEnabled !== undefined) root.ramEnabled = cfg.ramEnabled;
+                    if (cfg.gpuUsageEnabled !== undefined) root.gpuUsageEnabled = cfg.gpuUsageEnabled;
+                    if (cfg.gpuTempEnabled !== undefined) root.gpuTempEnabled = cfg.gpuTempEnabled;
+                    if (cfg.gpuPowerEnabled !== undefined) root.gpuPowerEnabled = cfg.gpuPowerEnabled;
+                    if (cfg.fpsEnabled !== undefined) root.fpsEnabled = cfg.fpsEnabled;
+                    if (cfg.diskEnabled !== undefined) root.diskEnabled = cfg.diskEnabled;
+                    if (cfg.metricColorCpu) root.metricColorCpu = cfg.metricColorCpu;
+                    if (cfg.metricColorGpu) root.metricColorGpu = cfg.metricColorGpu;
+                    if (cfg.metricColorFps) root.metricColorFps = cfg.metricColorFps;
+                    if (cfg.metricColorRam) root.metricColorRam = cfg.metricColorRam;
+                    if (cfg.metricColorDisk) root.metricColorDisk = cfg.metricColorDisk;
+                } catch (e) {
+                    console.warn("Failed to load metrics config:", e);
+                }
+            }
+        }
+    }
+
+    // ── History ──
     property var cpuHistory: []
     property var ramHistory: []
     property var gpuHistories: []
     property var cpuTempHistory: []
     property var gpuTempHistories: []
+    property var fpsHistory: []
     property int maxHistoryPoints: 50
     property int totalDataPoints: 0
 
-    // Update interval
+    // ── Update interval ──
     property int updateInterval: 2000
 
-    // Unified monitor process.
-    // Resource-efficient: only runs when dashboard is open.
-    // Optimized GPU polling avoids waking dGPUs.
+    // ════════════════════════════════════════════════════════════════
+    // Monitor process — runs when the dashboard metrics tab is open
+    // OR when the notch metrics overlay is active.
+    // ════════════════════════════════════════════════════════════════
+    property bool notchMetricsActive: Config.notch && Config.notch.showMetrics === true
+
     property Process monitorProcess: Process {
         id: monitorProcess
-        running: GlobalStates.dashboardOpen && GlobalStates.dashboardCurrentTab === 2 && root.validDisks.length > 0
-        
+
+        // Run when either dashboard metrics tab OR notch metrics mode is active
+        running: (GlobalStates.dashboardOpen && GlobalStates.dashboardCurrentTab === 2) || root.notchMetricsActive
+
         command: {
             let cmd = ["python3", Quickshell.shellDir + "/scripts/system_monitor.py", root.updateInterval.toString()];
             return cmd.concat(root.validDisks);
         }
-        
+
         stdout: SplitParser {
             onRead: data => {
                 try {
                     const stats = JSON.parse(data);
-                    
-                    // Static info (received once at start)
+
+                    // ── Static info (received once) ──
                     if (stats.static) {
                         root.cpuModel = stats.static.cpu_model || root.cpuModel;
                         root.gpuNames = stats.static.gpu_names || [];
@@ -82,35 +194,48 @@ Singleton {
                         return;
                     }
 
-                    // Update metrics
+                    // ── CPU ──
                     if (stats.cpu) {
                         root.cpuUsage = stats.cpu.usage;
                         root.cpuTemp = stats.cpu.temp;
+                        // power is sent by the script when available
+                        if (stats.cpu.power !== undefined) root.cpuPower = stats.cpu.power;
                     }
-                    
+
+                    // ── RAM ──
                     if (stats.ram) {
                         root.ramUsage = stats.ram.usage;
                         root.ramTotal = stats.ram.total;
                         root.ramUsed = stats.ram.used;
                         root.ramAvailable = stats.ram.available;
                     }
-                    
+
+                    // ── Disk ──
                     if (stats.disk) root.diskUsage = stats.disk.usage;
-                    
+
+                    // ── GPU ──
                     if (stats.gpu) {
                         root.gpuUsages = stats.gpu.usages;
                         root.gpuTemps = stats.gpu.temps;
+                        if (stats.gpu.power !== undefined) root.gpuPower = stats.gpu.power;
                     }
-                    
+
+                    // ── FPS (via MangoHud or generic) ──
+                    if (stats.fps !== undefined) root.fps = stats.fps;
+
                     root.updateHistory();
                 } catch (e) {
-                    console.warn("SystemResources: Failed to parse monitor data: " + e);
+                    console.warn("SystemResources: parse error: " + e);
                 }
             }
         }
     }
 
-    Component.onCompleted: validateDisks()
+    // ── Lifecycle ──
+    Component.onCompleted: {
+        validateDisks();
+        loadMetricsConfig();
+    }
 
     Connections {
         target: Config.system
@@ -122,6 +247,7 @@ Singleton {
 
     onValidDisksChanged: if (monitorProcess.running) restartMonitor()
     onUpdateIntervalChanged: if (monitorProcess.running) restartMonitor()
+    onNotchMetricsActiveChanged: if (!monitorProcess.running && notchMetricsActive) restartMonitor()
 
     function restartMonitor() {
         monitorProcess.running = false;
@@ -143,8 +269,7 @@ Singleton {
 
     function updateHistory() {
         totalDataPoints++;
-        
-        // Helper to update history arrays
+
         const pushHistory = (arr, val) => {
             let next = arr.slice();
             next.push(val);
@@ -159,17 +284,20 @@ Singleton {
         if (gpuDetected && gpuCount > 0) {
             let newGpuHistories = gpuHistories.slice();
             let newGpuTempHistories = gpuTempHistories.slice();
-            
+
             while (newGpuHistories.length < gpuCount) newGpuHistories.push([]);
             while (newGpuTempHistories.length < gpuCount) newGpuTempHistories.push([]);
-            
+
             for (let i = 0; i < gpuCount; i++) {
                 newGpuHistories[i] = pushHistory(newGpuHistories[i], (gpuUsages[i] || 0) / 100);
                 newGpuTempHistories[i] = pushHistory(newGpuTempHistories[i], (gpuTemps[i] ?? -1));
             }
-            
+
             gpuHistories = newGpuHistories;
             gpuTempHistories = newGpuTempHistories;
         }
+
+        // FPS history
+        fpsHistory = pushHistory(fpsHistory, fps);
     }
 }
diff --git a/modules/services/TaskbarApps.qml b/modules/services/TaskbarApps.qml
old mode 100644
new mode 100755
index e987fa25..15bf18db
--- a/modules/services/TaskbarApps.qml
+++ b/modules/services/TaskbarApps.qml
@@ -74,15 +74,19 @@ Singleton {
     }
 
     // Update on config change
+    // FIX: Guard enabled to prevent segfault when config properties are null mid-incubation
     Connections {
         target: Config.pinnedApps ?? null
+        enabled: Config.pinnedApps !== null
         function onAppsChanged() {
             updateTimer.restart();
         }
     }
 
+    // FIX: Guard enabled to prevent segfault when config properties are null mid-incubation
     Connections {
         target: Config.dock ?? null
+        enabled: Config.dock !== null
         function onIgnoredAppRegexesChanged() {
             updateTimer.restart();
         }
diff --git a/modules/services/UpdateService.qml b/modules/services/UpdateService.qml
old mode 100644
new mode 100755
index a4aae614..6a03eeb7
--- a/modules/services/UpdateService.qml
+++ b/modules/services/UpdateService.qml
@@ -10,7 +10,7 @@ Singleton {
 
     readonly property string currentVersion: Config.version
     readonly property string repoUrl: "https://api.github.com/repos/Axenide/Ambxst/tags"
-    readonly property string changelogUrl: "https://axeni.de/ambxst/changelog"
+    readonly property string changelogUrl: "https://github.com/Axenide/Ambxst/releases"
     // QUICKSHELL-GIT: readonly property string cacheFile: Quickshell.cachePath("update_check.json")
     readonly property string cacheFile: Quickshell.env("HOME") + "/.cache/ambxst/update_check.json"
 
diff --git a/modules/services/UsageTracker.qml b/modules/services/UsageTracker.qml
old mode 100644
new mode 100755
diff --git a/modules/services/Visibilities.qml b/modules/services/Visibilities.qml
old mode 100644
new mode 100755
diff --git a/modules/services/WeatherService.qml b/modules/services/WeatherService.qml
old mode 100644
new mode 100755
diff --git a/modules/services/WifiAccessPoint.qml b/modules/services/WifiAccessPoint.qml
old mode 100644
new mode 100755
diff --git a/modules/services/WlrToplevelMapper.qml b/modules/services/WlrToplevelMapper.qml
new file mode 100644
index 00000000..f6a2a1c7
--- /dev/null
+++ b/modules/services/WlrToplevelMapper.qml
@@ -0,0 +1,214 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+
+/*!
+ * \brief Maps hyprctl window data to WlrToplevel handles for ScreencopyView.
+ *
+ * ToplevelManager.toplevels.values provides WlrToplevel objects from
+ * native Wayland surfaces. This mapper bridges the gap by matching on
+ * appId/title heuristics and maintains a fallback screenshot cache
+ * for windows that can't get a live toplevel preview.
+ */
+Singleton {
+    id: root
+
+    // ── Internal cache ──
+    property var _cachedToplevels: []
+
+    property var _toplevelValues: ToplevelManager.toplevels ? ToplevelManager.toplevels.values : []
+    on_ToplevelValuesChanged: {
+        root._cachedToplevels = ToplevelManager.toplevels ? ToplevelManager.toplevels.values : [];
+    }
+
+    // Poll periodically for late-registering toplevels
+    Timer {
+        id: pollTimer
+        interval: 600
+        running: true
+        repeat: true
+        onTriggered: {
+            var fresh = ToplevelManager.toplevels ? ToplevelManager.toplevels.values : [];
+            if (fresh.length !== root._cachedToplevels.length) {
+                root._cachedToplevels = fresh;
+            }
+        }
+    }
+
+    // ═══════════════════════════════════════════════════════
+    // TOPLEVEL MATCHING
+    // ═══════════════════════════════════════════════════════
+
+    /*!
+     * Find the best WlrToplevel match for a given window class and title.
+     * Returns null if no match found.
+     *
+     * Strategy in order of priority:
+     *   1. Exact appId match → exact title match
+     *   2. Exact appId match → partial title match
+     *   3. Exact appId match → focused instance
+     *   4. appId ends-with class → exact title
+     *   5. appId starts-with class → exact title
+     *   6. appId contains class or vice versa → title match
+     *   7. Anything that matches poorly → focused instance
+     */
+    function find(cls, title) {
+        var tls = root._cachedToplevels;
+        if (!tls || tls.length === 0) return null;
+
+        var clsRaw = cls || "";
+        var clsLower = clsRaw.toLowerCase().trim();
+        if (!clsLower) return null;
+
+        var titleStr = (title || "").trim();
+        var titleLower = titleStr.toLowerCase();
+
+        // Helper: score a toplevel match
+        function score(t) {
+            var s = 0;
+            var aLower = (t.appId || "").toLowerCase().trim();
+
+            // Exact appId match = 100
+            if (aLower === clsLower) s += 100;
+            // appId ends with .cls or contains .cls.
+            else if (aLower.endsWith("." + clsLower) || aLower.endsWith(clsLower)) s += 80;
+            // appId starts with cls
+            else if (aLower.startsWith(clsLower)) s += 70;
+            // cls ends with appId (reverse DNS like org.kde.dolphin → dolphin)
+            else if (clsLower.endsWith("." + aLower) || clsLower.endsWith(aLower)) s += 75;
+            // cls starts with /* appId or appId starts with cls
+            else if (clsLower.indexOf(aLower) >= 0 || aLower.indexOf(clsLower) >= 0) s += 60;
+
+            if (s === 0) return 0; // No appId match at all
+
+            // Title bonus
+            var tTitle = (t.title || "").trim();
+            if (tTitle === titleStr) s += 50;         // Exact title
+            else if (tTitle.toLowerCase() === titleLower) s += 45;
+            else {
+                var tLower = tTitle.toLowerCase();
+                if (titleLower.indexOf(tLower) >= 0 || tLower.indexOf(titleLower) >= 0) s += 30;
+                else if (titleLower.split(/[\s-]+/).some(function(w) { return tLower.indexOf(w) >= 0; })) s += 15;
+            }
+
+            // Boost focused window
+            if (t.activated) s += 10;
+
+            return s;
+        }
+
+        // Find best match
+        var best = null;
+        var bestScore = 0;
+        for (var i = 0; i < tls.length; i++) {
+            var sc = score(tls[i]);
+            if (sc > bestScore) {
+                bestScore = sc;
+                best = tls[i];
+            }
+        }
+
+        // Only return if score is meaningful (≥60 means at least a partial appId match)
+        return bestScore >= 60 ? best : null;
+    }
+
+    /*!
+     * Returns all unmatched windows (cls,title pairs that had no toplevel).
+     * The overview can use this to trigger grim fallback screenshots.
+     */
+    property var unmatchedWindows: []
+
+    function updateUnmatched(allWindows) {
+        var result = [];
+        if (!allWindows) { root.unmatchedWindows = result; return; }
+        for (var i = 0; i < allWindows.length; i++) {
+            var w = allWindows[i];
+            var tl = root.find(w.class, w.title);
+            if (!tl) {
+                result.push({
+                    cls: w.class || "",
+                    title: w.title || "",
+                    addr: w.address || "",
+                    at: w.at || [0, 0],
+                    size: w.size || [100, 100],
+                    mon: w.monitor || 0
+                });
+            }
+        }
+        root.unmatchedWindows = result;
+    }
+
+    readonly property bool hasToplevels: _cachedToplevels.length > 0
+    readonly property int count: _cachedToplevels.length
+
+    // ═══════════════════════════════════════════════════════
+    // GRIM FALLBACK SCREENSHOT
+    // ═══════════════════════════════════════════════════════
+
+    // Cache of grim screenshots by window address
+    property var _screenshotCache: ({})
+    property bool _capturing: false
+
+    // Take a fallback screenshot using grim (one-shot, async)
+    // Output: /tmp/ambxst_preview_<addr>.png
+    Process {
+        id: grimProcess
+        stdout: StdioCollector {
+            onStreamFinished: {
+                // grim writes image to stdout or file
+                // We write to file: handled by command args
+                root._capturing = false;
+            }
+        }
+    }
+
+    /*!
+     * Capture a grim screenshot for a window that has no toplevel.
+     * Only works for windows on the CURRENT visible workspace.
+     * The image is saved to /tmp/ambxst_preview_<addr>.png
+     * and can be loaded via: file:///tmp/ambxst_preview_<addr>.png
+     */
+    function captureScreenshot(addr, at, size) {
+        if (!addr || !at || !size || root._capturing) return;
+        root._capturing = true;
+
+        var x = at[0] || 0;
+        var y = at[1] || 0;
+        var w = size[0] || 100;
+        var h = size[1] || 100;
+        var out = "/tmp/ambxst_preview_" + addr.replace(/[^a-f0-9]/g, '') + ".png";
+
+        grimProcess.command = ["grim", "-g", x + "," + y + " " + w + "x" + h, out];
+        grimProcess.running = true;
+    }
+
+    /*!
+     * Get the grim screenshot path for a window address.
+     * Returns null if no screenshot has been captured.
+     */
+    function screenshotPath(addr) {
+        if (!addr) return null;
+        var safe = addr.replace(/[^a-f0-9]/g, '');
+        var path = "/tmp/ambxst_preview_" + safe + ".png";
+        // Check if file exists by attempting to access it
+        // In QML, we can't check file existence, so we just return the path
+        // The Image.onStatusChanged handler can check if it loaded
+        return "file://" + path;
+    }
+
+    /*!
+     * Capture grim screenshots for all unmatched windows.
+     * Should be called when the overview opens.
+     */
+    function captureAllUnmatched() {
+        var um = root.unmatchedWindows;
+        for (var i = 0; i < um.length; i++) {
+            var win = um[i];
+            root.captureScreenshot(win.addr, win.at, win.size);
+        }
+    }
+}
diff --git a/modules/services/ai/AiModel.qml b/modules/services/ai/AiModel.qml
old mode 100644
new mode 100755
diff --git a/modules/services/ai/strategies/AnthropicApiStrategy.qml b/modules/services/ai/strategies/AnthropicApiStrategy.qml
old mode 100644
new mode 100755
diff --git a/modules/services/ai/strategies/ApiStrategy.qml b/modules/services/ai/strategies/ApiStrategy.qml
old mode 100644
new mode 100755
diff --git a/modules/services/ai/strategies/DeepSeekApiStrategy.qml b/modules/services/ai/strategies/DeepSeekApiStrategy.qml
new file mode 100644
index 00000000..eff77725
--- /dev/null
+++ b/modules/services/ai/strategies/DeepSeekApiStrategy.qml
@@ -0,0 +1,88 @@
+import QtQuick
+
+// DeepSeek API strategy — uses OpenAI-compatible format
+// endpoint: https://api.deepseek.com/v1/chat/completions
+ApiStrategy {
+    supportsStreaming: true
+
+    function getEndpoint(modelObj, apiKey) {
+        let base = modelObj.endpoint || "https://api.deepseek.com";
+        if (base.endsWith("/v1"))
+            return base + "/chat/completions";
+        return base + "/v1/chat/completions";
+    }
+
+    function getHeaders(apiKey) {
+        return [
+            "Content-Type: application/json",
+            "Authorization: Bearer " + apiKey
+        ];
+    }
+
+    function _formatMessages(messages) {
+        let formatted = [];
+        for (let i = 0; i < messages.length; i++) {
+            let msg = messages[i];
+            if (msg.attachments && msg.attachments.length > 0) {
+                let contentParts = [{type: "text", text: msg.content}];
+                for (let j = 0; j < msg.attachments.length; j++) {
+                    let att = msg.attachments[j];
+                    if (att.type === "image") {
+                        contentParts.push({
+                            type: "image_url",
+                            image_url: { url: att.url }
+                        });
+                    }
+                }
+                formatted.push({ role: msg.role, content: contentParts });
+            } else {
+                formatted.push({ role: msg.role, content: msg.content });
+            }
+        }
+        return formatted;
+    }
+
+    function buildRequestBody(modelObj, messages, systemPrompt, options) {
+        let body = {
+            model: modelObj.model || "deepseek-chat",
+            messages: []
+        };
+
+        if (systemPrompt) {
+            body.messages.push({ role: "system", content: systemPrompt });
+        }
+
+        let formatted = _formatMessages(messages);
+        for (let i = 0; i < formatted.length; i++) {
+            body.messages.push(formatted[i]);
+        }
+
+        if (options?.temperature != null) body.temperature = options.temperature;
+        if (options?.maxTokens) body.max_tokens = options.maxTokens;
+        if (options?.stream != null) body.stream = options.stream;
+
+        return body;
+    }
+
+    function parseResponse(data) {
+        try {
+            let json = JSON.parse(data);
+            if (json.choices && json.choices.length > 0) {
+                let content = json.choices[0].delta?.content || json.choices[0].message?.content || "";
+                return { content, done: json.choices[0].finish_reason != null };
+            }
+        } catch (e) {}
+        return { content: "", done: false };
+    }
+
+    function parseFullResponse(data) {
+        try {
+            let json = JSON.parse(data);
+            if (json.choices && json.choices.length > 0) {
+                let content = json.choices[0].message?.content || "";
+                return { content, model: json.model };
+            }
+        } catch (e) {}
+        return { content: "", model: "" };
+    }
+}
diff --git a/modules/services/ai/strategies/GeminiApiStrategy.qml b/modules/services/ai/strategies/GeminiApiStrategy.qml
old mode 100644
new mode 100755
diff --git a/modules/services/ai/strategies/GroqApiStrategy.qml b/modules/services/ai/strategies/GroqApiStrategy.qml
old mode 100644
new mode 100755
diff --git a/modules/services/ai/strategies/MiniMaxApiStrategy.qml b/modules/services/ai/strategies/MiniMaxApiStrategy.qml
old mode 100644
new mode 100755
diff --git a/modules/services/ai/strategies/MistralApiStrategy.qml b/modules/services/ai/strategies/MistralApiStrategy.qml
old mode 100644
new mode 100755
diff --git a/modules/services/ai/strategies/OllamaApiStrategy.qml b/modules/services/ai/strategies/OllamaApiStrategy.qml
old mode 100644
new mode 100755
diff --git a/modules/services/ai/strategies/OpenAiApiStrategy.qml b/modules/services/ai/strategies/OpenAiApiStrategy.qml
old mode 100644
new mode 100755
diff --git a/modules/services/clipboard_init.sql b/modules/services/clipboard_init.sql
old mode 100644
new mode 100755
diff --git a/modules/shell/ReservationWindows.qml b/modules/shell/ReservationWindows.qml
old mode 100644
new mode 100755
diff --git a/modules/shell/UnifiedShellPanel.qml b/modules/shell/UnifiedShellPanel.qml
old mode 100644
new mode 100755
index 028c2dce..4d7e91fa
--- a/modules/shell/UnifiedShellPanel.qml
+++ b/modules/shell/UnifiedShellPanel.qml
@@ -76,9 +76,16 @@ PanelWindow {
     readonly property alias dockFullscreen: dockContent.activeWindowFullscreen
     readonly property int dockHeight: dockContent.dockSize + dockContent.totalMargin
 
+    // Hide dock when island mode is active and dock shares the same position
+    readonly property bool _islandActive: (Config.bar && Config.bar.barMode === "dynamic") && (Config.notchTheme || "default") === "island" && barContent.barPosition === (Config.notchPosition || "top")
+    readonly property bool _dockHiddenByIsland: _islandActive && (dockContent.position === barContent.barPosition || (dockContent.position === "center" && (barContent.barPosition === "top" || barContent.barPosition === "bottom")))
+    // Dock standalone is always hidden in island mode (apps shown in island buttons)
+    readonly property bool dockActuallyVisible: dockEnabled && !root._dockHiddenByIsland
+
     readonly property alias notchHoverActive: notchContent.hoverActive
     readonly property alias notchOpen: notchContent.screenNotchOpen
     readonly property alias notchReveal: notchContent.reveal
+    readonly property alias notchPinned: notchContent.notchPinned
 
     // Generic names for external compatibility (Visibilities expects these on the panel object)
     readonly property alias pinned: barContent.pinned
@@ -103,7 +110,7 @@ PanelWindow {
         }
 
         // Check all windows on this monitor (robust path)
-        const wins = CompositorData.windowList;
+        const wins = CompositorData && CompositorData.windowList ? CompositorData.windowList : [];
         for (let i = 0; i < wins.length; i++) {
             if (wins[i].monitor === monId && wins[i].fullscreen && wins[i].workspace.id === activeWorkspaceId) {
                 return true;
@@ -152,14 +159,20 @@ PanelWindow {
         item: unifiedPanel.needsFullScreenInput ? fullScreenMask : null
         regions: [
             Region {
-                item: barContent.visible ? barContent.barHitbox : null
+                // In island mode, exclude bar hitbox so clicks reach the notch
+                item: !unifiedPanel._islandActive && barContent.visible ? barContent.barHitbox : null
+            },
+            Region {
+                // Always include hover region for edge detection
+                item: notchContent.notchHoverRegionRef
             },
             Region {
-                item: notchContent.notchHitbox
+                // Full notch area only when active (module open or revealed)
+                item: (unifiedPanel.needsFullScreenInput || unifiedPanel.notchReveal || unifiedPanel.notchOpen) ? notchContent.notchActiveRegion : null
             },
             Region {
                 // Only include the dock hitbox if the dock is actually enabled and visible on this screen.
-                item: dockContent.visible ? dockContent.dockHitbox : null
+                item: unifiedPanel.dockActuallyVisible ? dockContent.dockHitbox : null
             },
             Region {
                 item: (assistantSidebar.active || assistantSidebar.hitbox.visible) ? assistantSidebar.hitbox : null
@@ -206,7 +219,17 @@ PanelWindow {
         id: visualContent
         anchors.fill: parent
 
-        layer.enabled: true
+        // ⚡ Only enable the offscreen layer when something is actually visible.
+        // When bar/dock/notch/frame are all hidden, no shadow is needed.
+        // This saves a full-screen render-to-texture pass every frame.
+        readonly property bool needLayer: 
+            (unifiedPanel.barEnabled && unifiedPanel.barReveal) ||
+            (unifiedPanel.dockEnabled && unifiedPanel.dockReveal) ||
+            unifiedPanel.notchReveal ||
+            assistantSidebar.active ||
+            (Config.bar?.frameEnabled ?? false)
+
+        layer.enabled: needLayer
         layer.effect: Shadow {}
 
         ScreenFrameContent {
@@ -231,7 +254,7 @@ PanelWindow {
             anchors.fill: parent
             screen: unifiedPanel.targetScreen
             z: 3
-            visible: unifiedPanel.dockEnabled
+            visible: unifiedPanel.dockActuallyVisible
         }
 
         NotchContent {
diff --git a/modules/shell/osd/OSD.qml b/modules/shell/osd/OSD.qml
old mode 100644
new mode 100755
index 432f771d..cc31c719
--- a/modules/shell/osd/OSD.qml
+++ b/modules/shell/osd/OSD.qml
@@ -75,18 +75,20 @@ PanelWindow {
                     scale: GlobalStates.osdIndicator === "brightness" ? (0.8 + (root.osdValue * 0.2)) : 1
 
                     Behavior on rotation {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
                     Behavior on scale {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
diff --git a/modules/sidebar/AssistantSidebar.qml b/modules/sidebar/AssistantSidebar.qml
old mode 100644
new mode 100755
index be201de3..697e4556
--- a/modules/sidebar/AssistantSidebar.qml
+++ b/modules/sidebar/AssistantSidebar.qml
@@ -155,8 +155,9 @@ Item {
         Behavior on x {
             NumberAnimation {
                 id: slideAnimation
-                duration: Config.animDuration
-                easing.type: Easing.OutCubic
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -201,7 +202,7 @@ Item {
                                 opacity: parent.hovered ? 1 : 0
                                 Behavior on opacity {
                                     NumberAnimation {
-                                        duration: Config.animDuration / 4
+                                        duration: Anim.standardSmall
                                     }
                                 }
                             }
@@ -227,7 +228,7 @@ Item {
                                 opacity: parent.hovered ? 1 : 0
                                 Behavior on opacity {
                                     NumberAnimation {
-                                        duration: Config.animDuration / 4
+                                        duration: Anim.standardSmall
                                     }
                                 }
                             }
@@ -259,7 +260,7 @@ Item {
 
                                 Behavior on opacity {
                                     NumberAnimation {
-                                        duration: Config.animDuration / 4
+                                        duration: Anim.standardSmall
                                     }
                                 }
                             }
@@ -296,7 +297,7 @@ Item {
 
                                 Behavior on opacity {
                                     NumberAnimation {
-                                        duration: Config.animDuration / 4
+                                        duration: Anim.standardSmall
                                     }
                                 }
                             }
@@ -403,7 +404,7 @@ Item {
 
                             Behavior on opacity {
                                 NumberAnimation {
-                                    duration: Config.animDuration
+                                    duration: Anim.standardNormal
                                 }
                             }
 
@@ -751,6 +752,8 @@ Item {
                                                     anchors.fill: parent
                                                     source: "file://" + Quickshell.env("HOME") + "/.face.icon"
                                                     fillMode: Image.PreserveAspectCrop
+                                                    sourceSize.width: 32
+                                                    sourceSize.height: 32
 
                                                     onStatusChanged: {
                                                         if (status === Image.Error) {
@@ -1202,8 +1205,9 @@ Item {
 
                             Behavior on anchors.bottomMargin {
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
diff --git a/modules/sidebar/CodeBlock.qml b/modules/sidebar/CodeBlock.qml
old mode 100644
new mode 100755
diff --git a/modules/sidebar/ModelSelectorPopup.qml b/modules/sidebar/ModelSelectorPopup.qml
old mode 100644
new mode 100755
index c5e77af1..a5c66218
--- a/modules/sidebar/ModelSelectorPopup.qml
+++ b/modules/sidebar/ModelSelectorPopup.qml
@@ -174,10 +174,11 @@ Popup {
                 Layout.preferredHeight: 48
 
                 Behavior on Layout.preferredWidth {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -220,9 +221,9 @@ Popup {
                             }
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
+                                    duration: Anim.standardSmall
                                 }
                             }
                         }
@@ -243,9 +244,9 @@ Popup {
                         visible: opacity > 0
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration / 2
+                                duration: Anim.standardSmall
                             }
                         }
                     }
@@ -256,9 +257,9 @@ Popup {
                     radius: Styling.radius(4)
 
                     Behavior on color {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         ColorAnimation {
-                            duration: Config.animDuration / 2
+                            duration: Anim.standardSmall
                         }
                     }
                 }
@@ -295,10 +296,11 @@ Popup {
             property bool enableScrollAnimation: true
 
             Behavior on contentY {
-                enabled: Config.animDuration > 0 && modelList.enableScrollAnimation && !modelList.moving
+                enabled: Anim.animationsEnabled && modelList.enableScrollAnimation && !modelList.moving
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
@@ -329,10 +331,11 @@ Popup {
                 y: modelList.currentIndex >= 0 ? modelList.currentIndex * 48 : 0
 
                 Behavior on y {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -434,19 +437,21 @@ Popup {
                             color: iconRect.item
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
 
                         Behavior on color {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             ColorAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutCubic
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
@@ -466,10 +471,11 @@ Popup {
                             elide: Text.ElideRight
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
@@ -484,10 +490,11 @@ Popup {
                             elide: Text.ElideRight
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
@@ -509,10 +516,11 @@ Popup {
                             visible: delegateBtn.isActiveModel
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
diff --git a/modules/theme/AGENTS.md b/modules/theme/AGENTS.md
old mode 100644
new mode 100755
index b3038c4e..9d1f1ce1
--- a/modules/theme/AGENTS.md
+++ b/modules/theme/AGENTS.md
@@ -6,7 +6,7 @@ Dynamic theming layer providing colors, icons, and style utilities as singletons
 ## STRUCTURE
 | File | Type | Role |
 |------|------|------|
-| `Colors.qml` | Singleton | Watches `~/.cache/ambxst/colors.json`. Provides reactive palette (`primary`, `secondary`, `surface`, `onSurface`, etc.) |
+| `Colors.qml` | Singleton | Watches `~/.cache/Ambxst/colors.json`. Provides reactive palette (`primary`, `secondary`, `surface`, `onSurface`, etc.) |
 | `Styling.qml` | Singleton | `radius(offset)`, `fontSize(offset)`, `getStyledRectConfig(variant)`. Animation durations, spacing constants |
 | `Icons.qml` | Singleton | Character map for Phosphor-Bold icon font (`lock`, `power`, `layout`, etc.) |
 | `*Generator.qml` | Components | Translate `Colors` palette into config files for other apps |
@@ -22,7 +22,7 @@ Dynamic theming layer providing colors, icons, and style utilities as singletons
 ## WHERE TO LOOK
 | Task | Location | Notes |
 |------|----------|-------|
-| **Change colors** | `Colors.qml` | Modify `~/.cache/ambxst/colors.json` or change color preset |
+| **Change colors** | `Colors.qml` | Modify `~/.cache/Ambxst/colors.json` or change color preset |
 | **Add StyledRect variant** | `Styling.qml` → `getStyledRectConfig()` | Returns gradient, border, opacity config per variant |
 | **Adjust radius/font** | `Styling.qml` | `radius(offset)` and `fontSize(offset)` apply global scaling |
 | **Add icon** | `Icons.qml` | Add Phosphor-Bold unicode mapping |
diff --git a/modules/theme/Anim.qml b/modules/theme/Anim.qml
new file mode 100644
index 00000000..710aa3a6
--- /dev/null
+++ b/modules/theme/Anim.qml
@@ -0,0 +1,654 @@
+pragma Singleton
+import QtQuick
+import qs.config
+
+/*!
+    Anim.qml — Animation system for Ambxst.
+
+    Provides animation style profiles inspired by classic and modern OS platforms.
+    Each style defines unique easing curves, durations, and behaviors for
+    different motion types (standard, emphasized, spatial, spring).
+
+    Usage:
+        import qs.modules.theme
+
+        Behavior on opacity {
+            NumberAnimation { Anim.apply(this, "standard", "normal") }
+        }
+
+        NumberAnimation {
+            target: foo; property: "x"
+            Anim.configure(this, "emphasized", "large", "enter")
+        }
+
+        // Platform-specific easing:
+        duration: Anim.duration("standard", "normal")
+        easing.type: Anim.easing("standard").type
+        easing.bezierCurve: Anim.easing("standard").bezierCurve
+*/
+QtObject {
+    id: root
+
+    // ============================================
+    // ANIMATION STYLE PROFILES
+    // ============================================
+    // Each profile defines:
+    //   durations  — base ms per motion type
+    //   easings    — bezier curves per motion type
+    //   name       — human-readable name
+
+    readonly property var _profiles: ({
+        // ─── Material 3 (default) ──────────────────────────────────────
+        "m3": {
+            name: "Material 3",
+            durations: {
+                standard:   { small: 120,  normal: 250, large: 350, extraLarge: 450 },
+                emphasized: { small: 200,  normal: 350, large: 500 },
+                spatial:    { fast: 150,   default: 300, slow: 450 },
+                spring:     { small: 300,  normal: 450, large: 600 }
+            },
+            easings: {
+                standard:       [0.2, 0.0, 0.0, 1.0],
+                emphasized:     [0.05, 0.7, 0.1, 1.0],
+                emphasizedExit: [0.3, 0.0, 0.8, 0.15],
+                spatial:        [0.4, 0.0, 0.2, 1.0],
+                decelerate:     [0.0, 0.0, 0.2, 1.0],
+                accelerate:     [0.4, 0.0, 1.0, 1.0],
+                linear:         null
+            }
+        },
+
+        // ─── Windows Classic (95/98/ME/2000) ────────────────────────────
+        // Minimal animations, linear or very simple easing, short durations.
+        // Design principle: functional, no-nonsense, instant feedback.
+        "windows-classic": {
+            name: "Windows Classic",
+            durations: {
+                standard:   { small: 50,   normal: 100, large: 150, extraLarge: 200 },
+                emphasized: { small: 100,  normal: 150, large: 250 },
+                spatial:    { fast: 50,    default: 100, slow: 200 },
+                spring:     { small: 100,  normal: 150, large: 200 }
+            },
+            easings: {
+                standard:       [0.0, 0.0, 1.0, 1.0],  // Linear
+                emphasized:     [0.0, 0.0, 1.0, 1.0],  // Linear
+                emphasizedExit: [0.0, 0.0, 1.0, 1.0],  // Linear
+                spatial:        [0.0, 0.0, 1.0, 1.0],  // Linear
+                decelerate:     [0.0, 0.0, 1.0, 1.0],  // Linear
+                accelerate:     [0.0, 0.0, 1.0, 1.0],  // Linear
+                linear:         null
+            }
+        },
+
+        // ─── Windows XP ─────────────────────────────────────────────────
+        // Gentle ease-out, slightly playful, medium durations.
+        // "Luna" theme: smooth but not overly animated.
+        "windows-xp": {
+            name: "Windows XP",
+            durations: {
+                standard:   { small: 100,  normal: 200, large: 300, extraLarge: 400 },
+                emphasized: { small: 150,  normal: 250, large: 350 },
+                spatial:    { fast: 100,   default: 200, slow: 350 },
+                spring:     { small: 200,  normal: 300, large: 400 }
+            },
+            easings: {
+                standard:       [0.25, 0.1, 0.25, 1.0],  // Gentle ease
+                emphasized:     [0.0, 0.0, 0.2, 1.0],    // Ease-out emphasis
+                emphasizedExit: [0.4, 0.0, 1.0, 1.0],    // Ease-in
+                spatial:        [0.25, 0.1, 0.25, 1.0],
+                decelerate:     [0.0, 0.0, 0.2, 1.0],
+                accelerate:     [0.4, 0.0, 1.0, 1.0],
+                linear:         null
+            }
+        },
+
+        // ─── Windows 7 (Aero) ───────────────────────────────────────────
+        // Glass aesthetic, smooth transitions, subtle overshoot.
+        // Aero Glass: animated taskbar thumbnails, flip3d, window previews.
+        "windows-7": {
+            name: "Windows 7",
+            durations: {
+                standard:   { small: 150,  normal: 250, large: 350, extraLarge: 500 },
+                emphasized: { small: 200,  normal: 350, large: 500 },
+                spatial:    { fast: 150,   default: 300, slow: 450 },
+                spring:     { small: 300,  normal: 400, large: 550 }
+            },
+            easings: {
+                // Aero glass: smooth with gentle coefficient
+                standard:       [0.15, 0.60, 0.25, 0.90],
+                emphasized:     [0.05, 0.80, 0.15, 0.95],
+                emphasizedExit: [0.35, 0.05, 0.75, 0.35],
+                spatial:        [0.22, 0.50, 0.30, 0.88],
+                linear:         null
+            }
+        },
+
+        // ─── Mac OS Classic (pre-OS X) ──────────────────────────────────
+        // Almost no animations. Checkerboard, iris effects (Platinum).
+        // In practice: linear fades if anything.
+        "mac-classic": {
+            name: "Mac OS Classic",
+            durations: {
+                standard:   { small: 30,   normal: 80,  large: 120, extraLarge: 180 },
+                emphasized: { small: 80,   normal: 120, large: 200 },
+                spatial:    { fast: 30,    default: 80,  slow: 150 },
+                spring:     { small: 80,   normal: 120, large: 150 }
+            },
+            easings: {
+                standard:       [0.0, 0.0, 1.0, 1.0],  // All linear
+                emphasized:     [0.0, 0.0, 1.0, 1.0],
+                emphasizedExit: [0.0, 0.0, 1.0, 1.0],
+                spatial:        [0.0, 0.0, 1.0, 1.0],
+                decelerate:     [0.0, 0.0, 1.0, 1.0],
+                accelerate:     [0.0, 0.0, 1.0, 1.0],
+                linear:         null
+            }
+        },
+
+        // ─── Mac OS X Leopard/Snow Leopard ──────────────────────────────
+        // Genie effect, smooth fade, sine-based curves.
+        // Aqua UI: jelly buttons, smooth scrolling, cover flow.
+        "mac-legacy": {
+            name: "Mac OS X",
+            durations: {
+                standard:   { small: 200,  normal: 350, large: 500, extraLarge: 650 },
+                emphasized: { small: 300,  normal: 450, large: 600 },
+                spatial:    { fast: 200,   default: 350, slow: 500 },
+                spring:     { small: 350,  normal: 500, large: 700 }
+            },
+            easings: {
+                standard:       [0.42, 0.0, 0.58, 1.0],  // Sine ease-in-out
+                emphasized:     [0.25, 0.46, 0.45, 0.94], // Gentle overshoot
+                emphasizedExit: [0.55, 0.06, 0.68, 0.53], // Smooth exit
+                spatial:        [0.42, 0.0, 0.58, 1.0],   // Sine ease
+                decelerate:     [0.0, 0.0, 0.2, 1.0],
+                accelerate:     [0.4, 0.0, 1.0, 1.0],
+                linear:         null
+            }
+        },
+
+        // ─── macOS Modern (10.7+) ───────────────────────────────────────
+        // Spring animations, natural physics, smooth scrolling.
+        // Natural easing: mimic real-world physics (slight bounce).
+        "mac-modern": {
+            name: "macOS",
+            durations: {
+                standard:   { small: 150,  normal: 300, large: 450, extraLarge: 600 },
+                emphasized: { small: 250,  normal: 400, large: 550 },
+                spatial:    { fast: 150,   default: 300, slow: 450 },
+                spring:     { small: 400,  normal: 550, large: 750 }
+            },
+            easings: {
+                // Spring: zeta=0.55, natural bounce
+                standard:       [0.28, 0.65, 0.18, 0.88],
+                emphasized:     [0.15, 0.78, 0.22, 0.90],
+                emphasizedExit: [0.30, 0.08, 0.65, 0.25],
+                spatial:        [0.32, 0.55, 0.25, 0.85],
+                linear:         null
+            }
+        },
+
+        // ─── Android Gingerbread/Honeycomb (pre-Material) ──────────────
+        // Simple transitions, basic fade, short durations.
+        "android-legacy": {
+            name: "Android (Legacy)",
+            durations: {
+                standard:   { small: 80,   normal: 150, large: 250, extraLarge: 350 },
+                emphasized: { small: 150,  normal: 250, large: 350 },
+                spatial:    { fast: 80,    default: 150, slow: 300 },
+                spring:     { small: 150,  normal: 250, large: 350 }
+            },
+            easings: {
+                standard:       [0.4, 0.0, 0.6, 1.0],    // Gentle ease
+                emphasized:     [0.0, 0.0, 0.35, 1.0],   // Ease-out
+                emphasizedExit: [0.4, 0.0, 1.0, 1.0],    // Ease-in
+                spatial:        [0.4, 0.0, 0.6, 1.0],
+                decelerate:     [0.0, 0.0, 0.35, 1.0],
+                accelerate:     [0.4, 0.0, 1.0, 1.0],
+                linear:         null
+            }
+        },
+
+        // ─── Android Material Design (5.0-11) ───────────────────────────
+        // Responsive: fast start, slow end. Standard Material curves.
+        // FastOutSlowIn: immediate response + smooth deceleration.
+        "android-material": {
+            name: "Android Material",
+            durations: {
+                standard:   { small: 100,  normal: 200, large: 300, extraLarge: 400 },
+                emphasized: { small: 200,  normal: 300, large: 450 },
+                spatial:    { fast: 150,   default: 250, slow: 400 },
+                spring:     { small: 250,  normal: 350, large: 500 }
+            },
+            easings: {
+                standard:       [0.4, 0.0, 0.2, 1.0],   // FastOutSlowIn
+                emphasized:     [0.4, 0.0, 0.2, 1.0],   // Same for emphasis
+                emphasizedExit: [0.4, 0.0, 1.0, 1.0],   // FastOutLinearIn
+                spatial:        [0.4, 0.0, 0.2, 1.0],
+                decelerate:     [0.0, 0.0, 0.2, 1.0],   // LinearOutSlowIn
+                accelerate:     [0.4, 0.0, 1.0, 1.0],   // FastOutLinearIn
+                linear:         null
+            }
+        },
+
+        // ─── Android 12+ (Material You) ─────────────────────────────────
+        // Expressive, organic, spring physics. Longer durations.
+        // Emphasized deceleration, adaptive motion based on context.
+        "android-you": {
+            name: "Android 12+",
+            durations: {
+                standard:   { small: 200,  normal: 350, large: 500, extraLarge: 700 },
+                emphasized: { small: 350,  normal: 500, large: 700 },
+                spatial:    { fast: 250,   default: 400, slow: 600 },
+                spring:     { small: 450,  normal: 600, large: 850 }
+            },
+            easings: {
+                // Expressive spring: zeta=0.45, visible bounce
+                standard:       [0.15, 0.70, 0.20, 0.88],
+                emphasized:     [0.05, 0.85, 0.12, 0.92],
+                emphasizedExit: [0.30, 0.10, 0.68, 0.18],
+                spatial:        [0.30, 0.48, 0.25, 0.90],
+                linear:         null
+            }
+        }
+    })
+
+    // ============================================
+    // ACTIVE PROFILE
+    // ============================================
+    readonly property string _styleKey: {
+        const s = Config.theme && Config.theme.animStyle;
+        if (s && root._profiles[s]) return s;
+        return "m3";
+    }
+
+    readonly property var _profile: root._profiles[root._styleKey] || root._profiles["m3"]
+
+    // ============================================
+    // GLOBAL SPEED SCALE
+    // ============================================
+    readonly property real _baseScale: {
+        if (root._styleKey === "disabled") return 0;
+        // Check Config availability — during startup Config may not be ready
+        if (typeof Config === "undefined" || Config === null) return 1.0;
+        const ad = Config.animDuration;
+        if (ad === undefined || ad === null || ad <= 0) return 1.0; // Default to enabled
+        const cfgScale = Config.theme && Config.theme.animScale;
+        let userScale = (cfgScale !== undefined && cfgScale > 0) ? cfgScale : 1.0;
+        return userScale * ad / 300;
+    }
+
+    function _scale(baseMs) {
+        return Math.max(0, Math.round(baseMs * root._baseScale));
+    }
+
+    // ============================================
+    // PUBLIC API
+    // ============================================
+
+    /*! Get duration in ms for a given type/size.
+        @param type: "standard" | "emphasized" | "spatial" | "spring"
+        @param size: "small" | "normal" | "large" | "extraLarge" / "fast" / "default" / "slow"
+    */
+    function duration(type, size) {
+        const profile = root._profile;
+        const t = profile.durations[type];
+        if (!t) return 0;
+        return root._scale(t[size] || t.normal || t.default || 0);
+    }
+
+    /*! Get easing configuration object for a given type.
+        @param type: "standard" | "emphasized" | "emphasizedExit" | "spatial" | "decelerate" | "accelerate" | "linear"
+        @param variant: (optional) "enter" | "exit" — shorthand for emphasized variants
+        @returns {{ type: int, bezierCurve?: number[] }}
+    */
+    function easing(type, variant) {
+        const profile = root._profile;
+        let key = type;
+
+        if (type === "emphasized") {
+            if (variant === "exit" || variant === "accelerate")
+                key = "emphasizedExit";
+            else
+                key = "emphasized";
+        }
+
+        const curve = profile.easings[key] || profile.easings.standard || [0.0, 0.0, 1.0, 1.0];
+        if (curve === null)
+            return { type: Easing.Linear };
+
+        return { type: Easing.BezierSpline, bezierCurve: curve };
+    }
+
+    /*! Configure a NumberAnimation with the active profile's settings. */
+    function configure(anim, type, size, variant) {
+        if (!anim || !(anim instanceof NumberAnimation)) return;
+        anim.duration = root.duration(type, size);
+        const ease = root.easing(type, variant);
+        anim.easing.type = ease.type;
+        if (ease.bezierCurve !== undefined)
+            anim.easing.bezierCurve = ease.bezierCurve;
+    }
+
+    /*! Shorthand: apply profile settings to a Behavior's default animation. */
+    function apply(targetAnimation, type, size, variant) {
+        if (!targetAnimation) return;
+        root.configure(targetAnimation, type, size, variant);
+    }
+
+    // ============================================
+    // HYPRLAND ANIMATION CONFIG
+    // ============================================
+    // Returns bezier curve and speed for Hyprland animations based on style.
+    // Dramatic, physics-driven bezier curves for Hyprland animations.
+    // Each style uses unique math to create a distinct feel:
+    //   Overshoot:     c1y > 1.0 or c2y < 0.0 → bouncy/snap effect
+    //   Anticipation:  c1x < 0.0 → pull back before moving
+    //   Spring:        c1y > 1.0, c2y < 0.0 → full spring bounce
+    //   Snappy:        c1x very small, c2x close to 1.0 → quick start, fast finish
+    //   Smooth:        symmetric → butter-smooth
+    readonly property var _hyprBeziers: ({
+        // M3 — standard Material Deceleration: immediate response, gentle end
+        "m3":               { curve: [0.2, 0.0, 0.0, 1.0], speed: 2.5, name: "nl-standard" },
+        // Windows Classic — linear, no easing at all
+        "windows-classic":  { curve: [0.0, 0.0, 1.0, 1.0], speed: 1.0, name: "nl-linear" },
+        // Windows XP — gentle ease-out with slight anticipation
+        "windows-xp":       { curve: [0.25, 0.1, 0.25, 1.0], speed: 2.0, name: "nl-xp" },
+        // Windows 7 Aero — smooth reveal with subtle overshoot bounce
+        "windows-7":        { curve: [0.1, 0.8, 0.1, 1.0], speed: 2.8, name: "nl-aero" },
+        // Mac OS Classic — no easing, near-instant
+        "mac-classic":      { curve: [0.0, 0.0, 1.0, 1.0], speed: 0.5, name: "nl-linear" },
+        // Mac OS X Aqua — sine-wave smooth, long tail
+        "mac-legacy":       { curve: [0.42, 0.0, 0.58, 1.0], speed: 3.0, name: "nl-aqua" },
+        // macOS Modern — natural spring: slight bounce, organic
+        "mac-modern":       { curve: [0.34, 0.6, 0.12, 0.8], speed: 2.5, name: "nl-natural" },
+        // Android Legacy — simple ease-in-out
+        "hyprland":         { curve: [0.2, 0.0, 0.1, 1.0], speed: 4.0, name: "nl-hyprland" },
+        "android-legacy":   { curve: [0.4, 0.0, 0.6, 1.0], speed: 1.5, name: "nl-android-legacy" },
+        // Android Material — FastOutSlowIn: immediate, then smooth
+        "android-material": { curve: [0.4, 0.0, 0.2, 1.0], speed: 2.0, name: "nl-material" },
+        // Android 12+ — Emphasized Deceleration: dramatic, expressive
+        "android-you":      { curve: [0.05, 0.7, 0.1, 1.0], speed: 3.0, name: "nl-you" }
+    })
+
+    /*! Get Hyprland bezier animation config for the current style.
+        @returns { curve: number[], speed: number, name: string }
+        - curve: bezier control points for Hyprland's bezier keyword
+        - speed: animation speed multiplier for Hyprland
+        - name: unique bezier name to use in animation keywords */
+    function hyprConfig() {
+        const cfg = root._hyprBeziers[root._styleKey];
+        if (!cfg) return root._hyprBeziers["m3"];
+        return cfg;
+    }
+
+    /*! Get the Hyprland bezier definition line(s) needed for the current style.
+        Returns: "bezier = nl-name, cx1, cy1, cx2, cy2" */
+    function hyprBezierDef() {
+        const cfg = root.hyprConfig();
+        const c = cfg.curve;
+        return `bezier = ${cfg.name}, ${c[0]}, ${c[1]}, ${c[2]}, ${c[3]}`;
+    }
+
+    /*! Get the Hyprland animation command for a specific type.
+        @param type: "windows" | "border" | "fade" | "workspaces"
+        @param orientation: "horizontal" | "vertical" (for workspaces)
+        @returns the keyword command string */
+    function hyprAnimation(type, orientation) {
+        const cfg = root.hyprConfig();
+        const speed = cfg.speed.toFixed(1);
+        const bezierName = cfg.name;
+        const enabled = root.animationsEnabled ? "1" : "0";
+
+        switch (type) {
+        case "windows":
+            return `keyword animation windows,${enabled},${speed},${bezierName},popin 80%`;
+        case "border":
+            return `keyword animation border,${enabled},${speed},${bezierName}`;
+        case "fade":
+            return `keyword animation fade,${enabled},${speed},${bezierName}`;
+        case "workspaces":
+            const anim = orientation === "vertical" ? "slidefadevert 20%" : "slidefade 20%";
+            return `keyword animation workspaces,${enabled},${speed},${bezierName},${anim}`;
+        default:
+            return "";
+        }
+    }
+
+    /*! Get Hyprland config file line for an animation type.
+        Unlike hyprAnimation() which outputs 'keyword ...' for runtime,
+        this outputs the hyprland.conf syntax (no 'keyword' prefix).
+        @param type: "windows" | "border" | "fade" | "workspaces"
+        @param orientation: "horizontal" | "vertical" (for workspaces)
+        @returns config file line like: 'animation = windows, 1, 4.0, nl-name, popin 80%' */
+    function hyprConfLine(type, orientation) {
+        const cfg = root.hyprConfig();
+        const speed = cfg.speed.toFixed(1);
+        const bezierName = cfg.name;
+        const enabled = root.animationsEnabled ? "1" : "0";
+
+        switch (type) {
+        case "windows":
+            return `animation = windows, ${enabled}, ${speed}, ${bezierName}, popin 80%`;
+        case "border":
+            return `animation = border, ${enabled}, ${speed}, ${bezierName}`;
+        case "fade":
+            return `animation = fade, ${enabled}, ${speed}, ${bezierName}`;
+        case "workspaces":
+            const anim = orientation === "vertical" ? "slidefadevert 20%" : "slidefade 20%";
+            return `animation = workspaces, ${enabled}, ${speed}, ${bezierName}, ${anim}`;
+        default:
+            return "";
+        }
+    }
+
+    // ============================================
+    // ORGANIC PHYSICS — Spring, Anticipation, Overshoot, Momentum
+    // ============================================
+    // These use low-level math to generate physically-plausible
+    // animation curves that feel natural without expensive bindings.
+    //
+    // Inspired by: Framer Motion (springs), Apple UIKit (spring physics),
+    // Android Material (adaptive curves), and KDE Plasma (smooth scrolling).
+    //
+    // GPU-friendly principle: opacity/scale/rotation cost ~1µs,
+    // while x/y/width/height cost ~100µs (trigger relayout).
+
+    /*! Damped Spring Oscillator — the gold standard for organic motion.
+        Simulates a mass on a spring with damping.
+        @param stiffness:  (default 170) — spring tension, higher = snappier
+        @param damping:    (default 16)  — resistance, higher = less bounce
+        @param mass:       (default 1.0) — inertial mass, higher = slower
+        @param initialV:   (default 0)   — initial velocity for momentum
+        @returns { cx1, cy1, cx2, cy2 } bezier control points
+
+        Math behind the curve:
+          ω₀ = √(k/m)  (natural frequency)
+          ζ = d / (2√(km))  (damping ratio)
+          ζ < 1 → underdamped (bounces)
+          ζ ≈ 1 → critically damped (fastest without bounce)
+          ζ > 1 → overdamped (slow, no bounce)
+
+        Maps spring parameters to bezier by computing T_at_50% (half-life)
+        and T_at_90% (settle time) of the oscillator response. */
+    function springBezier(stiffness, damping, mass, initialV) {
+        const k = stiffness || 170;
+        const d = damping || 16;
+        const m = Math.max(0.1, mass || 1.0);
+        const v0 = initialV || 0;
+
+        // Natural frequency & damping ratio
+        const w0 = Math.sqrt(k / m);
+        const zeta = d / (2 * Math.sqrt(k * m));
+
+        // Approximate settle time: when envelope decays to 1%
+        // Envelope = e^(-zeta * w0 * t)
+        // t_settle ≈ ln(100) / (zeta * w0) ≈ 4.6 / (zeta * w0)
+        const settleTime = zeta * w0 > 0.01 ? 4.6 / (zeta * w0) : 10.0;
+        const settleMs = Math.round(settleTime * 1000);
+
+        // Calculate overshoot amount
+        // For zeta < 1: overshoot = e^(-pi*zeta / sqrt(1-zeta^2))
+        const overshoot = zeta < 1.0 ? Math.exp(-Math.PI * zeta / Math.sqrt(1 - zeta * zeta)) : 0;
+
+        // Generate bezier control points that approximate the spring
+        // cx1, cy1 = initial direction (velocity)
+        // cx2, cy2 = overshoot/recoil behavior
+        let cx1, cy1, cx2, cy2;
+
+        if (zeta < 0.5) {
+            // Bouncy: overshoot visible
+            cx1 = 0.2 + zeta * 0.3;
+            cy1 = 1.2 + (0.5 - zeta) * 1.5;  // Overshoot up
+            cx2 = 0.3 + zeta * 0.3;
+            cy2 = -0.3 - (0.5 - zeta) * 0.5;  // Dip below zero (recoil)
+        } else if (zeta < 0.8) {
+            // Gentle bounce: slight overshoot
+            cx1 = 0.25 + zeta * 0.2;
+            cy1 = 0.8 + (0.8 - zeta) * 0.5;
+            cx2 = 0.4 + zeta * 0.1;
+            cy2 = 0.1 + (0.8 - zeta) * 0.2;
+        } else {
+            // Critically damped / overdamped: smooth, no bounce
+            cx1 = 0.3;
+            cy1 = 0.6;
+            cx2 = 0.5;
+            cy2 = 0.4;
+        }
+
+        // Clamp to valid bezier range
+        cx1 = Math.max(-0.5, Math.min(1.5, cx1));
+        cy1 = Math.max(-0.5, Math.min(2.0, cy1));
+        cx2 = Math.max(-0.5, Math.min(1.5, cx2));
+        cy2 = Math.max(-0.5, Math.min(2.0, cy2));
+
+        return {
+            type: Easing.BezierSpline,
+            bezierCurve: [cx1, cy1, cx2, cy2],
+            duration: settleMs,
+            overshoot: overshoot,
+            zeta: zeta
+        };
+    }
+
+    /*! Natural spring easing — preset for UI elements.
+        Light stiffness, moderate damping = smooth, organic feel.
+        Similar to iOS spring animations. */
+    function spring(type, size) {
+        return root.springBezier(180, 18, 1.0, 0);
+    }
+
+    /*! Snappy spring — for buttons, toggles, micro-interactions.
+        High stiffness, high damping = immediate response, no bounce. */
+    function springSnappy() {
+        return root.springBezier(300, 25, 1.0, 0);
+    }
+
+    /*! Expressive spring — for modals, notifications, cards.
+        Lower damping = visible overshoot = playful feel.
+        Similar to Android 12+ spring animations. */
+    function springExpressive() {
+        return root.springBezier(200, 12, 1.0, 0);
+    }
+
+    /*! Anticipation easing — pull back before moving forward.
+        Creates a "recoil" effect that makes animations feel alive.
+        @param intensity: 0.0 (subtle) to 1.0 (dramatic) */
+    function anticipation(intensity) {
+        const i = Math.max(0, Math.min(1, intensity || 0.3));
+        return {
+            type: Easing.BezierSpline,
+            bezierCurve: [0.3 + i * 0.15, -i * 0.5, 0.1, 1.0]
+        };
+    }
+
+    /*! Overshoot easing — go past target, then settle back.
+        Creates a satisfying "stretch" effect.
+        @param amount: 0.0 (none) to 0.5 (maximum) */
+    function overshoot(amount) {
+        const a = amount || 0.2;
+        return {
+            type: Easing.BezierSpline,
+            bezierCurve: [0.2, 1.0 + a * 2.0, 0.3, 0.8 - a * 0.5]
+        };
+    }
+
+    /*! Adaptive duration — scales with distance for natural feel.
+        Small movements = fast, large movements = proportionate.
+        @param distance: pixel distance or normalized delta
+        @param baseMs: base duration at distance=1
+        @returns adaptive duration in ms */
+    function adaptiveDuration(distance, baseMs) {
+        const d = Math.abs(distance || 1);
+        // Weber-Fechner: perceived speed is logarithmic
+        // Fast for small moves, scales slowly for large moves
+        const logDist = Math.log(Math.max(1, d * 10)) / Math.log(10);
+        return Math.max(50, Math.min(600, Math.round(baseMs * (0.3 + logDist * 0.3))));
+    }
+
+    /*! GPU-friendly animation config.
+        Optimizes for transform animations (opacity/scale/rotation).
+        ~70% duration of standard, uses decelerate easing.
+        @returns { duration: number, easing: object } */
+    function gpuFriendly(type, size) {
+        const base = root.duration(type, size || "normal");
+        const gpuMs = Math.max(60, Math.round(base * 0.65));
+        return {
+            duration: gpuMs,
+            easing: root.easing("decelerate")
+        };
+    }
+
+    /*! Multi-stage animation — combines anticipation, move, and overshoot.
+        Use for elements that enter the screen (cards, modals, notifications).
+        @returns Array of { duration, easing } stages */
+    function enterAnimation() {
+        const spring = root.springBezier(200, 14, 1.0, 0);
+        return {
+            duration: spring.duration,
+            easing: spring
+        };
+    }
+
+    /*! Quick helper: get { duration, easing } for common cases. */
+    function animate(type, size) {
+        return {
+            duration: root.duration(type, size),
+            easing: root.easing(type),
+            type: type,
+            size: size || "normal"
+        };
+    }
+
+    // ============================================
+    // STYLE INFO
+    // ============================================
+    readonly property string styleName: root._profile.name || "M3"
+    readonly property string styleKey: root._styleKey
+    readonly property var availableStyles: {
+        const keys = Object.keys(root._profiles);
+        return keys.map(k => ({ key: k, name: root._profiles[k].name }));
+    }
+
+    // ============================================
+    // CONVENIENCE PROPERTIES
+    // ============================================
+    readonly property int standardSmall:      root.duration("standard", "small")
+    readonly property int standardNormal:     root.duration("standard", "normal")
+    readonly property int standardLarge:      root.duration("standard", "large")
+    readonly property int standardExtraLarge: root.duration("standard", "extraLarge")
+
+    readonly property int emphasizedSmall:  root.duration("emphasized", "small")
+    readonly property int emphasizedNormal: root.duration("emphasized", "normal")
+    readonly property int emphasizedLarge:  root.duration("emphasized", "large")
+
+    readonly property int spatialFast:    root.duration("spatial", "fast")
+    readonly property int spatialDefault: root.duration("spatial", "default")
+    readonly property int spatialSlow:    root.duration("spatial", "slow")
+
+    readonly property int springSmall:   root.duration("spring", "small")
+    readonly property int springNormal:  root.duration("spring", "normal")
+    readonly property int springLarge:   root.duration("spring", "large")
+
+    readonly property bool animationsEnabled: root._baseScale > 0
+}
diff --git a/modules/theme/Colors.qml b/modules/theme/Colors.qml
old mode 100644
new mode 100755
index 15a18dc2..14e9147d
--- a/modules/theme/Colors.qml
+++ b/modules/theme/Colors.qml
@@ -3,6 +3,7 @@ import QtQuick
 import Quickshell
 import Quickshell.Io
 import qs.config
+import qs.modules.globals
 
 FileView {
     id: colors
@@ -168,10 +169,17 @@ FileView {
         property color sourceColor: "#7f2424"
     }
 
+    // ============================================
+    // DYNAMIC SURFACE OPACITY — adjusted by wallpaper vibrancy
+    // More vibrant wallpapers → more transparent (show more wallpaper)
+    // Muted wallpapers → more opaque (better readability)
+    // ============================================
+    readonly property real _vibrancyAlpha: 0.5 + (1.0 - (typeof root !== "undefined" ? root.vibrancy : 0.5)) * 0.5
+
     property color background: Config.oledMode ? "#000000" : adapter.background
 
-    property color surface: Qt.tint(background, Qt.rgba(adapter.overBackground.r, adapter.overBackground.g, adapter.overBackground.b, 0.1))
-    property color surfaceBright: Qt.tint(background, Qt.rgba(adapter.overBackground.r, adapter.overBackground.g, adapter.overBackground.b, 0.2))
+    property color surface: Qt.tint(background, Qt.rgba(adapter.overBackground.r, adapter.overBackground.g, adapter.overBackground.b, 0.1 * (typeof root !== "undefined" ? root._vibrancyAlpha : 0.75)))
+    property color surfaceBright: Qt.tint(background, Qt.rgba(adapter.overBackground.r, adapter.overBackground.g, adapter.overBackground.b, 0.2 * (typeof root !== "undefined" ? root._vibrancyAlpha : 0.75)))
     property color surfaceContainer: adapter.surfaceContainer
     property color surfaceContainerHigh: adapter.surfaceContainerHigh
     property color surfaceContainerHighest: adapter.surfaceContainerHighest
@@ -232,6 +240,16 @@ FileView {
     property color overSecondaryFixedVariant: adapter.overSecondaryFixedVariant
     property color overSurface: adapter.overSurface
     property color overSurfaceVariant: adapter.overSurfaceVariant
+    property color onSurface: overBackground  // alias for M3 compatibility
+    property color onSurfaceVariant: overSurfaceVariant  // alias for M3 compatibility
+    property color onPrimaryContainer: overPrimaryContainer
+    property color onSecondaryContainer: overSecondaryContainer
+    property color onTertiaryContainer: overTertiaryContainer
+    property color onErrorContainer: overErrorContainer
+    property color onPrimary: overPrimary
+    property color onSecondary: overSecondary
+    property color onTertiary: overTertiary
+    property color onError: overError
     property color overTertiary: adapter.overTertiary
     property color overTertiaryContainer: adapter.overTertiaryContainer
     property color overTertiaryFixed: adapter.overTertiaryFixed
@@ -270,12 +288,275 @@ FileView {
     property color yellowValue: adapter.yellowValue
     property color sourceColor: adapter.sourceColor
 
+    // ============================================
+    // DYNAMIC COLOR — Wallpaper ColorQuantizer (M3 Material You)
+    // Extracts dominant colors from current wallpaper for dynamic theming.
+    // ============================================
+
+    /*! Dominant color extracted from wallpaper via ColorQuantizer (rescaleSize: 10).
+        Falls back to adapter.sourceColor when unavailable. */
+    property color dominantColor: adapter.sourceColor
+
+    /*! Vibrancy (0.0-1.0) of the extracted dominant color.
+        High vibrancy → more transparent surfaces.
+        Low vibrancy → more opaque surfaces (muted wallpapers). */
+    property real vibrancy: 0.5
+
+    /*! Whether dynamic color from wallpaper is active.
+        Controlled by Config.dynamicColor toggle.
+        When enabled, overrides static palette with quantizer colors. */
+    property bool dynamicColorEnabled: false
+    onDynamicColorEnabledChanged: {
+        if (dynamicColorEnabled && wallpaperQuantizer.colors.length > 0) {
+            console.log("DynamicColor: enabled, regenerating palette");
+        }
+    }
+
+    /*! Connection to wallpaperManager: re-quantize when wallpaper changes.
+        Delayed 500ms to ensure wallpaperManager is available. */
+    property Timer _wallpaperInitTimer: Timer {
+        id: _wallpaperInitTimer
+        interval: 500
+        repeat: false
+        onTriggered: {
+            if (typeof GlobalStates !== "undefined" && GlobalStates.wallpaperManager) {
+                wallpaperWatcher.target = GlobalStates.wallpaperManager;
+                const path = GlobalStates.wallpaperManager.currentWallpaper || "";
+                const ext = path.split(".").pop().toLowerCase();
+                if (["mp4", "webm", "mov", "avi", "mkv", "gif"].indexOf(ext) < 0) {
+                    wallpaperQuantizer.source = path;
+                }
+            } else {
+                // Retry later — services may not be initialized yet
+                _wallpaperInitTimer.restart();
+            }
+        }
+        Component.onCompleted: _wallpaperInitTimer.restart();
+    }
+
+    /*! Listen for wallpaper changes and re-quantize colors.
+        Target is set dynamically by _wallpaperInitTimer.
+        Skips video files (mp4, webm, gif) since ColorQuantizer only handles images. */
+    property Connections wallpaperWatcher: Connections {
+        id: wallpaperWatcher
+        target: null
+        function onCurrentWallpaperChanged() {
+            if (wallpaperWatcher.target) {
+                const path = wallpaperWatcher.target.currentWallpaper || "";
+                // Skip video files — ColorQuantizer only handles images
+                const ext = path.split(".").pop().toLowerCase();
+                if (["mp4", "webm", "mov", "avi", "mkv", "gif"].indexOf(ext) >= 0) {
+                    console.log("DynamicColor: skipping video wallpaper:", ext);
+                    return;
+                }
+                wallpaperQuantizer.source = path;
+            }
+        }
+    }
+
+    /*! ColorQuantizer: extracts dominant colors from current wallpaper.
+        Uses rescaleSize:10 (tiny downscale) for maximum performance.
+        Colors are available in wallpaperQuantizer.colors array.
+        Falls back to adapter.sourceColor when wallpaper is unavailable. */
+    property ColorQuantizer wallpaperQuantizer: ColorQuantizer {
+        id: wallpaperQuantizer
+        depth: 6
+        rescaleSize: 10
+        source: ""
+        onColorsChanged: {
+            if (wallpaperQuantizer.colors.length > 0) {
+                const c = wallpaperQuantizer.colors[0];
+                root.dominantColor = Qt.hsla(c.hslHue, c.hslSaturation, c.hslLightness, 1.0);
+                // Vibrancy: 0.0 (muted/greyscale) to 1.0 (vibrant/colorful)
+                // Formula: saturation contributes 60%, lightness contrast 40%
+                const sat = c.hslSaturation;
+                const lightContrast = 1.0 - Math.abs(c.hslLightness - 0.5) * 2.0;
+                root.vibrancy = Math.min(1.0, Math.max(0.0, sat * 0.6 + lightContrast * 0.4));
+                console.log("DynamicColor:", wallpaperQuantizer.colors.length, "colors,",
+                    "dominant:", root.dominantColor, "vibrancy:", root.vibrancy.toFixed(2));
+            }
+        }
+        onSourceChanged: {
+            if (source.toString().length > 0) {
+                const src = source.toString();
+                const ext = src.split(".").pop().toLowerCase();
+                if (["mp4", "webm", "mov", "avi", "mkv", "gif"].indexOf(ext) >= 0) {
+                    console.log("DynamicColor: skipping video (safety):", ext);
+                    // Clear the source to prevent the quantizer from trying to load it
+                    wallpaperQuantizer.source = "";
+                    return;
+                }
+                console.log("DynamicColor: quantizing:", src);
+            }
+        }
+    }
+
+    // ============================================
+    // M3 ELEVATION SYSTEM — helpers & semantic surfaces
+    // ============================================
+    // M3 defines 5 elevation levels (0-4) mapped to surface colors:
+    //   Level 0: surfaceDim (lowest, sunken)
+    //   Level 1: surfaceContainerLowest
+    //   Level 2: surfaceContainerLow
+    //   Level 3: surfaceContainer
+    //   Level 4: surfaceContainerHigh
+    //   Level 5: surfaceContainerHighest
+    //
+    // Usage:  Colors.elevation(3)  => surfaceContainer
+    //         Colors.elevation(0)  => surfaceDim
+
+    /*! Get surface color for M3 elevation level (0-5). */
+    function elevation(level) {
+        switch (level) {
+        case 0:  return root.surfaceDim;
+        case 1:  return root.surfaceContainerLowest;
+        case 2:  return root.surfaceContainerLow;
+        case 3:  return root.surfaceContainer;
+        case 4:  return root.surfaceContainerHigh;
+        case 5:  return root.surfaceContainerHighest;
+        default: return level <= 0 ? root.surfaceDim : root.surfaceContainerHighest;
+        }
+    }
+
+    /*! Convenience: get the over-surface color for a given elevation level. */
+    function overElevation(level) {
+        return root.overBackground; // M3 spec: all levels use same text color
+    }
+
+    /*! Get the surface tint/primary color for elevation (same as surfaceTint). */
+    function elevationTint(level) {
+        return root.surfaceTint;
+    }
+
+    // ============================================
+    // M3 PALETTE GENERATION — from source/dominant color
+    // ============================================
+    // Generates a tonal palette from a source color using the M3 HCT
+    // (Hue-Chroma-Tone) approach. Since QML doesn't expose HCT natively,
+    // we approximate using HSL + fixed chroma offsets per tone.
+    //
+    // Usage:
+    //   const palette = Colors.generatePalette(Colors.dominantColor);
+    //   console.log(palette.primary, palette.primaryContainer);
+
+    /*! Generate a tonal M3 palette from a source color.
+        Returns { primary, primaryContainer, secondary, secondaryContainer,
+                  tertiary, tertiaryContainer, error, errorContainer,
+                  surface, surfaceContainer, ... }
+        Uses a simplified HCT approximation (HSL-based). */
+    function generatePalette(sourceColor) {
+        if (!sourceColor) {
+            console.warn("generatePalette: no source color, using adapter");
+            return null;
+        }
+
+        const h = sourceColor.hslHue;
+        const s = sourceColor.hslSaturation;
+        const l = sourceColor.hslLightness;
+
+        // Tonal keys (M3): primary uses highest chroma at tone 40/80
+        // Secondary:  lower chroma, same hue
+        // Tertiary:   hue shifted by ~60°, lower chroma
+        // Error:      fixed red hue
+        // Surface:    neutral greys with hue shift
+        const palette = {
+            // Primary — full saturation, medium-light
+            primary:           Qt.hsla(h, Math.min(1.0, s * 0.9), 0.50, 1.0),
+            primaryContainer:  Qt.hsla(h, Math.min(1.0, s * 0.5), 0.30, 1.0),
+            primaryFixed:      Qt.hsla(h, Math.min(1.0, s * 0.7), 0.85, 1.0),
+            primaryFixedDim:   Qt.hsla(h, Math.min(1.0, s * 0.6), 0.70, 1.0),
+            onPrimary:         Qt.hsla(h, 0.0, 0.95, 1.0),
+            onPrimaryContainer: Qt.hsla(h, 0.0, 0.85, 1.0),
+
+            // Secondary — desaturated, same hue
+            secondary:           Qt.hsla(h, s * 0.3, 0.55, 1.0),
+            secondaryContainer:  Qt.hsla(h, s * 0.2, 0.30, 1.0),
+            secondaryFixed:      Qt.hsla(h, s * 0.2, 0.85, 1.0),
+            secondaryFixedDim:   Qt.hsla(h, s * 0.15, 0.70, 1.0),
+            onSecondary:         Qt.hsla(h, 0.0, 0.95, 1.0),
+            onSecondaryContainer: Qt.hsla(h, 0.0, 0.85, 1.0),
+
+            // Tertiary — hue shifted +60°, desaturated
+            tertiary:           Qt.hsla((h + 0.17) % 1.0, s * 0.25, 0.60, 1.0),
+            tertiaryContainer:  Qt.hsla((h + 0.17) % 1.0, s * 0.15, 0.30, 1.0),
+            tertiaryFixed:      Qt.hsla((h + 0.17) % 1.0, s * 0.15, 0.85, 1.0),
+            tertiaryFixedDim:   Qt.hsla((h + 0.17) % 1.0, s * 0.10, 0.70, 1.0),
+            onTertiary:         Qt.hsla(0.0, 0.0, 0.95, 1.0),
+            onTertiaryContainer: Qt.hsla(0.0, 0.0, 0.85, 1.0),
+
+            // Error — fixed red hue
+            error:              Qt.hsla(0.0, 0.8, 0.55, 1.0),
+            errorContainer:     Qt.hsla(0.0, 0.6, 0.25, 1.0),
+            onError:            Qt.hsla(0.0, 0.0, 0.95, 1.0),
+            onErrorContainer:   Qt.hsla(0.0, 0.0, 0.85, 1.0),
+
+            // Surface hierarchy — neutral with subtle hue tint
+            surface:             Qt.hsla(h, 0.03, 0.10, 1.0),
+            surfaceDim:          Qt.hsla(h, 0.02, 0.06, 1.0),
+            surfaceBright:       Qt.hsla(h, 0.04, 0.25, 1.0),
+            surfaceContainer:        Qt.hsla(h, 0.03, 0.14, 1.0),
+            surfaceContainerLow:     Qt.hsla(h, 0.02, 0.12, 1.0),
+            surfaceContainerLowest:  Qt.hsla(h, 0.02, 0.08, 1.0),
+            surfaceContainerHigh:    Qt.hsla(h, 0.04, 0.18, 1.0),
+            surfaceContainerHighest: Qt.hsla(h, 0.05, 0.22, 1.0),
+            surfaceVariant:      Qt.hsla(h, 0.04, 0.30, 1.0),
+            surfaceTint:         Qt.hsla(h, Math.min(1.0, s * 0.9), 0.50, 1.0),
+
+            // On-surface and backgrounds
+            onBackground:        Qt.hsla(h, 0.02, 0.92, 1.0),
+            onSurface:           Qt.hsla(h, 0.02, 0.92, 1.0),
+            onSurfaceVariant:    Qt.hsla(h, 0.03, 0.80, 1.0),
+            background:          Qt.hsla(h, 0.02, 0.10, 1.0),
+            outline:             Qt.hsla(h, 0.04, 0.55, 1.0),
+            outlineVariant:      Qt.hsla(h, 0.03, 0.25, 1.0),
+            shadow:              Qt.hsla(0.0, 0.0, 0.0, 1.0),
+            scrim:               Qt.hsla(0.0, 0.0, 0.0, 0.6),
+
+            // Light-mode equivalents (for toggling)
+            light: {
+                primary:           Qt.hsla(h, Math.min(1.0, s * 0.9), 0.40, 1.0),
+                secondary:         Qt.hsla(h, s * 0.3, 0.45, 1.0),
+                tertiary:          Qt.hsla((h + 0.17) % 1.0, s * 0.25, 0.45, 1.0),
+                background:        Qt.hsla(h, 0.02, 0.95, 1.0),
+                surface:           Qt.hsla(h, 0.02, 0.93, 1.0),
+                onBackground:      Qt.hsla(h, 0.02, 0.08, 1.0),
+                onSurface:         Qt.hsla(h, 0.02, 0.08, 1.0)
+            }
+        };
+
+        return palette;
+    }
+
+    /*! Compute luminance of a color (0-1). Useful for dynamic contrast logic. */
+    function luminance(color) {
+        return (0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b);
+    }
+
+    /*! Check if a color is "light" (luminance > 0.5). */
+    function isLight(color) {
+        return root.luminance(color) > 0.5;
+    }
+
+    /*! Blend two colors with alpha (useful for surface tints).
+        Equivalent to CSS: rgba(over.r, over.g, over.b, alpha) on top of base. */
+    function blend(base, over, alpha) {
+        const a = Math.max(0, Math.min(1, alpha));
+        return Qt.rgba(
+            over.r * a + base.r * (1 - a),
+            over.g * a + base.g * (1 - a),
+            over.b * a + base.b * (1 - a),
+            1.0
+        );
+    }
+
     property color criticalText: "#FF6B08"
     property color criticalRed: "#FF0028"
 
     // Semantic aliases
     property color warning: adapter.yellow
     property color success: adapter.green
+    property color info: adapter.secondary
+    property color danger: adapter.error
 
     // List of available color names for color pickers (excludes internal/source colors)
     readonly property var availableColorNames: ["background", "surface", "surfaceBright", "surfaceContainer", "surfaceContainerHigh", "surfaceContainerHighest", "surfaceContainerLow", "surfaceContainerLowest", "surfaceDim", "surfaceTint", "surfaceVariant", "primary", "primaryContainer", "primaryFixed", "primaryFixedDim", "secondary", "secondaryContainer", "secondaryFixed", "secondaryFixedDim", "tertiary", "tertiaryContainer", "tertiaryFixed", "tertiaryFixedDim", "error", "errorContainer", "overBackground", "overSurface", "overSurfaceVariant", "overPrimary", "overPrimaryContainer", "overPrimaryFixed", "overPrimaryFixedVariant", "overSecondary", "overSecondaryContainer", "overSecondaryFixed", "overSecondaryFixedVariant", "overTertiary", "overTertiaryContainer", "overTertiaryFixed", "overTertiaryFixedVariant", "overError", "overErrorContainer", "outline", "outlineVariant", "inversePrimary", "inverseSurface", "inverseOnSurface", "shadow", "scrim", "blue", "blueContainer", "overBlue", "overBlueContainer", "lightBlue", "cyan", "cyanContainer", "overCyan", "overCyanContainer", "lightCyan", "green", "greenContainer", "overGreen", "overGreenContainer", "lightGreen", "magenta", "magentaContainer", "overMagenta", "overMagentaContainer", "lightMagenta", "red", "redContainer", "overRed", "overRedContainer", "lightRed", "yellow", "yellowContainer", "overYellow", "overYellowContainer", "lightYellow", "white", "whiteContainer", "overWhite", "overWhiteContainer"]
diff --git a/modules/theme/DiscordGenerator.qml b/modules/theme/DiscordGenerator.qml
old mode 100644
new mode 100755
index f2c8533c..963ae6ad
--- a/modules/theme/DiscordGenerator.qml
+++ b/modules/theme/DiscordGenerator.qml
@@ -46,10 +46,10 @@ QtObject {
  * @author Axenide
  * @version 1.0.0
  * @invite gHG9WHyNvH
- * @website https://axeni.de/ambxst
+ * @website https://github.com/Axenide/Ambxst
  * @source https://github.com/Axenide/Ambxst
  * @authorId 294856304969908224
- * @authorLink https://axeni.de
+ * @authorLink https://github.com/Axenide
 */ 
 
 @import url('https://mwittrien.github.io/BetterDiscordAddons/Themes/DiscordRecolor/DiscordRecolor.css');
diff --git a/modules/theme/GtkGenerator.qml b/modules/theme/GtkGenerator.qml
old mode 100644
new mode 100755
diff --git a/modules/theme/Icons.qml b/modules/theme/Icons.qml
old mode 100644
new mode 100755
diff --git a/modules/theme/KittyGenerator.qml b/modules/theme/KittyGenerator.qml
old mode 100644
new mode 100755
diff --git a/modules/theme/NvChadGenerator.qml b/modules/theme/NvChadGenerator.qml
old mode 100644
new mode 100755
diff --git a/modules/theme/PywalGenerator.qml b/modules/theme/PywalGenerator.qml
old mode 100644
new mode 100755
diff --git a/modules/theme/QtCtGenerator.qml b/modules/theme/QtCtGenerator.qml
old mode 100644
new mode 100755
diff --git a/modules/theme/Styling.qml b/modules/theme/Styling.qml
old mode 100644
new mode 100755
index 0a768f97..f108d14d
--- a/modules/theme/Styling.qml
+++ b/modules/theme/Styling.qml
@@ -3,6 +3,7 @@ import QtQuick
 import qs.config
 
 QtObject {
+    id: root
     readonly property string defaultFont: Config.defaultFont
 
     function radius(offset) {
@@ -17,28 +18,134 @@ QtObject {
         return Math.max(Config.theme.monoFontSize + offset, 8);
     }
 
+    // ============================================
+    // M3 TYPOGRAPHY SYSTEM
+    // ============================================
+    // Material 3 type scale: https://m3.material.io/styles/typography/type-scale-tokens
+    //
+    // Each level returns { font, size, weight, lineHeight }
+    //
+    // Usage:
+    //   Text { font.pixelSize: Styling.m3("title", "medium").size; font.weight: Styling.m3("title", "medium").weight }
+    //
+    // Scale is derived from Config.theme.fontSize (base = 14px)
+
+    readonly property real _m3BaseSize: Math.max(Config.theme.fontSize || 14, 10)
+
+    property var _m3Scale: null
+
+    function _buildM3Scale() {
+        const b = root._m3BaseSize;
+        // M3 type scale ratios (relative to base 14px)
+        const s = (mult) => Math.round(b * mult / 14 * 10) / 10;
+        root._m3Scale = {
+            // Display: large, medium, small
+            "display": {
+                large:  { size: s(57), weight: Font.Normal, lineHeight: s(64) },
+                medium: { size: s(45), weight: Font.Normal, lineHeight: s(52) },
+                small:  { size: s(36), weight: Font.Normal, lineHeight: s(44) }
+            },
+            // Headline
+            "headline": {
+                large:  { size: s(32), weight: Font.Normal, lineHeight: s(40) },
+                medium: { size: s(28), weight: Font.Normal, lineHeight: s(36) },
+                small:  { size: s(24), weight: Font.Normal, lineHeight: s(32) }
+            },
+            // Title
+            "title": {
+                large:  { size: s(22), weight: Font.Medium, lineHeight: s(28) },
+                medium: { size: s(16), weight: Font.Medium, lineHeight: s(24) },
+                small:  { size: s(14), weight: Font.Medium, lineHeight: s(20) }
+            },
+            // Label
+            "label": {
+                large:  { size: s(14), weight: Font.Medium, lineHeight: s(20) },
+                medium: { size: s(12), weight: Font.Medium, lineHeight: s(16) },
+                small:  { size: s(11), weight: Font.Medium, lineHeight: s(16) }
+            },
+            // Body
+            "body": {
+                large:  { size: s(16), weight: Font.Normal, lineHeight: s(24) },
+                medium: { size: s(14), weight: Font.Normal, lineHeight: s(20) },
+                small:  { size: s(12), weight: Font.Normal, lineHeight: s(16) }
+            }
+        };
+    }
+
+    /*! Get M3 typography token.
+        @param type: "display" | "headline" | "title" | "label" | "body"
+        @param size: "large" | "medium" | "small"
+        @returns object with { size, weight, lineHeight }
+    */
+    function m3(type, size) {
+        if (!root._m3Scale) root._buildM3Scale();
+        const t = root._m3Scale[type];
+        if (!t || !t[size]) {
+            console.warn("M3 typography: unknown type/size", type, size);
+            return { size: 14, weight: Font.Normal, lineHeight: 20 };
+        }
+        return t[size];
+    }
+
+    // Convenience properties — using function() instead of bindings to avoid loops
+    property int m3HeadlineLarge:   0
+    property int m3HeadlineMedium:  0
+    property int m3HeadlineSmall:   0
+    property int m3TitleLarge:      0
+    property int m3TitleMedium:     0
+    property int m3TitleSmall:      0
+    property int m3BodyLarge:       0
+    property int m3BodyMedium:      0
+    property int m3BodySmall:       0
+    property int m3LabelLarge:      0
+    property int m3LabelMedium:     0
+    property int m3LabelSmall:      0
+
+    function _initM3Convenience() {
+        root.m3HeadlineLarge  = root.m3("headline", "large").size;
+        root.m3HeadlineMedium = root.m3("headline", "medium").size;
+        root.m3HeadlineSmall  = root.m3("headline", "small").size;
+        root.m3TitleLarge     = root.m3("title", "large").size;
+        root.m3TitleMedium    = root.m3("title", "medium").size;
+        root.m3TitleSmall     = root.m3("title", "small").size;
+        root.m3BodyLarge      = root.m3("body", "large").size;
+        root.m3BodyMedium     = root.m3("body", "medium").size;
+        root.m3BodySmall      = root.m3("body", "small").size;
+        root.m3LabelLarge     = root.m3("label", "large").size;
+        root.m3LabelMedium    = root.m3("label", "medium").size;
+        root.m3LabelSmall     = root.m3("label", "small").size;
+    }
+
+    Component.onCompleted: root._initM3Convenience()
+
+    // Pre-built "transparent" variant to avoid allocating a new object on every call
+    property var _transparentConfig: null
+
     function getStyledRectConfig(variant) {
         switch (variant) {
         case "transparent":
-            // Internal variant: uses bg config but with opacity, border and radius forced to 0
-            const bgConfig = Config.theme.srBg;
-            return {
-                gradient: bgConfig.gradient,
-                gradientType: bgConfig.gradientType,
-                gradientAngle: bgConfig.gradientAngle,
-                gradientCenterX: bgConfig.gradientCenterX,
-                gradientCenterY: bgConfig.gradientCenterY,
-                halftoneDotMin: bgConfig.halftoneDotMin,
-                halftoneDotMax: bgConfig.halftoneDotMax,
-                halftoneStart: bgConfig.halftoneStart,
-                halftoneEnd: bgConfig.halftoneEnd,
-                halftoneDotColor: bgConfig.halftoneDotColor,
-                halftoneBackgroundColor: bgConfig.halftoneBackgroundColor,
-                itemColor: bgConfig.itemColor,
-                opacity: 0,
-                border: [bgConfig.border[0], 0],
-                radius: 0
-            };
+            // Lazy-init the transparent config (needs bgConfig which may change on theme reload)
+            var bgConfig = Config.theme.srBg;
+            if (!root._transparentConfig) {
+                root._transparentConfig = {
+                    gradient: bgConfig.gradient,
+                    gradientType: bgConfig.gradientType,
+                    gradientAngle: bgConfig.gradientAngle,
+                    gradientCenterX: bgConfig.gradientCenterX,
+                    gradientCenterY: bgConfig.gradientCenterY,
+                    halftoneDotMin: bgConfig.halftoneDotMin,
+                    halftoneDotMax: bgConfig.halftoneDotMax,
+                    halftoneStart: bgConfig.halftoneStart,
+                    halftoneEnd: bgConfig.halftoneEnd,
+                    halftoneDotColor: bgConfig.halftoneDotColor,
+                    halftoneBackgroundColor: bgConfig.halftoneBackgroundColor,
+                    itemColor: bgConfig.itemColor,
+                    opacity: 0,
+                    border: [bgConfig.border[0], 0],
+                    radius: 0
+                };
+            }
+            return root._transparentConfig;
         case "bg":
             return Config.theme.srBg;
         case "popup":
diff --git a/modules/tools/MirrorWindow.qml b/modules/tools/MirrorWindow.qml
old mode 100644
new mode 100755
diff --git a/modules/tools/ScreenrecordTool.qml b/modules/tools/ScreenrecordTool.qml
old mode 100644
new mode 100755
diff --git a/modules/tools/ScreenshotOverlay.qml b/modules/tools/ScreenshotOverlay.qml
old mode 100644
new mode 100755
diff --git a/modules/tools/ScreenshotTool.qml b/modules/tools/ScreenshotTool.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/config/AiPanel.qml b/modules/widgets/config/AiPanel.qml
old mode 100644
new mode 100755
index d7d4ee86..d0d136c3
--- a/modules/widgets/config/AiPanel.qml
+++ b/modules/widgets/config/AiPanel.qml
@@ -39,7 +39,7 @@ Item {
 
             // Providers
             Repeater {
-                model: ["gemini", "openai", "anthropic", "mistral", "groq", "ollama", "minimax"]
+                model: ["gemini", "openai", "anthropic", "mistral", "groq", "ollama", "minimax", "deepseek"]
                 delegate: StyledRect {
                     required property string modelData
                     Layout.fillWidth: true
diff --git a/modules/widgets/config/SettingsWindow.qml b/modules/widgets/config/SettingsWindow.qml
old mode 100644
new mode 100755
index a42a0b33..faabdb9a
--- a/modules/widgets/config/SettingsWindow.qml
+++ b/modules/widgets/config/SettingsWindow.qml
@@ -3,7 +3,6 @@ import Quickshell
 import qs.modules.widgets.dashboard.controls
 import qs.modules.components
 import qs.modules.globals
-import qs.modules.services
 import qs.modules.theme
 import qs.config
 
@@ -13,7 +12,6 @@ FloatingWindow {
     // Window properties
     implicitWidth: 900
     implicitHeight: 650
-    title: "Ambxst Settings"
     visible: GlobalStates.settingsWindowVisible
 
     // Center on screen (approximate, since FloatingWindow usually centers by default or relies on WM)
@@ -21,60 +19,6 @@ FloatingWindow {
 
     color: "transparent"
 
-    function screenByName(name) {
-        if (!name) return null;
-
-        for (let i = 0; i < Quickshell.screens.length; i++) {
-            if (Quickshell.screens[i].name === name) {
-                return Quickshell.screens[i];
-            }
-        }
-
-        return null;
-    }
-
-    function preparePlacement() {
-        const targetScreen = screenByName(GlobalStates.settingsTargetScreenName || AxctlService.focusedMonitor?.name || "");
-        if (targetScreen) {
-            settingsWindow.screen = targetScreen;
-        }
-
-        placementTimer.attempts = 0;
-        placementTimer.restart();
-    }
-
-    function placeOnTargetWorkspace() {
-        const targetWorkspace = GlobalStates.settingsTargetWorkspaceId || AxctlService.focusedMonitor?.activeWorkspace?.id || AxctlService.focusedWorkspace?.id || 0;
-        if (!targetWorkspace) return false;
-
-        const clients = AxctlService.clients.values || [];
-        for (let i = 0; i < clients.length; i++) {
-            const client = clients[i];
-            if (client.title === settingsWindow.title) {
-                if (client.workspace?.id !== targetWorkspace) {
-                    AxctlService.dispatch(`movetoworkspacesilent ${targetWorkspace}, address:${client.address}`);
-                }
-                AxctlService.dispatch(`focuswindow address:${client.address}`);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    Timer {
-        id: placementTimer
-        interval: 100
-        repeat: true
-        property int attempts: 0
-        onTriggered: {
-            attempts++;
-            if (!settingsWindow.visible || settingsWindow.placeOnTargetWorkspace() || attempts >= 20) {
-                stop();
-            }
-        }
-    }
-
     // Use a StyledRect for the background and styling
     StyledRect {
         anchors.fill: parent
@@ -90,10 +34,6 @@ FloatingWindow {
 
     // Close on visibility change from outside
     onVisibleChanged: {
-        if (visible) {
-            preparePlacement();
-        }
-
         if (!visible && GlobalStates.settingsWindowVisible) {
             GlobalStates.settingsWindowVisible = false;
         }
@@ -103,9 +43,6 @@ FloatingWindow {
     Connections {
         target: GlobalStates
         function onSettingsWindowVisibleChanged() {
-            if (GlobalStates.settingsWindowVisible) {
-                settingsWindow.preparePlacement();
-            }
             settingsWindow.visible = GlobalStates.settingsWindowVisible;
         }
     }
diff --git a/modules/widgets/dashboard/AGENTS.md b/modules/widgets/dashboard/AGENTS.md
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/Dashboard.qml b/modules/widgets/dashboard/Dashboard.qml
old mode 100644
new mode 100755
index 0c23fc72..a1857b84
--- a/modules/widgets/dashboard/Dashboard.qml
+++ b/modules/widgets/dashboard/Dashboard.qml
@@ -208,17 +208,19 @@ NotchAnimationBehavior {
                 height: Math.abs(animatedY2 - animatedY1) + width
 
                 Behavior on animatedY1 {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration / 3
-                        easing.type: Easing.OutSine
+                        duration: Anim.spatialFast
+                        easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                     }
                 }
                 Behavior on animatedY2 {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutSine
+                        duration: Anim.spatialDefault
+                        easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                     }
                 }
 
@@ -264,10 +266,11 @@ NotchAnimationBehavior {
                             verticalAlignment: Text.AlignVCenter
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                                    easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
@@ -291,10 +294,11 @@ NotchAnimationBehavior {
                 opacity: GlobalStates.settingsWindowVisible ? 0 : 1
 
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
@@ -323,10 +327,11 @@ NotchAnimationBehavior {
                     verticalAlignment: Text.AlignVCenter
 
                     Behavior on color {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         ColorAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                            easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
@@ -391,6 +396,7 @@ NotchAnimationBehavior {
                 // Generic Tab Loader Component
                 component TabLoader : Loader {
                     anchors.fill: parent
+                    asynchronous: true
                     // Load based on LRU strategy or if currently active
                     active: root.shouldTabBeLoaded(index) || root.state.currentTab === index
                     
@@ -402,14 +408,22 @@ NotchAnimationBehavior {
                     transform: Translate {
                         y: visible ? 0 : (root.state.currentTab > index ? -20 : 20)
                         Behavior on y {
-                             enabled: Config.animDuration > 0
-                             NumberAnimation { duration: Config.animDuration; easing.type: Easing.OutQuart } 
+                             enabled: Anim.animationsEnabled
+                             NumberAnimation {
+                                 duration: Anim.standardNormal
+                                 easing.type: Anim.easing("standard").type
+                                 easing.bezierCurve: Anim.easing("standard").bezierCurve
+                             }
                         }
                     }
 
                     Behavior on opacity {
-                        enabled: Config.animDuration > 0
-                        NumberAnimation { duration: Config.animDuration; easing.type: Easing.OutQuart }
+                        enabled: Anim.animationsEnabled
+                        NumberAnimation {
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                            easing.bezierCurve: Anim.easing("standard").bezierCurve
+                        }
                     }
 
                     // Forward focus
@@ -545,20 +559,20 @@ NotchAnimationBehavior {
     onImplicitHeightChanged: animatedHeight = implicitHeight
 
     Behavior on animatedWidth {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutBack
-            easing.overshoot: 1.1
+            duration: Anim.emphasizedNormal
+            easing.type: Anim.easing("emphasized").type
+            easing.bezierCurve: Anim.easing("emphasized").bezierCurve
         }
     }
 
     Behavior on animatedHeight {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutBack
-            easing.overshoot: 1.1
+            duration: Anim.emphasizedNormal
+            easing.type: Anim.easing("emphasized").type
+            easing.bezierCurve: Anim.easing("emphasized").bezierCurve
         }
     }
 
diff --git a/modules/widgets/dashboard/DashboardView.qml b/modules/widgets/dashboard/DashboardView.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/LauncherButton.qml b/modules/widgets/dashboard/LauncherButton.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/clipboard/ClipboardTab.qml b/modules/widgets/dashboard/clipboard/ClipboardTab.qml
old mode 100644
new mode 100755
index 25815142..5615f6b8
--- a/modules/widgets/dashboard/clipboard/ClipboardTab.qml
+++ b/modules/widgets/dashboard/clipboard/ClipboardTab.qml
@@ -895,10 +895,11 @@ Item {
                     activeFocusOnTab: true
 
                     Behavior on width {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -956,10 +957,11 @@ Item {
                             verticalAlignment: Text.AlignVCenter
 
                             Behavior on opacity {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutQuart
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
@@ -1014,10 +1016,11 @@ Item {
                     property bool enableScrollAnimation: true
 
                     Behavior on contentY {
-                        enabled: Config.animDuration > 0 && resultsList.enableScrollAnimation && !resultsList.moving
+                        enabled: Anim.animationsEnabled && resultsList.enableScrollAnimation && !resultsList.moving
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -1103,18 +1106,20 @@ Item {
                         }
 
                         Behavior on y {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutCubic
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
                         Behavior on height {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -1143,10 +1148,11 @@ Item {
                             visible: root.selectedIndex >= 0
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutQuart
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
@@ -1178,18 +1184,20 @@ Item {
                         radius: 16
 
                         Behavior on y {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutCubic
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
                         Behavior on height {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -1360,19 +1368,21 @@ Item {
                                     x: isInDeleteMode ? 0 : 80
 
                                     Behavior on x {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardNormal
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
 
                                 Behavior on opacity {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     NumberAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
 
@@ -1402,17 +1412,19 @@ Item {
                                     height: 32 - activeButtonMargin * 2
 
                                     Behavior on idx1X {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration / 3
-                                            easing.type: Easing.OutSine
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                         }
                                     }
                                     Behavior on idx2X {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration
-                                            easing.type: Easing.OutSine
+                                            duration: Anim.standardNormal
+                                            easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                         }
                                     }
                                 }
@@ -1453,10 +1465,11 @@ Item {
                                             textFormat: Text.RichText
 
                                             Behavior on color {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 ColorAnimation {
-                                                    duration: Config.animDuration / 2
-                                                    easing.type: Easing.OutQuart
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
                                         }
@@ -1491,10 +1504,11 @@ Item {
                                             textFormat: Text.RichText
 
                                             Behavior on color {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 ColorAnimation {
-                                                    duration: Config.animDuration / 2
-                                                    easing.type: Easing.OutQuart
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
                                         }
@@ -1518,19 +1532,21 @@ Item {
                                     x: isInAliasMode ? 0 : 80
 
                                     Behavior on x {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardNormal
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
 
                                 Behavior on opacity {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     NumberAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
 
@@ -1560,17 +1576,19 @@ Item {
                                     height: 32 - activeButtonMargin * 2
 
                                     Behavior on idx1X {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration / 3
-                                            easing.type: Easing.OutSine
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                         }
                                     }
                                     Behavior on idx2X {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration
-                                            easing.type: Easing.OutSine
+                                            duration: Anim.standardNormal
+                                            easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                         }
                                     }
                                 }
@@ -1609,10 +1627,11 @@ Item {
                                             textFormat: Text.RichText
 
                                             Behavior on color {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 ColorAnimation {
-                                                    duration: Config.animDuration / 2
-                                                    easing.type: Easing.OutQuart
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
                                         }
@@ -1647,10 +1666,11 @@ Item {
                                             textFormat: Text.RichText
 
                                             Behavior on color {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 ColorAnimation {
-                                                    duration: Config.animDuration / 2
-                                                    easing.type: Easing.OutQuart
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
                                         }
@@ -1719,10 +1739,11 @@ Item {
                             opacity: (isExpanded && !isInDeleteMode && !isInAliasMode) ? 1 : 0
 
                             Behavior on opacity {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutQuart
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
@@ -1739,10 +1760,11 @@ Item {
                                 radius: Styling.radius(0)
 
                                 Behavior on Layout.preferredHeight {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     NumberAnimation {
-                                        duration: Config.animDuration
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardNormal
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
 
@@ -1840,17 +1862,18 @@ Item {
                                         z: -1
 
                                         Behavior on opacity {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             NumberAnimation {
-                                                duration: Config.animDuration / 2
-                                                easing.type: Easing.OutQuart
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                             }
                                         }
                                     }
 
-                                    highlightMoveDuration: Config.animDuration > 0 ? Config.animDuration / 2 : 0
+                                    highlightMoveDuration: Anim.animationsEnabled ? Anim.standardSmall : 0
                                     highlightMoveVelocity: -1
-                                    highlightResizeDuration: Config.animDuration / 2
+                                    highlightResizeDuration: Anim.standardSmall
                                     highlightResizeVelocity: -1
 
                                     delegate: Item {
@@ -1890,10 +1913,11 @@ Item {
                                                     }
 
                                                     Behavior on color {
-                                                        enabled: Config.animDuration > 0
+                                                        enabled: Anim.animationsEnabled
                                                         ColorAnimation {
-                                                            duration: Config.animDuration / 2
-                                                            easing.type: Easing.OutQuart
+                                                            duration: Anim.standardSmall
+                                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                         }
                                                     }
                                                 }
@@ -1914,10 +1938,11 @@ Item {
                                                     maximumLineCount: 1
 
                                                     Behavior on color {
-                                                        enabled: Config.animDuration > 0
+                                                        enabled: Anim.animationsEnabled
                                                         ColorAnimation {
-                                                            duration: Config.animDuration / 2
-                                                            easing.type: Easing.OutQuart
+                                                            duration: Anim.standardSmall
+                                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                         }
                                                     }
                                                 }
@@ -2029,10 +2054,11 @@ Item {
                             spacing: 8
 
                             Behavior on anchors.rightMargin {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutQuart
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
@@ -2304,10 +2330,11 @@ Item {
                                     opacity: 0.8
 
                                     Behavior on color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
@@ -2616,10 +2643,11 @@ Item {
                                 bottomRightRadius: Config.roundness > 0 ? Config.roundness + 4 : 0
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
 
@@ -3013,10 +3041,11 @@ Item {
                                     radius: Styling.radius(4)
 
                                     Behavior on color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
 
@@ -3428,10 +3457,11 @@ Item {
                                 }
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
 
@@ -3457,10 +3487,11 @@ Item {
                                     textFormat: Text.RichText
 
                                     Behavior on color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
@@ -3476,10 +3507,11 @@ Item {
                                 radius: Styling.radius(0)
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
 
@@ -3526,10 +3558,11 @@ Item {
                                     textFormat: Text.RichText
 
                                     Behavior on color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
diff --git a/modules/widgets/dashboard/clipboard/clipboard_utils.js b/modules/widgets/dashboard/clipboard/clipboard_utils.js
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/controls/AudioDeviceItem.qml b/modules/widgets/dashboard/controls/AudioDeviceItem.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/controls/AudioMixerPanel.qml b/modules/widgets/dashboard/controls/AudioMixerPanel.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/controls/AudioVolumeEntry.qml b/modules/widgets/dashboard/controls/AudioVolumeEntry.qml
old mode 100644
new mode 100755
index 17b76147..c8a65590
--- a/modules/widgets/dashboard/controls/AudioVolumeEntry.qml
+++ b/modules/widgets/dashboard/controls/AudioVolumeEntry.qml
@@ -66,9 +66,9 @@ Item {
                         color: root.isMuted ? Colors.error : Colors.overBackground
 
                         Behavior on color {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             ColorAnimation {
-                                duration: Config.animDuration / 2
+                                duration: Anim.standardSmall
                             }
                         }
                     }
@@ -108,9 +108,9 @@ Item {
                 }
 
                 Behavior on progressColor {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     ColorAnimation {
-                        duration: Config.animDuration / 2
+                        duration: Anim.standardSmall
                     }
                 }
             }
diff --git a/modules/widgets/dashboard/controls/BindsPanel.qml b/modules/widgets/dashboard/controls/BindsPanel.qml
old mode 100644
new mode 100755
index 6655f205..29e5c587
--- a/modules/widgets/dashboard/controls/BindsPanel.qml
+++ b/modules/widgets/dashboard/controls/BindsPanel.qml
@@ -55,7 +55,7 @@ Item {
     property bool editMode: false
     property int editingIndex: -1
     property var editingBind: null
-    property bool isEditingAmbxst: false
+    property bool isEditingNothingless: false
     property bool isCreatingNew: false
 
     // Edit form state - new format with keys[] and actions[]
@@ -237,13 +237,13 @@ Item {
         }
     }
 
-    function openEditDialog(bind, index, isAmbxst) {
+    function openEditDialog(bind, index, isNothingless) {
         root.editingIndex = index;
         root.editingBind = bind;
-        root.isEditingAmbxst = isAmbxst;
+        root.isEditingNothingless = isNothingless;
 
         // Initialize edit form state
-        if (isAmbxst) {
+        if (isNothingless) {
             // Ambxst binds still use old format (single key)
             const bindData = bind.bind;
             root.editName = "";
@@ -327,7 +327,7 @@ Item {
     }
 
     function saveEdit() {
-        if (root.isEditingAmbxst) {
+        if (root.isEditingNothingless) {
             // Save ambxst bind (still uses old format internally)
             const path = root.editingBind.path.split(".");
             // path = ["ambxst", "section"?, "bindName"]
@@ -432,7 +432,7 @@ Item {
     }
 
     // Get ambxst binds as a flat list
-    function getAmbxstBinds() {
+    function getNothinglessBinds() {
         const adapter = Config.keybindsLoader.adapter;
         if (!adapter || !adapter.ambxst)
             return [];
@@ -455,14 +455,19 @@ Item {
 
         // System binds
         if (ambxst.system) {
-            const systemKeys = ["overview", "powermenu", "config", "lockscreen", "tools", "screenshot", "screenrecord", "lens", "reload", "quit"];
+            const systemKeys = ["overview", "powermenu", "config", "lockscreen", "tools", "screenshot", "screenrecord", "lens", "reload", "quit", "toggle-metrics"];
             for (const key of systemKeys) {
-                if (ambxst.system[key]) {
+                let bindObj = ambxst.system[key];
+                // Fallback for keys not exposed by JsonAdapter (e.g., hyphenated names)
+                if (!bindObj && adapter.defaultNothinglessBinds && adapter.defaultNothinglessBinds.system) {
+                    bindObj = adapter.defaultNothinglessBinds.system[key];
+                }
+                if (bindObj) {
                     binds.push({
                         category: "System",
                         name: key.charAt(0).toUpperCase() + key.slice(1),
                         path: "ambxst.system." + key,
-                        bind: ambxst.system[key]
+                        bind: bindObj
                     });
                 }
             }
@@ -553,19 +558,21 @@ Item {
             x: root.editMode ? -30 : 0
 
             Behavior on x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutQuart
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -684,19 +691,21 @@ Item {
             x: root.editMode ? -30 : 0
 
             Behavior on x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutQuart
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -710,7 +719,7 @@ Item {
             // Ambxst binds view
             Repeater {
                 id: ambxstRepeater
-                model: root.currentCategory === "ambxst" ? root.getAmbxstBinds() : []
+                model: root.currentCategory === "ambxst" ? root.getNothinglessBinds() : []
 
                 delegate: BindItem {
                     required property var modelData
@@ -721,7 +730,7 @@ Item {
                     keybindText: root.formatKeybind(modelData.bind)
                     dispatcher: KeybindActions.describeAction(modelData.bind.action || modelData.bind)
                     argument: ""
-                    isAmbxst: true
+                    isNothingless: true
 
                     onEditRequested: {
                         root.openEditDialog(modelData, index, true);
@@ -768,7 +777,7 @@ Item {
                     dispatcher: firstDispatcher
                     argument: firstArgument
                     isEnabled: modelData.enabled !== false
-                    isAmbxst: false
+                    isNothingless: false
                     layouts: getUniqueLayouts()
 
                     onToggleEnabled: {
@@ -821,19 +830,21 @@ Item {
             x: root.editMode ? 0 : 30
 
             Behavior on x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutQuart
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -911,7 +922,7 @@ Item {
                         // Delete button (only for existing custom binds)
                         StyledRect {
                             id: deleteButton
-                            visible: !root.isEditingAmbxst && !root.isCreatingNew
+                            visible: !root.isEditingNothingless && !root.isCreatingNew
                             variant: deleteButtonArea.containsMouse ? "focus" : "common"
                             Layout.preferredWidth: 36
                             Layout.preferredHeight: 36
@@ -942,7 +953,7 @@ Item {
                         // Reset button (only for Ambxst binds)
                         StyledRect {
                             id: resetButton
-                            visible: root.isEditingAmbxst
+                            visible: root.isEditingNothingless
                             variant: resetButtonArea.pressed ? "primary" : (resetButtonArea.containsMouse ? "focus" : "common")
                             Layout.preferredWidth: resetButtonContent.width + 24
                             Layout.preferredHeight: 36
@@ -977,14 +988,14 @@ Item {
                                 hoverEnabled: true
                                 cursorShape: Qt.PointingHandCursor
                                 onClicked: {
-                                    if (root.isEditingAmbxst && root.editingBind) {
+                                    if (root.isEditingNothingless && root.editingBind) {
                                         const path = root.editingBind.path.split(".");
                                         // path = ["ambxst", "dashboard"|"system", "bindName"]
                                         const section = path[1];
                                         const bindName = path[2];
                                         
                                         // Use the new helper in Config.qml to get the default values
-                                        const defaultBind = Config.keybindsLoader.adapter.getAmbxstDefault(section, bindName);
+                                        const defaultBind = Config.keybindsLoader.adapter.getNothinglessDefault(section, bindName);
                                         
                                         if (defaultBind) {
                                             root.editKeys = [{
@@ -1062,7 +1073,7 @@ Item {
                         ColumnLayout {
                             Layout.fillWidth: true
                             spacing: 8
-                            visible: !root.isEditingAmbxst
+                            visible: !root.isEditingNothingless
 
                             Text {
                                 text: "Name (optional)"
@@ -1107,7 +1118,7 @@ Item {
 
                         // Bind name/info (for ambxst binds only)
                         Text {
-                            visible: root.isEditingAmbxst && root.editingBind !== null
+                            visible: root.isEditingNothingless && root.editingBind !== null
                             text: root.editingBind ? (root.editingBind.name || "") : ""
                             font.family: Config.theme.font
                             font.pixelSize: Styling.fontSize(1)
@@ -1179,7 +1190,7 @@ Item {
                                 // Remove key button
                                 StyledRect {
                                     id: removeKeyBtn
-                                    visible: root.editKeys.length > 1 && !root.isEditingAmbxst
+                                    visible: root.editKeys.length > 1 && !root.isEditingNothingless
                                     variant: removeKeyBtnArea.containsMouse ? "focus" : "common"
                                     Layout.preferredWidth: 28
                                     Layout.preferredHeight: 28
@@ -1272,7 +1283,7 @@ Item {
                                 // Add key button
                                 StyledRect {
                                     id: addKeyBtn
-                                    visible: !root.isEditingAmbxst
+                                    visible: !root.isEditingNothingless
                                     variant: addKeyBtnArea.containsMouse ? "primaryfocus" : "primary"
                                     Layout.preferredWidth: 28
                                     Layout.preferredHeight: 28
@@ -1388,7 +1399,7 @@ Item {
                         ColumnLayout {
                             Layout.fillWidth: true
                             spacing: 8
-                            // visible: !root.isEditingAmbxst - Removed to allow editing flags for Ambxst binds
+                            // visible: !root.isEditingNothingless - Removed to allow editing flags for Ambxst binds
 
                             // Actions section header with pager controls
                             RowLayout {
@@ -1406,7 +1417,7 @@ Item {
 
                                 // Page indicator
                                 Text {
-                                    visible: root.editActions.length > 1 && !root.isEditingAmbxst
+                                    visible: root.editActions.length > 1 && !root.isEditingNothingless
                                     text: (root.currentActionPage + 1) + " / " + root.editActions.length
                                     font.family: Config.theme.font
                                     font.pixelSize: Styling.fontSize(-1)
@@ -1416,7 +1427,7 @@ Item {
                                 // Remove action button
                                 StyledRect {
                                     id: removeActionBtn
-                                    visible: root.editActions.length > 1 && !root.isEditingAmbxst
+                                    visible: root.editActions.length > 1 && !root.isEditingNothingless
                                     variant: removeActionBtnArea.containsMouse ? "focus" : "common"
                                     Layout.preferredWidth: 28
                                     Layout.preferredHeight: 28
@@ -1447,7 +1458,7 @@ Item {
                                 // Previous action button
                                 StyledRect {
                                     id: prevActionBtn
-                                    visible: root.editActions.length > 1 && !root.isEditingAmbxst
+                                    visible: root.editActions.length > 1 && !root.isEditingNothingless
                                     variant: prevActionBtnArea.containsMouse ? "focus" : "common"
                                     Layout.preferredWidth: 28
                                     Layout.preferredHeight: 28
@@ -1478,7 +1489,7 @@ Item {
                                 // Next action button
                                 StyledRect {
                                     id: nextActionBtn
-                                    visible: root.editActions.length > 1 && !root.isEditingAmbxst
+                                    visible: root.editActions.length > 1 && !root.isEditingNothingless
                                     variant: nextActionBtnArea.containsMouse ? "focus" : "common"
                                     Layout.preferredWidth: 28
                                     Layout.preferredHeight: 28
@@ -1509,7 +1520,7 @@ Item {
                                 // Add action button
                                 StyledRect {
                                     id: addActionBtn
-                                    visible: !root.isEditingAmbxst
+                                    visible: !root.isEditingNothingless
                                     variant: addActionBtnArea.containsMouse ? "primaryfocus" : "primary"
                                     Layout.preferredWidth: 28
                                     Layout.preferredHeight: 28
@@ -1727,10 +1738,11 @@ Item {
                                         radius: Styling.radius(-2)
 
                                         Behavior on width {
-                                            enabled: (Config.animDuration ?? 0) > 0
+                                            enabled: Anim.animationsEnabled
                                             NumberAnimation {
-                                                duration: (Config.animDuration ?? 0) / 3
-                                                easing.type: Easing.OutCubic
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                             }
                                         }
 
@@ -1753,19 +1765,21 @@ Item {
                                                     opacity: layoutTag.isSelected ? 1 : 0
 
                                                     Behavior on opacity {
-                                                        enabled: (Config.animDuration ?? 0) > 0
+                                                        enabled: Anim.animationsEnabled
                                                         NumberAnimation {
-                                                            duration: (Config.animDuration ?? 0) / 3
-                                                            easing.type: Easing.OutCubic
+                                                            duration: Anim.standardSmall
+                                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                         }
                                                     }
                                                 }
 
                                                 Behavior on width {
-                                                    enabled: (Config.animDuration ?? 0) > 0
+                                                    enabled: Anim.animationsEnabled
                                                     NumberAnimation {
-                                                        duration: (Config.animDuration ?? 0) / 3
-                                                        easing.type: Easing.OutCubic
+                                                        duration: Anim.standardSmall
+                                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                     }
                                                 }
                                             }
@@ -1855,7 +1869,7 @@ Item {
         property string dispatcher: ""
         property string argument: ""
         property bool isEnabled: true
-        property bool isAmbxst: true
+        property bool isNothingless: true
         property bool isHovered: false
         property var layouts: []  // Layouts this bind is restricted to (empty = all layouts)
 
@@ -1890,7 +1904,7 @@ Item {
             // Checkbox for custom binds (styled like OLED Mode)
             Item {
                 id: checkboxItem
-                visible: !bindItem.isAmbxst
+                visible: !bindItem.isNothingless
                 Layout.preferredWidth: 32
                 Layout.preferredHeight: 32
 
@@ -1912,10 +1926,11 @@ Item {
                         opacity: bindItem.isEnabled ? 1.0 : 0.0
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -1928,11 +1943,11 @@ Item {
                             scale: bindItem.isEnabled ? 1.0 : 0.0
 
                             Behavior on scale {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutBack
-                                    easing.overshoot: 1.5
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                                 }
                             }
                         }
@@ -1971,7 +1986,7 @@ Item {
 
                     // Layout indicator
                     Row {
-                        visible: !bindItem.isAmbxst
+                        visible: !bindItem.isNothingless
                         spacing: 4
                         Layout.alignment: Qt.AlignVCenter
 
@@ -2048,7 +2063,7 @@ Item {
         // Checkbox MouseArea needs to be on top
         MouseArea {
             id: checkboxClickArea
-            visible: !bindItem.isAmbxst
+            visible: !bindItem.isNothingless
             x: 12
             y: (parent.height - 32) / 2
             width: 32
diff --git a/modules/widgets/dashboard/controls/BluetoothDeviceItem.qml b/modules/widgets/dashboard/controls/BluetoothDeviceItem.qml
old mode 100644
new mode 100755
index d35908ed..1ec02017
--- a/modules/widgets/dashboard/controls/BluetoothDeviceItem.qml
+++ b/modules/widgets/dashboard/controls/BluetoothDeviceItem.qml
@@ -18,10 +18,11 @@ Item {
     implicitHeight: contentColumn.implicitHeight + 16  // 8px margins top + bottom
 
     Behavior on implicitHeight {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutCubic
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -123,9 +124,9 @@ Item {
                     elide: Text.ElideRight
 
                     Behavior on opacity {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
+                            duration: Anim.standardSmall
                         }
                     }
                 }
@@ -173,9 +174,9 @@ Item {
             opacity: root.expanded ? 1 : 0
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
 
diff --git a/modules/widgets/dashboard/controls/BluetoothPanel.qml b/modules/widgets/dashboard/controls/BluetoothPanel.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/controls/ColorButton.qml b/modules/widgets/dashboard/controls/ColorButton.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/controls/ColorPickerPopup.qml b/modules/widgets/dashboard/controls/ColorPickerPopup.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/controls/ColorPickerView.qml b/modules/widgets/dashboard/controls/ColorPickerView.qml
old mode 100644
new mode 100755
index 28025d00..944e5787
--- a/modules/widgets/dashboard/controls/ColorPickerView.qml
+++ b/modules/widgets/dashboard/controls/ColorPickerView.qml
@@ -221,6 +221,8 @@ Item {
         // Color grid (SCROLLABLE)
         GridView {
             id: colorGrid
+
+
             Layout.fillWidth: true
             Layout.fillHeight: true
             clip: true
diff --git a/modules/widgets/dashboard/controls/ColorSelector.qml b/modules/widgets/dashboard/controls/ColorSelector.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/controls/CompositorPanel.qml b/modules/widgets/dashboard/controls/CompositorPanel.qml
old mode 100644
new mode 100755
index dfa858be..4a3de9ad
--- a/modules/widgets/dashboard/controls/CompositorPanel.qml
+++ b/modules/widgets/dashboard/controls/CompositorPanel.qml
@@ -145,9 +145,9 @@ Item {
                 border.color: toggleSwitch.checked ? Styling.srItem("overprimary") : Colors.outline
 
                 Behavior on color {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     ColorAnimation {
-                        duration: Config.animDuration / 2
+                        duration: Anim.standardSmall
                     }
                 }
 
@@ -160,10 +160,11 @@ Item {
                     color: toggleSwitch.checked ? Colors.background : Colors.overSurfaceVariant
 
                     Behavior on x {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
@@ -319,6 +320,58 @@ Item {
         }
     }
 
+    // Inline component for text input rows
+    component TextInputRow: RowLayout {
+        id: textInputRowRoot
+        property string label: ""
+        property string text: ""
+        property string placeholder: ""
+        signal textEdited(string newText)
+
+        Layout.fillWidth: true
+        spacing: 8
+
+        Text {
+            text: textInputRowRoot.label
+            font.family: Config.theme.font
+            font.pixelSize: Styling.fontSize(0)
+            color: Colors.overBackground
+            Layout.fillWidth: true
+        }
+
+        StyledRect {
+            variant: "common"
+            Layout.preferredWidth: 120
+            Layout.preferredHeight: 32
+            radius: Styling.radius(-2)
+
+            TextInput {
+                id: textInput
+                anchors.fill: parent
+                anchors.margins: 8
+                font.family: Config.theme.font
+                font.pixelSize: Styling.fontSize(0)
+                color: Colors.overBackground
+                selectByMouse: true
+                clip: true
+                verticalAlignment: TextInput.AlignVCenter
+                horizontalAlignment: TextInput.AlignHCenter
+
+                readonly property string configText: textInputRowRoot.text
+                onConfigTextChanged: {
+                    if (!activeFocus && text !== configText) {
+                        text = configText;
+                    }
+                }
+                Component.onCompleted: text = configText
+
+                onEditingFinished: {
+                    textInputRowRoot.textEdited(text);
+                }
+            }
+        }
+    }
+
     // Inline component for Border Gradients (Multi-color list)
     component BorderGradientRow: ColumnLayout {
         id: gradientRow
@@ -526,19 +579,21 @@ Item {
             x: root.colorPickerActive ? -30 : 0
 
             Behavior on x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutQuart
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -610,38 +665,21 @@ Item {
                     CompositorTabButton {
                         label: "AxctlService"
                         image: "../../../../assets/compositors/hyprland.svg"
-                        isSelected: stackLayout.currentIndex === 0
-                        onClicked: stackLayout.currentIndex = 0
-                    }
-
-                    CompositorTabButton {
-                        label: "Coming Soon"
-                        icon: Icons.clock
-                        isSelected: stackLayout.currentIndex === 1
-                        onClicked: stackLayout.currentIndex = 1
+                        isSelected: true
                     }
                 }
             }
 
-            // Stack for content
+            // Content
             Item {
                 Layout.fillWidth: true
-                Layout.preferredHeight: stackLayout.height
+                Layout.preferredHeight: compositorPage.implicitHeight
 
-                StackLayout {
-                    id: stackLayout
+                ColumnLayout {
+                    id: compositorPage
                     width: root.contentWidth
                     anchors.horizontalCenter: parent.horizontalCenter
-                    height: currentIndex === 0 ? compositorPage.implicitHeight : placeholderPage.implicitHeight
-                    currentIndex: 0
-
-                    // ═══════════════════════════════════════════════════════════════
-                    // COMPOSITOR TAB
-                    // ═══════════════════════════════════════════════════════════════
-                    ColumnLayout {
-                        id: compositorPage
-                        Layout.fillWidth: true
-                        spacing: 16
+                    spacing: 16
 
                         // Menu Section
                         ColumnLayout {
@@ -665,6 +703,38 @@ Item {
                                 text: "Blur"
                                 sectionId: "blur"
                             }
+                            SectionButton {
+                                text: "Opacity && Dim"
+                                sectionId: "opacity"
+                            }
+                            SectionButton {
+                                text: "Snap"
+                                sectionId: "snap"
+                            }
+                            SectionButton {
+                                text: "Input"
+                                sectionId: "input"
+                            }
+                            SectionButton {
+                                text: "Cursor"
+                                sectionId: "cursor"
+                            }
+                            SectionButton {
+                                text: "Monitors"
+                                sectionId: "monitors"
+                            }
+                            SectionButton {
+                                text: "Gestures"
+                                sectionId: "gestures"
+                            }
+                            SectionButton {
+                                text: "Layouts"
+                                sectionId: "layouts"
+                            }
+                            SectionButton {
+                                text: "Advanced"
+                                sectionId: "advanced"
+                            }
                         }
 
                         // General Section
@@ -1112,110 +1182,1105 @@ Item {
                             }
                         }
 
-                        // Bottom Padding
-                        Item {
+                        // Opacity & Dim Section
+                        ColumnLayout {
+                            visible: root.currentSection === "opacity"
                             Layout.fillWidth: true
-                            Layout.preferredHeight: 16
-                        }
-                    }
-
-                    // ═══════════════════════════════════════════════════════════════
-                    // COMING SOON TAB
-                    // ═══════════════════════════════════════════════════════════════
-                    Item {
-                        id: placeholderPage
-                        Layout.fillWidth: true
-                        implicitHeight: 300
+                            spacing: 8
 
-                        ColumnLayout {
-                            anchors.centerIn: parent
-                            spacing: 16
+                            Text {
+                                text: "Opacity && Dim"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-1)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.bottomMargin: -4
+                            }
 
                             Text {
-                                text: Icons.clock
-                                font.family: Icons.font
-                                font.pixelSize: 64
-                                color: Colors.surfaceVariant
-                                Layout.alignment: Qt.AlignHCenter
+                                text: "Window Opacity"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 4
+                            }
+
+                            DecimalInputRow {
+                                label: "Active"
+                                value: Config.compositor.activeOpacity ?? 1.0
+                                minValue: 0.0
+                                maxValue: 1.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.activeOpacity = newValue;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Inactive"
+                                value: Config.compositor.inactiveOpacity ?? 1.0
+                                minValue: 0.0
+                                maxValue: 1.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.inactiveOpacity = newValue;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Fullscreen"
+                                value: Config.compositor.fullscreenOpacity ?? 1.0
+                                minValue: 0.0
+                                maxValue: 1.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.fullscreenOpacity = newValue;
+                                }
                             }
 
                             Text {
-                                text: "Coming Soon"
+                                text: "Dim"
                                 font.family: Config.theme.font
-                                font.pixelSize: Styling.fontSize(2)
-                                font.bold: true
-                                color: Colors.overBackground
-                                Layout.alignment: Qt.AlignHCenter
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 8
+                            }
+
+                            ToggleRow {
+                                label: "Dim Inactive"
+                                checked: Config.compositor.dimInactive ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.dimInactive = value;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Dim Strength"
+                                value: Config.compositor.dimStrength ?? 0.5
+                                minValue: 0.0
+                                maxValue: 1.0
+                                enabled: Config.compositor.dimInactive
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.dimStrength = newValue;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Dim Around"
+                                value: Config.compositor.dimAround ?? 0.4
+                                minValue: 0.0
+                                maxValue: 1.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.dimAround = newValue;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Dim Special"
+                                value: Config.compositor.dimSpecial ?? 0.2
+                                minValue: 0.0
+                                maxValue: 1.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.dimSpecial = newValue;
+                                }
                             }
+                        }
+
+                        // Snap Section
+                        ColumnLayout {
+                            visible: root.currentSection === "snap"
+                            Layout.fillWidth: true
+                            spacing: 8
 
                             Text {
-                                text: "Support for more compositors\nis planned for future updates."
+                                text: "Snap"
                                 font.family: Config.theme.font
-                                font.pixelSize: Styling.fontSize(0)
+                                font.pixelSize: Styling.fontSize(-1)
+                                font.weight: Font.Medium
                                 color: Colors.overSurfaceVariant
-                                horizontalAlignment: Text.AlignHCenter
-                                Layout.alignment: Qt.AlignHCenter
+                                Layout.bottomMargin: -4
+                            }
+
+                            ToggleRow {
+                                label: "Enabled"
+                                checked: Config.compositor.snapEnabled ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.snapEnabled = value;
+                                }
+                            }
+
+                            NumberInputRow {
+                                label: "Window Gap"
+                                value: Config.compositor.snapWindowGap ?? 10
+                                minValue: 0
+                                maxValue: 100
+                                suffix: "px"
+                                enabled: Config.compositor.snapEnabled
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.snapWindowGap = newValue;
+                                }
+                            }
+
+                            NumberInputRow {
+                                label: "Monitor Gap"
+                                value: Config.compositor.snapMonitorGap ?? 10
+                                minValue: 0
+                                maxValue: 100
+                                suffix: "px"
+                                enabled: Config.compositor.snapEnabled
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.snapMonitorGap = newValue;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Border Overlap"
+                                checked: Config.compositor.snapBorderOverlap ?? false
+                                enabled: Config.compositor.snapEnabled
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.snapBorderOverlap = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Respect Gaps"
+                                checked: Config.compositor.snapRespectGaps ?? false
+                                enabled: Config.compositor.snapEnabled
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.snapRespectGaps = value;
+                                }
                             }
                         }
-                    }
-                }
-            }
-        }
-    }
 
-    // Color picker view (shown when colorPickerActive)
-    Item {
-        id: colorPickerContainer
-        anchors.fill: parent
-        clip: true
+                        // Input Section
+                        ColumnLayout {
+                            visible: root.currentSection === "input"
+                            Layout.fillWidth: true
+                            spacing: 8
 
-        // Horizontal slide + fade animation (enters from right)
-        opacity: root.colorPickerActive ? 1 : 0
-        transform: Translate {
-            x: root.colorPickerActive ? 0 : 30
+                            Text {
+                                text: "Input"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-1)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.bottomMargin: -4
+                            }
 
-            Behavior on x {
-                enabled: Config.animDuration > 0
-                NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
-                }
-            }
-        }
+                            Text {
+                                text: "Keyboard"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 4
+                            }
 
-        Behavior on opacity {
-            enabled: Config.animDuration > 0
-            NumberAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutQuart
-            }
-        }
+                            TextInputRow {
+                                label: "Layout"
+                                text: Config.compositor.kbLayout ?? "us"
+                                placeholder: "us"
+                                onTextEdited: newText => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.kbLayout = newText;
+                                }
+                            }
 
-        // Prevent interaction when hidden
-        enabled: root.colorPickerActive
+                            TextInputRow {
+                                label: "Variant"
+                                text: Config.compositor.kbVariant ?? ""
+                                placeholder: "e.g. dvorak"
+                                onTextEdited: newText => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.kbVariant = newText;
+                                }
+                            }
 
-        // Block interaction with elements behind when active
-        MouseArea {
-            anchors.fill: parent
-            enabled: root.colorPickerActive
-            hoverEnabled: true
-            acceptedButtons: Qt.AllButtons
-            onPressed: event => event.accepted = true
-            onReleased: event => event.accepted = true
-            onWheel: event => event.accepted = true
-        }
+                            TextInputRow {
+                                label: "Options"
+                                text: Config.compositor.kbOptions ?? ""
+                                placeholder: "e.g. caps:escape"
+                                onTextEdited: newText => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.kbOptions = newText;
+                                }
+                            }
 
-        ColorPickerView {
-            id: colorPickerContent
-            anchors.fill: parent
-            anchors.leftMargin: root.sideMargin
-            anchors.rightMargin: root.sideMargin
-            colorNames: root.colorPickerColorNames
-            currentColor: root.colorPickerCurrentColor
-            dialogTitle: root.colorPickerDialogTitle
+                            ToggleRow {
+                                label: "Numlock by Default"
+                                checked: Config.compositor.numlockByDefault ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.numlockByDefault = value;
+                                }
+                            }
+
+                            NumberInputRow {
+                                label: "Repeat Rate"
+                                value: Config.compositor.repeatRate ?? 25
+                                minValue: 0
+                                maxValue: 300
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.repeatRate = newValue;
+                                }
+                            }
+
+                            NumberInputRow {
+                                label: "Repeat Delay"
+                                value: Config.compositor.repeatDelay ?? 600
+                                minValue: 0
+                                maxValue: 2000
+                                suffix: "ms"
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.repeatDelay = newValue;
+                                }
+                            }
+
+                            Text {
+                                text: "Mouse"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 8
+                            }
+
+                            DecimalInputRow {
+                                label: "Sensitivity"
+                                value: Config.compositor.mouseSensitivity ?? 0.0
+                                minValue: -1.0
+                                maxValue: 1.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.mouseSensitivity = newValue;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Natural Scroll"
+                                checked: Config.compositor.mouseNaturalScroll ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.mouseNaturalScroll = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Left Handed"
+                                checked: Config.compositor.mouseLeftHanded ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.mouseLeftHanded = value;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Scroll Factor"
+                                value: Config.compositor.mouseScrollFactor ?? 1.0
+                                minValue: 0.1
+                                maxValue: 10.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.mouseScrollFactor = newValue;
+                                }
+                            }
+
+                            Text {
+                                text: "Touchpad"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 8
+                            }
+
+                            ToggleRow {
+                                label: "Disable While Typing"
+                                checked: Config.compositor.touchpadDisableWhileTyping ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.touchpadDisableWhileTyping = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Natural Scroll"
+                                checked: Config.compositor.touchpadNaturalScroll ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.touchpadNaturalScroll = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Tap to Click"
+                                checked: Config.compositor.touchpadTapToClick ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.touchpadTapToClick = value;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Scroll Factor"
+                                value: Config.compositor.touchpadScrollFactor ?? 1.0
+                                minValue: 0.1
+                                maxValue: 10.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.touchpadScrollFactor = newValue;
+                                }
+                            }
+                        }
+
+                        // Cursor Section
+                        ColumnLayout {
+                            visible: root.currentSection === "cursor"
+                            Layout.fillWidth: true
+                            spacing: 8
+
+                            Text {
+                                text: "Cursor"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-1)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.bottomMargin: -4
+                            }
+
+                            ToggleRow {
+                                label: "Enable Hyprcursor"
+                                checked: Config.compositor.enableHyprcursor ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.enableHyprcursor = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "No Hardware Cursors"
+                                checked: Config.compositor.noHardwareCursors ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.noHardwareCursors = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "No Warps"
+                                checked: Config.compositor.noWarps ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.noWarps = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Persistent Warps"
+                                checked: Config.compositor.persistentWarps ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.persistentWarps = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Warp on Workspace Change"
+                                checked: Config.compositor.warpOnChangeWorkspace ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.warpOnChangeWorkspace = value;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Zoom Factor"
+                                value: Config.compositor.cursorZoomFactor ?? 1.0
+                                minValue: 0.1
+                                maxValue: 10.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.cursorZoomFactor = newValue;
+                                }
+                            }
+
+                            NumberInputRow {
+                                label: "Inactive Timeout"
+                                value: Config.compositor.cursorInactiveTimeout ?? 0
+                                minValue: 0
+                                maxValue: 60
+                                suffix: "s"
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.cursorInactiveTimeout = newValue;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Hide on Key Press"
+                                checked: Config.compositor.cursorHideOnKeyPress ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.cursorHideOnKeyPress = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Hide on Touch"
+                                checked: Config.compositor.cursorHideOnTouch ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.cursorHideOnTouch = value;
+                                }
+                            }
+                        }
+
+                        // Gestures Section
+                        ColumnLayout {
+                            visible: root.currentSection === "gestures"
+                            Layout.fillWidth: true
+                            spacing: 8
+
+                            Text {
+                                text: "Gestures"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-1)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.bottomMargin: -4
+                            }
+
+                            ToggleRow {
+                                label: "Create New Workspace"
+                                checked: Config.compositor.workspaceSwipeCreateNew ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.workspaceSwipeCreateNew = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Swipe Forever"
+                                checked: Config.compositor.workspaceSwipeForever ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.workspaceSwipeForever = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Direction Lock"
+                                checked: Config.compositor.workspaceSwipeDirectionLock ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.workspaceSwipeDirectionLock = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Use Relative Workspaces"
+                                checked: Config.compositor.workspaceSwipeUseR ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.workspaceSwipeUseR = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Invert Direction"
+                                checked: Config.compositor.workspaceSwipeInvert ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.workspaceSwipeInvert = value;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Cancel Ratio"
+                                value: Config.compositor.workspaceSwipeCancelRatio ?? 0.5
+                                minValue: 0.0
+                                maxValue: 1.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.workspaceSwipeCancelRatio = newValue;
+                                }
+                            }
+
+                            NumberInputRow {
+                                label: "Min Speed to Force"
+                                value: Config.compositor.workspaceSwipeMinSpeedToForce ?? 30
+                                minValue: 0
+                                maxValue: 500
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.workspaceSwipeMinSpeedToForce = newValue;
+                                }
+                            }
+
+                            NumberInputRow {
+                                label: "Swipe Distance"
+                                value: Config.compositor.workspaceSwipeDistance ?? 300
+                                minValue: 0
+                                maxValue: 1000
+                                suffix: "px"
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.workspaceSwipeDistance = newValue;
+                                }
+                            }
+                        }
+
+                        // Layouts Section
+                        ColumnLayout {
+                            visible: root.currentSection === "layouts"
+                            Layout.fillWidth: true
+                            spacing: 8
+
+                            Text {
+                                text: "Layouts"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-1)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.bottomMargin: -4
+                            }
+
+                            Text {
+                                text: "Dwindle"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 4
+                            }
+
+                            ToggleRow {
+                                label: "Preserve Split"
+                                checked: Config.compositor.dwindlePreserveSplit ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.dwindlePreserveSplit = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Smart Split"
+                                checked: Config.compositor.dwindleSmartSplit ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.dwindleSmartSplit = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Smart Resizing"
+                                checked: Config.compositor.dwindleSmartResizing ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.dwindleSmartResizing = value;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Split Ratio"
+                                value: Config.compositor.dwindleDefaultSplitRatio ?? 1.0
+                                minValue: 0.1
+                                maxValue: 5.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.dwindleDefaultSplitRatio = newValue;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Special Scale"
+                                value: Config.compositor.dwindleSpecialScaleFactor ?? 0.8
+                                minValue: 0.1
+                                maxValue: 1.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.dwindleSpecialScaleFactor = newValue;
+                                }
+                            }
+
+                            Text {
+                                text: "Master"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 8
+                            }
+
+                            DecimalInputRow {
+                                label: "Master Factor"
+                                value: Config.compositor.masterMfact ?? 0.55
+                                minValue: 0.05
+                                maxValue: 0.95
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.masterMfact = newValue;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Smart Resizing (Master)"
+                                checked: Config.compositor.masterSmartResizing ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.masterSmartResizing = value;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Special Scale"
+                                value: Config.compositor.masterSpecialScaleFactor ?? 0.8
+                                minValue: 0.1
+                                maxValue: 1.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.masterSpecialScaleFactor = newValue;
+                                }
+                            }
+
+                            Text {
+                                text: "Scrolling"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 8
+                            }
+
+                            DecimalInputRow {
+                                label: "Column Width"
+                                value: Config.compositor.scrollingColumnWidth ?? 0.3
+                                minValue: 0.05
+                                maxValue: 1.0
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.scrollingColumnWidth = newValue;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Follow Focus"
+                                checked: Config.compositor.scrollingFollowFocus ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.scrollingFollowFocus = value;
+                                }
+                            }
+
+                            DecimalInputRow {
+                                label: "Min Visible"
+                                value: Config.compositor.scrollingFollowMinVisible ?? 0.1
+                                minValue: 0.0
+                                maxValue: 1.0
+                                enabled: Config.compositor.scrollingFollowFocus
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.scrollingFollowMinVisible = newValue;
+                                }
+                            }
+                        }
+
+                        // Free Layout Section
+                        ColumnLayout {
+                            visible: root.currentSection === "layout"
+                            Layout.fillWidth: true
+                            spacing: 6
+
+                            Text {
+                                text: "Free"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 8
+                            }
+
+                            NumberInputRow {
+                                label: "Grid Size"
+                                value: Config.compositor.freeGridSize ?? 20
+                                minValue: 4
+                                maxValue: 100
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.freeGridSize = newValue;
+                                }
+                            }
+
+                            NumberInputRow {
+                                label: "Snap Sensitivity"
+                                value: Config.compositor.freeSnapSensitivity ?? 10
+                                minValue: 1
+                                maxValue: 50
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.freeSnapSensitivity = newValue;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Snap to Edges"
+                                checked: Config.compositor.freeSnapEdges ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.freeSnapEdges = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Snap to Center"
+                                checked: Config.compositor.freeSnapCenter ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.freeSnapCenter = value;
+                                }
+                            }
+
+                            NumberInputRow {
+                                label: "Snap Gaps"
+                                value: Config.compositor.freeSnapGaps ?? 4
+                                minValue: 0
+                                maxValue: 50
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.freeSnapGaps = newValue;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Tile by Default"
+                                checked: Config.compositor.freeTileByDefault ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.freeTileByDefault = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Maximize by Default"
+                                checked: Config.compositor.freeMaximizedByDefault ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.freeMaximizedByDefault = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Smart Resize Anchors"
+                                checked: Config.compositor.smartResizeAnchors ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.smartResizeAnchors = value;
+                                }
+                            }
+                        }
+
+                        // Advanced Section
+                        ColumnLayout {
+                            visible: root.currentSection === "advanced"
+                            Layout.fillWidth: true
+                            spacing: 8
+
+                            Text {
+                                text: "Advanced"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-1)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.bottomMargin: -4
+                            }
+
+                            Text {
+                                text: "General"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 4
+                            }
+
+                            ToggleRow {
+                                label: "Allow Tearing"
+                                checked: Config.compositor.allowTearing ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.allowTearing = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Animations"
+                                checked: Config.compositor.animationsEnabled ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.animationsEnabled = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Animate Manual Resizes"
+                                checked: Config.compositor.animateManualResizes ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.animateManualResizes = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Animate Mouse Dragging"
+                                checked: Config.compositor.animateMouseWindowdragging ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.animateMouseWindowdragging = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Focus on Activate"
+                                checked: Config.compositor.focusOnActivate ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.focusOnActivate = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Resize on Border"
+                                checked: Config.compositor.resizeOnBorder ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.resizeOnBorder = value;
+                                }
+                            }
+
+                            NumberInputRow {
+                                label: "Border Grab Area"
+                                value: Config.compositor.extendBorderGrabArea ?? 15
+                                minValue: 0
+                                maxValue: 50
+                                suffix: "px"
+                                onValueEdited: newValue => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.extendBorderGrabArea = newValue;
+                                }
+                            }
+
+                            Text {
+                                text: "XWayland"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 8
+                            }
+
+                            ToggleRow {
+                                label: "XWayland Enabled"
+                                checked: Config.compositor.xwaylandEnabled ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.xwaylandEnabled = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Force Zero Scaling"
+                                checked: Config.compositor.xwaylandForceZeroScaling ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.xwaylandForceZeroScaling = value;
+                                }
+                            }
+
+                            Text {
+                                text: "Startup"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 8
+                            }
+
+                            ToggleRow {
+                                label: "Disable Logo"
+                                checked: Config.compositor.disableHyprlandLogo ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.disableHyprlandLogo = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Disable Splash"
+                                checked: Config.compositor.disableSplashRendering ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.disableSplashRendering = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Disable Update News"
+                                checked: Config.compositor.noUpdateNews ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.noUpdateNews = value;
+                                }
+                            }
+                        }
+
+                        // =====================
+                        // MONITORS SECTION
+                        // =====================
+                        ColumnLayout {
+                            visible: root.currentSection === "monitors"
+                            Layout.fillWidth: true
+                            spacing: 16
+
+                            Text {
+                                text: "Monitors"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-1)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.bottomMargin: -4
+                            }
+
+                            // ── Global monitor settings ──
+                            Text {
+                                text: "Global Settings"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 4
+                            }
+
+                            ToggleRow {
+                                label: "VFR (Variable Frame Rate)"
+                                checked: Config.compositor.vfr ?? true
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.vfr = value;
+                                }
+                            }
+
+                            Text {
+                                text: "DPMS (Power Management)"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-2)
+                                font.weight: Font.Medium
+                                color: Colors.overSurfaceVariant
+                                Layout.topMargin: 8
+                            }
+
+                            ToggleRow {
+                                label: "Wake on Mouse Move"
+                                checked: Config.compositor.mouseMoveEnablesDpms ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.mouseMoveEnablesDpms = value;
+                                }
+                            }
+
+                            ToggleRow {
+                                label: "Wake on Key Press"
+                                checked: Config.compositor.keyPressEnablesDpms ?? false
+                                onToggled: value => {
+                                    GlobalStates.markCompositorChanged();
+                                    Config.compositor.keyPressEnablesDpms = value;
+                                }
+                            }
+
+                            // ── Monitors configuration (nwg-displays style) ──
+                            MonitorsPanel {
+                                Layout.fillWidth: true
+                            }
+                        }
+
+                        // Bottom Padding
+                        Item {
+                            Layout.fillWidth: true
+                            Layout.preferredHeight: 16
+                        }
+                    }
+                }
+            }
+        }
+
+    // Color picker view (shown when colorPickerActive)
+    Item {
+        id: colorPickerContainer
+        anchors.fill: parent
+        clip: true
+
+        // Horizontal slide + fade animation (enters from right)
+        opacity: root.colorPickerActive ? 1 : 0
+        transform: Translate {
+            x: root.colorPickerActive ? 0 : 30
+
+            Behavior on x {
+                enabled: Anim.animationsEnabled
+                NumberAnimation {
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
+                }
+            }
+        }
+
+        Behavior on opacity {
+            enabled: Anim.animationsEnabled
+            NumberAnimation {
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
+            }
+        }
+
+        // Prevent interaction when hidden
+        enabled: root.colorPickerActive
+
+        // Block interaction with elements behind when active
+        MouseArea {
+            anchors.fill: parent
+            enabled: root.colorPickerActive
+            hoverEnabled: true
+            acceptedButtons: Qt.AllButtons
+            onPressed: event => event.accepted = true
+            onReleased: event => event.accepted = true
+            onWheel: event => event.accepted = true
+        }
+
+        ColorPickerView {
+            id: colorPickerContent
+            anchors.fill: parent
+            anchors.leftMargin: root.sideMargin
+            anchors.rightMargin: root.sideMargin
+            colorNames: root.colorPickerColorNames
+            currentColor: root.colorPickerCurrentColor
+            dialogTitle: root.colorPickerDialogTitle
+
+            onColorSelected: color => root.handleColorSelected(color)
+            onClosed: root.closeColorPicker()
+        }
+    }
+}
 
-            onColorSelected: color => root.handleColorSelected(color)
-            onClosed: root.closeColorPicker()
-        }
-    }
-}
diff --git a/modules/widgets/dashboard/controls/EasyEffectsPanel.qml b/modules/widgets/dashboard/controls/EasyEffectsPanel.qml
old mode 100644
new mode 100755
index 8370c8af..c9b6082e
--- a/modules/widgets/dashboard/controls/EasyEffectsPanel.qml
+++ b/modules/widgets/dashboard/controls/EasyEffectsPanel.qml
@@ -134,10 +134,11 @@ Item {
                                         bottomPadding: 6
 
                                         Behavior on spacing {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             NumberAnimation {
-                                                duration: Config.animDuration / 3
-                                                easing.type: Easing.OutCubic
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                             }
                                         }
 
@@ -149,10 +150,11 @@ Item {
                                             clip: true
 
                                             Behavior on width {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 NumberAnimation {
-                                                    duration: Config.animDuration / 3
-                                                    easing.type: Easing.OutCubic
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
 
@@ -165,10 +167,11 @@ Item {
                                                 opacity: presetButton.isActive ? 1 : 0
 
                                                 Behavior on opacity {
-                                                    enabled: Config.animDuration > 0
+                                                    enabled: Anim.animationsEnabled
                                                     NumberAnimation {
-                                                        duration: Config.animDuration / 3
-                                                        easing.type: Easing.OutCubic
+                                                        duration: Anim.standardSmall
+                                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                     }
                                                 }
                                             }
@@ -231,10 +234,11 @@ Item {
                                         bottomPadding: 6
 
                                         Behavior on spacing {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             NumberAnimation {
-                                                duration: Config.animDuration / 3
-                                                easing.type: Easing.OutCubic
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                             }
                                         }
 
@@ -246,10 +250,11 @@ Item {
                                             clip: true
 
                                             Behavior on width {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 NumberAnimation {
-                                                    duration: Config.animDuration / 3
-                                                    easing.type: Easing.OutCubic
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
 
@@ -262,10 +267,11 @@ Item {
                                                 opacity: inputPresetButton.isActive ? 1 : 0
 
                                                 Behavior on opacity {
-                                                    enabled: Config.animDuration > 0
+                                                    enabled: Anim.animationsEnabled
                                                     NumberAnimation {
-                                                        duration: Config.animDuration / 3
-                                                        easing.type: Easing.OutCubic
+                                                        duration: Anim.standardSmall
+                                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                     }
                                                 }
                                             }
diff --git a/modules/widgets/dashboard/controls/GradientStopsEditor.qml b/modules/widgets/dashboard/controls/GradientStopsEditor.qml
old mode 100644
new mode 100755
index 383ac132..55157fcf
--- a/modules/widgets/dashboard/controls/GradientStopsEditor.qml
+++ b/modules/widgets/dashboard/controls/GradientStopsEditor.qml
@@ -282,9 +282,9 @@ Item {
                             }
 
                             Behavior on border.width {
-                                enabled: (Config.animDuration ?? 0) > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: (Config.animDuration ?? 0) / 3
+                                    duration: Anim.standardSmall
                                 }
                             }
                         }
diff --git a/modules/widgets/dashboard/controls/MonitorArrangementView.qml b/modules/widgets/dashboard/controls/MonitorArrangementView.qml
new file mode 100644
index 00000000..40c58447
--- /dev/null
+++ b/modules/widgets/dashboard/controls/MonitorArrangementView.qml
@@ -0,0 +1,214 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import qs.modules.theme
+import qs.modules.components
+import qs.config
+
+StyledRect {
+    id: root
+    variant: "pane"
+    Layout.fillWidth: true
+    Layout.preferredHeight: canvasArea.implicitHeight + 16
+    radius: Styling.radius(0)
+    enableShadow: true
+
+    property var monitors: []
+    property int selectedIndex: 0
+
+    signal monitorMoved(int idx, int newX, int newY)
+    signal monitorSelected(int idx)
+
+    // Canvas math (logical pixels based on physical / scale)
+    property var viewBounds_: ({ minX: -100, minY: -100, maxX: 100, maxY: 100, spanW: 200, spanH: 200 })
+    property real viewScale: 0.1
+
+    function getLogicalWidth(m) {
+        if (!m) return 1920;
+        var isRot = m.transform === 1 || m.transform === 3 || m.transform === 5 || m.transform === 7;
+        return (isRot ? (m.height || 1080) : (m.width || 1920)) / (m.scale || 1.0);
+    }
+
+    function getLogicalHeight(m) {
+        if (!m) return 1080;
+        var isRot = m.transform === 1 || m.transform === 3 || m.transform === 5 || m.transform === 7;
+        return (isRot ? (m.width || 1920) : (m.height || 1080)) / (m.scale || 1.0);
+    }
+
+    function recalcBounds() {
+        var mons = root.monitors;
+        if (!mons || mons.length === 0) return;
+        var minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
+        for (var i = 0; i < mons.length; i++) {
+            var m = mons[i];
+            var w = getLogicalWidth(m);
+            var h = getLogicalHeight(m);
+            var x = m.x || 0, y = m.y || 0;
+            if (x < minX) minX = x;
+            if (y < minY) minY = y;
+            if (x + w > maxX) maxX = x + w;
+            if (y + h > maxY) maxY = y + h;
+        }
+        var margin = 100;
+        root.viewBounds_ = {
+            minX: minX - margin, minY: minY - margin,
+            maxX: maxX + margin, maxY: maxY + margin,
+            spanW: Math.max((maxX + margin) - (minX - margin), 1),
+            spanH: Math.max((maxY + margin) - (minY - margin), 1)
+        };
+        recalcScale();
+    }
+    onMonitorsChanged: recalcBounds()
+
+    function recalcScale() {
+        var cw = canvasArea.width, ch = canvasArea.height;
+        if (cw <= 0 || ch <= 0) return;
+        var vb = root.viewBounds_;
+        root.viewScale = Math.min((cw - 20) / vb.spanW, (ch - 20) / vb.spanH);
+    }
+
+    function realToCanvasX(rx) { return (rx - root.viewBounds_.minX) * root.viewScale + 10; }
+    function realToCanvasY(ry) { return (ry - root.viewBounds_.minY) * root.viewScale + 10; }
+
+    Item {
+        id: canvasArea
+        anchors.fill: parent; anchors.margins: 8
+        implicitHeight: 250
+        clip: true
+        onWidthChanged: recalcScale(); onHeightChanged: recalcScale()
+
+        StyledRect { anchors.fill: parent; variant: "internalbg"; radius: Styling.radius(-2) }
+
+        Item {
+            id: scrollBox
+            width: Math.max(parent.width, root.viewBounds_.spanW * root.viewScale + 20)
+            height: Math.max(parent.height, root.viewBounds_.spanH * root.viewScale + 20)
+
+            // Grid & origin
+            Repeater {
+                id: gridWRep
+                model: Math.floor(root.viewBounds_.spanW / 500) + 2
+                Rectangle { x: root.realToCanvasX(root.viewBounds_.minX + gridWRep.index * 500); y: 0; width: 1; height: scrollBox.height; color: Qt.rgba(Colors.outlineVariant.r, Colors.outlineVariant.g, Colors.outlineVariant.b, 0.06) }
+            }
+            Repeater {
+                id: gridHRep
+                model: Math.floor(root.viewBounds_.spanH / 500) + 2
+                Rectangle { x: 0; y: root.realToCanvasY(root.viewBounds_.minY + gridHRep.index * 500); width: scrollBox.width; height: 1; color: Qt.rgba(Colors.outlineVariant.r, Colors.outlineVariant.g, Colors.outlineVariant.b, 0.06) }
+            }
+            StyledRect { x: root.realToCanvasX(0) - 4; y: root.realToCanvasY(0) - 4; width: 8; height: 8; radius: 4; variant: "primary"; opacity: 0.6 }
+
+            // Monitor items
+            Repeater {
+                model: root.monitors
+                delegate: Item {
+                    id: monItem
+                    required property int index
+                    required property var modelData
+
+                    property bool dragging: false
+                    property real dragX: modelData.x
+                    property real dragY: modelData.y
+
+                    readonly property real rx: dragging ? dragX : modelData.x
+                    readonly property real ry: dragging ? dragY : modelData.y
+                    readonly property bool isSelected: root.selectedIndex === index
+
+                    readonly property real logicalW: root.getLogicalWidth(modelData)
+                    readonly property real logicalH: root.getLogicalHeight(modelData)
+
+                    x: root.realToCanvasX(rx); y: root.realToCanvasY(ry)
+                    width: Math.max(50, logicalW * root.viewScale)
+                    height: Math.max(35, logicalH * root.viewScale)
+                    visible: modelData.enabled
+
+                    StyledRect {
+                        anchors.fill: parent
+                        variant: isSelected ? "primary" : "common"
+                        radius: Styling.radius(-2); enableShadow: true
+                        border.width: isSelected ? 1.5 : 1
+                        border.color: isSelected ? Styling.srItem("primary") : Colors.outlineVariant
+                        opacity: modelData.enabled ? 1.0 : 0.5
+                    }
+                    Column {
+                        anchors.centerIn: parent; spacing: 1
+                        Text { anchors.horizontalCenter: parent.horizontalCenter; text: modelData.name; font.family: Config.theme.font; font.pixelSize: Math.max(8, Math.min(11, Styling.fontSize(-3))); font.bold: true; color: isSelected ? Styling.srItem("primary") : Colors.overBackground }
+                        Text { anchors.horizontalCenter: parent.horizontalCenter; text: rx + "," + ry; font.family: Config.theme.font; font.pixelSize: Math.max(7, Math.min(10, Styling.fontSize(-4))); color: Colors.outline }
+                        Text { anchors.horizontalCenter: parent.horizontalCenter; text: Math.round(logicalW) + "×" + Math.round(logicalH); font.family: Config.theme.font; font.pixelSize: Math.max(7, Math.min(10, Styling.fontSize(-4))); color: Colors.outline }
+                    }
+
+                    MouseArea {
+                        id: dragArea; anchors.fill: parent; cursorShape: Qt.SizeAllCursor; hoverEnabled: true
+                        property real pcx: 0; property real pcy: 0
+                        property real srx: 0; property real sry: 0
+                        
+                        onPressed: mouse => {
+                            monItem.z = 100; monItem.dragging = true
+                            pcx = mouse.x + monItem.x; pcy = mouse.y + monItem.y
+                            srx = modelData.x; sry = modelData.y
+                            root.monitorSelected(index)
+                        }
+                        onPositionChanged: mouse => {
+                            if (!monItem.dragging) return
+                            var dRX = ((mouse.x + monItem.x) - pcx) / root.viewScale
+                            var dRY = ((mouse.y + monItem.y) - pcy) / root.viewScale
+                            var newX = Math.round((srx + dRX) / 10) * 10
+                            var newY = Math.round((sry + dRY) / 10) * 10
+                            var mw = logicalW, mh = logicalH
+                            var snapPx = 15 / root.viewScale // 15 screen pixels
+
+                            for (var k = 0; k < root.monitors.length; k++) {
+                                if (k === index || !root.monitors[k].enabled) continue
+                                var o = root.monitors[k]; if (!o) continue
+                                var ox = o.x, oy = o.y, ow = root.getLogicalWidth(o), oh = root.getLogicalHeight(o)
+                                if (Math.abs(newX - (ox + ow)) < snapPx) newX = ox + ow
+                                if (Math.abs((newX + mw) - ox) < snapPx) newX = ox - mw
+                                if (Math.abs(newY - (oy + oh)) < snapPx) newY = oy + oh
+                                if (Math.abs((newY + mh) - oy) < snapPx) newY = oy - mh
+                                if (Math.abs(newX - ox) < snapPx) newX = ox
+                                if (Math.abs(newY - oy) < snapPx) newY = oy
+                            }
+                            monItem.dragX = newX; monItem.dragY = newY
+                        }
+                        onReleased: {
+                            if (!monItem.dragging) return; monItem.dragging = false; monItem.z = 1
+                            var rx = monItem.dragX, ry = monItem.dragY
+                            var mw = logicalW, mh = logicalH
+                            var snapPx = 25 / root.viewScale // stronger snap on release
+
+                            for (var k = 0; k < root.monitors.length; k++) {
+                                if (k === index || !root.monitors[k].enabled) continue
+                                var o = root.monitors[k]; if (!o) continue
+                                var ox = o.x, oy = o.y, ow = root.getLogicalWidth(o), oh = root.getLogicalHeight(o)
+                                if (Math.abs(rx - (ox + ow)) < snapPx) rx = ox + ow
+                                if (Math.abs((rx + mw) - ox) < snapPx) rx = ox - mw
+                                if (Math.abs(ry - (oy + oh)) < snapPx) ry = oy + oh
+                                if (Math.abs((ry + mh) - oy) < snapPx) ry = oy - mh
+                                if (Math.abs(rx - ox) < snapPx) rx = ox
+                                if (Math.abs(ry - oy) < snapPx) ry = oy
+                            }
+                            // Prevent overlap
+                            for (var j = 0; j < root.monitors.length; j++) {
+                                if (j === index || !root.monitors[j].enabled) continue
+                                var o2 = root.monitors[j]; if (!o2) continue
+                                var o2w = root.getLogicalWidth(o2), o2h = root.getLogicalHeight(o2)
+                                if (rx < o2.x + o2w && rx + mw > o2.x && ry < o2.y + o2h && ry + mh > o2.y) {
+                                    var dL = rx + mw - o2.x, dR = o2.x + o2w - rx, dU = ry + mh - o2.y, dD = o2.y + o2h - ry
+                                    var d = Math.min(dL, dR, dU, dD)
+                                    if (d === dL) rx = o2.x - mw
+                                    else if (d === dR) rx = o2.x + o2w
+                                    else if (d === dU) ry = o2.y - mh
+                                    else ry = o2.y + o2h
+                                }
+                            }
+                            rx = Math.round(rx / 10) * 10; ry = Math.round(ry / 10) * 10
+                            root.monitorMoved(index, rx, ry)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/modules/widgets/dashboard/controls/MonitorCard.qml b/modules/widgets/dashboard/controls/MonitorCard.qml
new file mode 100644
index 00000000..07fc4e96
--- /dev/null
+++ b/modules/widgets/dashboard/controls/MonitorCard.qml
@@ -0,0 +1,482 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import qs.modules.theme
+import qs.modules.components
+import qs.modules.services
+import qs.modules.globals
+import qs.config
+
+// ─────────────────────────────────────────────────────────────
+// MonitorCard — Per-monitor settings with polished visuals
+// Primary source: Quickshell.screens (always available)
+// Enriched with: AxctlService data + hyprctl monitors -j
+// ─────────────────────────────────────────────────────────────
+StyledRect {
+    id: root
+
+    required property int monitorIndex
+    required property var screen
+
+    property var axctlData: null
+    property var detailedInfo: null
+    property var availableModes: []
+    property var validScales: []
+    property int currentModeIndex: 0
+    property bool isFetchingModes: false
+    property string displayName: ""
+    property int displayWidth: 0
+    property int displayHeight: 0
+    property int displayX: 0
+    property int displayY: 0
+    property real displayScale: 1.0
+    property real displayRefreshRate: 60
+    property bool isCollapsed: false
+
+    variant: "pane"
+    Layout.fillWidth: true
+    Layout.preferredHeight: cardLayout.implicitHeight + 20
+    radius: Styling.radius(0)
+    enableShadow: true
+
+    Component.onCompleted: {
+        refreshBasicData();
+        updateAxctlMatch();
+        fetchDetailedInfo();
+    }
+
+    function refreshBasicData() {
+        if (!root.screen) return;
+        root.displayName = root.screen.name || ("Monitor " + (root.monitorIndex + 1));
+        root.displayWidth = root.screen.width || 0;
+        root.displayHeight = root.screen.height || 0;
+        root.displayX = root.screen.x || 0;
+        root.displayY = root.screen.y || 0;
+    }
+
+    function updateAxctlMatch() {
+        if (!root.screen || !root.screen.name) return;
+        var monitors = AxctlService.monitors.values;
+        if (!monitors || monitors.length === 0) return;
+        for (var i = 0; i < monitors.length; i++) {
+            if (monitors[i].name === root.screen.name) {
+                root.axctlData = monitors[i];
+                root.displayRefreshRate = monitors[i].refreshRate || 60;
+                root.displayScale = monitors[i].scale || 1.0;
+                return;
+            }
+        }
+    }
+
+    function fetchDetailedInfo() {
+        if (isFetchingModes || !root.displayName) return;
+        isFetchingModes = true;
+        modeFetcherHyprctl.running = true;
+    }
+
+    property Process modeFetcherHyprctl: Process {
+        command: ["hyprctl", "monitors", "-j"]
+        stdout: StdioCollector {}
+        running: false
+        onExited: exitCode => {
+            if (exitCode === 0) {
+                try {
+                    parseMonitorList(JSON.parse(modeFetcherHyprctl.stdout.text));
+                    return;
+                } catch (e) { console.warn("MonitorCard: hyprctl parse failed:", e); }
+            }
+            modeFetcherAxctl.running = true;
+        }
+    }
+
+    property Process modeFetcherAxctl: Process {
+        command: ["axctl", "monitor", "list"]
+        stdout: StdioCollector {}
+        running: false
+        onExited: exitCode => {
+            root.isFetchingModes = false;
+            if (exitCode === 0) {
+                try { parseMonitorList(JSON.parse(modeFetcherAxctl.stdout.text)); }
+                catch (e) { console.warn("MonitorCard: axctl parse failed:", e); setFallbackModes(); }
+            } else { setFallbackModes(); }
+        }
+    }
+
+    function parseMonitorList(allMonitors) {
+        root.isFetchingModes = false;
+        if (!allMonitors || !Array.isArray(allMonitors)) { setFallbackModes(); return; }
+        var found = null;
+        for (var i = 0; i < allMonitors.length; i++) {
+            if (allMonitors[i].name === root.displayName) { found = allMonitors[i]; break; }
+        }
+        if (!found) { setFallbackModes(); return; }
+        root.detailedInfo = found;
+        if (found.width) root.displayWidth = found.width;
+        if (found.height) root.displayHeight = found.height;
+        if (found.x !== undefined) root.displayX = found.x;
+        if (found.y !== undefined) root.displayY = found.y;
+        root.displayScale = found.scale || root.displayScale;
+        root.displayRefreshRate = found.refreshRate || found.refresh_rate || root.displayRefreshRate;
+        var modes = found.availableModes || found.available_modes || [];
+        if (modes.length === 0 && found.width && found.height) {
+            modes = [found.width + "x" + found.height + "@" + root.displayRefreshRate.toFixed(2) + "Hz"];
+        }
+        root.availableModes = modes;
+        root.currentModeIndex = 0;
+        for (var j = 0; j < modes.length; j++) {
+            var modeStr = (modes[j] + "").replace("Hz", "").replace("hz", "").trim();
+            if (modeStr.indexOf(found.width + "x" + found.height) === 0) {
+                root.currentModeIndex = j;
+                if (modeStr.indexOf(Math.round(root.displayRefreshRate).toString()) !== -1) break;
+            }
+        }
+        root.validScales = computeScales(root.displayWidth, root.displayHeight);
+    }
+
+    function setFallbackModes() {
+        root.isFetchingModes = false;
+        if (root.displayWidth > 0 && root.displayHeight > 0) {
+            root.availableModes = [root.displayWidth + "x" + root.displayHeight + "@" + root.displayRefreshRate.toFixed(2) + "Hz"];
+            root.currentModeIndex = 0;
+            root.validScales = computeScales(root.displayWidth, root.displayHeight);
+        }
+    }
+
+    function computeScales(w, h) {
+        var scales = [];
+        if (w <= 0 || h <= 0) { return [1.0, 1.25, 1.5, 1.75, 2.0]; }
+        var base = Math.max(1.0, Math.min(w / 640, h / 480));
+        for (var step = 0; step <= 120; step++) {
+            var s = base + step / 120.0;
+            if (s > 10.0) break;
+            scales.push(s);
+        }
+        if (scales.length === 0) scales = [1.0];
+        return scales;
+    }
+
+    function findScaleIndex(targetScale) {
+        if (!root.validScales || root.validScales.length === 0) return 0;
+        var bestIdx = 0, bestDiff = Infinity;
+        for (var i = 0; i < root.validScales.length; i++) {
+            var diff = Math.abs(root.validScales[i] - targetScale);
+            if (diff < bestDiff) { bestDiff = diff; bestIdx = i; }
+        }
+        return bestIdx;
+    }
+
+    function applyMonitorSetting(key, value) {
+        var monName = root.displayName;
+        if (!monName) return;
+        GlobalStates.markCompositorChanged();
+        var cmd = "";
+        if (key === "resolution") cmd = "monitor " + monName + "," + value + ",auto,auto";
+        else if (key === "position") cmd = "monitor " + monName + ",preferred," + value.x + "x" + value.y + ",auto";
+        else if (key === "scale") cmd = "monitor " + monName + ",preferred,auto," + value;
+        else if (key === "transform") cmd = "monitor " + monName + ",preferred,auto,auto,transform," + value;
+        else if (key === "vrr") cmd = "monitor " + monName + ",preferred,auto,auto,vrr," + value;
+        else if (key === "disabled") cmd = "monitor " + monName + "," + (value ? "disable" : "preferred,auto,auto");
+        if (cmd) {
+            AxctlService.dispatch(cmd);
+            // Persist to disk (debounced)
+            monitorSyncDebounce.restart();
+        }
+    }
+
+    // ──────────────────────────────────────────
+    // UI — Clean, modern design
+    // ──────────────────────────────────────────
+    ColumnLayout {
+        id: cardLayout
+        anchors.fill: parent
+        anchors.margins: 14
+        spacing: 10
+
+        // ── Header row ──
+        RowLayout {
+            Layout.fillWidth: true
+            spacing: 10
+
+            Rectangle {
+                width: 10; height: 10; radius: 5
+                color: (AxctlService.focusedMonitor && AxctlService.focusedMonitor.name === root.displayName)
+                    ? Styling.srItem("primary") : Colors.outline
+                Layout.alignment: Qt.AlignVCenter
+            }
+
+            ColumnLayout {
+                Layout.fillWidth: true
+                spacing: 1
+
+                Text {
+                    text: root.displayName
+                    font.family: Config.theme.font
+                    font.pixelSize: Styling.fontSize(1)
+                    font.bold: true
+                    color: Colors.overBackground
+                }
+
+                Text {
+                    text: {
+                        var p = [];
+                        if (root.detailedInfo && root.detailedInfo.make) p.push(root.detailedInfo.make);
+                        if (root.detailedInfo && root.detailedInfo.model) p.push(root.detailedInfo.model);
+                        if (root.displayWidth > 0) p.push(root.displayWidth + "×" + root.displayHeight + " @ " + Math.round(root.displayRefreshRate) + "Hz");
+                        return p.join("  ·  ");
+                    }
+                    font.family: Config.theme.font
+                    font.pixelSize: Styling.fontSize(-2)
+                    color: Colors.outline
+                    elide: Text.ElideRight
+                }
+            }
+
+            Button {
+                flat: true
+                Layout.preferredWidth: 32; Layout.preferredHeight: 32
+                Layout.alignment: Qt.AlignVCenter
+
+                contentItem: Text {
+                    text: root.isCollapsed ? Icons.caretDown : Icons.caretUp
+                    font.family: Icons.font; font.pixelSize: 16
+                    color: Colors.outline
+                    anchors.centerIn: parent
+                }
+
+                background: StyledRect {
+                    variant: "common"
+                    radius: Styling.radius(-6)
+                }
+                onClicked: root.isCollapsed = !root.isCollapsed
+            }
+        }
+
+        // ── Quick info chips (always visible) ──
+        RowLayout {
+            Layout.fillWidth: true
+            spacing: 6
+
+            StyledRect {
+                variant: "internalbg"
+                Layout.preferredHeight: 22
+                radius: Styling.radius(-6)
+                implicitWidth: posChipRow.implicitWidth + 12
+                RowLayout {
+                    id: posChipRow; anchors.centerIn: parent; spacing: 3
+                    Text { text: Icons.arrowsOutCardinal; font.family: Icons.font; font.pixelSize: 10; color: Colors.outline }
+                    Text { text: root.displayX + ", " + root.displayY; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-3); color: Colors.outline }
+                }
+            }
+
+            StyledRect {
+                variant: "internalbg"
+                Layout.preferredHeight: 22
+                radius: Styling.radius(-6)
+                implicitWidth: scaleChipRow.implicitWidth + 12
+                RowLayout {
+                    id: scaleChipRow; anchors.centerIn: parent; spacing: 3
+                    Text { text: Icons.arrowsOut; font.family: Icons.font; font.pixelSize: 10; color: Colors.outline }
+                    Text { text: root.displayScale.toFixed(2) + "x"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-3); color: Colors.outline }
+                }
+            }
+
+            StyledRect {
+                variant: "internalbg"
+                Layout.preferredHeight: 22
+                radius: Styling.radius(-6)
+                implicitWidth: rrChipRow.implicitWidth + 12
+                RowLayout {
+                    id: rrChipRow; anchors.centerIn: parent; spacing: 3
+                    Text { text: Icons.arrowCounterClockwise; font.family: Icons.font; font.pixelSize: 10; color: Colors.outline }
+                    Text { text: Math.round(root.displayRefreshRate) + "Hz"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-3); color: Colors.outline }
+                }
+            }
+
+            Item { Layout.fillWidth: true }
+
+            Switch {
+                id: enabledSwitch; checked: true; Layout.alignment: Qt.AlignVCenter
+                onToggled: root.applyMonitorSetting("disabled", !checked)
+                indicator: Rectangle {
+                    implicitWidth: 36; implicitHeight: 20; radius: 10
+                    color: enabledSwitch.checked ? Styling.srItem("primary") : Qt.rgba(Colors.outline.r, Colors.outline.g, Colors.outline.b, 0.3)
+                    border.color: enabledSwitch.checked ? Styling.srItem("primary") : Colors.outline; border.width: 1
+                    Rectangle {
+                        x: enabledSwitch.checked ? parent.width - width - 3 : 3
+                        y: (parent.height - height) / 2
+                        width: 14; height: 14; radius: 7
+                        color: enabledSwitch.checked ? "#ffffff" : Colors.outline
+                        Behavior on x { enabled: Anim.animationsEnabled; NumberAnimation { duration: Anim.standardSmall; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve } }
+                    }
+                    Behavior on color { enabled: Anim.animationsEnabled; ColorAnimation { duration: Anim.standardSmall } }
+                }
+            }
+        }
+
+        // ── Expandable settings ──
+        Item {
+            Layout.fillWidth: true
+            Layout.preferredHeight: root.isCollapsed ? 0 : settingsColumn.implicitHeight
+            clip: true
+            visible: !root.isCollapsed
+            Behavior on Layout.preferredHeight {
+                enabled: Anim.animationsEnabled
+                NumberAnimation { duration: Anim.standardSmall; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
+            }
+
+            ColumnLayout {
+                id: settingsColumn; width: parent.width; spacing: 6
+
+                SettingsRow {
+                    icon: Icons.layout; label: "Resolution"; Layout.fillWidth: true
+                    ComboBox {
+                        id: modeCombo
+                        model: root.availableModes.length > 0 ? root.availableModes.map(function(m) { return (m+"").replace("Hz"," Hz"); }) : [root.displayWidth + "×" + root.displayHeight + " " + Math.round(root.displayRefreshRate) + " Hz"]
+                        currentIndex: root.currentModeIndex; Layout.preferredWidth: 190
+                        background: Rectangle {
+                            color: modeCombo.hovered ? Colors.surfaceContainerHigh : Colors.surfaceContainer
+                            radius: Styling.radius(-2)
+                            border.color: Colors.outlineVariant; border.width: 1
+                        }
+                        contentItem: Text { text: modeCombo.displayText; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; verticalAlignment: Text.AlignVCenter; leftPadding: 10; elide: Text.ElideRight }
+                        indicator: Text { text: Icons.caretDown; font.family: Icons.font; font.pixelSize: 14; color: Colors.overBackground; anchors.verticalCenter: parent.verticalCenter; anchors.right: parent.right; anchors.rightMargin: 8 }
+                        onActivated: { if (root.availableModes.length > 0 && index < root.availableModes.length) root.applyMonitorSetting("resolution", root.availableModes[index]); }
+                    }
+                }
+
+                SettingsRow {
+                    icon: Icons.arrowsOut; label: "Scale"; Layout.fillWidth: true
+                    RowLayout {
+                        spacing: 4
+                        TextField {
+                            id: scaleInput
+                            text: root.displayScale.toFixed(2)
+                            font.family: Config.theme.font
+                            font.pixelSize: Styling.fontSize(-1)
+                            color: Colors.overBackground
+                            Layout.preferredWidth: 70
+                            horizontalAlignment: Text.AlignRight
+                            validator: DoubleValidator { bottom: 0.25; top: 10.0; decimals: 2 }
+                            background: Rectangle {
+                                color: scaleInput.hovered ? Colors.surfaceContainerHigh : Colors.surfaceContainer
+                                radius: Styling.radius(-2)
+                                border.color: Colors.outlineVariant; border.width: 1
+                            }
+                            onEditingFinished: {
+                                var val = parseFloat(text);
+                                if (!isNaN(val) && val >= 0.25 && val <= 10.0) {
+                                    root.applyMonitorSetting("scale", val);
+                                } else {
+                                    text = root.displayScale.toFixed(2);
+                                }
+                            }
+                        }
+                        Text {
+                            text: "×"
+                            font.family: Config.theme.font
+                            font.pixelSize: Styling.fontSize(-1)
+                            color: Colors.outline
+                        }
+                    }
+                }
+
+                SettingsRow {
+                    icon: Icons.arrowsOutCardinal; label: "Position"; Layout.fillWidth: true
+                    RowLayout {
+                        spacing: 4
+                        Text { text: "X"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-2); color: Colors.outline }
+                        SpinBox {
+                            id: posX; from: -10000; to: 10000; stepSize: 10; value: root.displayX; editable: true; Layout.preferredWidth: 80
+                            background: Rectangle { color: Colors.surfaceContainer; border.color: Colors.outlineVariant; border.width: 1; radius: Styling.radius(-2) }
+                            contentItem: TextInput { text: posX.value; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter }
+                            onValueModified: root.applyMonitorSetting("position", { x: posX.value, y: posY.value })
+                        }
+                        Text { text: "Y"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-2); color: Colors.outline }
+                        SpinBox {
+                            id: posY; from: -10000; to: 10000; stepSize: 10; value: root.displayY; editable: true; Layout.preferredWidth: 80
+                            background: Rectangle { color: Colors.surfaceContainer; border.color: Colors.outlineVariant; border.width: 1; radius: Styling.radius(-2) }
+                            contentItem: TextInput { text: posY.value; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter }
+                            onValueModified: root.applyMonitorSetting("position", { x: posX.value, y: posY.value })
+                        }
+                    }
+                }
+
+                SettingsRow {
+                    icon: Icons.arrowCounterClockwise; label: "Rotation"; Layout.fillWidth: true
+                    ComboBox {
+                        id: transformCombo
+                        model: ["0° Normal", "90°", "180°", "270°", "90° Flip", "270° Flip"]
+                        currentIndex: root.detailedInfo ? Math.min(root.detailedInfo.transform || 0, 5) : 0; Layout.preferredWidth: 140
+                        background: Rectangle {
+                            color: transformCombo.hovered ? Colors.surfaceContainerHigh : Colors.surfaceContainer
+                            radius: Styling.radius(-2)
+                            border.color: Colors.outlineVariant; border.width: 1
+                        }
+                        contentItem: Text { text: transformCombo.displayText; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; verticalAlignment: Text.AlignVCenter; leftPadding: 10 }
+                        indicator: Text { text: Icons.caretDown; font.family: Icons.font; font.pixelSize: 14; color: Colors.overBackground; anchors.verticalCenter: parent.verticalCenter; anchors.right: parent.right; anchors.rightMargin: 8 }
+                        onActivated: root.applyMonitorSetting("transform", index)
+                    }
+                }
+
+                SettingsRow {
+                    icon: Icons.waveform; label: "VRR"; Layout.fillWidth: true
+                    ComboBox {
+                        id: vrrCombo
+                        model: ["Global Default", "Disabled", "Enabled", "Fullscreen", "Fullscreen+Gaming"]
+                        currentIndex: 0; Layout.preferredWidth: 160
+                        background: Rectangle {
+                            color: vrrCombo.hovered ? Colors.surfaceContainerHigh : Colors.surfaceContainer
+                            radius: Styling.radius(-2)
+                            border.color: Colors.outlineVariant; border.width: 1
+                        }
+                        contentItem: Text { text: vrrCombo.displayText; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; verticalAlignment: Text.AlignVCenter; leftPadding: 10 }
+                        indicator: Text { text: Icons.caretDown; font.family: Icons.font; font.pixelSize: 14; color: Colors.overBackground; anchors.verticalCenter: parent.verticalCenter; anchors.right: parent.right; anchors.rightMargin: 8 }
+                        onActivated: { var v = [null, "0", "1", "2", "3"]; root.applyMonitorSetting("vrr", v[index]); }
+                    }
+                }
+            }
+        }
+    }
+
+    // ── Inline: SettingsRow component ──
+    component SettingsRow: RowLayout {
+        property string icon: ""; property string label: ""
+        spacing: 8
+        Text { text: icon; font.family: Icons.font; font.pixelSize: 14; color: Colors.outline; Layout.preferredWidth: 18 }
+        Text { text: label; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; Layout.preferredWidth: 80 }
+    }
+
+    // Debounced monitor config sync (after settings change)
+    Timer {
+        id: monitorSyncDebounce
+        interval: 2500
+        repeat: false
+        onTriggered: MonitorsWriter.sync()
+    }
+
+    // ── Connections ──
+    Connections {
+        target: AxctlService
+        function onMonitorsChanged() {
+            root.updateAxctlMatch();
+            // No longer restarting the debounce here - it created an infinite loop:
+            // sync -> hyprctl reload -> monitorsChanged -> restart debounce -> sync -> ...
+            // Disk persistence is now only triggered explicitly by the user
+            // via applyMonitorSetting() or the Apply button in MonitorsPanel
+        }
+    }
+
+    onDetailedInfoChanged: {
+        if (detailedInfo) {
+            if (detailedInfo.x !== undefined) posX.value = detailedInfo.x;
+            if (detailedInfo.y !== undefined) posY.value = detailedInfo.y;
+            if (detailedInfo.transform !== undefined) transformCombo.currentIndex = Math.min(detailedInfo.transform, 5);
+        }
+    }
+}
diff --git a/modules/widgets/dashboard/controls/MonitorSettingsForm.qml b/modules/widgets/dashboard/controls/MonitorSettingsForm.qml
new file mode 100644
index 00000000..fb420231
--- /dev/null
+++ b/modules/widgets/dashboard/controls/MonitorSettingsForm.qml
@@ -0,0 +1,373 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import qs.modules.theme
+import qs.modules.components
+import qs.config
+
+StyledRect {
+    id: root
+    variant: "pane"
+    Layout.fillWidth: true
+    Layout.preferredHeight: cardLayout.implicitHeight + 28
+    radius: Styling.radius(0)
+    enableShadow: true
+
+    property var monitor: null
+    signal settingChanged(string key, var value)
+
+    property var availableModes: []
+    property int currentModeIndex: 0
+    property bool disabled: !monitor
+
+    onMonitorChanged: {
+        if (!monitor) {
+            availableModes = [];
+            currentModeIndex = 0;
+            return;
+        }
+
+        var modes = monitor.modes || [];
+        if (modes.length === 0) {
+            modes = [monitor.width + "x" + monitor.height + "@" + monitor.refreshRate.toFixed(2) + "Hz"];
+        }
+        availableModes = modes;
+        
+        currentModeIndex = 0;
+        for (var j = 0; j < modes.length; j++) {
+            var ms = (modes[j]+"").replace(/Hz/gi,"").trim();
+            if (ms.indexOf(monitor.width+"x"+monitor.height) === 0 && ms.indexOf(Math.round(monitor.refreshRate).toString()) !== -1) {
+                currentModeIndex = j; break;
+            }
+        }
+    }
+
+    // ─── Shared ComboBox style components ───
+    component NLCombo: ComboBox {
+        id: nlCombo
+        Layout.preferredWidth: 180
+        Layout.preferredHeight: 28
+        font.family: Config.theme.font
+        font.pixelSize: Styling.fontSize(-1)
+
+        background: Rectangle {
+            color: nlCombo.hovered ? Colors.surfaceContainerHigh : Colors.surfaceContainer
+            radius: 4
+            border.color: Colors.surfaceBright
+            border.width: 1
+        }
+
+        contentItem: Text {
+            leftPadding: 8
+            rightPadding: 8
+            text: nlCombo.displayText
+            color: Colors.overBackground
+            verticalAlignment: Text.AlignVCenter
+            elide: Text.ElideRight
+        }
+
+        indicator: Text {
+            x: nlCombo.width - width - 8
+            y: (nlCombo.height - height) / 2
+            text: "▼"
+            font.family: Icons.font
+            font.pixelSize: 9
+            color: Colors.overSurfaceVariant
+        }
+
+        popup: Popup {
+            y: nlCombo.height + 2
+            width: nlCombo.width
+            implicitHeight: Math.min(contentItem.implicitHeight + 12, 350)
+            padding: 4
+
+            background: Rectangle {
+                color: Colors.surfaceContainer
+                radius: 6
+                border.color: Colors.surfaceBright
+                border.width: 1
+            }
+
+            contentItem: ListView {
+                clip: true
+                implicitHeight: contentHeight
+                model: nlCombo.delegateModel
+                currentIndex: nlCombo.currentIndex
+                interactive: contentHeight > 300
+                spacing: 2
+            }
+
+            onVisibleChanged: {
+                if (visible) {
+                    // Ensure popup is within screen bounds
+                    const maxY = parent.screen ? parent.screen.height : 1080;
+                    if (y + implicitHeight > maxY - 40) {
+                        y = nlCombo.height + 2;
+                    }
+                }
+            }
+        }
+
+        delegate: ItemDelegate {
+            required property var modelData
+            width: nlCombo.width - 8
+            height: 28
+            font.family: Config.theme.font
+            font.pixelSize: Styling.fontSize(-1)
+            leftPadding: 10
+
+            contentItem: Text {
+                text: modelData && modelData.text !== undefined ? modelData.text : (typeof modelData === "string" ? modelData : "")
+                font: parent.font
+                color: parent.highlighted ? Qt.rgba(1, 1, 1, 1) : Colors.overBackground
+                opacity: parent.highlighted ? 1.0 : 0.85
+                elide: Text.ElideRight
+                verticalAlignment: Text.AlignVCenter
+            }
+
+            background: Rectangle {
+                color: {
+                    if (parent.highlighted) return Qt.rgba(Colors.primary.r, Colors.primary.g, Colors.primary.b, 0.35);
+                    if (parent.hovered) return Qt.rgba(Colors.overBackground.r, Colors.overBackground.g, Colors.overBackground.b, 0.08);
+                    return "transparent";
+                }
+                radius: 3
+            }
+        }
+    }
+
+    component NLToggle: RowLayout {
+        property string label: ""
+        property bool checked: false
+        signal toggled(bool value)
+        spacing: 8
+        Layout.fillWidth: true
+
+        Text {
+            text: label
+            font.family: Config.theme.font
+            font.pixelSize: Styling.fontSize(-1)
+            color: Colors.overBackground
+            Layout.fillWidth: true
+        }
+
+        Switch {
+            id: toggleSwitch
+            checked: parent.checked
+            onClicked: parent.toggled(checked)
+
+            indicator: Rectangle {
+                implicitWidth: 36
+                implicitHeight: 20
+                radius: 10
+                color: toggleSwitch.checked ? Colors.primary : Qt.rgba(Colors.outline.r, Colors.outline.g, Colors.outline.b, 0.3)
+                border.color: toggleSwitch.checked ? Colors.primary : Colors.outline
+                border.width: 1
+
+                Rectangle {
+                    x: toggleSwitch.checked ? parent.width - width - 3 : 3
+                    y: (parent.height - height) / 2
+                    width: 14
+                    height: 14
+                    radius: 7
+                    color: toggleSwitch.checked ? "#ffffff" : Colors.outline
+
+                    Behavior on x {
+                        enabled: Anim.animationsEnabled
+                        NumberAnimation { duration: Anim.standardSmall; easing.type: Anim.easing("standard").type; easing.bezierCurve: Anim.easing("standard").bezierCurve }
+                    }
+                }
+
+                Behavior on color {
+                    enabled: Anim.animationsEnabled
+                    ColorAnimation { duration: Anim.standardSmall }
+                }
+            }
+        }
+    }
+
+    ColumnLayout {
+        id: cardLayout
+        anchors.fill: parent; anchors.margins: 14; spacing: 14
+
+        // ── Header row ──
+        RowLayout {
+            Layout.fillWidth: true; spacing: 10
+
+            // Status dot
+            Rectangle {
+                width: 10; height: 10; radius: 5
+                color: (root.monitor && root.monitor.focused) ? Colors.primary : Colors.outline
+                Layout.alignment: Qt.AlignVCenter
+            }
+
+            // Monitor info
+            ColumnLayout {
+                Layout.fillWidth: true; spacing: 1
+                Text {
+                    text: root.monitor ? root.monitor.name : "Select a monitor"
+                    font.family: Config.theme.font
+                    font.pixelSize: Styling.fontSize(1)
+                    font.weight: Font.DemiBold
+                    color: Colors.overBackground
+                }
+                Text {
+                    text: root.monitor ? [root.monitor.make, root.monitor.model, root.monitor.description].filter(function(s){return s}).join(" · ") : ""
+                    font.family: Config.theme.font
+                    font.pixelSize: Styling.fontSize(-2)
+                    color: Colors.overSurfaceVariant
+                    elide: Text.ElideRight
+                }
+            }
+
+            // Enabled toggle
+            NLToggle {
+                label: ""
+                checked: root.monitor ? root.monitor.enabled : false
+                onToggled: root.settingChanged("enabled", value)
+            }
+        }
+
+        // ── Settings grid ──
+        ColumnLayout {
+            Layout.fillWidth: true; spacing: 10
+            opacity: root.disabled ? 0.5 : 1.0
+            enabled: !root.disabled
+
+            // Resolution
+            GridLayout {
+                Layout.fillWidth: true
+                columns: 2
+                rowSpacing: 10
+                columnSpacing: 8
+
+                Text {
+                    text: Icons.layout; font.family: Icons.font; font.pixelSize: 14
+                    color: Colors.outline; Layout.alignment: Qt.AlignVCenter
+                }
+                RowLayout { Layout.fillWidth: true; spacing: 8
+                    Text { text: "Resolution"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; Layout.preferredWidth: 80 }
+                    NLCombo {
+                        id: modeCombo
+                        Layout.fillWidth: true
+                        model: root.availableModes.length > 0 ? root.availableModes.map(function(m){return (m+"").replace("Hz"," Hz")}) : []
+                        currentIndex: root.currentModeIndex
+                        onActivated: {
+                            if (root.availableModes.length > 0 && index < root.availableModes.length) {
+                                var val = root.availableModes[index];
+                                var clean = (val + "").replace(/Hz/gi, "").trim();
+                                var parts = clean.split("@"), wh = parts[0].split("x");
+                                root.settingChanged("width", parseInt(wh[0]));
+                                root.settingChanged("height", parseInt(wh[1]));
+                                root.settingChanged("refreshRate", parseFloat(parts[1]));
+                            }
+                        }
+                    }
+                }
+
+                // Scale
+                Text { text: Icons.arrowsOut; font.family: Icons.font; font.pixelSize: 14; color: Colors.outline }
+                RowLayout { Layout.fillWidth: true; spacing: 8
+                    Text { text: "Scale"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; Layout.preferredWidth: 80 }
+                    TextField {
+                        id: scaleInput
+                        text: root.monitor ? root.monitor.scale.toFixed(2) : "1.00"
+                        font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1)
+                        color: Colors.overBackground
+                        Layout.preferredWidth: 80; horizontalAlignment: Text.AlignRight
+                        validator: DoubleValidator { bottom: 0.25; top: 10.0; decimals: 2 }
+                        background: Rectangle {
+                            color: scaleInput.hovered ? Colors.surfaceContainerHigh : Colors.surfaceContainer
+                            radius: 4; border.color: Colors.surfaceBright; border.width: 1
+                        }
+                        onEditingFinished: {
+                            var v = parseFloat(text);
+                            if (!isNaN(v) && v>=0.25 && v<=10.0) root.settingChanged("scale", v);
+                            else text = root.monitor ? root.monitor.scale.toFixed(2) : "1.00";
+                        }
+                    }
+                    Text { text: "×"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.outline }
+                }
+
+                // Position X
+                Text { text: Icons.arrowsOutCardinal; font.family: Icons.font; font.pixelSize: 14; color: Colors.outline }
+                RowLayout { Layout.fillWidth: true; spacing: 8
+                    Text { text: "Position X"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; Layout.preferredWidth: 80 }
+                    SpinBox { id: posX; from: -10000; to: 30000; stepSize: 10; value: root.monitor ? root.monitor.x : 0; editable: true; Layout.preferredWidth: 90
+                        background: Rectangle { color: Colors.surfaceContainer; border.color: Colors.surfaceBright; border.width: 1; radius: 4 }
+                        contentItem: TextInput { text: posX.value; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter }
+                        onValueModified: root.settingChanged("x", posX.value) }
+                    Text { text: "Y"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-2); color: Colors.outline }
+                    SpinBox { id: posY; from: -10000; to: 30000; stepSize: 10; value: root.monitor ? root.monitor.y : 0; editable: true; Layout.preferredWidth: 90
+                        background: Rectangle { color: Colors.surfaceContainer; border.color: Colors.surfaceBright; border.width: 1; radius: 4 }
+                        contentItem: TextInput { text: posY.value; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter }
+                        onValueModified: root.settingChanged("y", posY.value) }
+                }
+
+                // Rotation
+                Text { text: Icons.arrowCounterClockwise; font.family: Icons.font; font.pixelSize: 14; color: Colors.outline }
+                RowLayout { Layout.fillWidth: true; spacing: 8
+                    Text { text: "Rotation"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; Layout.preferredWidth: 80 }
+                    NLCombo {
+                        id: transformCombo
+                        Layout.fillWidth: true
+                        model: ["0° Normal","90°","180°","270°","90° Flip","270° Flip"]
+                        currentIndex: root.monitor ? Math.min(root.monitor.transform, 5) : 0
+                        onActivated: root.settingChanged("transform", index)
+                    }
+                }
+
+                // VRR
+                Text { text: Icons.waveform; font.family: Icons.font; font.pixelSize: 14; color: Colors.outline }
+                RowLayout { Layout.fillWidth: true; spacing: 8
+                    Text { text: "VRR"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; Layout.preferredWidth: 80 }
+                    NLCombo {
+                        id: vrrCombo
+                        Layout.fillWidth: true
+                        model: ["Global Default","Disabled","Enabled","Fullscreen","Fullscreen+Gaming"]
+                        currentIndex: root.monitor && root.monitor.vrr !== undefined ? root.monitor.vrr : 0
+                        onActivated: { var v=[0,0,1,2,3]; root.settingChanged("vrr", v[index]) }
+                    }
+                }
+
+                // HDR toggle
+                Text { text: Icons.sun; font.family: Icons.font; font.pixelSize: 14; color: Colors.outline }
+                RowLayout { Layout.fillWidth: true; spacing: 8
+                    Text { text: "HDR"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; Layout.preferredWidth: 80 }
+                    Text {
+                        text: root.monitor && root.monitor.hdrSupported ? "Supported" : "Not supported"
+                        font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-2)
+                        color: root.monitor && root.monitor.hdrSupported ? Colors.primary : Colors.outline
+                        Layout.fillWidth: true
+                    }
+                    NLToggle {
+                        checked: root.monitor ? root.monitor.hdr || false : false
+                        enabled: root.monitor && root.monitor.hdrSupported || false
+                        onToggled: root.settingChanged("hdr", value)
+                    }
+                }
+
+                // Refresh rate display
+                Text { text: Icons.clock; font.family: Icons.font; font.pixelSize: 14; color: Colors.outline }
+                RowLayout { Layout.fillWidth: true; spacing: 8
+                    Text { text: "Refresh"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; Layout.preferredWidth: 80 }
+                    Text {
+                        text: root.monitor ? root.monitor.refreshRate.toFixed(2) + " Hz" : ""
+                        font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1)
+                        color: Colors.overSurfaceVariant
+                    }
+                }
+            }
+        }
+    }
+
+    component SR: RowLayout {
+        property string ic: ""; property string lb: ""
+        spacing: 8
+        Text { text: ic; font.family: Icons.font; font.pixelSize: 14; color: Colors.outline; Layout.preferredWidth: 20 }
+        Text { text: lb; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); color: Colors.overBackground; Layout.preferredWidth: 90 }
+    }
+}
diff --git a/modules/widgets/dashboard/controls/MonitorsPanel.qml b/modules/widgets/dashboard/controls/MonitorsPanel.qml
new file mode 100644
index 00000000..79085ada
--- /dev/null
+++ b/modules/widgets/dashboard/controls/MonitorsPanel.qml
@@ -0,0 +1,136 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import qs.modules.theme
+import qs.modules.components
+import qs.modules.services
+import qs.config
+
+Item {
+    id: root
+    implicitHeight: layout.implicitHeight
+    Layout.fillWidth: true
+
+    property var monitorList: []
+    property int selectedIndex: 0
+    property bool hasChanges: false
+    property bool isApplying: false
+    property string statusMsg: ""
+
+    Component.onCompleted: MonitorsWriter.listMonitors()
+
+    Connections {
+        target: MonitorsWriter
+        function onMonitorsListed(data) {
+            root.monitorList = data || [];
+            if (root.selectedIndex >= root.monitorList.length) {
+                root.selectedIndex = 0;
+            }
+            root.hasChanges = false;
+        }
+        function onSyncFinished(success, msg) {
+            root.isApplying = false;
+            if (success) {
+                root.statusMsg = "Applied ✓";
+                statusClearTimer.restart();
+                MonitorsWriter.listMonitors();
+            } else {
+                root.statusMsg = "Error: " + msg;
+            }
+        }
+    }
+
+    Timer { id: statusClearTimer; interval: 3000; onTriggered: root.statusMsg = "" }
+
+    function updateSetting(idx, key, value) {
+        var list = JSON.parse(JSON.stringify(root.monitorList));
+        list[idx][key] = value;
+        root.monitorList = list;
+        root.hasChanges = true;
+    }
+
+    function applyChanges() {
+        if (!root.hasChanges || root.isApplying || root.monitorList.length === 0) return;
+        root.isApplying = true;
+        root.statusMsg = "Applying...";
+        MonitorsWriter.syncWithData(root.monitorList);
+    }
+
+    ColumnLayout {
+        id: layout
+        anchors.left: parent.left; anchors.right: parent.right; spacing: 14
+
+        RowLayout {
+            Layout.fillWidth: true
+            Text {
+                text: "Monitor Layout"
+                font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1)
+                font.weight: Font.Medium; color: Colors.outline
+                Layout.fillWidth: true
+            }
+            Button {
+                flat: true; hoverEnabled: true
+                Layout.preferredHeight: 28
+                enabled: root.hasChanges && !root.isApplying
+                background: StyledRect {
+                    variant: root.hasChanges ? "primary" : "common"
+                    radius: Styling.radius(-4)
+                    opacity: root.hasChanges ? 1.0 : 0.5
+                }
+                contentItem: Text {
+                    text: root.isApplying ? (Icons.circleNotch + " Applying...") : (Icons.shieldCheck + " Apply")
+                    font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-2)
+                    color: root.hasChanges ? Styling.srItem("primary") : Colors.overBackground
+                    anchors.centerIn: parent
+                }
+                onClicked: root.applyChanges()
+            }
+        }
+
+        MonitorArrangementView {
+            id: arrangementView
+            Layout.fillWidth: true
+            monitors: root.monitorList
+            selectedIndex: root.selectedIndex
+            onMonitorMoved: (idx, x, y) => {
+                var list = JSON.parse(JSON.stringify(root.monitorList));
+                list[idx].x = x; list[idx].y = y;
+                root.monitorList = list;
+                root.hasChanges = true;
+            }
+            onMonitorSelected: (idx) => { root.selectedIndex = idx; }
+        }
+
+        Text {
+            text: "Selected Monitor Settings"
+            font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1)
+            font.weight: Font.Medium; color: Colors.outline
+            Layout.topMargin: 4
+        }
+
+        MonitorSettingsForm {
+            Layout.fillWidth: true
+            monitor: root.monitorList.length > root.selectedIndex ? root.monitorList[root.selectedIndex] : null
+            onSettingChanged: (key, value) => {
+                root.updateSetting(root.selectedIndex, key, value);
+            }
+        }
+
+        // Status bar
+        StyledRect {
+            Layout.fillWidth: true; Layout.preferredHeight: 24
+            variant: root.hasChanges ? "focus" : "internalbg"
+            radius: Styling.radius(-4)
+            RowLayout {
+                anchors.fill: parent; anchors.leftMargin: 10; anchors.rightMargin: 10; spacing: 8
+                Text {
+                    Layout.fillWidth: true
+                    text: root.statusMsg || (root.hasChanges ? Icons.edit + " Unsaved changes" : "All changes applied")
+                    font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-3)
+                    color: root.hasChanges ? Styling.srItem("primary") : Colors.outline; elide: Text.ElideRight
+                }
+            }
+        }
+    }
+}
diff --git a/modules/widgets/dashboard/controls/PanelTitlebar.qml b/modules/widgets/dashboard/controls/PanelTitlebar.qml
old mode 100644
new mode 100755
index 1113019a..18d88e72
--- a/modules/widgets/dashboard/controls/PanelTitlebar.qml
+++ b/modules/widgets/dashboard/controls/PanelTitlebar.qml
@@ -128,9 +128,9 @@ RowLayout {
             border.color: toggleSwitch.checked ? Styling.srItem("overprimary") : Colors.outline
 
             Behavior on color {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 ColorAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
 
@@ -143,10 +143,11 @@ RowLayout {
                 color: toggleSwitch.checked ? Colors.background : Colors.overSurfaceVariant
 
                 Behavior on x {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
diff --git a/modules/widgets/dashboard/controls/SettingsCrawler.js b/modules/widgets/dashboard/controls/SettingsCrawler.js
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/controls/SettingsIndex.qml b/modules/widgets/dashboard/controls/SettingsIndex.qml
old mode 100644
new mode 100755
index 6a606409..cb6d3653
--- a/modules/widgets/dashboard/controls/SettingsIndex.qml
+++ b/modules/widgets/dashboard/controls/SettingsIndex.qml
@@ -11,7 +11,7 @@ QtObject {
     // it will try to guess what users would want to search, not the feature name only
 
     // Main Sections:
-    // 0: Network, 1: Bluetooth, 2: Mixer, 3: Effects, 4: Theme, 5: Binds, 6: System, 7: Compositor, 8: Ambxst
+    // 0: Network, 1: Bluetooth, 2: Mixer, 3: Effects, 4: Theme, 5: Binds, 6: System, 7: Compositor, 8: Shell
     
     property var dynamicItems: []
 
@@ -99,7 +99,7 @@ QtObject {
         // System > Performance
         { label: "Blur Transition", keywords: "animation speed performance effect", section: 6, subSection: "performance", subLabel: "System > Performance", icon: Icons.lightning, isIcon: true },
         { label: "Window Preview", keywords: "thumbnail overview alt-tab", section: 6, subSection: "performance", subLabel: "System > Performance", icon: Icons.windowsLogo, isIcon: true },
-        { label: "Wavy Line", keywords: "animated wave effect performance", section: 6, subSection: "performance", subLabel: "System > Performance", icon: Icons.lightning, isIcon: true },
+        
         
         // System > Resources
         { label: "System Resources", keywords: "cpu ram memory usage monitor", section: 6, subSection: "resources", subLabel: "System > Resources", icon: Icons.circuitry, isIcon: true },
diff --git a/modules/widgets/dashboard/controls/SettingsTab.qml b/modules/widgets/dashboard/controls/SettingsTab.qml
old mode 100644
new mode 100755
index fcaeef56..c0a3d99d
--- a/modules/widgets/dashboard/controls/SettingsTab.qml
+++ b/modules/widgets/dashboard/controls/SettingsTab.qml
@@ -62,60 +62,67 @@ Rectangle {
         id: searchIndex
     }
 
-    // Dynamic Settings Indexer
+    // ─── Dynamic Settings Indexer (deferred to avoid startup lag) ───
     Item {
         id: settingsIndexer
-        visible: false // Headless
+        visible: false
 
         property int currentPanelIndex: 0
         property var aggregatedItems: []
         property bool isIndexing: false
 
-        // Helper to load panels one by one
         Loader {
             id: indexerLoader
             active: settingsIndexer.isIndexing
             asynchronous: true
-            source: settingsIndexer.isIndexing && settingsIndexer.currentPanelIndex < contentArea.panelComponents.length ? contentArea.panelComponents[settingsIndexer.currentPanelIndex].component : ""
+            source: settingsIndexer.isIndexing && settingsIndexer.currentPanelIndex < contentArea.panelComponents.length
+                ? contentArea.panelComponents[settingsIndexer.currentPanelIndex].component
+                : ""
 
             onStatusChanged: {
                 if (status === Loader.Ready && item) {
-                    // Scrape
                     const sectionId = contentArea.panelComponents[settingsIndexer.currentPanelIndex].section;
                     const newItems = SettingsCrawler.crawl(item, sectionId);
                     settingsIndexer.aggregatedItems = settingsIndexer.aggregatedItems.concat(newItems);
-
-                    // Move to next
-                    settingsIndexer.currentPanelIndex++;
+                    advanceTimer.start();
                 } else if (status === Loader.Error) {
                     console.warn("Failed to load panel for indexing:", source);
-                    settingsIndexer.currentPanelIndex++;
+                    advanceTimer.start();
                 }
             }
         }
 
-        onCurrentPanelIndexChanged: {
-            if (currentPanelIndex >= contentArea.panelComponents.length) {
-                // Done
-                if (isIndexing) {
-                    isIndexing = false;
-                    searchIndex.addDynamicItems(aggregatedItems);
-                }
+        // Timer breaks binding loop: source → statusChanged → currentPanelIndex → source
+        Timer {
+            id: advanceTimer
+            interval: 1
+            onTriggered: {
+                settingsIndexer.currentPanelIndex++;
             }
         }
 
-        Component.onCompleted: {
-            // Start indexing after a short delay to allow UI to settle
-            indexingTimer.start();
+        onCurrentPanelIndexChanged: {
+            if (currentPanelIndex >= contentArea.panelComponents.length && isIndexing) {
+                isIndexing = false;
+                searchIndex.addDynamicItems(aggregatedItems);
+            }
         }
 
+        // Delay indexing until the UI has fully settled after open
         Timer {
             id: indexingTimer
-            interval: 500
+            interval: 2500
             onTriggered: {
-                settingsIndexer.isIndexing = true;
+                // Only start if the window is still visible (user hasn't closed it)
+                if (root.visible) {
+                    settingsIndexer.isIndexing = true;
+                }
             }
         }
+
+        Component.onCompleted: {
+            indexingTimer.start();
+        }
     }
 
     // Store pending subsection to apply when panel loads
@@ -126,7 +133,7 @@ Rectangle {
             return;
 
         // Panels that support subsections: Theme(5), System(7), Compositor(8), Shell(9)
-        if ([5, 7, 8, 9].includes(sectionId)) {
+        if (sectionId === 5 || sectionId === 7 || sectionId === 8 || sectionId === 9) {
             if (panelLoader.item && panelLoader.status === Loader.Ready) {
                 panelLoader.item.currentSection = subSectionId;
             } else {
@@ -144,7 +151,6 @@ Rectangle {
         const tabSpacing = 0;
         const itemY = root.selectedIndex * (tabHeight + tabSpacing);
 
-        // Check bounds and scroll if needed
         if (itemY < sidebarFlickable.contentY) {
             sidebarFlickable.contentY = itemY;
         } else if (itemY + tabHeight > sidebarFlickable.contentY + sidebarFlickable.height) {
@@ -152,50 +158,53 @@ Rectangle {
         }
     }
 
-    // Fuzzy match: checks if all characters of query appear in order in target
+    // ─── High-performance fuzzy matching ───
+    // Returns boolean (fast path for filter checks)
     function fuzzyMatch(query, target) {
-        if (query.length === 0)
-            return true;
-        if (target.length === 0)
-            return false;
+        if (query.length === 0) return true;
+        if (target.length === 0) return false;
         const lowerQuery = query.toLowerCase();
         const lowerTarget = target.toLowerCase();
-        let queryIndex = 0;
-        for (let i = 0; i < lowerTarget.length && queryIndex < lowerQuery.length; i++) {
-            if (lowerTarget[i] === lowerQuery[queryIndex]) {
-                queryIndex++;
+        let qi = 0;
+        // Micro-opt: cache length, use while loop, avoid bounds checks on each iteration
+        const qLen = lowerQuery.length, tLen = lowerTarget.length;
+        for (let i = 0; i < tLen && qi < qLen; i++) {
+            if (lowerTarget.charCodeAt(i) === lowerQuery.charCodeAt(qi)) {
+                qi++;
             }
         }
-        return queryIndex === lowerQuery.length;
+        return qi === qLen;
     }
 
-    // Score a fuzzy match (higher is better)
+    // Returns integer score (higher = better match)
     function fuzzyScore(query, target) {
-        if (query.length === 0)
-            return 0;
-        if (target.length === 0)
-            return -1;
+        if (query.length === 0) return 0;
+        if (target.length === 0) return -1;
         const lowerQuery = query.toLowerCase();
         const lowerTarget = target.toLowerCase();
-
-        // Exact match gets highest score
-        if (lowerTarget.includes(lowerQuery))
-            return 1000 + (100 - target.length);
-
-        // Fuzzy scoring
-        let queryIndex = 0, score = 0, consecutive = 0, maxConsecutive = 0;
-        for (let i = 0; i < lowerTarget.length && queryIndex < lowerQuery.length; i++) {
-            if (lowerTarget[i] === lowerQuery[queryIndex]) {
-                queryIndex++;
-                consecutive++;
-                maxConsecutive = Math.max(maxConsecutive, consecutive);
-                if (i === 0 || " -_".includes(lowerTarget[i - 1]))
+        const qLen = lowerQuery.length, tLen = lowerTarget.length;
+
+        // Fast path: exact substring match → high score
+        if (lowerTarget.indexOf(lowerQuery) !== -1)
+            return 1000 + (100 - tLen);
+
+        // Fuzzy scoring with character codes for speed
+        let qi = 0, score = 0, consec = 0, maxConsec = 0;
+        for (let i = 0; i < tLen && qi < qLen; i++) {
+            const tc = lowerTarget.charCodeAt(i);
+            if (tc === lowerQuery.charCodeAt(qi)) {
+                qi++;
+                consec++;
+                if (consec > maxConsec) maxConsec = consec;
+                // Bonus for match at word boundary
+                if (i === 0 || tc < 97 || tc > 122) { // non-lowercase = boundary
                     score += 10;
+                }
             } else {
-                consecutive = 0;
+                consec = 0;
             }
         }
-        return queryIndex === lowerQuery.length ? score + maxConsecutive * 5 : -1;
+        return qi === qLen ? score + maxConsec * 5 : -1;
     }
 
     // Original sections model
@@ -268,27 +277,36 @@ Rectangle {
             return sectionModel;
 
         const query = searchQuery.toLowerCase();
-        return searchIndex.items.filter(item => {
-            return fuzzyMatch(query, item.label) || (item.keywords && item.keywords.includes(query));
-        }).map(item => {
-            // Find section metadata
+        const items = searchIndex.items;
+        const results = [];
+
+        // Single pass filter + map, avoid .filter().map() churn
+        for (let i = 0; i < items.length; i++) {
+            const item = items[i];
+            if (!fuzzyMatch(query, item.label) && !(item.keywords && item.keywords.indexOf(query) !== -1))
+                continue;
+
             const sectionMeta = sectionModel.find(s => s.section === item.section) || {};
-            return {
+            results.push({
                 label: item.label,
                 section: item.section,
                 subSection: item.subSection || "",
                 subLabel: item.subLabel || "",
-                // Use section icon instead of item icon
                 icon: sectionMeta.icon || item.icon,
                 isIcon: sectionMeta.isIcon !== undefined ? sectionMeta.isIcon : (item.isIcon !== undefined ? item.isIcon : true),
                 score: fuzzyScore(query, item.label)
-            };
-        }).sort((a, b) => b.score - a.score);
+            });
+        }
+
+        // Sort results by score descending
+        results.sort((a, b) => b.score - a.score);
+        return results;
     }
 
     // Find the index of current section in filtered list
     function getFilteredIndex(sectionId) {
-        for (let i = 0; i < filteredSections.length; i++) {
+        const fLen = filteredSections.length;
+        for (let i = 0; i < fLen; i++) {
             if (filteredSections[i].section === sectionId)
                 return i;
         }
@@ -365,10 +383,11 @@ Rectangle {
                     boundsBehavior: Flickable.StopAtBounds
 
                     Behavior on contentY {
-                        enabled: Config.animDuration > 0 && !sidebarFlickable.moving
+                        enabled: Anim.animationsEnabled && !sidebarFlickable.moving
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -392,10 +411,11 @@ Rectangle {
                         visible: root.selectedIndex >= 0 && root.selectedIndex < root.filteredSections.length
 
                         Behavior on y {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutCubic
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
@@ -419,7 +439,7 @@ Rectangle {
                                 flat: true
                                 hoverEnabled: true
 
-                                property bool isActive: index === root.selectedIndex
+                                readonly property bool isActive: index === root.selectedIndex
 
                                 background: Rectangle {
                                     color: "transparent"
@@ -434,21 +454,22 @@ Rectangle {
                                         text: sidebarButton.modelData.isIcon ? sidebarButton.modelData.icon : ""
                                         font.family: Icons.font
                                         font.pixelSize: 20
-                                        color: sidebarButton.isActive ? Styling.srItem("overprimary") : Styling.srItem("common")
+                                        color: sidebarButton.isActive ? Styling.srItem("primary") : Styling.srItem("common")
                                         anchors.verticalCenter: parent.verticalCenter
                                         leftPadding: 10
                                         visible: sidebarButton.modelData.isIcon && (root.searchQuery.length === 0 || !sidebarButton.modelData.subSection)
 
                                         Behavior on color {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             ColorAnimation {
-                                                duration: Config.animDuration
-                                                easing.type: Easing.OutCubic
+                                                duration: Anim.standardNormal
+                                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                             }
                                         }
                                     }
 
-                                    // SVG icon
+                                    // SVG icon (layer removed — same visual via icon font or direct colorization)
                                     Item {
                                         width: 30
                                         height: 20
@@ -467,10 +488,11 @@ Rectangle {
                                             smooth: true
                                             asynchronous: true
                                             layer.enabled: true
+                                            layer.samplerName: "source"
                                             layer.effect: MultiEffect {
                                                 brightness: 1.0
                                                 colorization: 1.0
-                                                colorizationColor: sidebarButton.isActive ? Styling.srItem("overprimary") : Styling.srItem("common")
+                                                colorizationColor: sidebarButton.isActive ? Styling.srItem("primary") : Styling.srItem("common")
                                             }
                                         }
                                     }
@@ -484,13 +506,14 @@ Rectangle {
                                             font.family: Config.theme.font
                                             font.pixelSize: Styling.fontSize(0)
                                             font.weight: sidebarButton.isActive ? Font.Bold : Font.Normal
-                                            color: sidebarButton.isActive ? Styling.srItem("overprimary") : Styling.srItem("common")
+                                            color: sidebarButton.isActive ? Styling.srItem("primary") : Styling.srItem("common")
 
                                             Behavior on color {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 ColorAnimation {
-                                                    duration: Config.animDuration
-                                                    easing.type: Easing.OutCubic
+                                                    duration: Anim.standardNormal
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
                                         }
@@ -602,16 +625,19 @@ Rectangle {
             Loader {
                 id: panelLoader
                 anchors.fill: parent
-                asynchronous: true
+                // FIX: Synchronous loading to avoid race conditions with PipeWire events
+                // that can cause segfaults when Connections targets get destroyed mid-incubation
+                asynchronous: false
                 source: contentArea.panelComponents[root.currentSection]?.component ?? ""
 
                 // Fade in animation
                 opacity: status === Loader.Ready ? 1 : 0
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
diff --git a/modules/widgets/dashboard/controls/ShellPanel.qml b/modules/widgets/dashboard/controls/ShellPanel.qml
index d02bf8cf..2f32c935 100644
--- a/modules/widgets/dashboard/controls/ShellPanel.qml
+++ b/modules/widgets/dashboard/controls/ShellPanel.qml
@@ -6,7 +6,9 @@ import QtQuick.Layouts
 import Quickshell
 import qs.modules.theme
 import qs.modules.components
+import Quickshell.Services.SystemTray
 import qs.modules.globals
+import qs.modules.services
 import qs.config
 
 Item {
@@ -194,9 +196,9 @@ Item {
                 border.color: toggleSwitch.checked ? Styling.srItem("overprimary") : Colors.outline
 
                 Behavior on color {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     ColorAnimation {
-                        duration: Config.animDuration / 2
+                        duration: Anim.standardSmall
                     }
                 }
 
@@ -209,10 +211,11 @@ Item {
                     color: toggleSwitch.checked ? Colors.background : Colors.overSurfaceVariant
 
                     Behavior on x {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
@@ -538,19 +541,21 @@ Item {
             x: root.colorPickerActive ? -30 : 0
 
             Behavior on x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutQuart
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -644,6 +649,10 @@ Item {
                             text: "Notch"
                             sectionId: "notch"
                         }
+                        SectionButton {
+                            text: "Island"
+                            sectionId: "island"
+                        }
                         SectionButton {
                             text: "Workspaces"
                             sectionId: "workspaces"
@@ -720,6 +729,46 @@ Item {
                             }
                         }
 
+                        Separator {
+                            Layout.fillWidth: true
+                        }
+
+                        Text {
+                            text: "Bar Mode"
+                            font.family: Config.theme.font
+                            font.pixelSize: Styling.fontSize(-1)
+                            font.weight: Font.Medium
+                            color: Colors.overSurfaceVariant
+                            Layout.bottomMargin: -4
+                        }
+
+                        SelectorRow {
+                            label: ""
+                            options: [
+                                {
+                                    label: "Extended",
+                                    value: "extended",
+                                    icon: Icons.alignJustify
+                                },
+                                {
+                                    label: "Dynamic",
+                                    value: "dynamic",
+                                    icon: Icons.alignCenter
+                                }
+                            ]
+                            value: Config.bar.barMode ?? "extended"
+                            onValueSelected: newValue => {
+                                if (newValue !== Config.bar.barMode) {
+                                    GlobalStates.markShellChanged();
+                                    Config.bar.barMode = newValue;
+                                }
+                            }
+                        }
+
+                        Separator {
+                            Layout.fillWidth: true
+                        }
+
                         TextInputRow {
                             label: "Launcher Icon"
                             value: Config.bar.launcherIcon ?? ""
@@ -810,7 +859,16 @@ Item {
                                 }
                             }
                         }
-
+                        ToggleRow {
+                            label: "Enable Chromium Player"
+                            checked: Config.bar.enableChromiumPlayer ?? false
+                            onToggled: value => {
+                                if (value !== Config.bar.enableChromiumPlayer) {
+                                    GlobalStates.markShellChanged();
+                                    Config.bar.enableChromiumPlayer = value;
+                                }
+                            }
+                        }
                         Separator {
                             Layout.fillWidth: true
                         }
@@ -848,7 +906,7 @@ Item {
 
                         NumberInputRow {
                             label: "Hover Region Height"
-                            value: Config.bar.hoverRegionHeight ?? 8
+                            value: Config.bar.hoverRegionHeight ?? 2
                             minValue: 0
                             maxValue: 32
                             suffix: "px"
@@ -973,7 +1031,56 @@ Item {
                     Separator {
                         Layout.fillWidth: true
                         visible: false
-                    }
+                    
+                        // Task Tray toggle
+                        RowLayout {
+                            Layout.fillWidth: true
+                            spacing: 8
+
+                            Text {
+                                Layout.fillWidth: true
+                                text: Icons.terminalWindow + "   Task Tray"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-1)
+                                color: Colors.overBackground
+                                Layout.alignment: Qt.AlignVCenter
+                            }
+
+                            Switch {
+                                id: taskTraySwitch
+                                checked: Config.bar.taskTrayEnabled ?? true
+                                onCheckedChanged: {
+                                    if (checked !== (Config.bar.taskTrayEnabled ?? true)) {
+                                        Config.bar.taskTrayEnabled = checked;
+                                    }
+                                }
+                            }
+                        }
+
+                        RowLayout {
+                            Layout.fillWidth: true
+                            spacing: 8
+
+                            Text {
+                                Layout.fillWidth: true
+                                text: Icons.dotsThree + "   Show Toggle Button"
+                                font.family: Config.theme.font
+                                font.pixelSize: Styling.fontSize(-1)
+                                color: Colors.overBackground
+                                Layout.alignment: Qt.AlignVCenter
+                            }
+
+                            Switch {
+                                id: showToggleSwitch
+                                checked: Config.bar.taskTrayShowToggle ?? true
+                                onCheckedChanged: {
+                                    if (checked !== (Config.bar.taskTrayShowToggle ?? true)) {
+                                        Config.bar.taskTrayShowToggle = checked;
+                                    }
+                                }
+                            }
+                        }
+}
 
                     // ═══════════════════════════════════════════════════════════════
                     // NOTCH SECTION
@@ -1038,7 +1145,7 @@ Item {
 
                         NumberInputRow {
                             label: "Hover Region Height"
-                            value: Config.notch.hoverRegionHeight ?? 8
+                            value: Config.notch.hoverRegionHeight ?? 2
                             minValue: 0
                             maxValue: 32
                             suffix: "px"
@@ -1132,6 +1239,90 @@ Item {
                         visible: false
                     }
 
+                    // ═══════════════════════════════════════════════════════════════
+                    // ISLAND SECTION
+                    // ═══════════════════════════════════════════════════════════════
+                    ColumnLayout {
+                        visible: root.currentSection === "island"
+                        Layout.fillWidth: true
+                        spacing: 8
+
+                        Text {
+                            text: "Dynamic Island"
+                            font.family: Config.theme.font
+                            font.pixelSize: Styling.fontSize(-1)
+                            font.weight: Font.Medium
+                            color: Colors.overSurfaceVariant
+                            Layout.bottomMargin: -4
+                        }
+
+                        ToggleRow {
+                            label: "Pinned"
+                            checked: (Config.notch && Config.notch.pinnedOnStartup !== undefined) ? Config.notch.pinnedOnStartup : true
+                            onToggled: value => {
+                                if (value !== (Config.notch?.pinnedOnStartup ?? true)) {
+                                    GlobalStates.markShellChanged();
+                                    Config.notch.pinnedOnStartup = value;
+                                }
+                            }
+                        }
+
+                        ToggleRow {
+                            label: "Show Dock Apps"
+                            checked: Config.notch?.showDockInIsland ?? true
+                            onToggled: value => {
+                                if (value !== (Config.notch?.showDockInIsland ?? true)) {
+                                    GlobalStates.markShellChanged();
+                                    Config.notch.showDockInIsland = value;
+                                }
+                            }
+                        }
+
+                        NumberInputRow {
+                            label: "Button Size"
+                            value: Config.notch?.islandButtonSize ?? 36
+                            minValue: 28
+                            maxValue: 52
+                            suffix: "px"
+                            onValueEdited: newValue => {
+                                if (newValue !== (Config.notch?.islandButtonSize ?? 36)) {
+                                    GlobalStates.markShellChanged();
+                                    Config.notch.islandButtonSize = newValue;
+                                }
+                            }
+                        }
+
+                        NumberInputRow {
+                            label: "Hover Region"
+                            value: Config.notch?.hoverRegionHeight ?? 2
+                            minValue: 0
+                            maxValue: 16
+                            suffix: "px"
+                            onValueEdited: newValue => {
+                                if (newValue !== (Config.notch?.hoverRegionHeight ?? 2)) {
+                                    GlobalStates.markShellChanged();
+                                    Config.notch.hoverRegionHeight = newValue;
+                                }
+                            }
+                        }
+
+                        ToggleRow {
+                            label: "Available on Fullscreen"
+                            checked: Config.bar?.availableOnFullscreen ?? false
+                            onToggled: value => {
+                                if (value !== (Config.bar?.availableOnFullscreen ?? false)) {
+                                    GlobalStates.markShellChanged();
+                                    Config.bar.availableOnFullscreen = value;
+                                }
+                            }
+                        }
+                    }
+
+                    Separator {
+                        Layout.fillWidth: true
+                        visible: false
+                    }
+
                     // ═══════════════════════════════════════════════════════════════
                     // WORKSPACES SECTION
                     // ═══════════════════════════════════════════════════════════════
@@ -1487,7 +1678,7 @@ Item {
                         NumberInputRow {
                             label: "Hover Region"
                             visible: (Config.dock.theme ?? "default") !== "integrated"
-                            value: Config.dock.hoverRegionHeight ?? 8
+                            value: Config.dock.hoverRegionHeight ?? 2
                             minValue: 0
                             maxValue: 32
                             suffix: "px"
@@ -1759,14 +1950,9 @@ Item {
                         ActionButton {
                             text: "About Ambxst " + Config.version
                             icon: Icons.info
-                            onClicked: Quickshell.execDetached(["xdg-open", "https://axeni.de/ambxst"])
+                            onClicked: Quickshell.execDetached(["xdg-open", "https://github.com/Axenide/Ambxst"])
                         }
 
-                        ActionButton {
-                            text: "Donate ❤️"
-                            icon: Icons.heart
-                            onClicked: Quickshell.execDetached(["xdg-open", "https://axeni.de/donate"])
-                        }
 
                         Text {
                             text: "OCR Languages"
@@ -1937,19 +2123,21 @@ Item {
             x: root.colorPickerActive ? 0 : 30
 
             Behavior on x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutQuart
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
diff --git a/modules/widgets/dashboard/controls/SystemPanel.qml b/modules/widgets/dashboard/controls/SystemPanel.qml
old mode 100644
new mode 100755
index c3bf0421..77361466
--- a/modules/widgets/dashboard/controls/SystemPanel.qml
+++ b/modules/widgets/dashboard/controls/SystemPanel.qml
@@ -141,6 +141,14 @@ Item {
                         SectionButton {
                             text: "Idle"
                             sectionId: "idle"
+                        SectionButton {
+                            text: "Battery"
+                            sectionId: "battery"
+                        }
+                        }
+                        SectionButton {
+                            text: "Battery"
+                            sectionId: "battery"
                         }
                     }
 
@@ -409,17 +417,6 @@ Item {
                             }
                         }
 
-                        // Wavy Line toggle
-                        ToggleRow {
-                            Layout.fillWidth: true
-                            label: "Wavy Line"
-                            description: "Animated wavy line effect"
-                            checked: Config.performance.wavyLine
-                            onToggled: checked => {
-                                Config.performance.wavyLine = checked;
-                            }
-                        }
-
                         // Rotate Cover Art toggle
                         ToggleRow {
                             Layout.fillWidth: true
@@ -593,6 +590,117 @@ Item {
                         }
                     }
 
+                    // =====================
+                    // BATTERY SECTION
+                    // =====================
+                    ColumnLayout {
+                        visible: root.currentSection === "battery"
+                        property string settingsSection: "battery"
+                        Layout.fillWidth: true
+                        spacing: 8
+
+                        Text {
+                            text: "Battery"
+                            font.family: Config.theme.font
+                            font.pixelSize: Styling.fontSize(-1)
+                            font.weight: Font.Medium
+                            color: Colors.overSurfaceVariant
+                            Layout.bottomMargin: -4
+                        }
+
+                        ToggleRow {
+                            label: "Low battery alerts"
+                            checked: Config.system.batteryNotifications.enabled
+                            onToggled: value => {
+                                if (value !== Config.system.batteryNotifications.enabled) {
+                                    Config.system.batteryNotifications.enabled = value;
+                                }
+                            }
+                        }
+
+                        NumberInputRow {
+                            label: "Low threshold (%)"
+                            value: Config.system.batteryNotifications.lowThreshold
+                            minValue: 5
+                            maxValue: 50
+                            onValueEdited: newValue => {
+                                Config.system.batteryNotifications.lowThreshold = newValue;
+                            }
+                        }
+
+                        NumberInputRow {
+                            label: "Critical threshold (%)"
+                            value: Config.system.batteryNotifications.criticalThreshold
+                            minValue: 3
+                            maxValue: 20
+                            onValueEdited: newValue => {
+                                Config.system.batteryNotifications.criticalThreshold = newValue;
+                            }
+                        }
+
+                        Separator { Layout.fillWidth: true }
+
+                        Text {
+                            text: "Power Save"
+                            font.family: Config.theme.font
+                            font.pixelSize: Styling.fontSize(-1)
+                            font.weight: Font.Medium
+                            color: Colors.overSurfaceVariant
+                            Layout.bottomMargin: -4
+                        }
+
+                        ToggleRow {
+                            label: "Auto power-save on low battery"
+                            checked: Config.system.batteryNotifications.autoPowerSave
+                            onToggled: value => {
+                                if (value !== Config.system.batteryNotifications.autoPowerSave) {
+                                    Config.system.batteryNotifications.autoPowerSave = value;
+                                }
+                            }
+                        }
+
+                        NumberInputRow {
+                            label: "Power-save threshold (%)"
+                            value: Config.system.batteryNotifications.powerSaveThreshold
+                            minValue: 5
+                            maxValue: 40
+                            onValueEdited: newValue => {
+                                Config.system.batteryNotifications.powerSaveThreshold = newValue;
+                            }
+                        }
+
+                        Separator { Layout.fillWidth: true }
+
+                        Text {
+                            text: "Charge Limit"
+                            font.family: Config.theme.font
+                            font.pixelSize: Styling.fontSize(-1)
+                            font.weight: Font.Medium
+                            color: Colors.overSurfaceVariant
+                            Layout.bottomMargin: -4
+                        }
+
+                        ToggleRow {
+                            label: "Charge limit notification"
+                            checked: Config.system.batteryNotifications.chargeLimitEnabled
+                            onToggled: value => {
+                                if (value !== Config.system.batteryNotifications.chargeLimitEnabled) {
+                                    Config.system.batteryNotifications.chargeLimitEnabled = value;
+                                }
+                            }
+                        }
+
+                        NumberInputRow {
+                            label: "Charge limit (%)"
+                            value: Config.system.batteryNotifications.chargeLimit
+                            minValue: 50
+                            maxValue: 100
+                            onValueEdited: newValue => {
+                                Config.system.batteryNotifications.chargeLimit = newValue;
+                            }
+                        }
+                    }
+
                     // =====================
                     // IDLE SECTION
                     // =====================
@@ -1043,10 +1151,11 @@ Item {
                 opacity: checked ? 1.0 : 0.0
 
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -1059,11 +1168,11 @@ Item {
                     scale: checked ? 1.0 : 0.0
 
                     Behavior on scale {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutBack
-                            easing.overshoot: 1.5
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                         }
                     }
                 }
diff --git a/modules/widgets/dashboard/controls/ThemePanel.qml b/modules/widgets/dashboard/controls/ThemePanel.qml
old mode 100644
new mode 100755
index e622dff3..08e66f16
--- a/modules/widgets/dashboard/controls/ThemePanel.qml
+++ b/modules/widgets/dashboard/controls/ThemePanel.qml
@@ -6,6 +6,7 @@ import QtQuick.Layouts
 import qs.modules.theme
 import qs.modules.components
 import qs.modules.globals
+import qs.modules.services
 import Quickshell
 import Quickshell.Io
 import qs.config
@@ -155,19 +156,21 @@ Item {
             x: root.colorPickerActive ? -30 : 0
 
             Behavior on x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutQuart
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -375,9 +378,9 @@ Item {
                                         border.color: tintIconsSwitch.checked ? Styling.srItem("overprimary") : Colors.outline
 
                                         Behavior on color {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             ColorAnimation {
-                                                duration: Config.animDuration / 2
+                                                duration: Anim.standardSmall
                                             }
                                         }
 
@@ -390,10 +393,11 @@ Item {
                                             color: tintIconsSwitch.checked ? Colors.background : Colors.overSurfaceVariant
 
                                             Behavior on x {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 NumberAnimation {
-                                                    duration: Config.animDuration / 2
-                                                    easing.type: Easing.OutCubic
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
                                         }
@@ -444,9 +448,9 @@ Item {
                                         border.color: enableCornersSwitch.checked ? Styling.srItem("overprimary") : Colors.outline
 
                                         Behavior on color {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             ColorAnimation {
-                                                duration: Config.animDuration / 2
+                                                duration: Anim.standardSmall
                                             }
                                         }
 
@@ -459,10 +463,11 @@ Item {
                                             color: enableCornersSwitch.checked ? Colors.background : Colors.overSurfaceVariant
 
                                             Behavior on x {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 NumberAnimation {
-                                                    duration: Config.animDuration / 2
-                                                    easing.type: Easing.OutCubic
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
                                         }
@@ -471,13 +476,268 @@ Item {
                                 }
                             }
 
+                            // Dynamic Color toggle (Material You from wallpaper)
+                            RowLayout {
+                                Layout.fillWidth: true
+                                spacing: 8
+                                visible: typeof Colors !== "undefined"
+
+                                Text {
+                                    text: "Dynamic"
+                                    font.family: Config.theme.font
+                                    font.pixelSize: Styling.fontSize(0)
+                                    color: Colors.overBackground
+                                    Layout.preferredWidth: 80
+                                }
+
+                                Text {
+                                    text: "Auto-color from wallpaper"
+                                    font.family: Config.theme.font
+                                    font.pixelSize: Styling.fontSize(-2)
+                                    color: Colors.overSurfaceVariant
+                                    Layout.fillWidth: true
+                                    elide: Text.ElideRight
+                                }
+
+                                Item { Layout.fillWidth: true }
+
+                                Switch {
+                                    id: dynamicColorSwitch
+                                    checked: Config.theme.dynamicColor || false
+
+                                    indicator: Rectangle {
+                                        implicitWidth: 40
+                                        implicitHeight: 22
+                                        x: dynamicColorSwitch.leftPadding
+                                        y: parent.height / 2 - height / 2
+                                        radius: 11
+                                        color: dynamicColorSwitch.checked ? Colors.primary : Colors.surfaceVariant
+                                        border.color: dynamicColorSwitch.checked ? Colors.primary : Colors.outline
+
+                                        Behavior on color {
+                                            enabled: Anim.animationsEnabled
+                                            ColorAnimation {
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("standard").type
+                                                easing.bezierCurve: Anim.easing("standard").bezierCurve
+                                            }
+                                        }
+
+                                        Rectangle {
+                                            x: dynamicColorSwitch.checked ? parent.width - width - 2 : 2
+                                            y: 2
+                                            width: parent.height - 4
+                                            height: width
+                                            radius: width / 2
+                                            color: dynamicColorSwitch.checked ? Colors.background : Colors.overSurfaceVariant
+
+                                            Behavior on x {
+                                                enabled: Anim.animationsEnabled
+                                                NumberAnimation {
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                                                    easing.bezierCurve: Anim.easing("standard").bezierCurve
+                                                }
+                                            }
+                                        }
+                                    }
+                                    background: null
+
+                                    onClicked: {
+                                        if (checked !== (Config.theme.dynamicColor || false)) {
+                                            Config.theme.dynamicColor = checked;
+                                            Colors.dynamicColorEnabled = checked;
+                                        }
+                                    }
+                                }
+                            }
+
+                            // Animation Style selector — platform-based animation profiles
+                            RowLayout {
+                                Layout.fillWidth: true
+                                spacing: 8
+
+                                Text {
+                                    text: "Anim Style"
+                                    font.family: Config.theme.font
+                                    font.pixelSize: Styling.fontSize(0)
+                                    color: Colors.overBackground
+                                    Layout.preferredWidth: 80
+                                }
+
+                                ComboBox {
+                                    id: animStyleCombo
+                                    Layout.fillWidth: true
+                                    Layout.preferredHeight: 30
+                                    font.family: Config.theme.font
+                                    font.pixelSize: Styling.fontSize(-1)
+
+                                    background: Rectangle {
+                                        // Use Colors directly for reliable theme-aware colors
+                                        color: Colors.surfaceContainerHigh || Qt.rgba(0.15, 0.15, 0.18, 0.8)
+                                        radius: 4
+                                        border.color: Colors.surfaceBright || Qt.rgba(0.5, 0.5, 0.5, 0.3)
+                                        border.width: 1
+                                    }
+
+                                    contentItem: Text {
+                                        leftPadding: 8
+                                        rightPadding: 8
+                                        text: {
+                                            const idx = animStyleCombo.currentIndex;
+                                            if (idx >= 0 && animStyleCombo.model && idx < animStyleCombo.model.count) {
+                                                return animStyleCombo.model.get(idx).text || "";
+                                            }
+                                            return "Select style";
+                                        }
+                                        // font inherited from ComboBox
+                                        color: Colors.overBackground
+                                        verticalAlignment: Text.AlignVCenter
+                                        elide: Text.ElideRight
+                                    }
+
+                                    indicator: Text {
+                                        x: animStyleCombo.width - width - 8
+                                        y: (animStyleCombo.height - height) / 2
+                                        text: "▼"
+                                        font.family: Icons.font
+                                        font.pixelSize: 10
+                                        color: Colors.overSurfaceVariant
+                                    }
+
+
+
+                                    popup: Popup {
+                                        y: animStyleCombo.height + 2
+                                        width: animStyleCombo.width
+                                        implicitHeight: Math.min(contentItem.implicitHeight + 16, 400)
+                                        padding: 4
+
+                                        background: Rectangle {
+                                            color: Colors.surfaceContainer || Qt.rgba(0.1, 0.1, 0.12, 0.95)
+                                            radius: 6
+                                            border.color: Colors.surfaceBright || Qt.rgba(0.3, 0.3, 0.3, 0.5)
+                                            border.width: 1
+                                        }
+
+                                        contentItem: ListView {
+                                            clip: true
+                                            implicitHeight: contentHeight
+                                            model: animStyleCombo.delegateModel
+                                            currentIndex: animStyleCombo.currentIndex
+                                            interactive: contentHeight > 300
+                                            spacing: 2
+                                        }
+                                    }
+
+                                    model: ListModel {
+                                        ListElement { text: "M3 (Material 3)"; key: "m3" }
+                                        ListElement { text: "── Windows ──"; key: "" }
+                                        ListElement { text: "Windows Classic"; key: "windows-classic" }
+                                        ListElement { text: "Windows XP"; key: "windows-xp" }
+                                        ListElement { text: "Windows 7 (Aero)"; key: "windows-7" }
+                                        ListElement { text: "── Mac ──"; key: "" }
+                                        ListElement { text: "Mac OS Classic"; key: "mac-classic" }
+                                        ListElement { text: "Mac OS X"; key: "mac-legacy" }
+                                        ListElement { text: "macOS (Modern)"; key: "mac-modern" }
+                                        ListElement { text: "── Hyprland ──"; key: "" }
+                                        ListElement { text: "Hyprland (Native)"; key: "hyprland" }
+                                        ListElement { text: "── Android ──"; key: "" }
+                                        ListElement { text: "Android (Legacy)"; key: "android-legacy" }
+                                        ListElement { text: "Android Material"; key: "android-material" }
+                                        ListElement { text: "Android 12+ (You)"; key: "android-you" }
+                                    }
+
+                                    // Guard to prevent marking unsaved changes during init
+                                    property bool _initialized: false
+
+                                    property string currentKey: {
+                                        const idx = animStyleCombo.currentIndex;
+                                        return idx >= 0 ? animStyleCombo.model.get(idx).key : "m3";
+                                    }
+
+                                    Component.onCompleted: {
+                                        const cur = Config.theme.animStyle || "m3";
+                                        for (let i = 0; i < model.count; i++) {
+                                            if (model.get(i).key === cur) {
+                                                currentIndex = i;
+                                                break;
+                                            }
+                                        }
+                                        // Mark as initialized AFTER setting the index
+                                        Qt.callLater(() => animStyleCombo._initialized = true);
+                                    }
+
+                                    onCurrentKeyChanged: {
+                                        if (!animStyleCombo._initialized) return;
+                                        if (typeof Config === "undefined" || !Config.theme) return;
+                                        const key = animStyleCombo.currentKey;
+                                        if (key && key !== (Config.theme.animStyle || "m3")) {
+                                            // Save current speed for the old style
+                                            const oldKey = Config.theme.animStyle || "m3";
+                                            const savedSpeeds = StateService.get("animStyleSpeeds", {});
+                                            savedSpeeds[oldKey] = Config.theme.animDuration;
+                                            StateService.set("animStyleSpeeds", savedSpeeds);
+                                            
+                                            // Apply new style
+                                            Config.theme.animStyle = key;
+                                            
+                                            // Restore saved speed for new style, or use default
+                                            const styleDefaults = {
+                                                "m3": 300, "windows-classic": 100, "windows-xp": 200,
+                                                "windows-7": 250, "mac-classic": 80, "mac-legacy": 350,
+                                                "mac-modern": 300, "hyprland": 120, "android-legacy": 150,
+                                                "android-material": 200, "android-you": 300
+                                            };
+                                            const savedSpeed = savedSpeeds[key];
+                                            if (savedSpeed !== undefined) {
+                                                Config.theme.animDuration = savedSpeed;
+                                            } else if (styleDefaults[key] !== undefined) {
+                                                Config.theme.animDuration = styleDefaults[key];
+                                            }
+                                            GlobalStates.markThemeChanged();
+                                        }
+                                    }
+
+                                    delegate: ItemDelegate {
+                                        required property var modelData
+                                        width: animStyleCombo.width
+                                        height: modelData.key === "" ? 22 : 32
+                                        enabled: modelData.key !== ""
+                                        font.family: Config.theme.font
+                                        font.pixelSize: modelData.key === "" ? Styling.fontSize(-2) : Styling.fontSize(-1)
+                                        font.weight: modelData.key === "" ? Font.Normal : Font.Medium
+                                        leftPadding: modelData.key === "" ? 8 : 16
+                                        contentItem: Text {
+                                            text: modelData.text
+                                            font: parent.font
+                                            color: modelData.key === "" ? Colors.overSurfaceVariant : (parent.highlighted ? Qt.rgba(1, 1, 1, 1) : Colors.overBackground)
+                                            opacity: modelData.key === "" ? 0.5 : (parent.highlighted ? 1.0 : 0.85)
+                                            elide: Text.ElideRight
+                                            leftPadding: parent.leftPadding
+                                            verticalAlignment: Text.AlignVCenter
+                                        }
+                                        background: Rectangle {
+                                            color: {
+                                                if (parent.highlighted) return Qt.rgba(Colors.primary.r, Colors.primary.g, Colors.primary.b, 0.45);
+                                                if (parent.hovered) return Qt.rgba(Colors.overBackground.r, Colors.overBackground.g, Colors.overBackground.b, 0.12);
+                                                return "transparent";
+                                            }
+                                            radius: Styling.radius(2)
+                                            border.color: parent.highlighted ? Qt.rgba(Colors.primary.r, Colors.primary.g, Colors.primary.b, 0.6) : "transparent"
+                                            border.width: parent.highlighted ? 1 : 0
+                                        }
+                                    }
+                                }
+                            }
+
                             // Animation Duration slider
                             RowLayout {
                                 Layout.fillWidth: true
                                 spacing: 8
 
                                 Text {
-                                    text: "Animation"
+                                    text: "Speed"
                                     font.family: Config.theme.font
                                     font.pixelSize: Styling.fontSize(0)
                                     color: Colors.overBackground
@@ -509,6 +769,11 @@ Item {
                                         if (newDuration !== Config.theme.animDuration) {
                                             GlobalStates.markThemeChanged();
                                             Config.theme.animDuration = newDuration;
+                                            // Save user preference for this style
+                                            const key = Config.theme.animStyle || "m3";
+                                            const savedSpeeds = StateService.get("animStyleSpeeds", {});
+                                            savedSpeeds[key] = newDuration;
+                                            StateService.set("animStyleSpeeds", savedSpeeds);
                                         }
                                     }
                                 }
@@ -1076,9 +1341,9 @@ Item {
                                         opacity: shadowColorButton.isHovered ? 0.15 : 0
 
                                         Behavior on opacity {
-                                            enabled: (Config.animDuration ?? 0) > 0
+                                            enabled: Anim.animationsEnabled
                                             NumberAnimation {
-                                                duration: (Config.animDuration ?? 0) / 2
+                                                duration: Anim.standardSmall
                                             }
                                         }
                                     }
@@ -1114,10 +1379,11 @@ Item {
                         property bool variantExpanded: false
 
                         Behavior on Layout.preferredHeight {
-                            enabled: (Config.animDuration ?? 0) > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: (Config.animDuration ?? 0) / 2
-                                easing.type: Easing.OutCubic
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -1180,10 +1446,11 @@ Item {
                                                     radius: isSelected ? Styling.radius(0) / 2 : Styling.radius(0)
 
                                                     Behavior on width {
-                                                        enabled: (Config.animDuration ?? 0) > 0
+                                                        enabled: Anim.animationsEnabled
                                                         NumberAnimation {
-                                                            duration: (Config.animDuration ?? 0) / 3
-                                                            easing.type: Easing.OutCubic
+                                                            duration: Anim.standardSmall
+                                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                         }
                                                     }
 
@@ -1210,19 +1477,21 @@ Item {
                                                                     opacity: variantTagRow.isSelected ? 1 : 0
 
                                                                     Behavior on opacity {
-                                                                        enabled: (Config.animDuration ?? 0) > 0
+                                                                        enabled: Anim.animationsEnabled
                                                                         NumberAnimation {
-                                                                            duration: (Config.animDuration ?? 0) / 3
-                                                                            easing.type: Easing.OutCubic
+                                                                            duration: Anim.standardSmall
+                                                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                                         }
                                                                     }
                                                                 }
 
                                                                 Behavior on width {
-                                                                    enabled: (Config.animDuration ?? 0) > 0
+                                                                    enabled: Anim.animationsEnabled
                                                                     NumberAnimation {
-                                                                        duration: (Config.animDuration ?? 0) / 3
-                                                                        easing.type: Easing.OutCubic
+                                                                        duration: Anim.standardSmall
+                                                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                                     }
                                                                 }
                                                             }
@@ -1236,10 +1505,11 @@ Item {
                                                                 color: variantTagRow.item
 
                                                                 Behavior on color {
-                                                                    enabled: (Config.animDuration ?? 0) > 0
+                                                                    enabled: Anim.animationsEnabled
                                                                     ColorAnimation {
-                                                                        duration: (Config.animDuration ?? 0) / 3
-                                                                        easing.type: Easing.OutCubic
+                                                                        duration: Anim.standardSmall
+                                                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                                     }
                                                                 }
                                                             }
@@ -1253,9 +1523,9 @@ Item {
                                                         opacity: variantTagRow.isHovered ? 0.15 : 0
 
                                                         Behavior on opacity {
-                                                            enabled: (Config.animDuration ?? 0) > 0
+                                                            enabled: Anim.animationsEnabled
                                                             NumberAnimation {
-                                                                duration: (Config.animDuration ?? 0) / 2
+                                                                duration: Anim.standardSmall
                                                             }
                                                         }
                                                     }
@@ -1336,10 +1606,11 @@ Item {
                                             radius: isSelected ? Styling.radius(0) / 2 : Styling.radius(0)
 
                                             Behavior on width {
-                                                enabled: (Config.animDuration ?? 0) > 0
+                                                enabled: Anim.animationsEnabled
                                                 NumberAnimation {
-                                                    duration: (Config.animDuration ?? 0) / 3
-                                                    easing.type: Easing.OutCubic
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
 
@@ -1366,19 +1637,21 @@ Item {
                                                             opacity: variantTag.isSelected ? 1 : 0
 
                                                             Behavior on opacity {
-                                                                enabled: (Config.animDuration ?? 0) > 0
+                                                                enabled: Anim.animationsEnabled
                                                                 NumberAnimation {
-                                                                    duration: (Config.animDuration ?? 0) / 3
-                                                                    easing.type: Easing.OutCubic
+                                                                    duration: Anim.standardSmall
+                                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                                 }
                                                             }
                                                         }
 
                                                         Behavior on width {
-                                                            enabled: (Config.animDuration ?? 0) > 0
+                                                            enabled: Anim.animationsEnabled
                                                             NumberAnimation {
-                                                                duration: (Config.animDuration ?? 0) / 3
-                                                                easing.type: Easing.OutCubic
+                                                                duration: Anim.standardSmall
+                                                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                             }
                                                         }
                                                     }
@@ -1392,10 +1665,11 @@ Item {
                                                         color: variantTag.item
 
                                                         Behavior on color {
-                                                            enabled: (Config.animDuration ?? 0) > 0
+                                                            enabled: Anim.animationsEnabled
                                                             ColorAnimation {
-                                                                duration: (Config.animDuration ?? 0) / 3
-                                                                easing.type: Easing.OutCubic
+                                                                duration: Anim.standardSmall
+                                                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                             }
                                                         }
                                                     }
@@ -1410,9 +1684,9 @@ Item {
                                                 opacity: variantTag.isHovered ? 0.15 : 0
 
                                                 Behavior on opacity {
-                                                    enabled: (Config.animDuration ?? 0) > 0
+                                                    enabled: Anim.animationsEnabled
                                                     NumberAnimation {
-                                                        duration: (Config.animDuration ?? 0) / 2
+                                                        duration: Anim.standardSmall
                                                     }
                                                 }
                                             }
@@ -1517,19 +1791,21 @@ Item {
             x: root.colorPickerActive ? 0 : 30
 
             Behavior on x {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutQuart
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -1549,7 +1825,7 @@ Item {
         }
 
         ColorPickerView {
-            id: colorPickerContent
+            id: colorPicker
             anchors.fill: parent
             anchors.leftMargin: root.sideMargin
             anchors.rightMargin: root.sideMargin
diff --git a/modules/widgets/dashboard/controls/VariantEditor.qml b/modules/widgets/dashboard/controls/VariantEditor.qml
old mode 100644
new mode 100755
index d1baba3f..1eaf9192
--- a/modules/widgets/dashboard/controls/VariantEditor.qml
+++ b/modules/widgets/dashboard/controls/VariantEditor.qml
@@ -333,10 +333,11 @@ Item {
                     rotation: root.variantConfig ? root.variantConfig.gradientAngle : 0
 
                     Behavior on rotation {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
@@ -568,10 +569,11 @@ Item {
                                 rotation: root.variantConfig ? root.variantConfig.gradientAngle : 0
 
                                 Behavior on rotation {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     NumberAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
diff --git a/modules/widgets/dashboard/controls/VariantPreview.qml b/modules/widgets/dashboard/controls/VariantPreview.qml
old mode 100644
new mode 100755
index 267356b6..c5d551fa
--- a/modules/widgets/dashboard/controls/VariantPreview.qml
+++ b/modules/widgets/dashboard/controls/VariantPreview.qml
@@ -41,9 +41,9 @@ Item {
                 radius: previewRect.radius
 
                 Behavior on border.width {
-                    enabled: (Config.animDuration ?? 0) > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: (Config.animDuration ?? 0) / 2
+                        duration: Anim.standardSmall
                     }
                 }
             }
@@ -76,9 +76,9 @@ Item {
                 opacity: 0
 
                 Behavior on opacity {
-                    enabled: (Config.animDuration ?? 0) > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: (Config.animDuration ?? 0) / 2
+                        duration: Anim.standardSmall
                     }
                 }
             }
@@ -96,9 +96,9 @@ Item {
             Layout.alignment: Qt.AlignHCenter
 
             Behavior on color {
-                enabled: (Config.animDuration ?? 0) > 0
+                enabled: Anim.animationsEnabled
                 ColorAnimation {
-                    duration: (Config.animDuration ?? 0) / 2
+                    duration: Anim.standardSmall
                 }
             }
         }
diff --git a/modules/widgets/dashboard/controls/WifiNetworkItem.qml b/modules/widgets/dashboard/controls/WifiNetworkItem.qml
old mode 100644
new mode 100755
index 9b86d816..6ac49085
--- a/modules/widgets/dashboard/controls/WifiNetworkItem.qml
+++ b/modules/widgets/dashboard/controls/WifiNetworkItem.qml
@@ -18,10 +18,11 @@ Item {
     implicitHeight: contentColumn.implicitHeight + 16
 
     Behavior on implicitHeight {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutCubic
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -120,9 +121,9 @@ Item {
                     elide: Text.ElideRight
 
                     Behavior on opacity {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
+                            duration: Anim.standardSmall
                         }
                     }
                 }
@@ -155,9 +156,9 @@ Item {
             opacity: root.expanded ? 1 : 0
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration / 2
+                    duration: Anim.standardSmall
                 }
             }
 
diff --git a/modules/widgets/dashboard/controls/WifiPanel.qml b/modules/widgets/dashboard/controls/WifiPanel.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/emoji/EmojiTab.qml b/modules/widgets/dashboard/emoji/EmojiTab.qml
old mode 100644
new mode 100755
index d7c7a504..da2a9877
--- a/modules/widgets/dashboard/emoji/EmojiTab.qml
+++ b/modules/widgets/dashboard/emoji/EmojiTab.qml
@@ -322,10 +322,11 @@ Rectangle {
     color: "transparent"
 
     Behavior on height {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -481,8 +482,9 @@ Rectangle {
 
                 Behavior on width {
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -533,8 +535,9 @@ Rectangle {
                         verticalAlignment: Text.AlignVCenter
                         Behavior on opacity {
                             NumberAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
@@ -575,10 +578,11 @@ Rectangle {
             property bool enableScrollAnimation: true
 
             Behavior on contentY {
-                enabled: Config.animDuration > 0 && emojiList.enableScrollAnimation && !emojiList.moving
+                enabled: Anim.animationsEnabled && emojiList.enableScrollAnimation && !emojiList.moving
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
@@ -652,10 +656,11 @@ Rectangle {
                             property bool enableScrollAnimation: true
 
                             Behavior on contentX {
-                                enabled: Config.animDuration > 0 && horizontalRecent.enableScrollAnimation && !horizontalRecent.moving
+                                enabled: Anim.animationsEnabled && horizontalRecent.enableScrollAnimation && !horizontalRecent.moving
                                 NumberAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
@@ -795,8 +800,9 @@ Rectangle {
                             opacity: visible ? 1 : 0
                             Behavior on opacity {
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutQuart
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
@@ -884,28 +890,32 @@ Rectangle {
                 }
 
                 Behavior on x {
-                    enabled: Config.animDuration > 0 && !emojiList.moving
+                    enabled: Anim.animationsEnabled && !emojiList.moving
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on y {
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on width {
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on height {
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
diff --git a/modules/widgets/dashboard/metrics/ConfigColorPick.qml b/modules/widgets/dashboard/metrics/ConfigColorPick.qml
new file mode 100755
index 00000000..ec97a830
--- /dev/null
+++ b/modules/widgets/dashboard/metrics/ConfigColorPick.qml
@@ -0,0 +1,80 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import qs.modules.theme
+import qs.modules.components
+import qs.config
+
+Item {
+    id: cp
+    Layout.fillWidth: true
+    property string label: ""; property string color: "#5EADFF"; property bool open: false
+    property real hue: 0.58; property real sat: 0.7; property real light: 0.6
+    signal picked(string hex)
+    implicitHeight: header.height + (open ? 40 : 0)
+
+    onColorChanged: {
+        let r = parseInt(color.slice(1,3),16)/255, g = parseInt(color.slice(3,5),16)/255, b = parseInt(color.slice(5,7),16)/255
+        let mx = Math.max(r,g,b), mn = Math.min(r,g,b), d = mx-mn
+        sat = mx === 0 ? 0 : d/mx
+        if (d === 0) hue = 0
+        else if (mx === r) hue = ((g-b)/d + (g<b?6:0))/6
+        else if (mx === g) hue = ((b-r)/d + 2)/6
+        else hue = ((r-g)/d + 4)/6
+        light = mx
+    }
+
+    function hsvHex(h,s,v) {
+        let i=Math.floor(h*6), f=h*6-i
+        let p=v*(1-s), q=v*(1-f*s), t=v*(1-(1-f)*s), r2,g2,b2
+        if (i%6===0) { r2=v; g2=t; b2=p }
+        else if (i%6===1) { r2=q; g2=v; b2=p }
+        else if (i%6===2) { r2=p; g2=v; b2=t }
+        else if (i%6===3) { r2=p; g2=q; b2=v }
+        else if (i%6===4) { r2=t; g2=p; b2=v }
+        else { r2=v; g2=p; b2=q }
+        return "#"+[r2,g2,b2].map(x=>Math.round(x*255).toString(16).padStart(2,'0')).join('').toUpperCase()
+    }
+
+    function pick(h,s,l) { hue=h; sat=s; light=l; let hex=hsvHex(h,s,l); color=hex; picked(hex) }
+
+    RowLayout { id: header; width: parent.width; spacing: 6
+        Text { text: cp.label; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-3); font.weight: Font.Medium; color: Colors.overBackground; Layout.preferredWidth: 60 }
+        Rectangle { Layout.preferredWidth: 24; Layout.preferredHeight: 24; radius: 5; color: cp.color; border.width: 1.5; border.color: Colors.outline
+            MouseArea { anchors.fill: parent; cursorShape: Qt.PointingHandCursor; onClicked: cp.open = !cp.open } }
+        Text { text: cp.color; font.family: Config.theme.monoFont; font.pixelSize: Styling.fontSize(-4); color: Colors.overSurfaceVariant; Layout.fillWidth: true }
+    }
+
+    ColumnLayout { anchors.top: header.bottom; anchors.topMargin: 4; anchors.left: parent.left; anchors.leftMargin: 34; width: parent.width - 34; visible: cp.open; spacing: 3
+        Rectangle { Layout.fillWidth: true; Layout.preferredHeight: 16; radius: 3
+            gradient: Gradient { orientation: Gradient.Horizontal
+                GradientStop { position: 0.0;  color: "#FF0000" }
+                GradientStop { position: 0.17; color: "#FFFF00" }
+                GradientStop { position: 0.33; color: "#00FF00" }
+                GradientStop { position: 0.50; color: "#00FFFF" }
+                GradientStop { position: 0.67; color: "#0000FF" }
+                GradientStop { position: 0.83; color: "#FF00FF" }
+                GradientStop { position: 1.0;  color: "#FF0000" }
+            }
+            Rectangle { x: parent.width * cp.hue - 6; y: -2; width: 12; height: parent.height + 4; radius: 2; color: "transparent"; border.width: 2; border.color: Colors.overBackground }
+            MouseArea { anchors.fill: parent
+                onPositionChanged: cp.pick(Math.max(0,Math.min(1,mouse.x/parent.width)), cp.sat, cp.light)
+                onClicked: cp.pick(Math.max(0,Math.min(1,mouse.x/parent.width)), cp.sat, cp.light)
+            }
+        }
+        Rectangle { Layout.fillWidth: true; Layout.preferredHeight: 16; radius: 3
+            gradient: Gradient { orientation: Gradient.Horizontal
+                GradientStop { position: 0.0; color: "#000000" }
+                GradientStop { position: 0.5; color: cp.hsvHex(cp.hue, cp.sat, 0.5) }
+                GradientStop { position: 1.0; color: "#FFFFFF" }
+            }
+            Rectangle { x: parent.width * cp.light - 6; y: -2; width: 12; height: parent.height + 4; radius: 2; color: "transparent"; border.width: 2; border.color: Colors.overBackground }
+            MouseArea { anchors.fill: parent
+                onPositionChanged: cp.pick(cp.hue, cp.sat, Math.max(0,Math.min(1,mouse.x/parent.width)))
+                onClicked: cp.pick(cp.hue, cp.sat, Math.max(0,Math.min(1,mouse.x/parent.width)))
+            }
+        }
+    }
+}
diff --git a/modules/widgets/dashboard/metrics/ConfigToggleRow.qml b/modules/widgets/dashboard/metrics/ConfigToggleRow.qml
new file mode 100755
index 00000000..13b8f144
--- /dev/null
+++ b/modules/widgets/dashboard/metrics/ConfigToggleRow.qml
@@ -0,0 +1,34 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import qs.modules.theme
+import qs.modules.components
+import qs.config
+
+RowLayout {
+    id: tr
+    Layout.fillWidth: true; Layout.preferredHeight: 26; spacing: 8
+    property string icon: ""; property string label: ""; property bool on: true
+    signal toggled(bool v)
+
+    Text { text: tr.icon; font.family: Icons.font; font.pixelSize: Styling.fontSize(-2); color: Colors.overBackground; Layout.preferredWidth: 18 }
+    Text { Layout.fillWidth: true; text: tr.label; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-2); color: Colors.overBackground; elide: Text.ElideRight }
+
+    Rectangle {
+        Layout.preferredWidth: 40; Layout.preferredHeight: 22; radius: 11
+        color: tr.on ? Styling.srItem("overprimary") : Qt.rgba(0.35,0.35,0.35,0.5)
+        border.width: 1.5; border.color: tr.on ? Styling.srItem("overprimary") : Colors.outline
+        Behavior on color { enabled: Anim.animationsEnabled; ColorAnimation { duration: 150 } }
+        Rectangle {
+            anchors.verticalCenter: parent.verticalCenter
+            x: tr.on ? parent.width - width - 3 : 3
+            width: 16; height: 16; radius: 8
+            color: tr.on ? Colors.background : Colors.overSurfaceVariant
+            Behavior on x { enabled: Anim.animationsEnabled; NumberAnimation { duration: 150; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve } }
+        }
+        MouseArea { anchors.fill: parent; cursorShape: Qt.PointingHandCursor; onClicked: { tr.on = !tr.on; tr.toggled(tr.on) } }
+    }
+}
diff --git a/modules/widgets/dashboard/metrics/MetricsConfigPanel.qml b/modules/widgets/dashboard/metrics/MetricsConfigPanel.qml
new file mode 100755
index 00000000..946c3cb1
--- /dev/null
+++ b/modules/widgets/dashboard/metrics/MetricsConfigPanel.qml
@@ -0,0 +1,220 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import qs.modules.theme
+import qs.modules.components
+import qs.modules.services
+import qs.config
+
+Flickable {
+    id: root
+    contentHeight: content.implicitHeight
+    clip: true
+    boundsBehavior: Flickable.StopAtBounds
+
+    signal applyChanges(var data)
+
+    // Local State
+    property bool cpuUsage: true
+    property bool cpuTemp: true
+    property bool cpuPower: false
+    property bool ram: true
+    property bool gpuUsage: true
+    property bool gpuTemp: true
+    property bool gpuPower: true
+    property bool fps: true
+    property bool disk: true
+    property string colorCpu: "#5EADFF"
+    property string colorGpu: "#B0B0B0"
+    property string colorFps: "#64FFDA"
+    property string colorRam: "#F59E0B"
+    property string colorDisk: "#C084FC"
+    
+    property bool saved: false
+    property bool raplOK: false
+    property bool raplBusy: false
+
+    Component.onCompleted: loadFromState()
+
+    function loadFromState() {
+        cpuUsage  = StateService.get("metricCpuUsage", true)
+        cpuTemp   = StateService.get("metricCpuTemp", true)
+        cpuPower  = StateService.get("metricCpuPower", false)
+        ram       = StateService.get("metricRam", true)
+        gpuUsage  = StateService.get("metricGpuUsage", true)
+        gpuTemp   = StateService.get("metricGpuTemp", true)
+        gpuPower  = StateService.get("metricGpuPower", true)
+        fps       = StateService.get("metricFps", true)
+        disk      = StateService.get("metricDisk", true)
+        colorCpu  = StateService.get("metricColorCpu", "#5EADFF")
+        colorGpu  = StateService.get("metricColorGpu", "#B0B0B0")
+        colorFps  = StateService.get("metricColorFps", "#64FFDA")
+        colorRam  = StateService.get("metricColorRam", "#F59E0B")
+        colorDisk = StateService.get("metricColorDisk", "#C084FC")
+        checkRapl()
+        saveToSystem()
+    }
+
+    function saveToSystem() {
+        SystemResources.cpuUsageEnabled  = cpuUsage
+        SystemResources.cpuTempEnabled   = cpuTemp
+        SystemResources.cpuPowerEnabled  = cpuPower
+        SystemResources.ramEnabled       = ram
+        SystemResources.gpuUsageEnabled  = gpuUsage
+        SystemResources.gpuTempEnabled   = gpuTemp
+        SystemResources.gpuPowerEnabled  = gpuPower
+        SystemResources.fpsEnabled       = fps
+        SystemResources.diskEnabled      = disk
+        SystemResources.metricColorCpu   = colorCpu
+        SystemResources.metricColorGpu   = colorGpu
+        SystemResources.metricColorFps   = colorFps
+        SystemResources.metricColorRam   = colorRam
+        SystemResources.metricColorDisk  = colorDisk
+
+        StateService.set("metricCpuUsage", cpuUsage)
+        StateService.set("metricCpuTemp", cpuTemp)
+        StateService.set("metricCpuPower", cpuPower)
+        StateService.set("metricRam", ram)
+        StateService.set("metricGpuUsage", gpuUsage)
+        StateService.set("metricGpuTemp", gpuTemp)
+        StateService.set("metricGpuPower", gpuPower)
+        StateService.set("metricFps", fps)
+        StateService.set("metricDisk", disk)
+        StateService.set("metricColorCpu", colorCpu)
+        StateService.set("metricColorGpu", colorGpu)
+        StateService.set("metricColorFps", colorFps)
+        StateService.set("metricColorRam", colorRam)
+        StateService.set("metricColorDisk", colorDisk)
+
+        SystemResources.notchVersion++
+        SystemResources.saveMetricsConfig()
+        saved = true
+        saveTimer.restart()
+    }
+
+    Timer { id: saveTimer; interval: 2000; onTriggered: saved = false }
+
+    function checkRapl() {
+        const p = Qt.createQmlObject('import Quickshell.Io; Process { running:true; command:["test","-r","/sys/class/powercap/intel-rapl:0/energy_uj"]; onExited:destroy() }', root)
+        if (p) p.exited.connect(function(){ raplOK = (p.exitCode === 0); p.destroy() })
+    }
+
+    function installRapl() {
+        raplBusy = true
+        var d = Quickshell.shellDir
+        var p = Qt.createQmlObject('import Quickshell.Io; Process { running:true; command:["pkexec","sh","-c","cp ' + d + '/config/99-rapl-permissions.rules /etc/udev/rules.d/ \u0026\u0026 udevadm control --reload-rules \u0026\u0026 udevadm trigger"]; onExited:destroy() }', root)
+        if (p) p.exited.connect(function(){ raplBusy=false; if(p.exitCode===0) checkRapl(); p.destroy() })
+        else raplBusy=false
+    }
+
+    function useThemeColors() {
+        colorCpu = String(Styling.srItem("overprimary") || "#5EADFF")
+        colorGpu = String(Colors.cyan || "#84d5c4")
+        colorFps = String(Colors.green || "#6BCB77")
+        colorRam = String(Colors.yellow || Colors.lightYellow || "#F59E0B")
+        colorDisk = String(Colors.magenta || "#C084FC")
+        saveToSystem()
+    }
+
+    function useWallColors() {
+        colorCpu = String(Colors.red || Colors.error || "#FF6B6B")
+        colorGpu = String(Colors.cyan || "#5EADFF")
+        colorFps = String(Colors.yellow || Colors.lightYellow || "#FFD93D")
+        colorRam = String(Colors.green || "#6BCB77")
+        colorDisk = String(Colors.magenta || "#C084FC")
+        saveToSystem()
+    }
+
+    ColumnLayout {
+        id: content
+        width: parent.width
+        spacing: 8
+
+        Text {
+            Layout.fillWidth: true
+            text: "Metrics Setup"
+            font.family: Config.theme.font
+            font.pixelSize: Styling.fontSize(-1)
+            font.weight: Font.Medium
+            color: Colors.overBackground
+        }
+
+        Rectangle { Layout.fillWidth: true; Layout.preferredHeight: 1; color: Colors.outline }
+
+        // ── CPU ──
+        ConfigToggleRow { icon: Icons.cpu; label: "CPU Usage %"; on: root.cpuUsage; onToggled: { root.cpuUsage = v } }
+        ConfigToggleRow { icon: Icons.temperature; label: "CPU Temperature"; on: root.cpuTemp; onToggled: { root.cpuTemp = v } }
+        ConfigToggleRow { icon: Icons.lightning; label: "CPU Power (RAPL)"; on: root.cpuPower; onToggled: { root.cpuPower = v; if(v && !root.raplOK) root.installRapl() } }
+        RowLayout {
+            Layout.leftMargin: 28; visible: root.cpuPower; spacing: 4
+            Text { visible: !root.raplOK; text: "\u26A0"; font.pixelSize: 10; color: Colors.yellow }
+            Text { text: root.raplOK ? "\u2713 RAPL ready" : root.raplBusy ? "Requesting..." : "Needs permission"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-4); color: root.raplOK ? Colors.green : Colors.yellow }
+        }
+        ConfigColorPick { label: "CPU Color"; color: root.colorCpu; visible: root.cpuUsage || root.cpuTemp || root.cpuPower; onPicked: { root.colorCpu = hex } }
+
+        Rectangle { Layout.fillWidth: true; Layout.preferredHeight: 1; color: Colors.outline + "44" }
+
+        // ── GPU ──
+        ConfigToggleRow { icon: Icons.gpu; label: "GPU Usage %"; on: root.gpuUsage; onToggled: { root.gpuUsage = v } }
+        ConfigToggleRow { icon: Icons.temperature; label: "GPU Temperature"; on: root.gpuTemp; onToggled: { root.gpuTemp = v } }
+        ConfigToggleRow { icon: Icons.lightning; label: "GPU Power"; on: root.gpuPower; onToggled: { root.gpuPower = v } }
+        ConfigColorPick { label: "GPU Color"; color: root.colorGpu; visible: root.gpuUsage || root.gpuTemp || root.gpuPower; onPicked: { root.colorGpu = hex } }
+
+
+
+        Rectangle { Layout.fillWidth: true; Layout.preferredHeight: 1; color: Colors.outline + "44" }
+
+        // ── RAM ──
+        ConfigToggleRow { icon: Icons.ram; label: "RAM Usage %"; on: root.ram; onToggled: { root.ram = v } }
+        ConfigColorPick { label: "RAM Color"; color: root.colorRam; visible: root.ram; onPicked: { root.colorRam = hex } }
+
+        Rectangle { Layout.fillWidth: true; Layout.preferredHeight: 1; color: Colors.outline + "44" }
+
+        // ── DISK ──
+        ConfigToggleRow { icon: Icons.disk; label: "Disk Usage %"; on: root.disk; onToggled: { root.disk = v } }
+        ConfigColorPick { label: "Disk Color"; color: root.colorDisk; visible: root.disk; onPicked: { root.colorDisk = hex } }
+
+        // ── FPS ──
+        ConfigToggleRow { icon: Icons.recordScreen; label: "FPS (Built-in)"; on: root.fps; onToggled: { root.fps = v } }
+        ConfigColorPick { label: "FPS Color"; color: root.colorFps; visible: root.fps; onPicked: { root.colorFps = hex } }
+
+        Rectangle { Layout.fillWidth: true; Layout.preferredHeight: 1; color: Colors.outline + "44" }
+
+        // ── Quick Palettes ──
+        Text { text: "Quick Palettes"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-2); font.weight: Font.Medium; color: Colors.overBackground }
+        RowLayout {
+            Layout.fillWidth: true; spacing: 4
+            StyledRect { Layout.preferredHeight: 22; Layout.fillWidth: true; radius: Styling.radius(-4); variant: themeMa.containsMouse ? "focus" : "pane"
+                Text { anchors.centerIn: parent; text: "Theme"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-4); color: Styling.srItem("overprimary") }
+                MouseArea { id: themeMa; anchors.fill: parent; cursorShape: Qt.PointingHandCursor; hoverEnabled: true; onClicked: root.useThemeColors() } }
+            StyledRect { Layout.preferredHeight: 22; Layout.fillWidth: true; radius: Styling.radius(-4); variant: wallMa.containsMouse ? "focus" : "pane"
+                Text { anchors.centerIn: parent; text: "Wallpaper"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-4); color: Colors.overBackground }
+                MouseArea { id: wallMa; anchors.fill: parent; cursorShape: Qt.PointingHandCursor; hoverEnabled: true; onClicked: root.useWallColors() } }
+            StyledRect { Layout.preferredHeight: 22; Layout.fillWidth: true; radius: Styling.radius(-4); variant: resetMa.containsMouse ? "focus" : "pane"
+                Text { anchors.centerIn: parent; text: "Reset"; font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-4); color: Colors.overSurfaceVariant }
+                MouseArea { id: resetMa; anchors.fill: parent; cursorShape: Qt.PointingHandCursor; hoverEnabled: true; onClicked: { root.colorCpu="#5EADFF"; root.colorGpu="#B0B0B0"; root.colorFps="#64FFDA"; root.colorRam="#F59E0B"; root.colorDisk="#C084FC"; root.saveToSystem() } } }
+        }
+
+        Rectangle { Layout.fillWidth: true; Layout.preferredHeight: 1; color: Colors.outline + "44" }
+
+        // ── SAVE BUTTON ──
+        StyledRect {
+            Layout.fillWidth: true; Layout.preferredHeight: 36; radius: Styling.radius(0)
+            variant: saveMa.containsMouse ? "focus" : root.saved ? "primary" : "pane"
+            Text {
+                anchors.centerIn: parent
+                text: root.saved ? "\u2713 Saved!" : "Save & Apply"
+                font.family: Config.theme.font; font.pixelSize: Styling.fontSize(-1); font.weight: Font.Bold
+                color: root.saved ? Colors.green : Styling.srItem("overprimary")
+            }
+            MouseArea {
+                id: saveMa; anchors.fill: parent; cursorShape: Qt.PointingHandCursor; hoverEnabled: true
+                onClicked: root.saveToSystem()
+            }
+        }
+    }
+}
diff --git a/modules/widgets/dashboard/metrics/MetricsTab.qml b/modules/widgets/dashboard/metrics/MetricsTab.qml
old mode 100644
new mode 100755
index 97b91b37..253ddac5
--- a/modules/widgets/dashboard/metrics/MetricsTab.qml
+++ b/modules/widgets/dashboard/metrics/MetricsTab.qml
@@ -194,6 +194,8 @@ Rectangle {
                             fillMode: Image.PreserveAspectCrop
                             smooth: true
                             asynchronous: true
+                            sourceSize.width: 96
+                            sourceSize.height: 96
                             visible: status === Image.Ready
 
                             layer.enabled: true
@@ -350,11 +352,22 @@ Rectangle {
                     }
                 }
 
+                MetricsConfigPanel {
+                    id: metricsConfig
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
+                    visible: root.configMode
+                    onVisibleChanged: { if (visible) metricsConfig.loadFromState() }
+                }
+
                 Flickable {
                     Layout.fillWidth: true
                     Layout.fillHeight: true
                     Layout.leftMargin: 16
                     Layout.rightMargin: 16
+                    visible: !root.configMode
                     contentHeight: resourcesColumn.height
                     clip: true
                     boundsBehavior: Flickable.StopAtBounds
@@ -368,13 +381,15 @@ Rectangle {
                         Column {
                             width: parent.width
                             spacing: 4
+                            visible: SystemResources.cpuUsageEnabled || SystemResources.cpuTempEnabled || SystemResources.cpuPowerEnabled
 
                             ResourceItem {
                                 width: parent.width
                                 icon: Icons.cpu
                                 label: "CPU"
-                                value: SystemResources.cpuUsage / 100
+                                value: SystemResources.cpuUsageEnabled ? SystemResources.cpuUsage / 100 : 0
                                 barColor: Colors.red
+                                visible: SystemResources.cpuUsageEnabled
                             }
 
                             RowLayout {
@@ -395,6 +410,7 @@ Rectangle {
                                 }
 
                                 Text {
+                                    visible: SystemResources.cpuUsageEnabled
                                     text: `${Math.round(SystemResources.cpuUsage)}%`
                                     font.family: Config.theme.font
                                     font.pixelSize: Styling.fontSize(-2)
@@ -403,7 +419,7 @@ Rectangle {
                                 }
 
                                 Text {
-                                    visible: SystemResources.cpuTemp >= 0
+                                    visible: SystemResources.cpuTempEnabled && SystemResources.cpuTemp >= 0
                                     text: Icons.temperature
                                     font.family: Icons.font
                                     font.pixelSize: Styling.fontSize(-2)
@@ -411,7 +427,7 @@ Rectangle {
                                 }
 
                                 Text {
-                                    visible: SystemResources.cpuTemp >= 0
+                                    visible: SystemResources.cpuTempEnabled && SystemResources.cpuTemp >= 0
                                     text: `${SystemResources.cpuTemp}°`
                                     font.family: Config.theme.font
                                     font.pixelSize: Styling.fontSize(-2)
@@ -419,12 +435,40 @@ Rectangle {
                                     color: Colors.overBackground
                                 }
                             }
+
+                            // CPU Power row (RAPL)
+                            RowLayout {
+                                width: parent.width
+                                spacing: 4
+                                visible: SystemResources.cpuPowerEnabled && SystemResources.cpuPower > 0
+
+                                Text {
+                                    text: Icons.lightning
+                                    font.family: Icons.font
+                                    font.pixelSize: Styling.fontSize(-2)
+                                    color: Colors.yellow
+                                }
+
+                                Text {
+                                    text: `${SystemResources.cpuPower.toFixed(1)} W`
+                                    font.family: Config.theme.font
+                                    font.pixelSize: Styling.fontSize(-2)
+                                    font.weight: Font.Medium
+                                    color: Colors.overBackground
+                                }
+
+                                Separator {
+                                    Layout.preferredHeight: 2
+                                    Layout.fillWidth: true
+                                }
+                            }
                         }
 
                         // RAM
                         Column {
                             width: parent.width
                             spacing: 4
+                            visible: SystemResources.ramEnabled
 
                             ResourceItem {
                                 width: parent.width
@@ -468,7 +512,8 @@ Rectangle {
                         // GPUs (if detected) - show one bar per GPU
                         Repeater {
                             id: gpuRepeater
-                            model: SystemResources.gpuDetected ? SystemResources.gpuCount : 0
+                            visible: !root.configMode
+                            model: (SystemResources.gpuDetected && (SystemResources.gpuUsageEnabled || SystemResources.gpuTempEnabled || SystemResources.gpuPowerEnabled)) ? SystemResources.gpuCount : 0
 
                             Column {
                                 required property int index
@@ -569,7 +614,8 @@ Rectangle {
                         // Disks
                         Repeater {
                             id: diskRepeater
-                            model: SystemResources.validDisks
+                            visible: !root.configMode
+                            model: SystemResources.diskEnabled ? SystemResources.validDisks : []
 
                             Column {
                                 required property string modelData
@@ -926,10 +972,11 @@ Rectangle {
                             }
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
@@ -972,10 +1019,11 @@ Rectangle {
                             }
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
@@ -984,4 +1032,49 @@ Rectangle {
             }
         }
     }
-}
+
+    // ═══════════════════════════════════════════════════════════════
+    //  Metrics Configuration — gear toggles inline config
+    // ═══════════════════════════════════════════════════════════════
+
+    property bool configMode: false
+
+    // Gear icon (top-right corner)
+    StyledRect {
+        id: gearBtn
+        anchors.top: parent.top
+        anchors.right: parent.right
+        anchors.topMargin: 8
+        anchors.rightMargin: 8
+        width: 32; height: 32
+        radius: Styling.radius(-4)
+        variant: gearMa.containsMouse ? "focus" : "common"
+        z: 10
+
+        Text {
+            anchors.centerIn: parent
+            text: root.configMode ? Icons.caretLeft : Icons.gear
+            font.family: Icons.font
+            font.pixelSize: 16
+            color: gearMa.containsMouse ? Styling.srItem("overprimary") : Colors.overBackground
+
+            Behavior on color {
+                enabled: Anim.animationsEnabled
+                ColorAnimation { duration: Anim.standardNormal }
+            }
+        }
+
+        MouseArea {
+            id: gearMa
+            anchors.fill: parent
+            cursorShape: Qt.PointingHandCursor
+            hoverEnabled: true
+            onClicked: root.configMode = !root.configMode
+        }
+
+        StyledToolTip {
+            visible: gearMa.containsMouse
+            tooltipText: root.configMode ? "Back to metrics" : "Configure metrics"
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/widgets/dashboard/metrics/ResourceItem.qml b/modules/widgets/dashboard/metrics/ResourceItem.qml
old mode 100644
new mode 100755
index cd6f1782..ffd22298
--- a/modules/widgets/dashboard/metrics/ResourceItem.qml
+++ b/modules/widgets/dashboard/metrics/ResourceItem.qml
@@ -48,10 +48,11 @@ Item {
                 anchors.leftMargin: 4
 
                 Behavior on width {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
diff --git a/modules/widgets/dashboard/notes/NotesTab.qml b/modules/widgets/dashboard/notes/NotesTab.qml
old mode 100644
new mode 100755
index 01e120bc..556b53ac
--- a/modules/widgets/dashboard/notes/NotesTab.qml
+++ b/modules/widgets/dashboard/notes/NotesTab.qml
@@ -1260,10 +1260,11 @@ Item {
                 property bool enableScrollAnimation: true
 
                 Behavior on contentY {
-                    enabled: resultsList.enableScrollAnimation && Config.animDuration > 0
+                    enabled: resultsList.enableScrollAnimation && Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -1307,18 +1308,20 @@ Item {
                     }
 
                     Behavior on y {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
                     Behavior on height {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -1347,10 +1350,11 @@ Item {
                         visible: root.selectedIndex >= 0
 
                         Behavior on color {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             ColorAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
@@ -1380,10 +1384,11 @@ Item {
                     radius: 16
 
                     Behavior on height {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -1492,19 +1497,21 @@ Item {
                                 x: isInDeleteMode ? 0 : 80
 
                                 Behavior on x {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     NumberAnimation {
-                                        duration: Config.animDuration
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardNormal
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
 
                             Behavior on opacity {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutQuart
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
@@ -1534,17 +1541,19 @@ Item {
                                 height: 32 - activeButtonMargin * 2
 
                                 Behavior on idx1X {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     NumberAnimation {
-                                        duration: Config.animDuration / 3
-                                        easing.type: Easing.OutSine
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                     }
                                 }
                                 Behavior on idx2X {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     NumberAnimation {
-                                        duration: Config.animDuration
-                                        easing.type: Easing.OutSine
+                                        duration: Anim.standardNormal
+                                        easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                     }
                                 }
                             }
@@ -1579,10 +1588,11 @@ Item {
                                         textFormat: Text.RichText
 
                                         Behavior on color {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             ColorAnimation {
-                                                duration: Config.animDuration / 2
-                                                easing.type: Easing.OutQuart
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                             }
                                         }
                                     }
@@ -1613,10 +1623,11 @@ Item {
                                         textFormat: Text.RichText
 
                                         Behavior on color {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             ColorAnimation {
-                                                duration: Config.animDuration / 2
-                                                easing.type: Easing.OutQuart
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                             }
                                         }
                                     }
@@ -1637,10 +1648,11 @@ Item {
                         spacing: 8
 
                         Behavior on anchors.rightMargin {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -1713,10 +1725,11 @@ Item {
                                     elide: Text.ElideRight
 
                                     Behavior on color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
@@ -1797,19 +1810,21 @@ Item {
                             x: isInRenameMode ? 0 : 80
 
                             Behavior on x {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutQuart
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -1839,17 +1854,19 @@ Item {
                             height: 32 - activeButtonMargin * 2
 
                             Behavior on idx1X {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration / 3
-                                    easing.type: Easing.OutSine
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                 }
                             }
                             Behavior on idx2X {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutSine
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                 }
                             }
                         }
@@ -1885,10 +1902,11 @@ Item {
                                     textFormat: Text.RichText
 
                                     Behavior on color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
@@ -1920,10 +1938,11 @@ Item {
                                     textFormat: Text.RichText
 
                                     Behavior on color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
@@ -1945,10 +1964,11 @@ Item {
                         opacity: (isExpanded && !isInDeleteMode && !isInRenameMode) ? 1 : 0
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -2014,10 +2034,11 @@ Item {
                             radius: Styling.radius(0)
 
                             Behavior on Layout.preferredHeight {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutQuart
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
@@ -2053,17 +2074,18 @@ Item {
                                     z: -1
 
                                     Behavior on opacity {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
 
-                                highlightMoveDuration: Config.animDuration > 0 ? Config.animDuration / 2 : 0
+                                highlightMoveDuration: Anim.animationsEnabled ? Anim.standardSmall : 0
                                 highlightMoveVelocity: -1
-                                highlightResizeDuration: Config.animDuration / 2
+                                highlightResizeDuration: Anim.standardSmall
                                 highlightResizeVelocity: -1
 
                                 delegate: Item {
@@ -2103,10 +2125,11 @@ Item {
                                                 }
 
                                                 Behavior on color {
-                                                    enabled: Config.animDuration > 0
+                                                    enabled: Anim.animationsEnabled
                                                     ColorAnimation {
-                                                        duration: Config.animDuration / 2
-                                                        easing.type: Easing.OutQuart
+                                                        duration: Anim.standardSmall
+                                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                     }
                                                 }
                                             }
@@ -2127,10 +2150,11 @@ Item {
                                                 maximumLineCount: 1
 
                                                 Behavior on color {
-                                                    enabled: Config.animDuration > 0
+                                                    enabled: Anim.animationsEnabled
                                                     ColorAnimation {
-                                                        duration: Config.animDuration / 2
-                                                        easing.type: Easing.OutQuart
+                                                        duration: Anim.standardSmall
+                                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                     }
                                                 }
                                             }
diff --git a/modules/widgets/dashboard/notes/notes_utils.js b/modules/widgets/dashboard/notes/notes_utils.js
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/tmux/TmuxTab.qml b/modules/widgets/dashboard/tmux/TmuxTab.qml
old mode 100644
new mode 100755
index 7db449df..0da9d067
--- a/modules/widgets/dashboard/tmux/TmuxTab.qml
+++ b/modules/widgets/dashboard/tmux/TmuxTab.qml
@@ -365,10 +365,11 @@ Item {
     }
 
     Behavior on height {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -775,10 +776,11 @@ Item {
                 property bool enableScrollAnimation: true
 
                 Behavior on contentY {
-                    enabled: Config.animDuration > 0 && resultsList.enableScrollAnimation && !resultsList.moving
+                    enabled: Anim.animationsEnabled && resultsList.enableScrollAnimation && !resultsList.moving
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -838,18 +840,20 @@ Item {
                     radius: 16
 
                     Behavior on y {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
                     Behavior on height {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                     clip: true
@@ -1007,10 +1011,11 @@ Item {
                         opacity: (isExpanded && !isInDeleteMode && !isInRenameMode) ? 1 : 0
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -1021,10 +1026,11 @@ Item {
                             radius: Styling.radius(0)
 
                             Behavior on Layout.preferredHeight {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutQuart
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
@@ -1090,17 +1096,18 @@ Item {
                                     z: -1
 
                                     Behavior on opacity {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
 
-                                highlightMoveDuration: Config.animDuration > 0 ? Config.animDuration / 2 : 0
+                                highlightMoveDuration: Anim.animationsEnabled ? Anim.standardSmall : 0
                                 highlightMoveVelocity: -1
-                                highlightResizeDuration: Config.animDuration / 2
+                                highlightResizeDuration: Anim.standardSmall
                                 highlightResizeVelocity: -1
 
                                 delegate: Item {
@@ -1140,10 +1147,11 @@ Item {
                                                 }
 
                                                 Behavior on color {
-                                                    enabled: Config.animDuration > 0
+                                                    enabled: Anim.animationsEnabled
                                                     ColorAnimation {
-                                                        duration: Config.animDuration / 2
-                                                        easing.type: Easing.OutQuart
+                                                        duration: Anim.standardSmall
+                                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                     }
                                                 }
                                             }
@@ -1164,10 +1172,11 @@ Item {
                                                 maximumLineCount: 1
 
                                                 Behavior on color {
-                                                    enabled: Config.animDuration > 0
+                                                    enabled: Anim.animationsEnabled
                                                     ColorAnimation {
-                                                        duration: Config.animDuration / 2
-                                                        easing.type: Easing.OutQuart
+                                                        duration: Anim.standardSmall
+                                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                     }
                                                 }
                                             }
@@ -1212,19 +1221,21 @@ Item {
                             x: isInRenameMode ? 0 : 80
 
                             Behavior on x {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutQuart
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -1254,17 +1265,19 @@ Item {
                             height: 32 - activeButtonMargin * 2
 
                             Behavior on idx1X {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration / 3
-                                    easing.type: Easing.OutSine
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                 }
                             }
                             Behavior on idx2X {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutSine
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                 }
                             }
                         }
@@ -1306,10 +1319,11 @@ Item {
                                     textFormat: Text.RichText
 
                                     Behavior on color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
@@ -1344,10 +1358,11 @@ Item {
                                     textFormat: Text.RichText
 
                                     Behavior on color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
@@ -1366,10 +1381,11 @@ Item {
                         spacing: 8
 
                         Behavior on anchors.rightMargin {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -1508,19 +1524,21 @@ Item {
                             x: isInDeleteMode ? 0 : 80
 
                             Behavior on x {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutQuart
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -1550,17 +1568,19 @@ Item {
                             height: 32 - activeButtonMargin * 2
 
                             Behavior on idx1X {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration / 3
-                                    easing.type: Easing.OutSine
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                 }
                             }
                             Behavior on idx2X {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
-                                    duration: Config.animDuration
-                                    easing.type: Easing.OutSine
+                                    duration: Anim.standardNormal
+                                    easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                                 }
                             }
                         }
@@ -1602,10 +1622,11 @@ Item {
                                     textFormat: Text.RichText
 
                                     Behavior on color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
@@ -1640,10 +1661,11 @@ Item {
                                     textFormat: Text.RichText
 
                                     Behavior on color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
@@ -1679,18 +1701,20 @@ Item {
                     }
 
                     Behavior on y {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
                     Behavior on height {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -1722,18 +1746,20 @@ Item {
                         visible: root.selectedIndex >= 0
 
                         Behavior on color {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             ColorAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration / 2
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
@@ -1920,18 +1946,20 @@ Item {
                                     radius: paneRect.radius
 
                                     Behavior on border.width {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
 
                                     Behavior on border.color {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         ColorAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
@@ -1954,10 +1982,11 @@ Item {
                                         visible: parent.parent.height > 35
 
                                         Behavior on color {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             ColorAnimation {
-                                                duration: Config.animDuration / 2
-                                                easing.type: Easing.OutQuart
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                             }
                                         }
                                     }
@@ -1973,10 +2002,11 @@ Item {
                                         visible: parent.parent.height > 70
 
                                         Behavior on color {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             ColorAnimation {
-                                                duration: Config.animDuration / 2
-                                                easing.type: Easing.OutQuart
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                             }
                                         }
                                     }
@@ -2135,10 +2165,11 @@ Item {
                                             color: modelData.active ? Colors.overPrimary : Colors.overSurface
 
                                             Behavior on color {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 ColorAnimation {
-                                                    duration: Config.animDuration / 2
-                                                    easing.type: Easing.OutQuart
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
                                         }
diff --git a/modules/widgets/dashboard/wallpapers/FilterBar.qml b/modules/widgets/dashboard/wallpapers/FilterBar.qml
old mode 100644
new mode 100755
index eec82f0a..cf7e2be1
--- a/modules/widgets/dashboard/wallpapers/FilterBar.qml
+++ b/modules/widgets/dashboard/wallpapers/FilterBar.qml
@@ -151,8 +151,9 @@ FocusScope {
         // Animación suave para el scroll programático
         NumberAnimation on contentX {
             id: scrollAnimation
-            duration: Config.animDuration / 2
-            easing.type: Easing.OutQuart
+            duration: Anim.standardSmall
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
 
         // Modelo de filtros
@@ -271,19 +272,21 @@ FocusScope {
                                     opacity: isActive ? 1 : 0
 
                                     Behavior on opacity {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration / 3
-                                            easing.type: Easing.OutCubic
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
                                 }
 
                                 Behavior on width {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     NumberAnimation {
-                                        duration: Config.animDuration / 3
-                                        easing.type: Easing.OutCubic
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -296,10 +299,11 @@ FocusScope {
                                 color: filterTag.item
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 3
-                                        easing.type: Easing.OutCubic
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -330,10 +334,11 @@ FocusScope {
                     }
 
                     Behavior on width {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 3
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
diff --git a/modules/widgets/dashboard/wallpapers/SchemeSelector.qml b/modules/widgets/dashboard/wallpapers/SchemeSelector.qml
old mode 100644
new mode 100755
index b47a2f02..b90e3a08
--- a/modules/widgets/dashboard/wallpapers/SchemeSelector.qml
+++ b/modules/widgets/dashboard/wallpapers/SchemeSelector.qml
@@ -150,10 +150,11 @@ Item {
     implicitHeight: schemeListExpanded ? 40 + 4 + (40 * 3) + 8 : 48
 
     Behavior on implicitHeight {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -323,10 +324,11 @@ Item {
                             anchors.verticalCenter: parent.verticalCenter
 
                             Behavior on x {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
                                     duration: 200
-                                    easing.type: Easing.OutCubic
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
@@ -401,10 +403,11 @@ Item {
                                 leftPadding: 8
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -440,34 +443,37 @@ Item {
                             z: -1
                         }
 
-                        highlightMoveDuration: Config.animDuration > 0 ? Config.animDuration / 2 : 0
+                        highlightMoveDuration: Anim.animationsEnabled ? Anim.standardSmall : 0
                         highlightMoveVelocity: -1
-                        highlightResizeDuration: Config.animDuration / 2
+                        highlightResizeDuration: Anim.standardSmall
                         highlightResizeVelocity: -1
                     }
 
                     // Animate topMargin for ClippingRectangle
                     Behavior on Layout.topMargin {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
                     Behavior on Layout.preferredHeight {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
                     Behavior on opacity {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
diff --git a/modules/widgets/dashboard/wallpapers/Wallpaper.qml b/modules/widgets/dashboard/wallpapers/Wallpaper.qml
old mode 100644
new mode 100755
index 852359ef..8aab3736
--- a/modules/widgets/dashboard/wallpapers/Wallpaper.qml
+++ b/modules/widgets/dashboard/wallpapers/Wallpaper.qml
@@ -1,11 +1,11 @@
 import QtQuick
+import QtMultimedia
 import Quickshell
 import Quickshell.Wayland
 import Quickshell.Io
 import qs.modules.globals
 import qs.modules.theme
 import qs.config
-import "MpvShaderGenerator.js" as ShaderGenerator
 
 PanelWindow {
     id: wallpaper
@@ -24,10 +24,23 @@ PanelWindow {
     color: "transparent"
 
     property string wallpaperDir: wallpaperConfig.adapter.wallPath
-    property string fallbackDir: decodeURIComponent(Qt.resolvedUrl("../../../../assets/wallpapers_example").toString().replace("file://", ""))
+    property string fallbackDir: decodeURIComponent(Qt.resolvedUrl("../../../../assets/ambxst-wallpapers").toString().replace("file://", ""))
     property var wallpaperPaths: []
     property var subfolderFilters: []
     property var allSubdirs: []
+
+    // Custom palette loaded from JSON file
+    property var customPalette: []
+    property int customPaletteSize: 0
+
+    // Default palette (optimizedPalette) as fallback
+    readonly property var fallbackPalette: optimizedPalette
+    readonly property int fallbackPaletteSize: optimizedPalette.length
+
+    // Effective palette that will be used in the shader
+    readonly property var effectivePalette: customPaletteSize > 0 ? customPalette : fallbackPalette
+    readonly property int effectivePaletteSize: customPaletteSize > 0 ? customPaletteSize : fallbackPaletteSize
+
     property int currentIndex: 0
     property string currentWallpaper: initialLoadCompleted && wallpaperPaths.length > 0 ? wallpaperPaths[currentIndex] : ""
     property bool initialLoadCompleted: false
@@ -38,16 +51,23 @@ PanelWindow {
     property string effectiveWallpaper: perScreenWallpapers[currentScreenName] || currentWallpaper
     property string currentScreenName: wallpaper.screen ? wallpaper.screen.name : ""
     property alias tintEnabled: wallpaperAdapter.tintEnabled
+    property alias interpolationEnabled: wallpaperAdapter.interpolationEnabled
+    property alias interpolationMultiplier: wallpaperAdapter.interpolationMultiplier
+    property alias targetInputFps: wallpaperAdapter.targetInputFps
     property int thumbnailsVersion: 0
 
-    // QUICKSHELL-GIT: property string mpvShaderDir: Quickshell.cacheDir + "/mpv_shaders_" + (currentScreenName ? currentScreenName : "ALL")
-    property string mpvShaderDir: Quickshell.env("HOME") + "/.cache/ambxst/mpv_shaders_" + (currentScreenName ? currentScreenName : "ALL")
-    property string mpvShaderPath: ""
-    property bool mpvShaderReady: false
-
-    readonly property var optimizedPalette: ["background", "overBackground", "shadow", "surface", "surfaceBright", "surfaceDim", "surfaceContainer", "surfaceContainerHigh", "surfaceContainerHighest", "surfaceContainerLow", "surfaceContainerLowest", "primary", "secondary", "tertiary", "red", "lightRed", "green", "lightGreen", "blue", "lightBlue", "yellow", "lightYellow", "cyan", "lightCyan", "magenta", "lightMagenta"]
-
-    // Sync state from the primary wallpaper manager to secondary instances
+    // Optimized palette color names (used as fallback)
+    readonly property var optimizedPalette: [
+        "background", "overBackground", "shadow", "surface", "surfaceBright", "surfaceDim",
+        "surfaceContainer", "surfaceContainerHigh", "surfaceContainerHighest",
+        "surfaceContainerLow", "surfaceContainerLowest", "primary", "secondary", "tertiary",
+        "red", "lightRed", "green", "lightGreen", "blue", "lightBlue", "yellow", "lightYellow",
+        "cyan", "lightCyan", "magenta", "lightMagenta"
+    ]
+
+    // -------------------------------------------------------------------
+    // Bindings to sync state from primary wallpaper manager
+    // -------------------------------------------------------------------
     Binding {
         target: wallpaper
         property: "wallpaperPaths"
@@ -76,6 +96,9 @@ PanelWindow {
         when: GlobalStates.wallpaperManager !== null && GlobalStates.wallpaperManager !== wallpaper
     }
 
+    // -------------------------------------------------------------------
+    // Color presets
+    // -------------------------------------------------------------------
     property string colorPresetsDir: Quickshell.env("HOME") + "/.config/ambxst/colors"
     property string officialColorPresetsDir: decodeURIComponent(Qt.resolvedUrl("../../../../assets/colors").toString().replace("file://", ""))
     onColorPresetsDirChanged: console.log("Color Presets Directory:", colorPresetsDir)
@@ -83,7 +106,6 @@ PanelWindow {
     onColorPresetsChanged: console.log("Color Presets Updated:", colorPresets)
     property string activeColorPreset: wallpaperConfig.adapter.activeColorPreset || ""
 
-    // React to light/dark mode changes
     property bool isLightMode: Config.theme.lightMode
     onIsLightModeChanged: {
         if (activeColorPreset) {
@@ -106,19 +128,14 @@ PanelWindow {
     }
 
     function applyColorPreset() {
-        if (!activeColorPreset)
-            return;
+        if (!activeColorPreset) return;
 
         var mode = Config.theme.lightMode ? "light.json" : "dark.json";
-
         var officialFile = officialColorPresetsDir + "/" + activeColorPreset + "/" + mode;
         var userFile = colorPresetsDir + "/" + activeColorPreset + "/" + mode;
-        // QUICKSHELL-GIT: var dest = Quickshell.cachePath("colors.json");
         var dest = Quickshell.env("HOME") + "/.cache/ambxst/colors.json";
 
-        // Try official first, then user. Use bash conditional.
         var cmd = "if [ -f '" + officialFile + "' ]; then cp '" + officialFile + "' '" + dest + "'; else cp '" + userFile + "' '" + dest + "'; fi";
-
         console.log("Applying color preset:", activeColorPreset);
         applyPresetProcess.command = ["bash", "-c", cmd];
         applyPresetProcess.running = true;
@@ -126,10 +143,11 @@ PanelWindow {
 
     function setColorPreset(name) {
         wallpaperConfig.adapter.activeColorPreset = name;
-    // activeColorPreset property will update automatically via binding to adapter
     }
 
-    // Funciones utilitarias para tipos de archivo
+    // -------------------------------------------------------------------
+    // Utility functions for file types
+    // -------------------------------------------------------------------
     function getFileType(path) {
         var extension = path.toLowerCase().split('.').pop();
         if (['jpg', 'jpeg', 'png', 'webp', 'tif', 'tiff', 'bmp'].includes(extension)) {
@@ -143,68 +161,39 @@ PanelWindow {
     }
 
     function getThumbnailPath(filePath) {
-        // Compute relative path from wallpaperDir
         var basePath = wallpaperDir.endsWith("/") ? wallpaperDir : wallpaperDir + "/";
         var relativePath = filePath.replace(basePath, "");
-
-        // Replace the filename with .jpg extension
         var pathParts = relativePath.split('/');
         var fileName = pathParts.pop();
         var thumbnailName = fileName + ".jpg";
         var relativeDir = pathParts.join('/');
-
-        // Build the proxy path
-        // QUICKSHELL-GIT: var thumbnailPath = Quickshell.cacheDir + "/thumbnails/" + relativeDir + "/" + thumbnailName;
-        var thumbnailPath = Quickshell.env("HOME") + "/.cache/ambxst" + "/thumbnails/" + relativeDir + "/" + thumbnailName;
-        return thumbnailPath;
+        return Quickshell.env("HOME") + "/.cache/ambxst/thumbnails/" + relativeDir + "/" + thumbnailName;
     }
 
     function getDisplaySource(filePath) {
         var fileType = getFileType(filePath);
-
-        // Para el display (WallpapersTab), siempre usar thumbnails si están disponibles
         if (fileType === 'video' || fileType === 'image' || fileType === 'gif') {
-            var thumbnailPath = getThumbnailPath(filePath);
-            // Verificar si el thumbnail existe (esto es solo para debugging, QML manejará el fallback)
-            return thumbnailPath;
+            return getThumbnailPath(filePath);
         }
-
-        // Fallback al archivo original si no es un tipo soportado
         return filePath;
     }
 
     function getColorSource(filePath) {
         var fileType = getFileType(filePath);
-
-        // Para generación de colores: solo videos usan thumbnails
         if (fileType === 'video') {
             return getThumbnailPath(filePath);
         }
-
-        // Imágenes y GIFs usan el archivo original para colores
         return filePath;
     }
 
     function getLockscreenFramePath(filePath) {
-        if (!filePath) {
-            return "";
-        }
-
+        if (!filePath) return "";
         var fileType = getFileType(filePath);
-
-        // Para imágenes estáticas, usar el archivo original
-        if (fileType === 'image') {
-            return filePath;
-        }
-
-        // Para videos y GIFs, usar el frame cacheado
+        if (fileType === 'image') return filePath;
         if (fileType === 'video' || fileType === 'gif') {
             var fileName = filePath.split('/').pop();
-            // QUICKSHELL-GIT: var cachePath = Quickshell.cacheDir + "/lockscreen/" + fileName + ".jpg";
-            var cachePath = Quickshell.env("HOME") + "/.cache/ambxst" + "/lockscreen/" + fileName + ".jpg";
-            return cachePath;
+            return Quickshell.env("HOME") + "/.cache/ambxst/lockscreen/" + fileName + ".jpg";
         }
-
         return filePath;
     }
 
@@ -213,15 +202,10 @@ PanelWindow {
             console.warn("generateLockscreenFrame: empty filePath");
             return;
         }
-
         console.log("Generating lockscreen frame for:", filePath);
-
         var scriptPath = decodeURIComponent(Qt.resolvedUrl("../../../../scripts/lockwall.py").toString().replace("file://", ""));
-        // QUICKSHELL-GIT: var dataPath = Quickshell.cacheDir;
         var dataPath = Quickshell.env("HOME") + "/.cache/ambxst";
-
         lockscreenWallpaperScript.command = ["python3", scriptPath, filePath, dataPath];
-
         lockscreenWallpaperScript.running = true;
     }
 
@@ -229,58 +213,92 @@ PanelWindow {
         var basePath = wallpaperDir.endsWith("/") ? wallpaperDir : wallpaperDir + "/";
         var relativePath = filePath.replace(basePath, "");
         var parts = relativePath.split("/");
-        if (parts.length > 1) {
-            return parts[0];
-        }
+        if (parts.length > 1) return parts[0];
         return "";
     }
 
+    // -------------------------------------------------------------------
+    // Palette loading
+    // -------------------------------------------------------------------
+    function loadCustomPalette(filePath) {
+        if (!filePath) return;
+        // Vaciar paleta actual para usar fallback mientras se carga la nueva
+        customPalette = [];
+        customPaletteSize = 0;
+        var palettePath = getPalettePath(filePath);
+        var xhr = new XMLHttpRequest();
+        xhr.open("GET", "file://" + palettePath, true);
+        xhr.onreadystatechange = function() {
+            if (xhr.readyState === XMLHttpRequest.DONE) {
+                if (xhr.status === 200) {
+                    try {
+                        var data = JSON.parse(xhr.responseText);
+                        customPalette = data.colors;
+                        customPaletteSize = data.size;
+                        console.log("Palette loaded:", customPaletteSize, "colors - First:", customPalette[0]);
+                    } catch (e) {
+                        console.warn("Failed to parse palette:", palettePath, e);
+                        fallbackToDefaultPalette();
+                    }
+                } else {
+                    console.warn("Palette file not found (status " + xhr.status + "):", palettePath);
+                    fallbackToDefaultPalette();
+                }
+            }
+        };
+        xhr.send();
+    }
+
+    function fallbackToDefaultPalette() {
+        customPalette = [];
+        customPaletteSize = 0;
+    }
+
+    function getPalettePath(filePath) {
+        var basePath = wallpaperDir.endsWith("/") ? wallpaperDir : wallpaperDir + "/";
+        var relativePath = filePath.replace(basePath, "");
+        return Quickshell.env("HOME") + "/.cache/ambxst/palettes/" + relativePath + ".json";
+    }
+
     function scanSubfolders() {
-        if (!wallpaperDir)
-            return;
-        // Explicitly update command with current wallpaperDir
+        if (!wallpaperDir) return;
         var cmd = ["find", wallpaperDir, "-mindepth", "1", "-name", ".*", "-prune", "-o", "-type", "d", "-print"];
         scanSubfoldersProcess.command = cmd;
         scanSubfoldersProcess.running = true;
     }
 
-    // Update directory watcher when wallpaperDir changes
     onWallpaperDirChanged: {
-        // Skip initial spurious changes before config is loaded
-        if (!_wallpaperDirInitialized)
-            return;
-
-        // Only the primary wallpaper manager should handle directory changes
-        if (GlobalStates.wallpaperManager !== wallpaper)
-            return;
+        if (!_wallpaperDirInitialized) return;
+        if (GlobalStates.wallpaperManager !== wallpaper) return;
 
         console.log("Wallpaper directory changed to:", wallpaperDir);
         usingFallback = false;
-
-        // Clear current lists to reflect change immediately
         wallpaperPaths = [];
         subfolderFilters = [];
-
         directoryWatcher.path = wallpaperDir;
 
-        // Force update scan command
-        var cmd = ["find", wallpaperDir, "-name", ".*", "-prune", "-o", "-type", "f", "(", "-name", "*.jpg", "-o", "-name", "*.jpeg", "-o", "-name", "*.png", "-o", "-name", "*.webp", "-o", "-name", "*.tif", "-o", "-name", "*.tiff", "-o", "-name", "*.gif", "-o", "-name", "*.mp4", "-o", "-name", "*.webm", "-o", "-name", "*.mov", "-o", "-name", "*.avi", "-o", "-name", "*.mkv", ")", "-print"];
+        var cmd = ["find", wallpaperDir, "-name", ".*", "-prune", "-o", "-type", "f",
+            "(", "-name", "*.jpg", "-o", "-name", "*.jpeg", "-o", "-name", "*.png",
+            "-o", "-name", "*.webp", "-o", "-name", "*.tif", "-o", "-name", "*.tiff",
+            "-o", "-name", "*.gif", "-o", "-name", "*.mp4", "-o", "-name", "*.webm",
+            "-o", "-name", "*.mov", "-o", "-name", "*.avi", "-o", "-name", "*.mkv", ")", "-print"];
         scanWallpapers.command = cmd;
         scanWallpapers.running = true;
-
         scanSubfolders();
 
-        // Regenerate thumbnails for the new directory (delayed)
         if (delayedThumbnailGen.running)
             delayedThumbnailGen.restart();
         else
             delayedThumbnailGen.start();
     }
 
-    onCurrentWallpaperChanged:
-    // Matugen se ejecuta manualmente en las funciones de cambio
-    {}
+    onCurrentWallpaperChanged: {
+        // Matugen is executed manually in change functions
+    }
 
+    // -------------------------------------------------------------------
+    // Wallpaper control functions
+    // -------------------------------------------------------------------
     function setWallpaper(path, targetScreen = null) {
         if (GlobalStates.wallpaperManager && GlobalStates.wallpaperManager !== wallpaper) {
             GlobalStates.wallpaperManager.setWallpaper(path, targetScreen);
@@ -292,29 +310,28 @@ PanelWindow {
         var pathIndex = wallpaperPaths.indexOf(path);
         if (pathIndex !== -1) {
             if (targetScreen) {
-                // If targeting a specific screen, save to perScreenWallpapers instead of currentWall
                 let perScreen = Object.assign({}, wallpaperConfig.adapter.perScreenWallpapers || {});
                 perScreen[targetScreen] = path;
                 wallpaperConfig.adapter.perScreenWallpapers = perScreen;
-                
-                // If this targetScreen is the primary screen, it must update currentWall
-                // because currentWall is exactly the primary monitor fallback.
+
                 let isPrimary = false;
                 if (GlobalStates.wallpaperManager && GlobalStates.wallpaperManager.screen) {
                     isPrimary = (targetScreen === GlobalStates.wallpaperManager.screen.name);
                 }
-
                 if (isPrimary || !wallpaperConfig.adapter.currentWall) {
                     currentIndex = pathIndex;
                     wallpaperConfig.adapter.currentWall = path;
                     currentWallpaper = path;
+                    loadCustomPalette(path);
+                    generateLockscreenFrame(path);
                     runMatugenForCurrentWallpaper();
                 }
             } else {
-                // Global fallback target
                 currentIndex = pathIndex;
                 wallpaperConfig.adapter.currentWall = path;
                 currentWallpaper = path;
+                loadCustomPalette(path);
+                generateLockscreenFrame(path);
                 runMatugenForCurrentWallpaper();
             }
             generateLockscreenFrame(path);
@@ -328,7 +345,6 @@ PanelWindow {
             GlobalStates.wallpaperManager.clearPerScreenWallpaper(targetScreen);
             return;
         }
-        
         console.log("Clearing per-screen wallpaper for:", targetScreen);
         let perScreen = Object.assign({}, wallpaperConfig.adapter.perScreenWallpapers || {});
         if (perScreen[targetScreen]) {
@@ -342,9 +358,7 @@ PanelWindow {
             GlobalStates.wallpaperManager.nextWallpaper();
             return;
         }
-
-        if (wallpaperPaths.length === 0)
-            return;
+        if (wallpaperPaths.length === 0) return;
         initialLoadCompleted = true;
         currentIndex = (currentIndex + 1) % wallpaperPaths.length;
         currentWallpaper = wallpaperPaths[currentIndex];
@@ -358,9 +372,7 @@ PanelWindow {
             GlobalStates.wallpaperManager.previousWallpaper();
             return;
         }
-
-        if (wallpaperPaths.length === 0)
-            return;
+        if (wallpaperPaths.length === 0) return;
         initialLoadCompleted = true;
         currentIndex = currentIndex === 0 ? wallpaperPaths.length - 1 : currentIndex - 1;
         currentWallpaper = wallpaperPaths[currentIndex];
@@ -374,7 +386,6 @@ PanelWindow {
             GlobalStates.wallpaperManager.setWallpaperByIndex(index);
             return;
         }
-
         if (index >= 0 && index < wallpaperPaths.length) {
             initialLoadCompleted = true;
             currentIndex = index;
@@ -385,10 +396,8 @@ PanelWindow {
         }
     }
 
-    // Función para re-ejecutar Matugen con el wallpaper actual
     function setMatugenScheme(scheme) {
         wallpaperConfig.adapter.matugenScheme = scheme;
-
         if (wallpaperConfig.adapter.activeColorPreset) {
             console.log("Switching to Matugen scheme, clearing preset");
             wallpaperConfig.adapter.activeColorPreset = "";
@@ -397,294 +406,74 @@ PanelWindow {
         }
     }
 
-    // property string mpvSocket: "/tmp/ambxst_mpv_socket"
-    property string mpvSocket: "/tmp/ambxst_mpv_socket_" + (currentScreenName ? currentScreenName : "ALL")
-
     function runMatugenForCurrentWallpaper() {
         if (activeColorPreset) {
             console.log("Skipping Matugen because color preset is active:", activeColorPreset);
             return;
         }
-
         if (currentWallpaper && initialLoadCompleted) {
+            // No regenerar si el wallpaper Y el scheme no han cambiado
+            var lastWallpaper = wallpaperConfig.adapter.lastMatugenWallpaper || "";
+            var lastScheme = wallpaperConfig.adapter.lastMatugenScheme || "";
+            var currentScheme = wallpaperConfig.adapter.matugenScheme;
+            if (lastWallpaper === currentWallpaper && lastScheme === currentScheme) {
+                console.log("Skipping Matugen — wallpaper unchanged since last generation");
+                return;
+            }
+            
             console.log("Running Matugen for current wallpaper:", currentWallpaper);
-
             var fileType = getFileType(currentWallpaper);
             var matugenSource = getColorSource(currentWallpaper);
-
             console.log("Using source for matugen:", matugenSource, "(type:", fileType + ")");
 
-            // Stop existing processes if running to prioritize new request
-            if (matugenProcessWithConfig.running) {
-                matugenProcessWithConfig.running = false;
-            }
-            if (matugenProcessNormal.running) {
-                matugenProcessNormal.running = false;
-            }
+            if (matugenProcessWithConfig.running) matugenProcessWithConfig.running = false;
+            if (matugenProcessNormal.running) matugenProcessNormal.running = false;
 
-            // Ejecutar matugen con configuración específica
-            var commandWithConfig = ["matugen", "image", matugenSource, "--source-color-index", "0", "-c", decodeURIComponent(Qt.resolvedUrl("../../../../assets/matugen/config.toml").toString().replace("file://", "")), "-t", wallpaperConfig.adapter.matugenScheme];
-            if (Config.theme.lightMode) {
-                commandWithConfig.push("-m", "light");
-            }
+            var commandWithConfig = ["matugen", "image", matugenSource, "--source-color-index", "0",
+                "-c", decodeURIComponent(Qt.resolvedUrl("../../../../assets/matugen/config.toml").toString().replace("file://", "")),
+                "-t", wallpaperConfig.adapter.matugenScheme];
+            if (Config.theme.lightMode) commandWithConfig.push("-m", "light");
             matugenProcessWithConfig.command = commandWithConfig;
             matugenProcessWithConfig.running = true;
 
-            // Ejecutar matugen normal en paralelo
-            var commandNormal = ["matugen", "image", matugenSource, "--source-color-index", "0", "-t", wallpaperConfig.adapter.matugenScheme];
-            if (Config.theme.lightMode) {
-                commandNormal.push("-m", "light");
-            }
+            var commandNormal = ["matugen", "image", matugenSource, "--source-color-index", "0",
+                "-t", wallpaperConfig.adapter.matugenScheme];
+            if (Config.theme.lightMode) commandNormal.push("-m", "light");
             matugenProcessNormal.command = commandNormal;
             matugenProcessNormal.running = true;
-        }
-    }
-
-    function updateMpvRuntime(enable) {
-        var cmdString;
-        if (enable) {
-            // Since we are using unique filenames, we can just set the new path.
-            // MPV will handle the switch smoothly and won't use cached versions.
-            var setCmd = JSON.stringify({
-                "command": ["set_property", "glsl-shaders", mpvShaderPath]
-            });
-            cmdString = "echo '" + setCmd + "' | socat - " + mpvSocket;
-        } else {
-            // Clear shaders
-            var jsonCmd = JSON.stringify({
-                "command": ["set_property", "glsl-shaders", ""]
-            });
-            cmdString = "echo '" + jsonCmd + "' | socat - " + mpvSocket;
-        }
-
-        mpvIpcProcess.command = ["bash", "-c", cmdString];
-        mpvIpcProcess.running = true;
-    }
-
-    function requestVideoSync() {
-        if (GlobalStates.wallpaperManager !== wallpaper) {
-            if (GlobalStates.wallpaperManager) {
-                GlobalStates.wallpaperManager.requestVideoSync();
-            }
-            return;
-        }
-        videoSyncTimer.restart();
-    }
-
-    Timer {
-        id: videoSyncTimer
-        interval: 1200 // give mpvpaper processes time to spawn and initialize
-        repeat: false
-        onTriggered: {
-            console.log("Broadcasting video sync to all mpvpaper sockets...");
-            mpvSyncProcess.running = true;
-        }
-    }
-
-    Process {
-        id: mpvSyncProcess
-        running: false
-        command: ["bash", "-c", "for sock in /tmp/ambxst_mpv_socket_*; do echo '{ \"command\": [\"set_property\", \"time-pos\", 0] }' | socat - \"$sock\" 2>/dev/null; done"]
-        onExited: code => {
-            console.log("Video sync broadcast completed with code:", code);
-        }
-    }
-
-    function updateMpvShader() {
-        if (getFileType(effectiveWallpaper) !== "video") {
-            return;
-        }
-        if (!wallpaperAdapter.tintEnabled) {
-            updateMpvRuntime(false);
-            return;
-        }
-
-        var colors = [];
-        // Log the first color to see if it changed
-        var firstColorRaw = Colors[optimizedPalette[0]];
-        console.log("Generating MPV shader. First palette color (" + optimizedPalette[0] + "):", firstColorRaw);
-
-        for (var i = 0; i < optimizedPalette.length; i++) {
-            var rawColor = Colors[optimizedPalette[i]];
-            if (rawColor) {
-                var c = Qt.darker(rawColor, 1.0);
-                if (c && !isNaN(c.r) && !isNaN(c.g) && !isNaN(c.b)) {
-                    colors.push({
-                        r: c.r,
-                        g: c.g,
-                        b: c.b
-                    });
-                }
-            }
-        }
-
-        if (colors.length === 0) {
-            console.warn("MpvShaderGenerator: No valid colors found for palette! Aborting.");
-            return;
-        }
-
-        var shaderContent = ShaderGenerator.generate(colors);
-
-        // Generate a unique filename in a dedicated directory
-        var timestamp = Date.now();
-        var currentShaderPath = mpvShaderDir + "/tint_" + timestamp + ".glsl";
-
-        // Store the current active path so updateMpvRuntime knows which one to use
-        wallpaper.mpvShaderPath = currentShaderPath;
-
-        var cmd = ["python3", "-c", "import sys, os, pathlib; " + "d = pathlib.Path(sys.argv[1]); " + "d.mkdir(parents=True, exist_ok=True); " + "[f.unlink() for f in d.iterdir() if f.is_file()]; " + "pathlib.Path(sys.argv[2]).write_text(sys.argv[3]); " + "print('Wrote shader to ' + sys.argv[2]); " + "legacy_dir = os.path.dirname(sys.argv[1]); " + "[pathlib.Path(legacy_dir, f).unlink(missing_ok=True) for f in ['mpv_tint_0.glsl', 'mpv_tint_1.glsl', 'mpv_tint.glsl']]", mpvShaderDir, currentShaderPath, shaderContent];
-
-        mpvShaderWriter.command = cmd;
-        mpvShaderWriter.running = true;
-    }
-
-    property int ipcRetryCount: 0
-
-    Timer {
-        id: ipcRetryTimer
-        interval: 200
-        repeat: false
-        onTriggered: {
-            // Retry the last command (which is currently set in mpvIpcProcess)
-            mpvIpcProcess.running = true;
-        }
-    }
-
-    Process {
-        id: mpvIpcProcess
-        running: false
-        onExited: code => {
-            if (code !== 0) {
-                console.warn("MPV IPC failed (is mpvpaper running?) Code:", code);
-                if (ipcRetryCount < 10) {
-                    ipcRetryCount++;
-                    console.log("Retrying IPC (" + ipcRetryCount + "/10)...");
-                    ipcRetryTimer.restart();
-                }
-            } else {
-                ipcRetryCount = 0;
-            }
-        }
-    }
-
-    Process {
-        id: mpvShaderWriter
-        running: false
-        command: []
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (text.length > 0) {
-                    console.log("mpvShaderWriter stdout:", text);
-                }
-            }
-        }
-
-        stderr: StdioCollector {
-            onStreamFinished: {
-                if (text.length > 0) {
-                    console.warn("mpvShaderWriter stderr:", text);
-                }
-            }
-        }
-
-        onExited: code => {
-            if (code === 0) {
-                console.log("MPV tint shader generated at:", mpvShaderPath);
-                mpvShaderReady = true;
-                // Apply immediately via IPC
-                updateMpvRuntime(true);
-            } else {
-                console.warn("Failed to generate MPV shader");
-            }
-        }
-    }
-
-    // Trigger update when colors change
-    Timer {
-        id: shaderUpdateDebounce
-        interval: 500
-        onTriggered: {
-            console.log("Shader debounce triggered, updating MPV...");
-            updateMpvShader();
-        }
-    }
-
-    Connections {
-        target: Colors
-        // Watch for file reload (theme change)
-        function onFileChanged() {
-            console.log("Colors file changed, scheduling update...");
-            shaderUpdateDebounce.restart();
-        }
-        // Watch for background change (OLED mode often affects this first/only)
-        function onBackgroundChanged() {
-            console.log("Colors background changed, scheduling update...");
-            shaderUpdateDebounce.restart();
-        }
-        // Fallback
-        function onPrimaryChanged() {
-            console.log("Colors primary changed, scheduling update...");
-            shaderUpdateDebounce.restart();
-        }
-    }
-
-    Connections {
-        target: Config
-        function onOledModeChanged() {
-            console.log("Config OLED mode changed, scheduling update...");
-            shaderUpdateDebounce.restart();
-        }
-    }
-
-    onTintEnabledChanged: {
-        console.log("Tint enabled changed to", tintEnabled);
-        updateMpvShader();
-    }
-
-    onEffectiveWallpaperChanged: {
-        if (getFileType(effectiveWallpaper) === "video") {
-            shaderUpdateDebounce.restart();
+            
+            // Guardar el wallpaper y scheme actual para no regenerar al reiniciar
+            wallpaperConfig.adapter.lastMatugenWallpaper = currentWallpaper;
+            wallpaperConfig.adapter.lastMatugenScheme = wallpaperConfig.adapter.matugenScheme;
         }
     }
 
     Component.onCompleted: {
-        // Only the first Wallpaper instance should manage scanning
-        // Other instances (for other screens) share the same data via GlobalStates
         if (GlobalStates.wallpaperManager !== null) {
-            // Another instance already registered, skip initialization
             _wallpaperDirInitialized = true;
             return;
         }
-
         GlobalStates.wallpaperManager = wallpaper;
 
-        // Verificar si existe wallpapers.json, si no, crear con fallback
         checkWallpapersJson.running = true;
-
-        // Initial scans - do these once after config is loaded
         scanColorPresets();
-        // Start directory monitoring
         presetsWatcher.reload();
         officialPresetsWatcher.reload();
-        // Load initial wallpaper config - this will trigger onWallPathChanged which does the actual scan
         wallpaperConfig.reload();
 
-        // Generate lockscreen frame for initial wallpaper after a short delay
         Qt.callLater(function () {
             if (currentWallpaper) {
                 generateLockscreenFrame(currentWallpaper);
-            }
-            // Force shader generation on startup if enabled
-            if (tintEnabled) {
-                updateMpvShader();
+                loadCustomPalette(currentWallpaper);
             }
         });
     }
 
+    // -------------------------------------------------------------------
+    // Configuration file handling
+    // -------------------------------------------------------------------
     FileView {
         id: wallpaperConfig
-        // QUICKSHELL-GIT: path: Quickshell.cachePath("wallpapers.json")
         path: Quickshell.env("HOME") + "/.cache/ambxst/wallpapers.json"
         watchChanges: true
 
@@ -697,11 +486,9 @@ PanelWindow {
 
         onFileChanged: reload()
         onAdapterUpdated: {
-            // Ensure matugenScheme has a default value
             if (!wallpaperConfig.adapter.matugenScheme) {
                 wallpaperConfig.adapter.matugenScheme = "scheme-tonal-spot";
             }
-            // Update the currentMatugenScheme property to trigger UI updates
             currentMatugenScheme = Qt.binding(function () {
                 return wallpaperConfig.adapter.matugenScheme;
             });
@@ -714,7 +501,12 @@ PanelWindow {
             property string wallPath: ""
             property string matugenScheme: "scheme-tonal-spot"
             property string activeColorPreset: ""
+            property string lastMatugenWallpaper: ""
+            property string lastMatugenScheme: ""
             property bool tintEnabled: false
+            property bool interpolationEnabled: false
+            property real targetInputFps: 24.0 
+            property int interpolationMultiplier: 2
             property var perScreenWallpapers: ({})
 
             onActiveColorPresetChanged: {
@@ -724,17 +516,9 @@ PanelWindow {
             }
 
             onCurrentWallChanged: {
-                // Skip during initial load - scanWallpapers handles this
-                if (!wallpaper._wallpaperDirInitialized)
-                    return;
-
-                // Siempre actualizar si es diferente al actual
+                if (!wallpaper._wallpaperDirInitialized) return;
                 if (currentWall && currentWall !== wallpaper.currentWallpaper) {
-                    // If paths are not loaded yet, wait for scanWallpapers to finish
-                    if (wallpaper.wallpaperPaths.length === 0) {
-                        return;
-                    }
-
+                    if (wallpaper.wallpaperPaths.length === 0) return;
                     var pathIndex = wallpaper.wallpaperPaths.indexOf(currentWall);
                     if (pathIndex !== -1) {
                         wallpaper.currentIndex = pathIndex;
@@ -751,22 +535,19 @@ PanelWindow {
             onWallPathChanged: {
                 if (wallPath) {
                     console.log("Config wallPath updated:", wallPath);
-
-                    // Initialize scanning on first valid wallPath load
                     if (!wallpaper._wallpaperDirInitialized && GlobalStates.wallpaperManager === wallpaper) {
                         wallpaper._wallpaperDirInitialized = true;
-
-                        // Set up directory watcher
                         directoryWatcher.path = wallPath;
                         directoryWatcher.reload();
 
-                        // Perform initial wallpaper scan
-                        var cmd = ["find", wallPath, "-name", ".*", "-prune", "-o", "-type", "f", "(", "-name", "*.jpg", "-o", "-name", "*.jpeg", "-o", "-name", "*.png", "-o", "-name", "*.webp", "-o", "-name", "*.tif", "-o", "-name", "*.tiff", "-o", "-name", "*.gif", "-o", "-name", "*.mp4", "-o", "-name", "*.webm", "-o", "-name", "*.mov", "-o", "-name", "*.avi", "-o", "-name", "*.mkv", ")", "-print"];
+                        var cmd = ["find", wallPath, "-name", ".*", "-prune", "-o", "-type", "f",
+                            "(", "-name", "*.jpg", "-o", "-name", "*.jpeg", "-o", "-name", "*.png",
+                            "-o", "-name", "*.webp", "-o", "-name", "*.tif", "-o", "-name", "*.tiff",
+                            "-o", "-name", "*.gif", "-o", "-name", "*.mp4", "-o", "-name", "*.webm",
+                            "-o", "-name", "*.mov", "-o", "-name", "*.avi", "-o", "-name", "*.mkv", ")", "-print"];
                         scanWallpapers.command = cmd;
                         scanWallpapers.running = true;
                         wallpaper.scanSubfolders();
-
-                        // Start thumbnail generation
                         delayedThumbnailGen.start();
                     }
                 }
@@ -774,12 +555,13 @@ PanelWindow {
         }
     }
 
+    // -------------------------------------------------------------------
+    // External processes
+    // -------------------------------------------------------------------
     Process {
         id: checkWallpapersJson
         running: false
-        // QUICKSHELL-GIT: command: ["test", "-f", Quickshell.cachePath("wallpapers.json")]
         command: ["test", "-f", Quickshell.env("HOME") + "/.cache/ambxst/wallpapers.json"]
-
         onExited: function (exitCode) {
             if (exitCode !== 0) {
                 console.log("wallpapers.json does not exist, creating with fallbackDir");
@@ -794,77 +576,28 @@ PanelWindow {
         id: matugenProcessWithConfig
         running: false
         command: []
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (text.length > 0) {
-                    console.log("Matugen (with config) output:", text);
-                }
-            }
-        }
-
-        stderr: StdioCollector {
-            onStreamFinished: {
-                if (text.length > 0) {
-                    console.warn("Matugen (with config) error:", text);
-                }
-            }
-        }
-
-        onExited: {
-            console.log("Matugen with config finished");
-        }
+        stdout: StdioCollector { onStreamFinished: { if (text.length > 0) console.log("Matugen (with config) output:", text); } }
+        stderr: StdioCollector { onStreamFinished: { if (text.length > 0) console.warn("Matugen (with config) error:", text); } }
+        onExited: { console.log("Matugen with config finished"); }
     }
 
     Process {
         id: matugenProcessNormal
         running: false
         command: []
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (text.length > 0) {
-                    console.log("Matugen (normal) output:", text);
-                }
-            }
-        }
-
-        stderr: StdioCollector {
-            onStreamFinished: {
-                if (text.length > 0) {
-                    console.warn("Matugen (normal) error:", text);
-                }
-            }
-        }
-
-        onExited: {
-            console.log("Matugen normal finished");
-        }
+        stdout: StdioCollector { onStreamFinished: { if (text.length > 0) console.log("Matugen (normal) output:", text); } }
+        stderr: StdioCollector { onStreamFinished: { if (text.length > 0) console.warn("Matugen (normal) error:", text); } }
+        onExited: { console.log("Matugen normal finished"); }
     }
 
-    // Proceso para generar thumbnails de videos
     Process {
         id: thumbnailGeneratorScript
         running: false
-        // QUICKSHELL-GIT: command: ["python3", decodeURIComponent(Qt.resolvedUrl("../../../../scripts/thumbgen.py").toString().replace("file://", "")), Quickshell.cacheDir + "/wallpapers.json", Quickshell.cacheDir, fallbackDir]
-        command: ["python3", decodeURIComponent(Qt.resolvedUrl("../../../../scripts/thumbgen.py").toString().replace("file://", "")), Quickshell.env("HOME") + "/.cache/ambxst" + "/wallpapers.json", Quickshell.env("HOME") + "/.cache/ambxst", fallbackDir]
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (text.length > 0) {
-                    console.log("Thumbnail Generator:", text);
-                }
-            }
-        }
-
-        stderr: StdioCollector {
-            onStreamFinished: {
-                if (text.length > 0) {
-                    console.warn("Thumbnail Generator Error:", text);
-                }
-            }
-        }
-
+        command: ["python3", decodeURIComponent(Qt.resolvedUrl("../../../../scripts/thumbgen.py").toString().replace("file://", "")),
+                 Quickshell.env("HOME") + "/.cache/ambxst/wallpapers.json",
+                 Quickshell.env("HOME") + "/.cache/ambxst", fallbackDir]
+        stdout: StdioCollector { onStreamFinished: { if (text.length > 0) console.log("Thumbnail Generator:", text); } }
+        stderr: StdioCollector { onStreamFinished: { if (text.length > 0) console.warn("Thumbnail Generator Error:", text); } }
         onExited: function (exitCode) {
             if (exitCode === 0) {
                 console.log("✅ Video thumbnails generated successfully");
@@ -877,39 +610,20 @@ PanelWindow {
 
     Timer {
         id: delayedThumbnailGen
-        interval: 2000 // Delay 2 seconds after change to not block
+        interval: 2000
         repeat: false
         onTriggered: thumbnailGeneratorScript.running = true
     }
 
-    // Proceso para generar frame de lockscreen con el script de Python
     Process {
         id: lockscreenWallpaperScript
         running: false
         command: []
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (text.length > 0) {
-                    console.log("Lockscreen Wallpaper Generator:", text);
-                }
-            }
-        }
-
-        stderr: StdioCollector {
-            onStreamFinished: {
-                if (text.length > 0) {
-                    console.warn("Lockscreen Wallpaper Generator Error:", text);
-                }
-            }
-        }
-
+        stdout: StdioCollector { onStreamFinished: { if (text.length > 0) console.log("Lockscreen Wallpaper Generator:", text); } }
+        stderr: StdioCollector { onStreamFinished: { if (text.length > 0) console.warn("Lockscreen Wallpaper Generator Error:", text); } }
         onExited: function (exitCode) {
-            if (exitCode === 0) {
-                console.log("✅ Lockscreen wallpaper ready");
-            } else {
-                console.warn("⚠️ Lockscreen wallpaper generation failed with code:", exitCode);
-            }
+            if (exitCode === 0) console.log("✅ Lockscreen wallpaper ready");
+            else console.warn("⚠️ Lockscreen wallpaper generation failed with code:", exitCode);
         }
     }
 
@@ -917,18 +631,12 @@ PanelWindow {
         id: scanSubfoldersProcess
         running: false
         command: wallpaperDir ? ["find", wallpaperDir, "-mindepth", "1", "-name", ".*", "-prune", "-o", "-type", "d", "-print"] : []
-
         stdout: StdioCollector {
             onStreamFinished: {
                 console.log("scanSubfolders stdout:", text);
-                var rawPaths = text.trim().split("\n").filter(function (f) {
-                    return f.length > 0;
-                });
-
+                var rawPaths = text.trim().split("\n").filter(function (f) { return f.length > 0; });
                 allSubdirs = rawPaths;
-
                 var basePath = wallpaperDir.endsWith("/") ? wallpaperDir : wallpaperDir + "/";
-
                 var topLevelFolders = rawPaths.filter(function (path) {
                     var relative = path.replace(basePath, "");
                     return relative.indexOf("/") === -1;
@@ -937,58 +645,38 @@ PanelWindow {
                 }).filter(function (name) {
                     return name.length > 0 && !name.startsWith(".");
                 });
-
                 topLevelFolders.sort();
                 subfolderFilters = topLevelFolders;
-                subfolderFiltersChanged();  // Emitir señal manualmente
                 console.log("Updated subfolderFilters:", subfolderFilters);
             }
         }
-
-        stderr: StdioCollector {
-            onStreamFinished: {
-                if (text.length > 0) {
-                    console.warn("Error scanning subfolders:", text);
-                }
-            }
-        }
-
+        stderr: StdioCollector { onStreamFinished: { if (text.length > 0) console.warn("Error scanning subfolders:", text); } }
         onRunningChanged: {
-            if (running) {
-                console.log("Starting scanSubfolders for directory:", wallpaperDir);
-            } else {
-                console.log("Finished scanSubfolders");
-            }
+            if (running) console.log("Starting scanSubfolders for directory:", wallpaperDir);
+            else console.log("Finished scanSubfolders");
         }
     }
 
-    // Directory watcher using FileView to monitor the wallpaper directory
+    // -------------------------------------------------------------------
+    // Directory watchers
+    // -------------------------------------------------------------------
     FileView {
         id: directoryWatcher
         path: wallpaperDir
         watchChanges: true
         printErrors: false
-
         onFileChanged: {
-            if (wallpaperDir === "")
-                return;
+            if (wallpaperDir === "") return;
             console.log("Wallpaper directory changed, rescanning...");
             scanWallpapers.running = true;
             scanSubfoldersProcess.running = true;
-            // Regenerar thumbnails si hay nuevos videos (delayed)
-            if (delayedThumbnailGen.running)
-                delayedThumbnailGen.restart();
-            else
-                delayedThumbnailGen.start();
+            if (delayedThumbnailGen.running) delayedThumbnailGen.restart();
+            else delayedThumbnailGen.start();
         }
-
-        // Remove onLoadFailed to prevent premature fallback activation
     }
 
-    // Recursive directory watchers for subfolders
     Instantiator {
         model: allSubdirs
-
         delegate: FileView {
             path: modelData
             watchChanges: true
@@ -997,36 +685,28 @@ PanelWindow {
                 console.log("Subdirectory content changed (" + path + "), rescanning...");
                 scanWallpapers.running = true;
                 scanSubfoldersProcess.running = true;
-
-                // Regenerar thumbnails (delayed)
-                if (delayedThumbnailGen.running)
-                    delayedThumbnailGen.restart();
-                else
-                    delayedThumbnailGen.start();
+                if (delayedThumbnailGen.running) delayedThumbnailGen.restart();
+                else delayedThumbnailGen.start();
             }
         }
     }
 
-    // Directory watcher for user color presets
     FileView {
         id: presetsWatcher
         path: colorPresetsDir
         watchChanges: true
         printErrors: false
-
         onFileChanged: {
             console.log("User color presets directory changed, rescanning...");
             scanPresetsProcess.running = true;
         }
     }
 
-    // Directory watcher for official color presets
     FileView {
         id: officialPresetsWatcher
         path: officialColorPresetsDir
         watchChanges: true
         printErrors: false
-
         onFileChanged: {
             console.log("Official color presets directory changed, rescanning...");
             scanPresetsProcess.running = true;
@@ -1036,41 +716,34 @@ PanelWindow {
     Process {
         id: scanWallpapers
         running: false
-        command: wallpaperDir ? ["find", wallpaperDir, "-name", ".*", "-prune", "-o", "-type", "f", "(", "-name", "*.jpg", "-o", "-name", "*.jpeg", "-o", "-name", "*.png", "-o", "-name", "*.webp", "-o", "-name", "*.tif", "-o", "-name", "*.tiff", "-o", "-name", "*.gif", "-o", "-name", "*.mp4", "-o", "-name", "*.webm", "-o", "-name", "*.mov", "-o", "-name", "*.avi", "-o", "-name", "*.mkv", ")", "-print"] : []
-
+        command: wallpaperDir ? ["find", wallpaperDir, "-name", ".*", "-prune", "-o", "-type", "f",
+            "(", "-name", "*.jpg", "-o", "-name", "*.jpeg", "-o", "-name", "*.png",
+            "-o", "-name", "*.webp", "-o", "-name", "*.tif", "-o", "-name", "*.tiff",
+            "-o", "-name", "*.gif", "-o", "-name", "*.mp4", "-o", "-name", "*.webm",
+            "-o", "-name", "*.mov", "-o", "-name", "*.avi", "-o", "-name", "*.mkv", ")", "-print"] : []
         onRunningChanged: {
             if (running && wallpaperDir === "") {
                 console.log("Blocking scanWallpapers because wallpaperDir is empty");
                 running = false;
             }
         }
-
         stdout: StdioCollector {
             onStreamFinished: {
-                var files = text.trim().split("\n").filter(function (f) {
-                    return f.length > 0;
-                });
+                var files = text.trim().split("\n").filter(function (f) { return f.length > 0; });
                 if (files.length === 0) {
                     console.log("No wallpapers found in main directory, using fallback");
                     usingFallback = true;
                     scanFallback.running = true;
                 } else {
                     usingFallback = false;
-                    // Only update if the list has actually changed
                     var newFiles = files.sort();
                     var listChanged = JSON.stringify(newFiles) !== JSON.stringify(wallpaperPaths);
                     if (listChanged) {
                         console.log("Wallpaper directory updated. Found", newFiles.length, "images");
                         wallpaperPaths = newFiles;
-
-                        // Always try to load the saved wallpaper when list changes
                         if (wallpaperPaths.length > 0) {
-                            // Trigger thumbnail generation if list changed
-                            if (delayedThumbnailGen.running)
-                                delayedThumbnailGen.restart();
-                            else
-                                delayedThumbnailGen.start();
-
+                            if (delayedThumbnailGen.running) delayedThumbnailGen.restart();
+                            else delayedThumbnailGen.start();
                             if (wallpaperConfig.adapter.currentWall) {
                                 var savedIndex = wallpaperPaths.indexOf(wallpaperConfig.adapter.currentWall);
                                 if (savedIndex !== -1) {
@@ -1083,25 +756,21 @@ PanelWindow {
                             } else {
                                 currentIndex = 0;
                             }
-
                             if (!initialLoadCompleted) {
                                 if (!wallpaperConfig.adapter.currentWall) {
                                     wallpaperConfig.adapter.currentWall = wallpaperPaths[0];
                                 }
                                 initialLoadCompleted = true;
-                                // runMatugenForCurrentWallpaper() will be called by onCurrentWallChanged
                             }
                         }
                     }
                 }
             }
         }
-
         stderr: StdioCollector {
             onStreamFinished: {
                 if (text.length > 0) {
                     console.warn("Error scanning wallpaper directory:", text);
-                    // Only fallback if we don't already have wallpapers loaded AND we have a valid directory that failed
                     if (wallpaperPaths.length === 0 && wallpaperDir !== "") {
                         console.log("Directory scan failed for " + wallpaperDir + ", using fallback");
                         usingFallback = true;
@@ -1115,38 +784,30 @@ PanelWindow {
     Process {
         id: scanFallback
         running: false
-        command: ["find", fallbackDir, "-name", ".*", "-prune", "-o", "-type", "f", "(", "-name", "*.jpg", "-o", "-name", "*.jpeg", "-o", "-name", "*.png", "-o", "-name", "*.webp", "-o", "-name", "*.tif", "-o", "-name", "*.tiff", "-o", "-name", "*.gif", "-o", "-name", "*.mp4", "-o", "-name", "*.webm", "-o", "-name", "*.mov", "-o", "-name", "*.avi", "-o", "-name", "*.mkv", ")", "-print"]
-
+        command: ["find", fallbackDir, "-name", ".*", "-prune", "-o", "-type", "f",
+            "(", "-name", "*.jpg", "-o", "-name", "*.jpeg", "-o", "-name", "*.png",
+            "-o", "-name", "*.webp", "-o", "-name", "*.tif", "-o", "-name", "*.tiff",
+            "-o", "-name", "*.gif", "-o", "-name", "*.mp4", "-o", "-name", "*.webm",
+            "-o", "-name", "*.mov", "-o", "-name", "*.avi", "-o", "-name", "*.mkv", ")", "-print"]
         stdout: StdioCollector {
             onStreamFinished: {
-                var files = text.trim().split("\n").filter(function (f) {
-                    return f.length > 0;
-                });
+                var files = text.trim().split("\n").filter(function (f) { return f.length > 0; });
                 console.log("Using fallback wallpapers. Found", files.length, "images");
-
-                // Only use fallback if we don't already have main wallpapers loaded
                 if (usingFallback) {
                     wallpaperPaths = files.sort();
-
-                    // Initialize fallback wallpaper selection
                     if (wallpaperPaths.length > 0) {
                         if (wallpaperConfig.adapter.currentWall) {
                             var savedIndex = wallpaperPaths.indexOf(wallpaperConfig.adapter.currentWall);
-                            if (savedIndex !== -1) {
-                                currentIndex = savedIndex;
-                            } else {
-                                currentIndex = 0;
-                            }
+                            if (savedIndex !== -1) currentIndex = savedIndex;
+                            else currentIndex = 0;
                         } else {
                             currentIndex = 0;
                         }
-
                         if (!initialLoadCompleted) {
                             if (!wallpaperConfig.adapter.currentWall) {
                                 wallpaperConfig.adapter.currentWall = wallpaperPaths[0];
                             }
                             initialLoadCompleted = true;
-                            // runMatugenForCurrentWallpaper() will be called by onCurrentWallChanged
                         }
                     }
                 }
@@ -1157,9 +818,7 @@ PanelWindow {
     Process {
         id: scanPresetsProcess
         running: false
-        // Scan both directories. find will complain to stderr if one is missing but still output what it finds.
         command: ["find", officialColorPresetsDir, colorPresetsDir, "-mindepth", "1", "-maxdepth", "1", "-type", "d"]
-
         stdout: StdioCollector {
             onStreamFinished: {
                 console.log("Scan Presets Output:", text);
@@ -1167,286 +826,579 @@ PanelWindow {
                 var uniqueNames = [];
                 for (var i = 0; i < rawLines.length; i++) {
                     var line = rawLines[i].trim();
-                    if (line.length === 0)
-                        continue;
+                    if (line.length === 0) continue;
                     var name = line.split('/').pop();
-                    // Deduplicate
-                    if (uniqueNames.indexOf(name) === -1) {
-                        uniqueNames.push(name);
-                    }
+                    if (uniqueNames.indexOf(name) === -1) uniqueNames.push(name);
                 }
                 uniqueNames.sort();
                 console.log("Found color presets:", uniqueNames);
                 colorPresets = uniqueNames;
             }
         }
-
-        stderr: StdioCollector {
-            onStreamFinished: {
-                // Suppress common "No such file or directory" if one dir is missing
-                // console.warn("Scan Presets Error:", text);
-            }
-        }
+        stderr: StdioCollector { onStreamFinished: { /* suppress errors */ } }
     }
 
     Process {
         id: applyPresetProcess
         running: false
         command: []
-
         onExited: code => {
-            if (code === 0)
-                console.log("Color preset applied successfully");
-            else
-                console.warn("Failed to apply color preset, code:", code);
+            if (code === 0) console.log("Color preset applied successfully");
+            else console.warn("Failed to apply color preset, code:", code);
         }
     }
 
-    Rectangle {
-        id: background
-        anchors.fill: parent
-        color: "black"
-        focus: true
-
-        Keys.onLeftPressed: {
-            if (wallpaper.wallpaperPaths.length > 0) {
-                wallpaper.previousWallpaper();
-            }
-        }
-
-        Keys.onRightPressed: {
-            if (wallpaper.wallpaperPaths.length > 0) {
-                wallpaper.nextWallpaper();
-            }
-        }
-
-        WallpaperImage {
-            id: wallImage
-            anchors.fill: parent
-            source: wallpaper.effectiveWallpaper
-        }
+    // -------------------------------------------------------------------
+    // Reusable shader effect for palette tinting
+    // -------------------------------------------------------------------
+    component PaletteShaderEffect: ShaderEffect {
+        id: effect
+        property var source: null
+        property var paletteTexture: null
+        property real paletteSize: 0
+        property real sharpness: 20.0
+        property real mixStrength: 1.0
+        property real texWidth: 1
+        property real texHeight: 1
+
+        vertexShader: "palette.vert.qsb"
+        fragmentShader: "palette.frag.qsb"
     }
 
-    component WallpaperImage: Item {
-        property string source
-        property string previousSource
+    // -------------------------------------------------------------------
+    // Component for static images (jpg, png, webp, etc.)
+    // -------------------------------------------------------------------
+    Component {
+        id: staticImageComponent
+        Item {
+            id: staticImageRoot
+            anchors.fill: parent
+            property string sourceFile
+            property bool tint: wallpaper.tintEnabled
+
+            onSourceFileChanged: console.log("staticImageComponent: sourceFile =", sourceFile)
+            onTintChanged: console.log("staticImageComponent: tint =", tint)
+
+            // ─── Canvas-based palette texture (pre-baked once; no per-frame render-to-texture) ───
+            Canvas {
+                id: paletteCanvas
+                width: wallpaper.effectivePaletteSize
+                height: 1
+                visible: false
+
+                onPaint: {
+                    var ctx = getContext("2d");
+                    if (!ctx) return;
+                    ctx.clearRect(0, 0, width, height);
+                    var pal = wallpaper.effectivePalette;
+                    for (var i = 0; i < pal.length; i++) {
+                        var c = pal[i];
+                        if (typeof c === "string" && c.charAt(0) === '#') {
+                            ctx.fillStyle = c;
+                        } else {
+                            ctx.fillStyle = Colors[c] || "#000000";
+                        }
+                        ctx.fillRect(i, 0, 1, 1);
+                    }
+                }
 
-        Process {
-            id: killMpvpaperProcess
-            running: false
-            command: ["pkill", "-f", wallpaper.mpvSocket]
+                Component.onCompleted: requestPaint()    // ⚡ Trigger initial paint
 
-            onExited: function (exitCode) {
-                console.log("Killed mpvpaper processes on socket", wallpaper.mpvSocket, ", exit code:", exitCode);
+                Connections {
+                    target: Colors
+                    function onFileChanged() { Qt.callLater(paletteCanvas.requestPaint); }
+                }
+                Connections {
+                    target: wallpaper
+                    function onEffectivePaletteChanged() { paletteCanvas.requestPaint(); }
+                }
             }
-        }
 
-        // Trigger animation when source changes
-        onSourceChanged: {
-            if (previousSource !== "" && source !== previousSource) {
-                if (Config.animDuration > 0) {
-                    transitionAnimation.restart();
+            ShaderEffectSource {
+                id: paletteTextureSource
+                sourceItem: paletteCanvas
+                live: false                    // ⚡ static texture — no per-frame re-capture
+                hideSource: true
+                visible: false
+                smooth: false
+                recursive: false
+
+                Connections {
+                    target: paletteCanvas
+                    function onPainted() { paletteTextureSource.scheduleUpdate(); }
                 }
             }
-            previousSource = source;
 
-            // Kill mpvpaper if switching to a static image
-            if (source) {
-                var fileType = getFileType(source);
-                if (fileType === 'image') {
-                    killMpvpaperProcess.running = true;
+            // Image with layer effect for tinting
+            Image {
+                id: rawImage
+                anchors.fill: parent
+                source: staticImageRoot.sourceFile ? "file://" + staticImageRoot.sourceFile : ""
+                fillMode: Image.PreserveAspectCrop
+                asynchronous: true
+                smooth: true
+                mipmap: true
+                visible: true
+
+                // Layer effect for palette tinting
+                layer.enabled: staticImageRoot.tint && wallpaper.effectivePaletteSize > 0
+                layer.effect: PaletteShaderEffect {
+                    property var paletteTexture: paletteTextureSource
+                    property int paletteSize: wallpaper.effectivePaletteSize
+                    property real sharpness: 20.0
+                    property real mixStrength: 1.0
+                    texWidth: rawImage.width
+                    texHeight: rawImage.height
+
+                    vertexShader: "palette.vert.qsb"
+                    fragmentShader: "palette.frag.qsb"
+                }
+
+                onStatusChanged: {
+                    if (status === Image.Ready) {
+                        console.log("rawImage ready");
+                    }
                 }
             }
         }
-
-        SequentialAnimation {
-            id: transitionAnimation
-
-            ParallelAnimation {
-                NumberAnimation {
-                    target: wallImage
-                    property: "scale"
-                    to: 1.01
-                    duration: Config.animDuration
-                    easing.type: Easing.OutCubic
+    }
+    // -------------------------------------------------------------------
+    // Component for videos and GIFs with software‑controlled input FPS
+    // -------------------------------------------------------------------
+    Component {
+        id: videoComponent
+        Item {
+            id: videoRoot
+            anchors.fill: parent
+            property string sourceFile
+            property bool tint: wallpaper.tintEnabled
+            property bool interpolate: wallpaper.interpolationEnabled
+            property int multiplier: wallpaper.interpolationMultiplier
+            property real targetInputFps: 24.0
+
+            // Frame control properties
+            property real originalFps: 30
+            property real effectiveInputFps: targetInputFps
+            property real captureIntervalMs: 1000 / effectiveInputFps
+            property real lastCaptureTime: 0
+            property real blendFactor: 0.0
+            property bool isOriginalFrame: true
+            property int frameCounter: 0
+
+            // FPS estimation
+            property real fpsOutput: 0
+            property int frameCountSinceLastSecond: 0
+            property real lastFpsUpdateTime: 0
+
+            // Debug overlay
+            property bool debugMode: false
+
+            onTintChanged: console.log("videoComponent: tint =", tint)
+            onInterpolateChanged: {
+                console.log("videoComponent: interpolate =", interpolate)
+                if (interpolate) {
+                    captureTimer.restart()
+                    frameAnimation.running = true
+                    previousFrameSource.scheduleUpdate()
+                    videoRoot.lastCaptureTime = Date.now()
+                } else {
+                    captureTimer.stop()
+                    frameAnimation.running = false
                 }
-                NumberAnimation {
-                    target: wallImage
-                    property: "opacity"
-                    to: 0.5
-                    duration: Config.animDuration
-                    easing.type: Easing.OutCubic
+            }
+            onMultiplierChanged: {
+                // multiplier does not affect capture rate
+            }
+            onTargetInputFpsChanged: {
+                effectiveInputFps = Math.min(originalFps, targetInputFps)
+                captureIntervalMs = 1000 / effectiveInputFps
+                if (interpolate) {
+                    captureTimer.restart()
+                    videoRoot.lastCaptureTime = Date.now()
                 }
             }
 
-            ParallelAnimation {
-                NumberAnimation {
-                    target: wallImage
-                    property: "scale"
-                    to: 1.0
-                    duration: Config.animDuration
-                    easing.type: Easing.OutCubic
+            // ═══════════════════════════════════════════════════════════
+            // Canvas-based palette texture (pre-baked once, no per-frame re-render)
+            // ═══════════════════════════════════════════════════════════
+            Canvas {
+                id: paletteCanvas2
+                width: wallpaper.effectivePaletteSize
+                height: 1
+                visible: false
+
+                onPaint: {
+                    var ctx = getContext("2d");
+                    if (!ctx) return;
+                    ctx.clearRect(0, 0, width, height);
+                    var pal = wallpaper.effectivePalette;
+                    for (var i = 0; i < pal.length; i++) {
+                        var c = pal[i];
+                        if (typeof c === "string" && c.charAt(0) === '#') {
+                            ctx.fillStyle = c;
+                        } else {
+                            ctx.fillStyle = Colors[c] || "#000000";
+                        }
+                        ctx.fillRect(i, 0, 1, 1);
+                    }
+                }
+
+                Component.onCompleted: requestPaint()    // ⚡ Trigger initial paint
+
+                Connections {
+                    target: Colors
+                    function onFileChanged() { Qt.callLater(paletteCanvas2.requestPaint); }
                 }
-                NumberAnimation {
-                    target: wallImage
-                    property: "opacity"
-                    to: 1.0
-                    duration: Config.animDuration
-                    easing.type: Easing.OutCubic
+                Connections {
+                    target: wallpaper
+                    function onEffectivePaletteChanged() { paletteCanvas2.requestPaint(); }
                 }
             }
-        }
-
-        Loader {
-            anchors.fill: parent
-            sourceComponent: {
-                if (!parent.source)
-                    return null;
 
-                var fileType = getFileType(parent.source);
-                if (fileType === 'image') {
-                    return staticImageComponent;
-                } else if (fileType === 'gif' || fileType === 'video') {
-                    return mpvpaperComponent;
+            ShaderEffectSource {
+                id: paletteTextureSource
+                sourceItem: paletteCanvas2
+                live: false                    // ⚡ static texture — no per-frame re-capture
+                hideSource: true
+                visible: false
+                smooth: false
+                recursive: false
+
+                Connections {
+                    target: paletteCanvas2
+                    function onPainted() { paletteTextureSource.scheduleUpdate(); }
                 }
-                return staticImageComponent; // fallback
             }
 
-            property string sourceFile: parent.source
-        }
+            // -------------------------------------------------------------------
+            // Original video player (plays at normal speed)
+            // -------------------------------------------------------------------
+            Video {
+                id: videoPlayer
+                anchors.fill: parent
+                source: videoRoot.sourceFile ? "file://" + videoRoot.sourceFile : ""
+                loops: MediaPlayer.Infinite
+                autoPlay: true
+                muted: true
+                fillMode: VideoOutput.PreserveAspectCrop
+                visible: !videoRoot.interpolate || videoRoot.multiplier <= 1
+                // Siempre a velocidad normal; el control de FPS lo hace el Timer
+                playbackRate: 1.0
+
+                onMetaDataChanged: {
+                    if (metaData.frameRate && metaData.frameRate > 0) {
+                        videoRoot.originalFps = metaData.frameRate
+                        videoRoot.effectiveInputFps = Math.min(videoRoot.originalFps, videoRoot.targetInputFps)
+                        videoRoot.captureIntervalMs = 1000 / videoRoot.effectiveInputFps
+                        console.log("videoComponent: detected FPS =", videoRoot.originalFps,
+                                    "effective input FPS =", videoRoot.effectiveInputFps)
+                    }
+                }
 
-        Component {
-            id: staticImageComponent
-            Item {
-                id: staticImageRoot
-                width: parent.width
-                height: parent.height
-                property string sourceFile: parent.sourceFile
-                property bool tint: wallpaper.tintEnabled
-
-                // Subset of colors for optimization (approx 25 colors vs 98)
-                readonly property var optimizedPalette: ["background", "overBackground", "shadow", "surface", "surfaceBright", "surfaceDim", "surfaceContainer", "surfaceContainerHigh", "surfaceContainerHighest", "surfaceContainerLow", "surfaceContainerLowest", "primary", "secondary", "tertiary", "red", "lightRed", "green", "lightGreen", "blue", "lightBlue", "yellow", "lightYellow", "cyan", "lightCyan", "magenta", "lightMagenta"]
-
-                // Palette generation for the shader
-                Item {
-                    id: paletteSourceItem
-                    // Must be visible for ShaderEffectSource to capture it,
-                    // but we hide it visually by placing it behind or expecting ShaderEffectSource hideSource behavior.
-                    visible: true
-                    width: staticImageRoot.optimizedPalette.length
-                    height: 1
-                    opacity: 0 // Make invisible to eye but maintain presence for capture if needed (though hideSource usually handles this)
-
-                    Row {
-                        anchors.fill: parent
-                        Repeater {
-                            model: staticImageRoot.optimizedPalette
-                            Rectangle {
-                                width: 1
-                                height: 1
-                                color: Colors[modelData]
-                            }
-                        }
+                onPlaybackStateChanged: {
+                    if (playbackState === MediaPlayer.PlayingState && videoRoot.interpolate) {
+                        captureTimer.restart()
+                        frameAnimation.running = true
+                        previousFrameSource.scheduleUpdate()
+                        videoRoot.lastCaptureTime = Date.now()
+                    } else {
+                        captureTimer.stop()
+                        frameAnimation.running = false
                     }
                 }
+            }
 
-                ShaderEffectSource {
-                    id: paletteTextureSource
-                    sourceItem: paletteSourceItem
-                    hideSource: true
-                    visible: false // The source object itself doesn't need to be visible in the scene graph
-                    smooth: false
-                    recursive: false
+            // Live capture of the current frame
+            ShaderEffectSource {
+                id: liveSource
+                // Only capture from videoPlayer when interpolation is ON.
+                // When off, sourceItem = null so QSGVideoNode renders directly to screen
+                // without being forced into texture-capture mode.
+                sourceItem: videoRoot.interpolate ? videoPlayer : null
+                live: videoRoot.interpolate
+                hideSource: true
+                smooth: true
+                visible: false
+            }
+
+            // Buffer for the previous frame (updated at target input FPS)
+            ShaderEffectSource {
+                id: previousFrameSource
+                sourceItem: videoRoot.interpolate ? videoPlayer : null
+                live: false
+                hideSource: true
+                smooth: true
+                visible: false
+            }
+
+            // -------------------------------------------------------------------
+            // Timer that captures frames at the desired input FPS
+            // -------------------------------------------------------------------
+            Timer {
+                id: captureTimer
+                interval: videoRoot.captureIntervalMs
+                repeat: true
+                running: false
+                onTriggered: {
+                    if (!videoRoot.interpolate) return
+                    previousFrameSource.scheduleUpdate()
+                    videoRoot.lastCaptureTime = Date.now()
+                    videoRoot.isOriginalFrame = true
+                    console.log("Captured input frame at", videoRoot.lastCaptureTime)
                 }
+            }
 
-                Image {
-                    mipmap: true
-                    id: rawImage
-                    anchors.fill: parent
-                    source: parent.sourceFile ? "file://" + parent.sourceFile : ""
-                    fillMode: Image.PreserveAspectCrop
-                    asynchronous: true
-                    smooth: true
-                    sourceSize.width: wallpaper.width
-                    sourceSize.height: wallpaper.height
-                    layer.enabled: parent.tint
-                    layer.effect: ShaderEffect {
-                        property var paletteTexture: paletteTextureSource
-                        property real paletteSize: staticImageRoot.optimizedPalette.length
-                        property real texWidth: rawImage.width
-                        property real texHeight: rawImage.height
-
-                        vertexShader: "palette.vert.qsb"
-                        fragmentShader: "palette.frag.qsb"
+            // -------------------------------------------------------------------
+            // FrameAnimation for continuous blendFactor updates (VSync synced)
+            // -------------------------------------------------------------------
+            FrameAnimation {
+                id: frameAnimation
+                running: false
+                onTriggered: {
+                    if (!videoRoot.interpolate || videoRoot.multiplier <= 1) return
+                    if (videoPlayer.playbackState !== MediaPlayer.PlayingState) return
+
+                    var now = Date.now()
+                    var elapsed = now - videoRoot.lastCaptureTime
+                    var factor = elapsed / videoRoot.captureIntervalMs
+                    videoRoot.blendFactor = Math.min(1.0, factor)
+                    videoRoot.isOriginalFrame = (videoRoot.blendFactor < 0.01 || videoRoot.blendFactor > 0.99)
+
+                    // Update FPS statistics
+                    videoRoot.frameCountSinceLastSecond++
+                    var fpsElapsed = now - videoRoot.lastFpsUpdateTime
+                    if (fpsElapsed >= 1000) {
+                        videoRoot.fpsOutput = videoRoot.frameCountSinceLastSecond * 1000 / fpsElapsed
+                        videoRoot.frameCountSinceLastSecond = 0
+                        videoRoot.lastFpsUpdateTime = now
                     }
+                    videoRoot.frameCounter++
                 }
             }
-        }
 
-        Component {
-            id: mpvpaperComponent
-            Item {
-                property string sourceFile: parent.sourceFile
-                property string scriptPath: decodeURIComponent(Qt.resolvedUrl("mpvpaper.sh").toString().replace("file://", ""))
-
-                Timer {
-                    id: mpvpaperRestartTimer
-                    interval: 100
-                    onTriggered: {
-                        if (sourceFile) {
-                            console.log("Restarting mpvpaper for:", sourceFile);
-                            mpvpaperProcess.running = true;
-                            wallpaper.requestVideoSync();
-                        }
+            // -------------------------------------------------------------------
+            // Interpolation Shader Effect
+            // -------------------------------------------------------------------
+            ShaderEffect {
+                id: interpolationEffect
+                anchors.fill: parent
+                visible: videoRoot.interpolate && videoRoot.multiplier > 1
+                property var currentFrame: liveSource
+                property var previousFrame: previousFrameSource
+                property real blendFactor: videoRoot.blendFactor
+                property vector2d iResolution: Qt.vector2d(width, height)
+                property int blockSize: 12
+                property int searchRadius: 3
+                property real motionThreshold: 0.05
+                property bool debugMode: videoRoot.debugMode
+                property bool isOriginalFrame: videoRoot.isOriginalFrame
+                property int frameCounter: videoRoot.frameCounter
+
+                vertexShader: "interpol.vert.qsb"
+                fragmentShader: "interpol.frag.qsb"
+
+                onStatusChanged: {
+                    if (status === ShaderEffect.Error) {
+                        console.warn("❌ Interpolation shader error - falling back to direct video")
+                        videoRoot.interpolate = false
+                    } else if (status === ShaderEffect.Ready) {
+                        console.log("✅ Interpolation shader ready")
                     }
                 }
+            }
+
+            // -------------------------------------------------------------------
+            // Tint layer applied over everything
+            // -------------------------------------------------------------------
+            layer.enabled: videoRoot.tint && wallpaper.effectivePaletteSize > 0
+            layer.smooth: true
+            layer.effect: ShaderEffect {
+                property var paletteTexture: paletteTextureSource
+                property int paletteSize: wallpaper.effectivePaletteSize
+                property real sharpness: 20.0
+                property real mixStrength: 1.0
+                property real texWidth: videoRoot.width
+                property real texHeight: videoRoot.height
+
+                vertexShader: "palette.vert.qsb"
+                fragmentShader: "palette.frag.qsb"
+            }
 
-                onSourceFileChanged: {
-                    if (sourceFile) {
-                        console.log("Source file changed to:", sourceFile);
-                        mpvpaperProcess.running = false;
-                        mpvpaperRestartTimer.restart();
+            // -------------------------------------------------------------------
+            // Debug overlay
+            // -------------------------------------------------------------------
+            Rectangle {
+                anchors.bottom: parent.bottom
+                anchors.left: parent.left
+                anchors.margins: 8
+                color: "#80000000"
+                radius: 4
+                visible: videoRoot.debugMode
+                width: debugColumn.implicitWidth + 16
+                height: debugColumn.implicitHeight + 8
+
+                Column {
+                    id: debugColumn
+                    anchors.centerIn: parent
+                    spacing: 2
+
+                    Text {
+                        text: "Input FPS: " + videoRoot.effectiveInputFps.toFixed(1) + " (orig: " + videoRoot.originalFps.toFixed(1) + ")"
+                        color: "white"
+                        font.pixelSize: 12
+                    }
+                    Text {
+                        text: "Multiplier: x" + videoRoot.multiplier
+                        color: "white"
+                        font.pixelSize: 12
+                    }
+                    Text {
+                        text: "Target Output FPS: " + (videoRoot.effectiveInputFps * videoRoot.multiplier).toFixed(1)
+                        color: "#aaffaa"
+                        font.pixelSize: 12
+                    }
+                    Text {
+                        text: "Actual Output FPS: " + videoRoot.fpsOutput.toFixed(1)
+                        color: "#ffaa00"
+                        font.pixelSize: 12
+                    }
+                    Text {
+                        text: "Frame: " + (videoRoot.isOriginalFrame ? "ORIGINAL" : "INTERPOLATED")
+                        color: videoRoot.isOriginalFrame ? "#aaaaff" : "#aaffaa"
+                        font.pixelSize: 12
+                    }
+                    Text {
+                        text: "Blend: " + videoRoot.blendFactor.toFixed(2)
+                        color: "white"
+                        font.pixelSize: 12
+                    }
+                    Text {
+                        text: "Count: " + videoRoot.frameCounter
+                        color: "white"
+                        font.pixelSize: 12
                     }
                 }
+            }
 
-                Component.onCompleted: {
-                    if (sourceFile) {
-                        console.log("Initial mpvpaper run for:", sourceFile);
-                        mpvpaperProcess.running = true;
-                        wallpaper.requestVideoSync();
-                    }
+            // -------------------------------------------------------------------
+            // Source synchronization
+            // -------------------------------------------------------------------
+            onSourceFileChanged: {
+                console.log("videoComponent: sourceFile =", sourceFile)
+                if (sourceFile) {
+                    videoPlayer.source = "file://" + sourceFile
+                } else {
+                    videoPlayer.source = ""
+                }
+                previousFrameSource.scheduleUpdate()
+                videoRoot.lastCaptureTime = Date.now()
+                videoRoot.lastFpsUpdateTime = Date.now()
+                videoRoot.frameCountSinceLastSecond = 0
+                videoRoot.fpsOutput = 0
+            }
+
+            Component.onCompleted: {
+                if (sourceFile) {
+                    videoPlayer.source = "file://" + sourceFile
                 }
+                previousFrameSource.scheduleUpdate()
+                videoRoot.lastCaptureTime = Date.now()
+                videoRoot.lastFpsUpdateTime = Date.now()
+            }
+        }
+    }
+    // -------------------------------------------------------------------
+    // Main wallpaper display area
+    // -------------------------------------------------------------------
+    Rectangle {
+        id: background
+        anchors.fill: parent
+        color: "black"
+        focus: true
 
-                Component.onDestruction:
-                // mpvpaper script handles killing previous instances
-                {}
+        Keys.onLeftPressed: {
+            if (wallpaper.wallpaperPaths.length > 0) wallpaper.previousWallpaper();
+        }
 
-                Process {
-                    id: mpvpaperProcess
-                    running: false
-                    command: sourceFile && wallpaper.currentScreenName ? ["bash", scriptPath, sourceFile, (wallpaper.tintEnabled ? wallpaper.mpvShaderPath : ""), wallpaper.currentScreenName] : []
+        Keys.onRightPressed: {
+            if (wallpaper.wallpaperPaths.length > 0) wallpaper.nextWallpaper();
+        }
 
-                    stdout: StdioCollector {
-                        onStreamFinished: {
-                            if (text.length > 0) {
-                                console.log("mpvpaper output:", text);
-                            }
-                        }
-                    }
+        // Container that handles source changes, transitions, and palette loading
+        Item {
+            id: wallImageContainer
+            anchors.fill: parent
+            property string source: wallpaper.effectiveWallpaper
+            property string previousSource: ""
 
-                    stderr: StdioCollector {
-                        onStreamFinished: {
-                            if (text.length > 0) {
-                                console.warn("mpvpaper error:", text);
-                            }
-                        }
+            onSourceChanged: {
+                console.log("wallImageContainer source changed to:", source);
+                if (source) wallpaper.loadCustomPalette(source);
+                // Animation will be triggered after loader finishes loading
+            }
+
+            SequentialAnimation {
+                id: transitionAnimation
+                ParallelAnimation {
+                    NumberAnimation { target: wallImageContainer; property: "scale"; to: 1.01; duration: Anim.standardNormal; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
+                    NumberAnimation { target: wallImageContainer; property: "opacity"; to: 0.5; duration: Anim.standardNormal; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
+                }
+                ParallelAnimation {
+                    NumberAnimation { target: wallImageContainer; property: "scale"; to: 1.0; duration: Anim.standardNormal; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
+                    NumberAnimation { target: wallImageContainer; property: "opacity"; to: 1.0; duration: Anim.standardNormal; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
+                }
+            }
+
+            Loader {
+                id: wallImageLoader
+                anchors.fill: parent
+                asynchronous: true
+                sourceComponent: {
+                    if (!wallImageContainer.source) return null;
+                    var fileType = wallpaper.getFileType(wallImageContainer.source);
+                    console.log("Loader: fileType =", fileType, "source =", wallImageContainer.source);
+                    if (fileType === 'image') return staticImageComponent;
+                    else if (fileType === 'gif' || fileType === 'video') return videoComponent;
+                    return staticImageComponent;
+                }
+
+                onLoaded: {
+                    console.log("Loader: item loaded, assigning sourceFile =", wallImageContainer.source);
+                    if (item) {
+                        item.sourceFile = wallImageContainer.source;
+                    }
+                    // Trigger animation after new content is loaded
+                    if (wallImageContainer.previousSource !== "" && 
+                        wallImageContainer.source !== wallImageContainer.previousSource &&
+                        Config.animDuration > 0) {
+                        transitionAnimation.restart();
                     }
+                    wallImageContainer.previousSource = wallImageContainer.source;
+                }
+
+                // Bind sourceFile directly to wallImageContainer.source
+                Binding {
+                    target: wallImageLoader.item
+                    property: "sourceFile"
+                    value: wallImageContainer.source
+                    when: wallImageLoader.item !== null
+                }
+            }
 
-                    onExited: function (exitCode) {
-                        console.log("mpvpaper process exited with code:", exitCode);
+            // Fallback in case Binding doesn't trigger
+            Connections {
+                target: wallImageContainer
+                function onSourceChanged() {
+                    if (wallImageLoader.item) {
+                        console.log("Connections: updating sourceFile to", wallImageContainer.source);
+                        wallImageLoader.item.sourceFile = wallImageContainer.source;
                     }
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/modules/widgets/dashboard/wallpapers/WallpapersTab.qml b/modules/widgets/dashboard/wallpapers/WallpapersTab.qml
old mode 100644
new mode 100755
index e35d928f..32659481
--- a/modules/widgets/dashboard/wallpapers/WallpapersTab.qml
+++ b/modules/widgets/dashboard/wallpapers/WallpapersTab.qml
@@ -73,6 +73,13 @@ FocusScope {
                 tintCheckbox.forceActiveFocus();
             }
         },
+        {
+            id: "interpolationCheckbox",
+            focusFunc: function () {
+                interpolationCheckboxContainer.keyboardNavigationActive = true;
+                interpolationCheckbox.forceActiveFocus();
+            }
+        },
         {
             id: "schemeSelector",
             focusFunc: function () {
@@ -108,8 +115,13 @@ FocusScope {
 
     // Función para enfocar los filtros
     function focusFilters() {
-        currentFocusIndex = 2;
-        focusableElements[2].focusFunc();
+        for (var i = 0; i < focusableElements.length; i++) {
+            if (focusableElements[i].id === "filters") {
+                currentFocusIndex = i;
+                focusableElements[i].focusFunc();
+                break;
+            }
+        }
     }
 
     // Función para navegar hacia adelante (Tab)
@@ -356,10 +368,11 @@ FocusScope {
                     opacity: 1.0
 
                     Behavior on opacity {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -386,10 +399,11 @@ FocusScope {
                                 elide: Text.ElideRight
                                 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -445,10 +459,11 @@ FocusScope {
                                     opacity: perScreenCheckbox.checked ? 1.0 : 0.0
 
                                     Behavior on opacity {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
 
@@ -461,11 +476,11 @@ FocusScope {
                                         scale: perScreenCheckbox.checked ? 1.0 : 0.0
 
                                         Behavior on scale {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             NumberAnimation {
-                                                duration: Config.animDuration / 2
-                                                easing.type: Easing.OutBack
-                                                easing.overshoot: 1.5
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                                             }
                                         }
                                     }
@@ -499,10 +514,11 @@ FocusScope {
                     opacity: oledCheckbox.enabled ? 1.0 : 0.5
 
                     Behavior on opacity {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -528,10 +544,11 @@ FocusScope {
                                 leftPadding: 8
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -598,10 +615,11 @@ FocusScope {
                                     opacity: oledCheckbox.checked ? 1.0 : 0.0
 
                                     Behavior on opacity {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
 
@@ -614,11 +632,11 @@ FocusScope {
                                         scale: oledCheckbox.checked ? 1.0 : 0.0
 
                                         Behavior on scale {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             NumberAnimation {
-                                                duration: Config.animDuration / 2
-                                                easing.type: Easing.OutBack
-                                                easing.overshoot: 1.5
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                                             }
                                         }
                                     }
@@ -728,10 +746,11 @@ FocusScope {
                                     opacity: tintCheckbox.checked ? 1.0 : 0.0
 
                                     Behavior on opacity {
-                                        enabled: Config.animDuration > 0
+                                        enabled: Anim.animationsEnabled
                                         NumberAnimation {
-                                            duration: Config.animDuration / 2
-                                            easing.type: Easing.OutQuart
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                         }
                                     }
 
@@ -744,11 +763,11 @@ FocusScope {
                                         scale: tintCheckbox.checked ? 1.0 : 0.0
 
                                         Behavior on scale {
-                                            enabled: Config.animDuration > 0
+                                            enabled: Anim.animationsEnabled
                                             NumberAnimation {
-                                                duration: Config.animDuration / 2
-                                                easing.type: Easing.OutBack
-                                                easing.overshoot: 1.5
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                                             }
                                         }
                                     }
@@ -768,6 +787,220 @@ FocusScope {
                     }
                 }
             }
+            
+            // Spacer
+            // Item { Layout.fillWidth: true }
+
+            // Motion Interpolation Toggle + Multiplier
+            Item {
+                id: interpolationCheckboxContainer
+                Layout.preferredWidth: 180
+                Layout.preferredHeight: 48
+
+                property bool keyboardNavigationActive: false
+
+                StyledRect {
+                    variant: interpolationCheckboxContainer.keyboardNavigationActive && interpolationCheckbox.activeFocus ? "focus" : "pane"
+                    anchors.fill: parent
+                    radius: Styling.radius(4)
+                    opacity: 1.0
+
+                    RowLayout {
+                        anchors.fill: parent
+                        anchors.margins: 4
+                        spacing: 4
+
+                        // Label area (clickable)
+                        Rectangle {
+                            Layout.fillWidth: true
+                            Layout.fillHeight: true
+                            color: Colors.background
+                            radius: Styling.radius(0)
+
+                            RowLayout {
+                                anchors.fill: parent
+                                spacing: 6
+
+                                Text {
+                                    text: (typeof Icons !== 'undefined' && Icons.movie !== undefined) ? Icons.movie : ""
+                                    font.family: (typeof Icons !== 'undefined' && Icons.font !== undefined) ? Icons.font : Config.theme.font
+                                    font.pixelSize: 20
+                                    color: interpolationCheckbox.checked ? Styling.srItem("primary") : Colors.overSurfaceVariant
+                                    verticalAlignment: Text.AlignVCenter
+                                }
+
+                                Text {
+                                    Layout.fillWidth: true
+                                    text: "Motion"
+                                    color: Colors.overSurface
+                                    font.family: Config.theme.font
+                                    font.pixelSize: Config.theme.fontSize
+                                    font.weight: Font.Medium
+                                    verticalAlignment: Text.AlignVCenter
+                                }
+                            }
+
+                            MouseArea {
+                                anchors.fill: parent
+                                cursorShape: Qt.PointingHandCursor
+                                onClicked: {
+                                    if (GlobalStates.wallpaperManager) {
+                                        GlobalStates.wallpaperManager.interpolationEnabled = !GlobalStates.wallpaperManager.interpolationEnabled;
+                                    }
+                                }
+                            }
+                        }
+
+                        // Checkbox (same style as OLED/Tint)
+                        Item {
+                            id: interpolationCheckbox
+                            Layout.preferredWidth: 40
+                            Layout.preferredHeight: 40
+
+                            property bool checked: GlobalStates.wallpaperManager ? GlobalStates.wallpaperManager.interpolationEnabled : false
+
+                            onActiveFocusChanged: {
+                                if (!activeFocus) {
+                                    interpolationCheckboxContainer.keyboardNavigationActive = false;
+                                }
+                            }
+
+                            Keys.onPressed: event => {
+                                if (event.key === Qt.Key_Tab) {
+                                    interpolationCheckboxContainer.keyboardNavigationActive = false;
+                                    if (event.modifiers & Qt.ShiftModifier) {
+                                        wallpapersTabRoot.focusPreviousElement();
+                                    } else {
+                                        wallpapersTabRoot.focusNextElement();
+                                    }
+                                    event.accepted = true;
+                                } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter || event.key === Qt.Key_Space) {
+                                    if (GlobalStates.wallpaperManager) {
+                                        GlobalStates.wallpaperManager.interpolationEnabled = !GlobalStates.wallpaperManager.interpolationEnabled;
+                                    }
+                                    event.accepted = true;
+                                } else if (event.key === Qt.Key_Escape) {
+                                    interpolationCheckboxContainer.keyboardNavigationActive = false;
+                                    focusSearch();
+                                    event.accepted = true;
+                                }
+                            }
+
+                            Item {
+                                anchors.fill: parent
+
+                                Rectangle {
+                                    anchors.fill: parent
+                                    radius: Styling.radius(0)
+                                    color: Colors.background
+                                    visible: !interpolationCheckbox.checked
+                                }
+
+                                StyledRect {
+                                    variant: "primary"
+                                    anchors.fill: parent
+                                    radius: Styling.radius(0)
+                                    visible: interpolationCheckbox.checked
+                                    opacity: interpolationCheckbox.checked ? 1.0 : 0.0
+
+                                    Behavior on opacity {
+                                        enabled: Anim.animationsEnabled
+                                        NumberAnimation {
+                                            duration: Anim.standardSmall
+                                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
+                                        }
+                                    }
+
+                                    Text {
+                                        anchors.centerIn: parent
+                                        text: (typeof Icons !== 'undefined' && Icons.accept !== undefined) ? Icons.accept : "✓"
+                                        color: Styling.srItem("primary")
+                                        font.family: (typeof Icons !== 'undefined' && Icons.font !== undefined) ? Icons.font : Config.theme.font
+                                        font.pixelSize: 20
+                                        scale: interpolationCheckbox.checked ? 1.0 : 0.0
+
+                                        Behavior on scale {
+                                            enabled: Anim.animationsEnabled
+                                            NumberAnimation {
+                                                duration: Anim.standardSmall
+                                                easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            MouseArea {
+                                anchors.fill: parent
+                                cursorShape: Qt.PointingHandCursor
+                                onClicked: {
+                                    if (GlobalStates.wallpaperManager) {
+                                        GlobalStates.wallpaperManager.interpolationEnabled = !GlobalStates.wallpaperManager.interpolationEnabled;
+                                    }
+                                }
+                            }
+                        }
+
+                        // Multiplier selector (visible when checked)
+                        ComboBox {
+                            id: multiplierCombo
+                            Layout.preferredWidth: 70
+                            Layout.preferredHeight: 40
+                            visible: interpolationCheckbox.checked
+
+                            model: ["x2", "x3", "x4", "x5"]
+                            currentIndex: {
+                                var mult = GlobalStates.wallpaperManager ? GlobalStates.wallpaperManager.interpolationMultiplier : 2
+                                return Math.max(0, Math.min(3, mult - 2))
+                            }
+                            // CORRECCIÓN: parámetro explícito en función
+                            onActivated: function(index) {
+                                if (GlobalStates.wallpaperManager) {
+                                    GlobalStates.wallpaperManager.interpolationMultiplier = index + 2
+                                }
+                            }
+
+                            background: Rectangle {
+                                color: Colors.background
+                                radius: Styling.radius(0)
+                            }
+
+                            contentItem: Text {
+                                text: parent.displayText
+                                color: Colors.overSurface
+                                font: Config.theme.font
+                                verticalAlignment: Text.AlignVCenter
+                                horizontalAlignment: Text.AlignHCenter
+                            }
+
+                            indicator: Text {
+                                x: parent.width - width - 8
+                                y: parent.height / 2 - height / 2
+                                text: (typeof Icons !== 'undefined' && Icons.chevronDown !== undefined) ? Icons.chevronDown : "▼"
+                                font.family: (typeof Icons !== 'undefined' && Icons.font !== undefined) ? Icons.font : Config.theme.font
+                                font.pixelSize: 16
+                                color: Colors.overSurfaceVariant
+                            }
+
+                            Keys.onPressed: event => {
+                                if (event.key === Qt.Key_Tab) {
+                                    if (event.modifiers & Qt.ShiftModifier) {
+                                        wallpapersTabRoot.focusPreviousElement();
+                                    } else {
+                                        wallpapersTabRoot.focusNextElement();
+                                    }
+                                    event.accepted = true;
+                                } else if (event.key === Qt.Key_Escape) {
+                                    focusSearch();
+                                    event.accepted = true;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
 
             // Spacer
             // Item { Layout.fillWidth: true }
@@ -888,18 +1121,20 @@ FocusScope {
 
                     // Deshabilitar animaciones durante scroll para evitar saltos
                     Behavior on x {
-                        enabled: Config.animDuration > 0 && !wallpaperGrid.isScrolling
+                        enabled: Anim.animationsEnabled && !wallpaperGrid.isScrolling
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
                     Behavior on y {
-                        enabled: Config.animDuration > 0 && !wallpaperGrid.isScrolling
+                        enabled: Anim.animationsEnabled && !wallpaperGrid.isScrolling
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -1166,18 +1401,20 @@ FocusScope {
 
                     // Animaciones de color y escala.
                     Behavior on color {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         ColorAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
                     Behavior on scale {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 3
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
diff --git a/modules/widgets/dashboard/wallpapers/interpol.frag b/modules/widgets/dashboard/wallpapers/interpol.frag
new file mode 100755
index 00000000..ce9cba2a
--- /dev/null
+++ b/modules/widgets/dashboard/wallpapers/interpol.frag
@@ -0,0 +1,172 @@
+#version 440
+
+#ifdef GL_ES
+precision highp float;
+precision mediump int;
+#endif
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D currentFrame;
+layout(binding = 2) uniform sampler2D previousFrame;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    float blendFactor;
+    vec2 iResolution;
+    int blockSize;
+    int searchRadius;
+    float motionThreshold;
+    int debugMode;
+    int isOriginalFrame;
+    int frameCounter;
+} ubuf;
+
+// -------------------------------------------------------------------
+// Ultra‑fast approximate exp() – Refined Quake‑style polynomial
+// -------------------------------------------------------------------
+float fast_exp(float x) {
+    x = clamp(x, -10.0, 10.0);
+    float x2 = x * x;
+    float x3 = x2 * x;
+    float x4 = x2 * x2;
+    return 1.0 + x + 0.5 * x2 + 0.16666666 * x3 + 0.04166666 * x4;
+}
+
+// -------------------------------------------------------------------
+// Utility: clamp integer coordinate
+// -------------------------------------------------------------------
+ivec2 clampCoord(ivec2 coord, ivec2 minBound, ivec2 maxBound) {
+    return ivec2(clamp(coord.x, minBound.x, maxBound.x),
+                 clamp(coord.y, minBound.y, maxBound.y));
+}
+
+// -------------------------------------------------------------------
+// Sample a pixel safely
+// -------------------------------------------------------------------
+vec3 samplePixel(sampler2D tex, ivec2 coord) {
+    ivec2 res = ivec2(ubuf.iResolution);
+    ivec2 clamped = clampCoord(coord, ivec2(0, 0), res - 1);
+    return texelFetch(tex, clamped, 0).rgb;
+}
+
+// -------------------------------------------------------------------
+// Optimized SAD using texelFetch (with manual unrolling for speed)
+// -------------------------------------------------------------------
+float blockSADFast(ivec2 centerCurr, ivec2 centerPrev, int bSize) {
+    float sad = 0.0;
+    int h = bSize / 2;
+    ivec2 res = ivec2(ubuf.iResolution);
+    ivec2 minBound = ivec2(h, h);
+    ivec2 maxBound = res - h - 1;
+
+    for (int y = -h; y < h; ++y) {
+        for (int x = -h; x < h; ++x) {
+            ivec2 offset = ivec2(x, y);
+            ivec2 coord_curr = clampCoord(centerCurr + offset, minBound, maxBound);
+            ivec2 coord_prev = clampCoord(centerPrev + offset, minBound, maxBound);
+            vec3 c = texelFetch(currentFrame, coord_curr, 0).rgb;
+            vec3 p = texelFetch(previousFrame, coord_prev, 0).rgb;
+            sad += dot(abs(c - p), vec3(0.299, 0.587, 0.114));
+        }
+    }
+    return sad / float(bSize * bSize);
+}
+
+void main() {
+    vec2 uv = qt_TexCoord0;
+    ivec2 res = ivec2(ubuf.iResolution);
+    ivec2 texelCoord = ivec2(uv * vec2(res));
+
+    int bSize = ubuf.blockSize;
+    int h = bSize / 2;
+    ivec2 minBound = ivec2(h, h);
+    ivec2 maxBound = res - h - 1;
+    ivec2 safeCoord = clampCoord(texelCoord, minBound, maxBound);
+
+    ivec2 blockIdx = safeCoord / bSize;
+    ivec2 blockCenter = blockIdx * bSize + h;
+
+    vec3 curr = samplePixel(currentFrame, safeCoord);
+    vec3 prev = samplePixel(previousFrame, safeCoord);
+
+    vec2 motion = vec2(0.0);
+    float bestCost = 1e10;
+    bool motionValid = false;
+
+    // ---- Pyramid‑based motion search (only at block centers) ----
+    if (all(equal(safeCoord, blockCenter))) {
+        // Fast check: if block difference is low, skip expensive search
+        float coarseDiff = blockSADFast(blockCenter, blockCenter, bSize);
+        if (coarseDiff > ubuf.motionThreshold) {
+            int sr = ubuf.searchRadius;
+            // Coarse search at 1/4 resolution for efficiency
+            vec2 coarseTexel = 4.0 / vec2(res);
+            vec2 coarseUV = uv * 0.25;
+            for (int dy = -sr; dy <= sr; ++dy) {
+                for (int dx = -sr; dx <= sr; ++dx) {
+                    vec2 offset = vec2(float(dx), float(dy)) * coarseTexel;
+                    vec3 c = textureLod(currentFrame, coarseUV, 2.0).rgb;
+                    vec3 p = textureLod(previousFrame, coarseUV + offset, 2.0).rgb;
+                    float cost = dot(abs(c - p), vec3(0.299, 0.587, 0.114));
+                    if (cost < bestCost) {
+                        bestCost = cost;
+                        motion = offset * 4.0;
+                    }
+                }
+            }
+            // Fine refinement at full resolution (only if coarse search found something)
+            if (bestCost < 1e9) {
+                ivec2 coarseMotion = ivec2(motion * vec2(res));
+                for (int dy = -2; dy <= 2; ++dy) {
+                    for (int dx = -2; dx <= 2; ++dx) {
+                        ivec2 offset = coarseMotion + ivec2(dx, dy);
+                        ivec2 blockCenterPrev = blockCenter + offset;
+                        if (any(lessThan(blockCenterPrev, minBound)) || any(greaterThan(blockCenterPrev, maxBound)))
+                            continue;
+                        float sad = blockSADFast(blockCenter, blockCenterPrev, bSize);
+                        if (sad < bestCost) {
+                            bestCost = sad;
+                            motion = vec2(offset) / vec2(res);
+                        }
+                    }
+                }
+                motionValid = (bestCost < ubuf.motionThreshold * 2.0);
+            }
+        }
+    }
+
+    // ---- Warping & hole filling ----
+    vec2 texelSize = 1.0 / vec2(res);
+    vec2 motionUV = motion;
+    vec2 halfTexel = texelSize * 0.5;
+
+    vec2 warpedUV = uv - motionUV * ubuf.blendFactor;
+    warpedUV = clamp(warpedUV, halfTexel, 1.0 - halfTexel);
+    vec3 warpedPrev = texture(previousFrame, warpedUV).rgb;
+
+    vec2 warpedCurrUV = uv + motionUV * (1.0 - ubuf.blendFactor);
+    warpedCurrUV = clamp(warpedCurrUV, halfTexel, 1.0 - halfTexel);
+    vec3 warpedCurr = texture(currentFrame, warpedCurrUV).rgb;
+
+    vec3 blended = mix(prev, curr, ubuf.blendFactor);
+    vec3 finalColor;
+
+    if (motionValid) {
+        vec3 centerWarpedPrev = texture(previousFrame, warpedUV).rgb;
+        float holeWeight = clamp(dot(abs(curr - centerWarpedPrev), vec3(0.299, 0.587, 0.114)) / 0.3, 0.0, 1.0);
+        vec3 motionCompensated = mix(warpedPrev, warpedCurr, holeWeight);
+        float confidence = 1.0 - clamp(bestCost / (ubuf.motionThreshold * 3.0), 0.0, 1.0);
+        finalColor = mix(blended, motionCompensated, confidence * 0.9);
+    } else {
+        finalColor = blended;
+    }
+
+    if (ubuf.debugMode != 0 && ubuf.isOriginalFrame == 0) {
+        finalColor *= vec3(1.0, 1.2, 1.0);
+    }
+
+    fragColor = vec4(finalColor, 1.0) * ubuf.qt_Opacity;
+}
\ No newline at end of file
diff --git a/modules/widgets/dashboard/wallpapers/interpol.frag.qsb b/modules/widgets/dashboard/wallpapers/interpol.frag.qsb
new file mode 100755
index 00000000..46c7fb26
Binary files /dev/null and b/modules/widgets/dashboard/wallpapers/interpol.frag.qsb differ
diff --git a/modules/widgets/dashboard/wallpapers/interpol.vert b/modules/widgets/dashboard/wallpapers/interpol.vert
new file mode 100755
index 00000000..ae795deb
--- /dev/null
+++ b/modules/widgets/dashboard/wallpapers/interpol.vert
@@ -0,0 +1,22 @@
+#version 440
+layout(location = 0) in vec4 qt_Vertex;
+layout(location = 1) in vec2 qt_MultiTexCoord0;
+layout(location = 0) out vec2 qt_TexCoord0;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    float blendFactor;
+    vec2 iResolution;
+    int blockSize;
+    int searchRadius;
+    float motionThreshold;
+    int debugMode;
+    int isOriginalFrame;
+    int frameCounter;
+} ubuf;
+
+void main() {
+    qt_TexCoord0 = qt_MultiTexCoord0;
+    gl_Position = ubuf.qt_Matrix * qt_Vertex;
+}
\ No newline at end of file
diff --git a/modules/widgets/dashboard/wallpapers/interpol.vert.qsb b/modules/widgets/dashboard/wallpapers/interpol.vert.qsb
new file mode 100755
index 00000000..1c67b18e
Binary files /dev/null and b/modules/widgets/dashboard/wallpapers/interpol.vert.qsb differ
diff --git a/modules/widgets/dashboard/wallpapers/palette.frag b/modules/widgets/dashboard/wallpapers/palette.frag
old mode 100644
new mode 100755
index eabcd2eb..a468a8fa
--- a/modules/widgets/dashboard/wallpapers/palette.frag
+++ b/modules/widgets/dashboard/wallpapers/palette.frag
@@ -1,4 +1,10 @@
 #version 440
+
+#ifdef GL_ES
+precision highp float;
+precision mediump int;
+#endif
+
 layout(location = 0) in vec2 qt_TexCoord0;
 layout(location = 0) out vec4 fragColor;
 
@@ -8,7 +14,9 @@ layout(binding = 2) uniform sampler2D paletteTexture;
 layout(std140, binding = 0) uniform buf {
     mat4 qt_Matrix;
     float qt_Opacity;
-    float paletteSize;
+    int paletteSize;
+    float sharpness;
+    float mixStrength;
     float texWidth;
     float texHeight;
 } ubuf;
@@ -16,39 +24,41 @@ layout(std140, binding = 0) uniform buf {
 void main() {
     vec4 tex = texture(source, qt_TexCoord0);
     vec3 color = tex.rgb;
-
-    vec3 accumulatedColor = vec3(0.0);
-    float totalWeight = 0.0;
     
-    int size = int(ubuf.paletteSize);
+    if (tex.a < 0.001) {
+        fragColor = vec4(0.0);
+        return;
+    }
+    
+    int size = ubuf.paletteSize;
+    if (size <= 0 || ubuf.mixStrength <= 0.0) {
+        fragColor = tex * ubuf.qt_Opacity;
+        return;
+    }
+    
+    mediump vec3 accum = vec3(0.0);
+    mediump float sumW = 0.0;
     
-    // "Sharpness" factor. 
-    // Higher value = colors stick closer to the palette (more posterized).
-    // Lower value = colors blend more (more washed out/grey).
-    // 15.0 - 20.0 is a good sweet spot for keeping identity while allowing gradients.
-    float distributionSharpness = 20.0; 
-
-    for (int i = 0; i < 128; i++) {
+    const float invLn2 = 1.44269504;
+    float sharpness = ubuf.sharpness;
+    
+    // Loop bound = 32 (max palette size is 26, gives margin)
+    // Previously 128 — the GLSL compiler would unroll ALL 128 iterations
+    // wasting GPU cycles on break checks. 32 fits in 1-2 warp/wavefront.
+    for (int i = 0; i < 32; ++i) {
         if (i >= size) break;
         
-        float u = (float(i) + 0.5) / ubuf.paletteSize;
-        vec3 pColor = texture(paletteTexture, vec2(u, 0.5)).rgb;
-        
+        vec3 pColor = texelFetch(paletteTexture, ivec2(i, 0), 0).rgb;
         vec3 diff = color - pColor;
-        // Euclidean squared distance
-        float distSq = dot(diff, diff); 
+        mediump float distSq = dot(diff, diff);
+        mediump float w = exp2(-sharpness * distSq * invLn2);
         
-        // Gaussian Weighting function: e^(-k * d^2)
-        // This creates a smooth bell curve of influence around each palette color.
-        float weight = exp(-distributionSharpness * distSq);
-        
-        accumulatedColor += pColor * weight;
-        totalWeight += weight;
+        accum += pColor * w;
+        sumW  += w;
     }
-
-    // Normalize
-    vec3 finalColor = accumulatedColor / (totalWeight + 0.00001); // Avoid div by zero
-
-    // Pre-multiply alpha for proper blending in Qt Quick
-    fragColor = vec4(finalColor * tex.a, tex.a) * ubuf.qt_Opacity;
-}
+    
+    vec3 finalColor = accum / (sumW + 1e-5);
+    vec3 mixed = mix(color, finalColor, ubuf.mixStrength);
+    
+    fragColor = vec4(mixed * tex.a, tex.a) * ubuf.qt_Opacity;
+}
\ No newline at end of file
diff --git a/modules/widgets/dashboard/wallpapers/palette.frag.qsb b/modules/widgets/dashboard/wallpapers/palette.frag.qsb
old mode 100644
new mode 100755
index 1b3548ee..0ec1c0a5
Binary files a/modules/widgets/dashboard/wallpapers/palette.frag.qsb and b/modules/widgets/dashboard/wallpapers/palette.frag.qsb differ
diff --git a/modules/widgets/dashboard/wallpapers/palette.vert b/modules/widgets/dashboard/wallpapers/palette.vert
old mode 100644
new mode 100755
index fbecaa9d..266347ef
--- a/modules/widgets/dashboard/wallpapers/palette.vert
+++ b/modules/widgets/dashboard/wallpapers/palette.vert
@@ -6,7 +6,9 @@ layout(location = 0) out vec2 qt_TexCoord0;
 layout(std140, binding = 0) uniform buf {
     mat4 qt_Matrix;
     float qt_Opacity;
-    float paletteSize;
+    int paletteSize;
+    float sharpness;
+    float mixStrength;
     float texWidth;
     float texHeight;
 } ubuf;
@@ -14,4 +16,4 @@ layout(std140, binding = 0) uniform buf {
 void main() {
     qt_TexCoord0 = qt_MultiTexCoord0;
     gl_Position = ubuf.qt_Matrix * qt_Vertex;
-}
+}
\ No newline at end of file
diff --git a/modules/widgets/dashboard/wallpapers/palette.vert.qsb b/modules/widgets/dashboard/wallpapers/palette.vert.qsb
old mode 100644
new mode 100755
index a1bd0d0b..dde97c2f
Binary files a/modules/widgets/dashboard/wallpapers/palette.vert.qsb and b/modules/widgets/dashboard/wallpapers/palette.vert.qsb differ
diff --git a/modules/widgets/dashboard/widgets/ControlButton.qml b/modules/widgets/dashboard/widgets/ControlButton.qml
old mode 100644
new mode 100755
index 2ad87376..694b5ad7
--- a/modules/widgets/dashboard/widgets/ControlButton.qml
+++ b/modules/widgets/dashboard/widgets/ControlButton.qml
@@ -38,10 +38,11 @@ StyledRect {
         verticalAlignment: Text.AlignVCenter
 
         Behavior on color {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             ColorAnimation {
-                duration: Config.animDuration / 2
-                easing.type: Easing.OutQuart
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
     }
diff --git a/modules/widgets/dashboard/widgets/FullPlayer.qml b/modules/widgets/dashboard/widgets/FullPlayer.qml
old mode 100644
new mode 100755
index 5c701ba5..fdfa4401
--- a/modules/widgets/dashboard/widgets/FullPlayer.qml
+++ b/modules/widgets/dashboard/widgets/FullPlayer.qml
@@ -128,10 +128,11 @@ StyledRect {
         opacity: (player.hasArtwork || player.wallpaperPath !== "") ? 0.25 : 0.0
         visible: player.hasArtwork || player.wallpaperPath !== ""
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutQuart
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
     }
@@ -158,10 +159,11 @@ StyledRect {
         opacity: (player.hasArtwork || player.wallpaperPath !== "") ? 1.0 : 0.0
         visible: player.hasArtwork || player.wallpaperPath !== ""
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutQuart
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
     }
@@ -203,7 +205,7 @@ StyledRect {
                 accentColor: Colors.primary
                 trackColor: Colors.outline
                 lineWidth: 6
-                wavy: Config.performance.wavyLine
+                wavy: false
                 waveAmplitude: player.isPlaying ? 3 : 0
                 waveFrequency: 24
                 handleSpacing: 20
@@ -249,25 +251,7 @@ StyledRect {
                         fillMode: Image.PreserveAspectCrop
                         asynchronous: true
 
-                        // Placeholder (with WavyLine)
-                        Rectangle {
-                            anchors.fill: parent
-                            color: Colors.surface
-                            visible: !player.hasArtwork && player.wallpaperPath === ""
-
-                            Loader {
-                                active: parent.visible && Config.performance.wavyLine
-                                anchors.centerIn: parent
-                                width: parent.width * 0.6
-                                height: 20
-                                sourceComponent: WavyLine {
-                                    anchors.fill: parent
-                                    color: Colors.primary
-                                    frequency: 2
-                                    amplitudeMultiplier: 2
-                                }
-                            }
-                        }
+
                     }
                 }
 
@@ -473,7 +457,8 @@ StyledRect {
                 NumberAnimation {
                     properties: "radius"
                     duration: 300
-                    easing.type: Easing.OutBack
+                    easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                 }
             }
 
diff --git a/modules/widgets/dashboard/widgets/LockPlayer.qml b/modules/widgets/dashboard/widgets/LockPlayer.qml
old mode 100644
new mode 100755
index cc1d673e..306b6ef1
--- a/modules/widgets/dashboard/widgets/LockPlayer.qml
+++ b/modules/widgets/dashboard/widgets/LockPlayer.qml
@@ -29,10 +29,11 @@ StyledRect {
     backgroundOpacity: (MprisController.activePlayer || wallpaperPath !== "") ? 0.0 : 1.0
 
     Behavior on backgroundOpacity {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -62,10 +63,11 @@ StyledRect {
             blur: 0.75
             opacity: (MprisController.activePlayer || wallpaperPath !== "") ? 1.0 : 0.0
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
@@ -111,24 +113,8 @@ StyledRect {
             anchors.right: parent.right
             anchors.verticalCenter: parent.verticalCenter
             height: 24
-            sourceComponent: CarouselProgress {
-                anchors.fill: parent
-                frequency: 4
-                color: Colors.surfaceBright
-                amplitudeMultiplier: 4
-                lineWidth: 2
-                fullLength: width
-                opacity: 1.0
-                animationsEnabled: true
-                active: true
-
-                Behavior on color {
-                    enabled: Config.animDuration > 0
-                    ColorAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
-                    }
-                }
+            sourceComponent: Rectangle {
+                color: Qt.rgba(Colors.surfaceBright.r, Colors.surfaceBright.g, Colors.surfaceBright.b, 0.4)
             }
         }
     }
@@ -183,10 +169,11 @@ StyledRect {
                     blur: playPauseHover.hovered ? 0.75 : 0
 
                     Behavior on blur {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
@@ -197,10 +184,11 @@ StyledRect {
                     opacity: playPauseHover.hovered ? 0.5 : 0.0
 
                     Behavior on opacity {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
@@ -218,10 +206,11 @@ StyledRect {
                 visible: MprisController.canTogglePlaying
 
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
@@ -292,10 +281,11 @@ StyledRect {
                     opacity: MprisController.canGoPrevious ? 1.0 : 0.3
 
                     Behavior on color {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         ColorAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -332,10 +322,11 @@ StyledRect {
                     opacity: MprisController.canGoNext ? 1.0 : 0.3
 
                     Behavior on color {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         ColorAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -378,10 +369,11 @@ StyledRect {
                     }
 
                     Behavior on color {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         ColorAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -434,10 +426,11 @@ StyledRect {
                     opacity: MprisController.activePlayer ? 1.0 : 0.3
 
                     Behavior on color {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         ColorAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
diff --git a/modules/widgets/dashboard/widgets/NotificationHistory.qml b/modules/widgets/dashboard/widgets/NotificationHistory.qml
old mode 100644
new mode 100755
index 38797936..60ba623c
--- a/modules/widgets/dashboard/widgets/NotificationHistory.qml
+++ b/modules/widgets/dashboard/widgets/NotificationHistory.qml
@@ -211,9 +211,9 @@ Item {
                 Image {
                     mipmap: true
                     source: Qt.resolvedUrl("../../../../assets/ambxst/ambxst-logo.svg")
-                    opacity: 0.25
-                    sourceSize.width: 64
-                    sourceSize.height: 64
+                    opacity: 0.35
+                    sourceSize.width: 160
+                    sourceSize.height: 160
                     fillMode: Image.PreserveAspectFit
                     anchors.horizontalCenter: parent.horizontalCenter
                     layer.enabled: true
diff --git a/modules/widgets/dashboard/widgets/QuickControls.qml b/modules/widgets/dashboard/widgets/QuickControls.qml
old mode 100644
new mode 100755
index 6886d4e8..0bd84a96
--- a/modules/widgets/dashboard/widgets/QuickControls.qml
+++ b/modules/widgets/dashboard/widgets/QuickControls.qml
@@ -25,10 +25,11 @@ StyledRect {
     }
     
     Behavior on implicitHeight {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutCubic
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -135,13 +136,15 @@ StyledRect {
             opacity: root.expandedPanel !== -1 ? 1 : 0
             
             Behavior on Layout.preferredHeight {
-                enabled: Config.animDuration > 0
-                NumberAnimation { duration: Config.animDuration; easing.type: Easing.OutQuart }
+                enabled: Anim.animationsEnabled
+                NumberAnimation { duration: Anim.standardNormal; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
             }
             
             Behavior on opacity {
-                enabled: Config.animDuration > 0
-                NumberAnimation { duration: Config.animDuration; easing.type: Easing.OutQuart }
+                enabled: Anim.animationsEnabled
+                NumberAnimation { duration: Anim.standardNormal; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve }
             }
             
             StyledRect {
@@ -172,8 +175,10 @@ StyledRect {
                             }
                         }
 
-                        Behavior on opacity { enabled: Config.animDuration > 0; NumberAnimation { duration: Config.animDuration; easing.type: Easing.OutQuart } }
-                        Behavior on x { enabled: Config.animDuration > 0; NumberAnimation { duration: Config.animDuration; easing.type: Easing.OutQuart } }
+                        Behavior on opacity { enabled: Anim.animationsEnabled; NumberAnimation { duration: Anim.standardNormal; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve } }
+                        Behavior on x { enabled: Anim.animationsEnabled; NumberAnimation { duration: Anim.standardNormal; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve } }
                     }
 
                     Loader {
@@ -192,8 +197,10 @@ StyledRect {
                             }
                         }
 
-                        Behavior on opacity { enabled: Config.animDuration > 0; NumberAnimation { duration: Config.animDuration; easing.type: Easing.OutQuart } }
-                        Behavior on x { enabled: Config.animDuration > 0; NumberAnimation { duration: Config.animDuration; easing.type: Easing.OutQuart } }
+                        Behavior on opacity { enabled: Anim.animationsEnabled; NumberAnimation { duration: Anim.standardNormal; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve } }
+                        Behavior on x { enabled: Anim.animationsEnabled; NumberAnimation { duration: Anim.standardNormal; easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve } }
                     }
                 }
             }
diff --git a/modules/widgets/dashboard/widgets/WeatherWidget.qml b/modules/widgets/dashboard/widgets/WeatherWidget.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/dashboard/widgets/WidgetsTab.qml b/modules/widgets/dashboard/widgets/WidgetsTab.qml
old mode 100644
new mode 100755
index 18082e7d..b137d045
--- a/modules/widgets/dashboard/widgets/WidgetsTab.qml
+++ b/modules/widgets/dashboard/widgets/WidgetsTab.qml
@@ -114,7 +114,7 @@ Rectangle {
                         anchors.fill: parent
 
                         Behavior on variant {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                         }
 
                         Text {
@@ -134,38 +134,42 @@ Rectangle {
                             property real syncIconRotation: 0
 
                             Behavior on text {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                             }
 
                             Behavior on color {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 ColorAnimation {
-                                    duration: Config.animDuration / 2
-                                    easing.type: Easing.OutCubic
+                                    duration: Anim.standardSmall
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
                             Behavior on opacity {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
                                     duration: 150
-                                    easing.type: Easing.OutCubic
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
                             Behavior on rotation {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
                                     duration: 400
-                                    easing.type: Easing.OutCubic
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
 
                             Behavior on scale {
-                                enabled: Config.animDuration > 0
+                                enabled: Anim.animationsEnabled
                                 NumberAnimation {
                                     duration: 400
-                                    easing.type: Easing.OutCubic
+                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                 }
                             }
                         }
diff --git a/modules/widgets/dashboard/widgets/calendar/Calendar.qml b/modules/widgets/dashboard/widgets/calendar/Calendar.qml
old mode 100644
new mode 100755
index face38d4..085d6930
--- a/modules/widgets/dashboard/widgets/calendar/Calendar.qml
+++ b/modules/widgets/dashboard/widgets/calendar/Calendar.qml
@@ -9,23 +9,15 @@ Item {
     id: root
 
     property int monthShift: 0
-    property date currentDate: new Date()
-    property var viewingDate: CalendarLayout.getDateInXMonthsTime(monthShift, currentDate)
+    property var viewingDate: CalendarLayout.getDateInXMonthsTime(monthShift)
     property var calendarLayoutData: CalendarLayout.getCalendarLayout(viewingDate, monthShift === 0)
     property var calendarLayout: calendarLayoutData.calendar
     property int currentWeekRow: calendarLayoutData.currentWeekRow
     property int currentDayOfWeek: {
         if (monthShift !== 0)
             return -1;
-        return (currentDate.getDay() + 6) % 7;
-    }
-
-    Timer {
-        interval: 60000
-        running: true
-        repeat: true
-        triggeredOnStart: true
-        onTriggered: root.currentDate = new Date()
+        var now = new Date();
+        return (now.getDay() + 6) % 7;
     }
 
     // Helper function to get localized day abbreviation
diff --git a/modules/widgets/dashboard/widgets/calendar/CalendarDayButton.qml b/modules/widgets/dashboard/widgets/calendar/CalendarDayButton.qml
old mode 100644
new mode 100755
index 4a99c804..1cd02fb3
--- a/modules/widgets/dashboard/widgets/calendar/CalendarDayButton.qml
+++ b/modules/widgets/dashboard/widgets/calendar/CalendarDayButton.qml
@@ -47,7 +47,7 @@ Rectangle {
             }
 
             Behavior on color {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 ColorAnimation {
                     duration: 150
                 }
diff --git a/modules/widgets/dashboard/widgets/calendar/layout.js b/modules/widgets/dashboard/widgets/calendar/layout.js
old mode 100644
new mode 100755
index fa7388ae..5003c2ad
--- a/modules/widgets/dashboard/widgets/calendar/layout.js
+++ b/modules/widgets/dashboard/widgets/calendar/layout.js
@@ -40,8 +40,8 @@ function getPrevMonthDays(month, year) {
     return 31;
 }
 
-function getDateInXMonthsTime(x, baseDate) {
-    var currentDate = baseDate || new Date(); // Get the current date
+function getDateInXMonthsTime(x) {
+    var currentDate = new Date(); // Get the current date
     if (x == 0) return currentDate; // If x is 0, return the current date
 
     var targetMonth = currentDate.getMonth() + x; // Calculate the target month
diff --git a/modules/widgets/defaultview/CompactPlayer.qml b/modules/widgets/defaultview/CompactPlayer.qml
old mode 100644
new mode 100755
index 265b87e8..28f85d92
--- a/modules/widgets/defaultview/CompactPlayer.qml
+++ b/modules/widgets/defaultview/CompactPlayer.qml
@@ -10,6 +10,7 @@ import qs.modules.theme
 import qs.modules.bar.workspaces
 import qs.modules.services
 import qs.modules.components
+import qs.modules.globals
 import qs.config
 
 Item {
@@ -38,7 +39,7 @@ Item {
     readonly property string focusedTitle: {
         const activeWsId = AxctlService.focusedMonitor?.activeWorkspace?.id;
         if (!activeWsId) return "";
-        const windows = CompositorData.workspaceWindowsMap[activeWsId] || [];
+        const windows = (CompositorData && CompositorData.workspaceWindowsMap ? CompositorData.workspaceWindowsMap[activeWsId] : undefined) || [];
         if (windows.length === 0) return "";
         const best = windows.reduce((best, win) => {
             const bestFocus = best?.focusHistoryID ?? Infinity;
@@ -145,10 +146,11 @@ Item {
             z: 5
 
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
         }
@@ -177,12 +179,13 @@ Item {
                 blurMax: 32
                 blur: 0.75
                 autoPaddingEnabled: false
-                opacity: (hasArtwork || wallpaperPath !== "") ? 1.0 : 0.0
+                opacity: (hasArtwork || ((typeof wallpaperPath !== "undefined" ? wallpaperPath : "") || "") !== "") ? 1.0 : 0.0
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
@@ -190,13 +193,14 @@ Item {
             StyledRect {
                 anchors.fill: parent
                 variant: "internalbg"
-                opacity: (hasArtwork || wallpaperPath !== "") ? 0.5 : 0.0
+                opacity: (hasArtwork || ((typeof wallpaperPath !== "undefined" ? wallpaperPath : "") || "") !== "") ? 0.5 : 0.0
                 radius: Styling.radius(-4)
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
@@ -212,17 +216,19 @@ Item {
             opacity: (compactPlayer.notchHovered && compactPlayer.player) ? 1.0 : 0.0
             visible: opacity > 0
             Behavior on opacity {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
             Behavior on spacing {
-                enabled: Config.animDuration > 0
+                enabled: Anim.animationsEnabled
                 NumberAnimation {
-                    duration: Config.animDuration
-                    easing.type: Easing.OutQuart
+                    duration: Anim.standardNormal
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
@@ -249,15 +255,16 @@ Item {
                         anchors.fill: parent
                         source: artworkImage
                         // Only enable blur when there's content to blur (saves GPU)
-                        blurEnabled: (hasArtwork || wallpaperPath !== "") && compactPlayer.notchHovered
+                        blurEnabled: (hasArtwork || ((typeof wallpaperPath !== "undefined" ? wallpaperPath : "") || "") !== "") && compactPlayer.notchHovered
                         blurMax: 32
                         blur: 0.75
-                        opacity: (hasArtwork || wallpaperPath !== "") ? 1.0 : 0.0 // Simplificado
+                        opacity: (hasArtwork || ((typeof wallpaperPath !== "undefined" ? wallpaperPath : "") || "") !== "") ? 1.0 : 0.0 // Simplificado
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
@@ -265,13 +272,14 @@ Item {
                     StyledRect {
                         anchors.fill: parent
                         variant: "internalbg"
-                        opacity: ((hasArtwork || wallpaperPath !== "") && compactPlayer.notchHovered) ? 0.5 : 0.0
-                        radius: parent.radius
+                        opacity: ((hasArtwork || ((typeof wallpaperPath !== "undefined" ? wallpaperPath : "") || "") !== "") && compactPlayer.notchHovered) ? 0.5 : 0.0
+                        radius: parent && parent.radius !== undefined ? parent.radius : Styling.radius(-4)
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
@@ -281,7 +289,7 @@ Item {
                         anchors.centerIn: parent
                         text: compactPlayer.isPlaying ? Icons.pause : Icons.play
                         textFormat: Text.RichText
-                        color: playPauseHover.hovered ? ((hasArtwork || wallpaperPath !== "") ? Styling.srItem("overprimary") : Styling.srItem("overprimary")) : ((hasArtwork || wallpaperPath !== "") ? Colors.overBackground : Colors.overBackground)
+                        color: playPauseHover.hovered ? ((hasArtwork || ((typeof wallpaperPath !== "undefined" ? wallpaperPath : "") || "") !== "") ? Styling.srItem("overprimary") : Styling.srItem("overprimary")) : ((hasArtwork || ((typeof wallpaperPath !== "undefined" ? wallpaperPath : "") || "") !== "") ? Colors.overBackground : Colors.overBackground)
                         font.pixelSize: 16
                         font.family: Icons.font
                         opacity: (compactPlayer.player?.canPause ?? false) && compactPlayer.notchHovered ? 1.0 : 0.0
@@ -290,25 +298,27 @@ Item {
                         layer.effect: BgShadow {}
                         visible: opacity > 0
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                         Behavior on color {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             ColorAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                         Behavior on scale {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutBack
-                                easing.overshoot: 1.5
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                             }
                         }
                         HoverHandler {
@@ -338,7 +348,7 @@ Item {
                 id: previousBtn
                 text: Icons.previous
                 textFormat: Text.RichText
-                color: previousHover.hovered ? ((hasArtwork || wallpaperPath !== "") ? Styling.srItem("overprimary") : Styling.srItem("overprimary")) : Colors.overBackground
+                color: previousHover.hovered ? ((hasArtwork || ((typeof wallpaperPath !== "undefined" ? wallpaperPath : "") || "") !== "") ? Styling.srItem("overprimary") : Styling.srItem("overprimary")) : Colors.overBackground
                 font.pixelSize: 16
                 font.family: Icons.font
                 opacity: compactPlayer.player?.canGoPrevious ?? false ? 1.0 : 0.3
@@ -348,25 +358,27 @@ Item {
                 readonly property real naturalWidth: implicitWidth
                 Layout.preferredWidth: (compactPlayer.player !== null && compactPlayer.notchHovered) ? naturalWidth : 0
                 Behavior on Layout.preferredWidth {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on color {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     ColorAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on scale {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutBack
-                        easing.overshoot: 1.5
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                     }
                 }
                 HoverHandler {
@@ -405,7 +417,7 @@ Item {
                 id: nextBtn
                 text: Icons.next
                 textFormat: Text.RichText
-                color: nextHover.hovered ? ((hasArtwork || wallpaperPath !== "") ? Styling.srItem("overprimary") : Styling.srItem("overprimary")) : Colors.overBackground
+                color: nextHover.hovered ? ((hasArtwork || ((typeof wallpaperPath !== "undefined" ? wallpaperPath : "") || "") !== "") ? Styling.srItem("overprimary") : Styling.srItem("overprimary")) : Colors.overBackground
                 font.pixelSize: 16
                 font.family: Icons.font
                 opacity: compactPlayer.player?.canGoNext ?? false ? 1.0 : 0.3
@@ -415,25 +427,27 @@ Item {
                 readonly property real naturalWidth: implicitWidth
                 Layout.preferredWidth: (compactPlayer.player !== null && compactPlayer.notchHovered) ? naturalWidth : 0
                 Behavior on Layout.preferredWidth {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on color {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     ColorAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on scale {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutBack
-                        easing.overshoot: 1.5
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                     }
                 }
                 HoverHandler {
@@ -472,7 +486,7 @@ Item {
                     }
                 }
                 textFormat: Text.RichText
-                color: modeBtn.modeHover.hovered ? ((hasArtwork || wallpaperPath !== "") ? Styling.srItem("overprimary") : Styling.srItem("overprimary")) : Colors.overBackground
+                color: modeBtn.modeHover.hovered ? ((hasArtwork || ((typeof wallpaperPath !== "undefined" ? wallpaperPath : "") || "") !== "") ? Styling.srItem("overprimary") : Styling.srItem("overprimary")) : Colors.overBackground
                 property alias modeHover: modeHover
                 font.pixelSize: 16
                 font.family: Icons.font
@@ -489,25 +503,27 @@ Item {
                 readonly property real naturalWidth: implicitWidth
                 Layout.preferredWidth: (compactPlayer.player !== null && compactPlayer.notchHovered) ? naturalWidth : 0
                 Behavior on Layout.preferredWidth {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on color {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     ColorAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on scale {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutBack
-                        easing.overshoot: 1.5
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
                     }
                 }
                 HoverHandler {
@@ -544,7 +560,7 @@ Item {
                 id: playerIcon
                 text: compactPlayer.getPlayerIcon(compactPlayer.player)
                 textFormat: Text.RichText
-                color: playerIconHover.hovered ? ((hasArtwork || wallpaperPath !== "") ? Styling.srItem("overprimary") : Styling.srItem("overprimary")) : Colors.overBackground
+                color: playerIconHover.hovered ? ((hasArtwork || ((typeof wallpaperPath !== "undefined" ? wallpaperPath : "") || "") !== "") ? Styling.srItem("overprimary") : Styling.srItem("overprimary")) : Colors.overBackground
                 font.pixelSize: 20
                 font.family: Icons.font
                 verticalAlignment: Text.AlignVCenter
@@ -552,24 +568,27 @@ Item {
                 Layout.preferredWidth: (compactPlayer.player !== null && compactPlayer.notchHovered) ? implicitWidth : 0
                 Layout.rightMargin: (compactPlayer.player !== null && compactPlayer.notchHovered) ? 4 : 0
                 Behavior on Layout.preferredWidth {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on Layout.rightMargin {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 Behavior on color {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     ColorAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 HoverHandler {
diff --git a/modules/widgets/defaultview/DefaultView.qml b/modules/widgets/defaultview/DefaultView.qml
old mode 100644
new mode 100755
index c75a7ad2..71a8f106
--- a/modules/widgets/defaultview/DefaultView.qml
+++ b/modules/widgets/defaultview/DefaultView.qml
@@ -57,16 +57,104 @@ Item {
     property real mainRowMargin: 16
 
     Behavior on mainRowMargin {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutBack
-            easing.overshoot: 1.2
+            duration: Anim.standardNormal
+            easing.type: Anim.springSnappy().type
+            easing.bezierCurve: Anim.springSnappy().bezierCurve
         }
     }
 
+    // Metrics mode
+    readonly property bool metricsActive: Config.notch && Config.notch.showMetrics === true
+
+    // Dynamic notch metrics model (ordered by notchMetricsOrder from StateService)
+    property ListModel notchMetrics: ListModel {}
+    property var notchOrder: []
+
+    function rebuildNotchMetrics() {
+        notchMetrics.clear()
+        var order = StateService.get("notchMetricsOrder", ["cpu","gpu","fps","ram","disk"])
+        notchOrder = order
+        var items = {}
+
+        // Unified CPU: temp + usage % + power
+        items.cpu = {
+            id: "cpu", label: "CPU",
+            visible: SystemResources.cpuUsageEnabled || SystemResources.cpuTempEnabled || SystemResources.cpuPowerEnabled,
+            labelColor: SystemResources.metricColorCpu,
+            valueText: (SystemResources.metricsAvailable && SystemResources.cpuTempEnabled && SystemResources.cpuTemp > 0) ? SystemResources.cpuTemp.toString() : (SystemResources.metricsAvailable && SystemResources.cpuUsageEnabled) ? Math.round(SystemResources.cpuUsage).toString() : "--",
+            valueUnit: (SystemResources.metricsAvailable && SystemResources.cpuTempEnabled && SystemResources.cpuTemp > 0) ? "°C" : (SystemResources.metricsAvailable && SystemResources.cpuUsageEnabled) ? "%" : "",
+            subValue: (SystemResources.metricsAvailable && SystemResources.cpuPowerEnabled && SystemResources.cpuPower > 0) ? SystemResources.cpuPower.toFixed(0) : "",
+            subUnit: (SystemResources.metricsAvailable && SystemResources.cpuPowerEnabled && SystemResources.cpuPower > 0) ? "W" : ""
+        }
+        // Unified GPU: temp + usage % + power
+        items.gpu = {
+            id: "gpu", label: "GPU",
+            visible: SystemResources.gpuUsageEnabled || SystemResources.gpuTempEnabled || SystemResources.gpuPowerEnabled,
+            labelColor: SystemResources.metricColorGpu,
+            valueText: (SystemResources.metricsAvailable && SystemResources.gpuTempEnabled && SystemResources.gpuTemp > 0) ? SystemResources.gpuTemp.toString() : (SystemResources.metricsAvailable && SystemResources.gpuUsageEnabled && SystemResources.gpuUsages.length > 0) ? Math.round(SystemResources.gpuUsages[0]).toString() : "--",
+            valueUnit: (SystemResources.metricsAvailable && SystemResources.gpuTempEnabled && SystemResources.gpuTemp > 0) ? "°C" : (SystemResources.metricsAvailable && SystemResources.gpuUsageEnabled) ? "%" : "",
+            subValue: (SystemResources.metricsAvailable && SystemResources.gpuPowerEnabled && SystemResources.gpuPower > 0) ? SystemResources.gpuPower.toFixed(0) : "",
+            subUnit: (SystemResources.metricsAvailable && SystemResources.gpuPowerEnabled && SystemResources.gpuPower > 0) ? "W" : ""
+        }
+        // FPS
+        items.fps = {
+            id: "fps", label: "FPS", visible: SystemResources.fpsEnabled,
+            labelColor: SystemResources.metricColorFps,
+            valueText: (SystemResources.metricsAvailable && SystemResources.fpsEnabled && SystemResources.fps > 0) ? Math.round(SystemResources.fps).toString() : "--",
+            valueUnit: "", subValue: "", subUnit: ""
+        }
+        // RAM
+        items.ram = {
+            id: "ram", label: "RAM", visible: SystemResources.ramEnabled,
+            labelColor: SystemResources.metricColorRam,
+            valueText: (SystemResources.metricsAvailable && SystemResources.ramEnabled && SystemResources.ramUsage > 0) ? Math.round(SystemResources.ramUsage).toString() : "--",
+            valueUnit: (SystemResources.metricsAvailable && SystemResources.ramEnabled && SystemResources.ramUsage > 0) ? "%" : "",
+            subValue: "", subUnit: ""
+        }
+        // Disk
+        items.disk = {
+            id: "disk", label: "DSK", visible: SystemResources.diskEnabled,
+            labelColor: SystemResources.metricColorDisk,
+            valueText: (SystemResources.metricsAvailable && SystemResources.diskEnabled && SystemResources.validDisks.length > 0 && SystemResources.diskUsage[SystemResources.validDisks[0]]) ? Math.round(SystemResources.diskUsage[SystemResources.validDisks[0]]).toString() : "--",
+            valueUnit: (SystemResources.metricsAvailable && SystemResources.diskEnabled && SystemResources.validDisks.length > 0) ? "%" : "",
+            subValue: "", subUnit: ""
+        }
+
+        for (var i = 0; i < order.length; i++) {
+            var it = items[order[i]]
+            if (it) notchMetrics.append(it)
+        }
+    }
+
+    // Rebuild when any toggle or color changes
+    Connections {
+        target: SystemResources
+        function onCpuUsageEnabledChanged() { rebuildNotchMetrics() }
+        function onCpuTempEnabledChanged() { rebuildNotchMetrics() }
+        function onCpuPowerEnabledChanged() { rebuildNotchMetrics() }
+        function onRamEnabledChanged() { rebuildNotchMetrics() }
+        function onGpuUsageEnabledChanged() { rebuildNotchMetrics() }
+        function onGpuTempEnabledChanged() { rebuildNotchMetrics() }
+        function onGpuPowerEnabledChanged() { rebuildNotchMetrics() }
+        function onFpsEnabledChanged() { rebuildNotchMetrics() }
+        function onDiskEnabledChanged() { rebuildNotchMetrics() }
+        function onMetricColorCpuChanged() { rebuildNotchMetrics() }
+        function onMetricColorGpuChanged() { rebuildNotchMetrics() }
+        function onMetricColorFpsChanged() { rebuildNotchMetrics() }
+        function onMetricColorRamChanged() { rebuildNotchMetrics() }
+        function onMetricColorDiskChanged() { rebuildNotchMetrics() }
+        function onNotchVersionChanged() { rebuildNotchMetrics() }
+    }
+
+    Component.onCompleted: rebuildNotchMetrics()
+    readonly property real metricsRowWidth: (metricsActive && metricsModeRow.visible) ? metricsModeRow.implicitWidth : 0
+
     // Computed dimensions
-    readonly property real mainRowContentWidth: 200 + userInfo.width + separator1.width + separator2.width + notifIndicator.width + (mainRow.spacing * 4) + mainRowMargin
+    readonly property real mainRowContentWidth: metricsActive
+        ? Math.max(metricsRowWidth + mainRowMargin, 200)
+        : (200 + userInfo.width + separator1.width + separator2.width + notifIndicator.width + (mainRow.spacing * 4) + mainRowMargin)
     readonly property real mainRowHeight: Config.showBackground ? (Config.notchTheme === "island" ? 36 : 44) : (Config.notchTheme === "island" ? 36 : 40)
     readonly property real notificationMinWidth: expandedState ? 420 : 320
     readonly property real notificationContainerHeight: notificationView.implicitHeight + notificationPaddingTop + notificationPaddingBottom
@@ -76,11 +164,11 @@ Item {
     implicitHeight: hasActiveNotifications ? mainRowHeight + notificationContainerHeight : mainRowHeight
 
     Behavior on implicitWidth {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutBack
-            easing.overshoot: 1.2
+            duration: Anim.standardNormal
+            easing.type: Anim.springSnappy().type
+            easing.bezierCurve: Anim.springSnappy().bezierCurve
         }
     }
 
@@ -128,10 +216,78 @@ Item {
 
     Item {
         anchors.fill: parent
+        clip: true
+
+        // Metrics mode content (replaces mainRow when showMetrics is active)
+        Row {
+            id: metricsModeRow
+            visible: metricsActive
+
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.verticalCenter: parent.verticalCenter
+            height: mainRowHeight
+            spacing: 14
+            leftPadding: 6
+            rightPadding: 6
+            z: 3
+
+            MetricsGroup {
+                visible: SystemResources.cpuUsageEnabled || SystemResources.cpuTempEnabled || SystemResources.cpuPowerEnabled
+                label: "CPU"
+                labelColor: SystemResources.metricColorCpu
+                valueText: (SystemResources.metricsAvailable && SystemResources.cpuTempEnabled && SystemResources.cpuTemp > 0) ? (SystemResources.cpuTemp.toString() + (SystemResources.metricsAvailable && SystemResources.cpuUsageEnabled ? "° " + Math.round(SystemResources.cpuUsage).toString() + "%" : "°C")) : (SystemResources.metricsAvailable && SystemResources.cpuUsageEnabled) ? Math.round(SystemResources.cpuUsage).toString() + "%" : "--"
+                valueUnit: ""
+                subValue: (SystemResources.metricsAvailable && SystemResources.cpuPowerEnabled && SystemResources.cpuPower > 0) ? SystemResources.cpuPower.toFixed(0) : ""
+                subUnit: (SystemResources.metricsAvailable && SystemResources.cpuPowerEnabled && SystemResources.cpuPower > 0) ? "W" : ""
+            }
+
+            MetricsGroup {
+                visible: SystemResources.gpuUsageEnabled || SystemResources.gpuTempEnabled || SystemResources.gpuPowerEnabled
+                label: "GPU"
+                labelColor: SystemResources.metricColorGpu
+                valueText: (SystemResources.metricsAvailable && SystemResources.gpuTempEnabled && SystemResources.gpuTemp > 0) ? (SystemResources.gpuTemp.toString() + (SystemResources.metricsAvailable && SystemResources.gpuUsageEnabled && SystemResources.gpuUsages.length > 0 ? "° " + Math.round(SystemResources.gpuUsages[0]).toString() + "%" : "°C")) : (SystemResources.metricsAvailable && SystemResources.gpuUsageEnabled && SystemResources.gpuUsages.length > 0) ? Math.round(SystemResources.gpuUsages[0]).toString() + "%" : "--"
+                valueUnit: ""
+                subValue: (SystemResources.metricsAvailable && SystemResources.gpuPowerEnabled && SystemResources.gpuPower > 0) ? SystemResources.gpuPower.toFixed(0) : ""
+                subUnit: (SystemResources.metricsAvailable && SystemResources.gpuPowerEnabled && SystemResources.gpuPower > 0) ? "W" : ""
+            }
+
+
+
+            MetricsGroup {
+                visible: SystemResources.ramEnabled
+                label: "RAM"
+                labelColor: SystemResources.metricColorRam
+                valueText: (SystemResources.metricsAvailable && SystemResources.ramEnabled && SystemResources.ramUsage > 0) ? Math.round(SystemResources.ramUsage).toString() + "%" : "--"
+                valueUnit: ""
+                subValue: ""
+                subUnit: ""
+            }
+
+            MetricsGroup {
+                visible: SystemResources.diskEnabled
+                label: "DSK"
+                labelColor: SystemResources.metricColorDisk
+                valueText: (SystemResources.metricsAvailable && SystemResources.diskEnabled && SystemResources.validDisks.length > 0 && SystemResources.diskUsage[SystemResources.validDisks[0]]) ? Math.round(SystemResources.diskUsage[SystemResources.validDisks[0]]).toString() + "%" : "--"
+                valueUnit: ""
+                subValue: ""
+                subUnit: ""
+            }
+
+            MetricsGroup {
+                visible: SystemResources.fpsEnabled
+                label: "FPS"
+                labelColor: SystemResources.metricColorFps
+                valueText: (SystemResources.metricsAvailable && SystemResources.fpsEnabled && SystemResources.fps > 0) ? Math.round(SystemResources.fps).toString() : "--"
+                valueUnit: ""
+                subValue: ""
+                subUnit: ""
+            }
+        }
 
-        // mainRow container
+        // mainRow container (hidden when metrics mode is active)
         Row {
             id: mainRow
+            visible: !metricsActive
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.top: isBottom ? undefined : parent.top
             anchors.bottom: isBottom ? parent.bottom : undefined
@@ -198,10 +354,11 @@ Item {
                 onIsNavigatingChanged: root.isNavigating = isNavigating
 
                 Behavior on opacity {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
             }
diff --git a/modules/widgets/defaultview/MetricsGroup.qml b/modules/widgets/defaultview/MetricsGroup.qml
new file mode 100755
index 00000000..dda21459
--- /dev/null
+++ b/modules/widgets/defaultview/MetricsGroup.qml
@@ -0,0 +1,81 @@
+import QtQuick
+
+/**
+ * Individual metrics group in the notch metrics overlay.
+ * Shows a colored dot, label, value with small unit, optional sub value/unit.
+ * e.g. "CPU 51°C 40W" → label=CPU, valueText=51, valueUnit=°C, subValue=40, subUnit=W
+ */
+Item {
+    id: root
+
+    required property string label
+    required property color labelColor
+    property string valueText: ""
+    property string valueUnit: ""
+    property string subValue: ""
+    property string subUnit: ""
+
+    implicitHeight: parent ? parent.height : 32
+    implicitWidth: innerRow.implicitWidth
+
+    Row {
+        id: innerRow
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+        spacing: 5
+
+        // Label
+        Text {
+            text: root.label
+            color: root.labelColor
+            font.pixelSize: 11
+            font.weight: Font.Bold
+            font.family: "sans-serif"
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+        // Value number (large)
+        Text {
+            text: root.valueText
+            color: "#FFFFFF"
+            font.pixelSize: 12
+            font.weight: Font.DemiBold
+            font.family: "sans-serif"
+            anchors.verticalCenter: parent.verticalCenter
+            visible: root.valueText !== ""
+        }
+
+        // Value unit (small, e.g. °C)
+        Text {
+            text: root.valueUnit
+            color: "#CCFFFFFF"
+            font.pixelSize: 8
+            font.weight: Font.Normal
+            font.family: "sans-serif"
+            anchors.verticalCenter: parent.verticalCenter
+            visible: root.valueUnit !== ""
+        }
+
+        // Sub value (large, e.g. watts)
+        Text {
+            text: root.subValue
+            color: "#FFFFFF"
+            font.pixelSize: 12
+            font.weight: Font.DemiBold
+            font.family: "sans-serif"
+            anchors.verticalCenter: parent.verticalCenter
+            visible: root.subValue !== ""
+        }
+
+        // Sub unit (small, e.g. W)
+        Text {
+            text: root.subUnit
+            color: "#CCFFFFFF"
+            font.pixelSize: 8
+            font.weight: Font.Normal
+            font.family: "sans-serif"
+            anchors.verticalCenter: parent.verticalCenter
+            visible: root.subUnit !== ""
+        }
+    }
+}
diff --git a/modules/widgets/defaultview/NotificationIndicator.qml b/modules/widgets/defaultview/NotificationIndicator.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/defaultview/UserInfo.qml b/modules/widgets/defaultview/UserInfo.qml
old mode 100644
new mode 100755
index 1cfad227..2a6e4401
--- a/modules/widgets/defaultview/UserInfo.qml
+++ b/modules/widgets/defaultview/UserInfo.qml
@@ -64,6 +64,8 @@ Item {
                         anchors.fill: parent
                         source: `file://${Quickshell.env("HOME")}/.face.icon`
                         fillMode: Image.PreserveAspectCrop
+                        sourceSize.width: 24
+                        sourceSize.height: 24
                     }
                 }
             }
@@ -81,9 +83,9 @@ Item {
                 visible: false
 
                 Behavior on color {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     ColorAnimation {
-                        duration: Config.animDuration / 2
+                        duration: Anim.standardSmall
                     }
                 }
             }
diff --git a/modules/widgets/launcher/AGENTS.md b/modules/widgets/launcher/AGENTS.md
old mode 100644
new mode 100755
diff --git a/modules/widgets/launcher/LauncherView.qml b/modules/widgets/launcher/LauncherView.qml
old mode 100644
new mode 100755
index 9af6e933..1a062a34
--- a/modules/widgets/launcher/LauncherView.qml
+++ b/modules/widgets/launcher/LauncherView.qml
@@ -18,6 +18,9 @@ Rectangle {
     id: root
     color: "transparent"
     
+    property string calcResult: ""
+    property bool isMathQuery: false
+
     readonly property bool isCompact: currentTab === 0 || currentTab === 2
     implicitWidth: isCompact ? 464 : 900
     implicitHeight: isCompact ? 296 : 392
@@ -173,8 +176,17 @@ Rectangle {
         function updateFilteredApps() {
             if (searchText.length > 0) {
                 filteredApps = AppSearch.fuzzyQuery(searchText);
+                // Check if query looks like a math expression
+                const mathRegex = /^[0-9+\-*/.()%\^ ]+$/;
+                root.isMathQuery = searchText.length > 1 && mathRegex.test(searchText.trim());
+                if (root.isMathQuery && typeof Calculator !== "undefined" && Calculator.isAvailable) {
+                    Calculator.evaluate(searchText.trim());
+                } else {
+                    root.calcResult = "";
+                }
             } else {
                 filteredApps = AppSearch.getAllApps();
+                root.calcResult = "";
             }
         }
 
@@ -227,13 +239,55 @@ Rectangle {
 
         function executeApp(appId) {
             let app = appsById[appId];
-            if (app && app.execute) {
-                app.execute();
-                // Record usage for sorting priority
+            if (app) {
+                // Delegate to AppSearch.launchApp for consistency with DockAppButton.
+                // app.execute() (Quickshell DesktopEntry) does not handle Terminal=true
+                // entries: TUI apps (btop, htop, nvim, ranger, etc.) launched from the
+                // drawer fail silently because the Exec is run without a terminal wrapper.
+                AppSearch.launchApp(app);
                 UsageTracker.recordUsage(appId);
             }
         }
 
+        // Calculator result header
+        Item {
+            id: calcHeader
+            width: parent.width
+            height: root.calcResult ? 40 : 0
+            visible: root.calcResult && root.isMathQuery
+            clip: true
+
+            Behavior on height {
+                enabled: Anim.animationsEnabled
+                NumberAnimation { duration: Anim.standardSmall }
+            }
+
+            RowLayout {
+                anchors.fill: parent
+                anchors.leftMargin: 12
+                anchors.rightMargin: 12
+                spacing: 8
+                visible: parent.visible
+
+                Text {
+                    text: "="
+                    font.family: Config.theme.font
+                    font.pixelSize: 14
+                    font.weight: Font.Bold
+                    color: Colors.primary
+                }
+
+                Text {
+                    text: root.calcResult
+                    font.family: Config.theme.monoFont
+                    font.pixelSize: 14
+                    color: Colors.overBackground
+                    Layout.fillWidth: true
+                    elide: Text.ElideRight
+                }
+            }
+        }
+
         ListModel {
             id: appsModel
         }
@@ -251,6 +305,21 @@ Rectangle {
             });
         }
 
+        // Calculator result handler
+        Connections {
+            target: typeof Calculator !== "undefined" ? Calculator : null
+            function onResultReady(expression, result) {
+                if (expression === appLauncher.searchText.trim()) {
+                    root.calcResult = result;
+                }
+            }
+            function onError(expression, error) {
+                if (expression === appLauncher.searchText.trim()) {
+                    root.calcResult = "";
+                }
+            }
+        }
+
         Timer {
             id: initialLoadTimer
             interval: 100
@@ -381,10 +450,11 @@ Rectangle {
         }
 
         Behavior on height {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutQuart
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -597,10 +667,11 @@ Rectangle {
                 property bool enableScrollAnimation: true
 
                 Behavior on contentY {
-                    enabled: Config.animDuration > 0 && resultsList.enableScrollAnimation && !resultsList.moving
+                    enabled: Anim.animationsEnabled && resultsList.enableScrollAnimation && !resultsList.moving
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -666,10 +737,11 @@ Rectangle {
                     radius: 16
 
                     Behavior on height {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -776,10 +848,11 @@ Rectangle {
                                 elide: Text.ElideRight
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutCubic
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -802,10 +875,11 @@ Rectangle {
                                 visible: text !== ""
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutCubic
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -825,10 +899,11 @@ Rectangle {
                         opacity: isExpanded ? 1 : 0
 
                         Behavior on opacity {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
 
@@ -947,10 +1022,11 @@ Rectangle {
                                                 }
 
                                                 Behavior on color {
-                                                    enabled: Config.animDuration > 0
+                                                    enabled: Anim.animationsEnabled
                                                     ColorAnimation {
-                                                        duration: Config.animDuration / 2
-                                                        easing.type: Easing.OutQuart
+                                                        duration: Anim.standardSmall
+                                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                     }
                                                 }
                                             }
@@ -971,10 +1047,11 @@ Rectangle {
                                                 maximumLineCount: 1
 
                                                 Behavior on color {
-                                                    enabled: Config.animDuration > 0
+                                                    enabled: Anim.animationsEnabled
                                                     ColorAnimation {
-                                                        duration: Config.animDuration / 2
-                                                        easing.type: Easing.OutQuart
+                                                        duration: Anim.standardSmall
+                                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                     }
                                                 }
                                             }
@@ -1030,18 +1107,20 @@ Rectangle {
                     }
 
                     Behavior on y {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutCubic
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
                     Behavior on height {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
diff --git a/modules/widgets/launcher/qmldir b/modules/widgets/launcher/qmldir
old mode 100644
new mode 100755
diff --git a/modules/widgets/overview/AGENTS.md b/modules/widgets/overview/AGENTS.md
old mode 100644
new mode 100755
diff --git a/modules/widgets/overview/Overview.qml b/modules/widgets/overview/Overview.qml
old mode 100644
new mode 100755
index 6dad0e66..25e99e5d
--- a/modules/widgets/overview/Overview.qml
+++ b/modules/widgets/overview/Overview.qml
@@ -3,6 +3,8 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Effects
 import Quickshell
+import Quickshell.Io
+import Quickshell.Widgets
 import Quickshell.Wayland
 import qs.modules.globals
 import qs.modules.theme
@@ -11,396 +13,786 @@ import qs.modules.bar.workspaces
 import qs.modules.services
 import qs.config
 
-
-
 Item {
     id: overviewRoot
-
-    // Cache config values to avoid repeated lookups
-    readonly property real scale: Config.overview.scale
-    readonly property int rows: Config.overview.rows
-    readonly property int columns: Config.overview.columns
-    readonly property int workspacesShown: rows * columns
-    readonly property real workspaceSpacing: Config.overview.workspaceSpacing
-    readonly property real workspacePadding: 8
-    readonly property color activeBorderColor: Styling.srItem("overprimary")
-
-    // Use the screen's monitor instead of focused monitor for multi-monitor support
-    property var currentScreen: null  // This will be set from parent
-    readonly property var monitor: currentScreen ? AxctlService.monitorFor(currentScreen) : AxctlService.focusedMonitor
-    readonly property int workspaceGroup: Math.floor((monitor?.activeWorkspace?.id - 1 || 0) / workspacesShown)
-
-    // Cache these references
-    readonly property var windowList: CompositorData.windowList
-    readonly property var monitors: CompositorData.monitors
-    readonly property int monitorId: monitor?.id ?? -1
-    readonly property var monitorData: monitors.find(m => m.id === monitorId) ?? null
-
-    readonly property string barPosition: Config.bar.position
-    readonly property var barPanel: monitor ? Visibilities.getBarPanelForScreen(monitor.name) : null
-    readonly property bool isBarPinned: barPanel ? barPanel.pinned : (Config.bar.pinnedOnStartup ?? true)
-    readonly property int barReserved: isBarPinned ? (Config.showBackground ? 44 : 40) : 0
-
-    // Search functionality (controlled from parent)
-    property string searchQuery: ""
-    property var matchingWindows: []
-    property int selectedMatchIndex: 0
-
-    // Reset search state
-    function resetSearch() {
-        searchQuery = "";
-        matchingWindows = [];
-        selectedMatchIndex = 0;
-    }
-
-    // Update matching windows when search query or window list changes
-    onSearchQueryChanged: updateMatchingWindows()
-    onWindowListChanged: updateMatchingWindows()
-
-    // Fuzzy match: checks if all characters of query appear in order in target
-    function fuzzyMatch(query, target) {
-        if (query.length === 0)
-            return true;
-        if (target.length === 0)
-            return false;
-
-        let queryIndex = 0;
-        for (let i = 0; i < target.length && queryIndex < query.length; i++) {
-            if (target[i] === query[queryIndex]) {
-                queryIndex++;
+    anchors.fill: parent
+
+    Process { id: wsSwitchProcess }
+
+    // ── Window data from hyprctl ──
+    property var rawWindows: []
+    property var rawMonitors: []
+
+    Process {
+        id: clientProcess
+        command: ["hyprctl", "clients", "-j"]
+        stdout: StdioCollector {
+            onStreamFinished: {
+                try {
+                    var raw = JSON.parse(text);
+                    if (Array.isArray(raw)) overviewRoot.rawWindows = raw;
+                } catch (e) {}
             }
         }
-        return queryIndex === query.length;
     }
 
-    // Score a fuzzy match (higher is better)
-    function fuzzyScore(query, target) {
-        if (query.length === 0)
-            return 0;
-        if (target.length === 0)
-            return -1;
-
-        // Exact match gets highest score
-        if (target.includes(query))
-            return 1000 + (100 - target.length);
-
-        // Check for fuzzy match
-        let queryIndex = 0;
-        let consecutiveMatches = 0;
-        let maxConsecutive = 0;
-        let score = 0;
-
-        for (let i = 0; i < target.length && queryIndex < query.length; i++) {
-            if (target[i] === query[queryIndex]) {
-                queryIndex++;
-                consecutiveMatches++;
-                maxConsecutive = Math.max(maxConsecutive, consecutiveMatches);
-                // Bonus for matches at word boundaries
-                if (i === 0 || target[i - 1] === ' ' || target[i - 1] === '-' || target[i - 1] === '_') {
-                    score += 10;
-                }
-            } else {
-                consecutiveMatches = 0;
+    Process {
+        id: monProcess
+        command: ["hyprctl", "monitors", "-j"]
+        stdout: StdioCollector {
+            onStreamFinished: {
+                try {
+                    var raw = JSON.parse(text);
+                    if (Array.isArray(raw)) overviewRoot.rawMonitors = raw;
+                } catch (e) {}
             }
         }
-
-        if (queryIndex !== query.length)
-            return -1; // No match
-
-        return score + maxConsecutive * 5;
     }
 
-    function updateMatchingWindows() {
-        if (searchQuery.length === 0) {
-            matchingWindows = [];
-            selectedMatchIndex = 0;
-            return;
+    // When rawWindows updates, tell the mapper to find unmatched windows
+    onRawWindowsChanged: {
+        if (GlobalStates.overviewOpen && WlrToplevelMapper) {
+            WlrToplevelMapper.updateUnmatched(rawWindows);
+            WlrToplevelMapper.captureAllUnmatched();
         }
-
-        const query = searchQuery.toLowerCase();
-        const matches = windowList.filter(win => {
-            if (!win)
-                return false;
-            const title = (win.title || "").toLowerCase();
-            const windowClass = (win.class || "").toLowerCase();
-            return fuzzyMatch(query, title) || fuzzyMatch(query, windowClass);
-        }).map(win => ({
-                    window: win,
-                    score: Math.max(fuzzyScore(query, (win.title || "").toLowerCase()), fuzzyScore(query, (win.class || "").toLowerCase()))
-                })).sort((a, b) => b.score - a.score).map(item => item.window);
-
-        matchingWindows = matches;
-        selectedMatchIndex = matches.length > 0 ? 0 : -1;
     }
 
-    function navigateToSelectedWindow() {
-        if (matchingWindows.length === 0 || selectedMatchIndex < 0)
-            return;
-
-        const win = matchingWindows[selectedMatchIndex];
-        if (!win)
-            return;
-
-        // Close overview and focus the matched window
-        Visibilities.setActiveModule("", true);
-        Qt.callLater(() => {
-            AxctlService.dispatch(`focuswindow address:${win.address}`);
-        });
+    Timer {
+        id: refreshTimer
+        interval: 600
+        running: GlobalStates.overviewOpen
+        repeat: true
+        onTriggered: {
+            if (!clientProcess.running) clientProcess.running = true;
+            if (!monProcess.running) monProcess.running = true;
+        }
     }
 
-    function selectNextMatch() {
-        if (matchingWindows.length === 0)
-            return;
-        selectedMatchIndex = (selectedMatchIndex + 1) % matchingWindows.length;
+    // Timer to wait for axctl to process the move before refreshing window data
+    Timer {
+        id: delayedRefreshTimer
+        interval: 200
+        onTriggered: {
+            if (!clientProcess.running) clientProcess.running = true;
+            if (!monProcess.running) monProcess.running = true;
+        }
     }
 
-    function selectPrevMatch() {
-        if (matchingWindows.length === 0)
-            return;
-        selectedMatchIndex = (selectedMatchIndex - 1 + matchingWindows.length) % matchingWindows.length;
+    // ── Config ──
+    readonly property int rows: Config.overview.rows
+    readonly property int columns: Config.overview.columns
+    readonly property int workspacesShown: rows * columns
+    readonly property real workspaceSpacing: Config.overview.workspaceSpacing
+    readonly property real workspacePadding: 8
+    readonly property color activeBorderColor: Styling.srItem("overprimary")
+    property var currentScreen: null
+
+    // Monitor lookup by ID
+    readonly property var monMap: {
+        var m = {};
+        var list = overviewRoot.rawMonitors;
+        for (var i = 0; i < list.length; i++) m[list[i].id] = list[i];
+        return m;
     }
 
-    function isWindowMatched(windowAddress) {
-        if (searchQuery.length === 0)
-            return false;
-        return matchingWindows.some(win => win?.address === windowAddress);
+    // ── Cell size — 16:9 ──
+    readonly property real _spacingW: (columns - 1) * workspaceSpacing + workspacePadding * 2
+    readonly property real _spacingH: (rows - 1) * workspaceSpacing + workspacePadding * 2
+    readonly property real _cellWfromW: Math.max(80, Math.round((width - _spacingW) / columns))
+    readonly property real _cellHfromW: Math.max(60, Math.round(_cellWfromW * 9 / 16))
+    readonly property real _cellHfromH: Math.max(60, Math.round((height - _spacingH) / rows))
+    readonly property real _cellWfromH: Math.max(80, Math.round(_cellHfromH * 16 / 9))
+    readonly property bool _useWbase: (rows * _cellHfromW + _spacingH) <= height
+    readonly property real wsCellW: _useWbase ? _cellWfromW : _cellWfromH
+    readonly property real wsCellH: _useWbase ? _cellHfromW : _cellHfromH
+    readonly property real gridTotalW: columns * wsCellW + _spacingW
+    readonly property real gridTotalH: rows * wsCellH + _spacingH
+
+    // ── Windows grouped by workspace ──
+    readonly property var windowsByWs: {
+        var map = {};
+        var list = overviewRoot.rawWindows;
+        for (var i = 0; i < list.length; i++) {
+            var w = list[i];
+            var wsId = w.workspace && w.workspace.id ? w.workspace.id : 0;
+            if (wsId < 1 || wsId > workspacesShown) continue;
+            if (!map[wsId]) map[wsId] = [];
+            map[wsId].push(w);
+        }
+        return map;
     }
 
-    function isWindowSelected(windowAddress) {
-        if (matchingWindows.length === 0 || selectedMatchIndex < 0)
-            return false;
-        return matchingWindows[selectedMatchIndex]?.address === windowAddress;
+    function winsForWs(wsNum) { return overviewRoot.windowsByWs[String(wsNum)] || []; }
+
+    function iconForClass(cls) { return AppSearch.guessIcon(cls || ""); }
+
+    function colorForClass(cls) {
+        var c = (cls || "").toLowerCase();
+        var hash = 0;
+        for (var i = 0; i < c.length; i++) hash = ((hash << 5) - hash) + c.charCodeAt(i);
+        var hue = ((hash % 360) + 360) % 360;
+        return Qt.hsla(hue / 360, 0.5, 0.4, 1.0);
     }
 
-    // Pre-calculate workspace dimensions once
-    readonly property real workspaceImplicitWidth: {
-        if (!monitorData)
-            return 200;
-        const isRotated = (monitorData.transform % 2 === 1);
-        const monitorScale = monitorData.scale || 1.0;
-        const width = isRotated ? (monitor?.height || 1920) : (monitor?.width || 1920);
-        let scaledWidth = (width / monitorScale) * scale;
-        if (barPosition === "left" || barPosition === "right") {
-            scaledWidth -= barReserved * scale;
+    // ── Refresh when overview opens ──
+    property int _refreshCount: 0
+
+    Timer {
+        id: openRefreshTimer
+        interval: 200
+        running: GlobalStates.overviewOpen && _refreshCount < 8
+        repeat: true
+        onTriggered: {
+            if (!clientProcess.running) clientProcess.running = true;
+            if (!monProcess.running) monProcess.running = true;
+            _refreshCount++;
         }
-        return Math.max(0, Math.round(scaledWidth));
     }
 
-    readonly property real workspaceImplicitHeight: {
-        if (!monitorData)
-            return 150;
-        const isRotated = (monitorData.transform % 2 === 1);
-        const monitorScale = monitorData.scale || 1.0;
-        const height = isRotated ? (monitor?.width || 1080) : (monitor?.height || 1080);
-        let scaledHeight = (height / monitorScale) * scale;
-        if (barPosition === "top" || barPosition === "bottom") {
-            scaledHeight -= barReserved * scale;
+    Connections {
+        target: GlobalStates
+        function onOverviewOpenChanged() {
+            if (GlobalStates.overviewOpen) {
+                _refreshCount = 0;
+                if (!clientProcess.running) clientProcess.running = true;
+                if (!monProcess.running) monProcess.running = true;
+                // Trigger grim fallback on next data refresh
+                Qt.callLater(function() {
+                    if (WlrToplevelMapper && rawWindows.length > 0) {
+                        WlrToplevelMapper.updateUnmatched(rawWindows);
+                        WlrToplevelMapper.captureAllUnmatched();
+                    }
+                });
+            } else {
+                // Reset drag state on close
+                overviewRoot.isDragging = false;
+                overviewRoot.dragToWorkspace = -1;
+                overviewRoot.dragFromWorkspace = -1;
+                overviewRoot.dragWindowAddr = "";
+            }
         }
-        return Math.max(0, Math.round(scaledHeight));
     }
 
-    property int draggingFromWorkspace: -1
-    property int draggingTargetWorkspace: -1
-
-    implicitWidth: overviewBackground.implicitWidth
-    implicitHeight: overviewBackground.implicitHeight
+    // ── Drag state ──
+    property int dragFromWorkspace: -1
+    property int dragToWorkspace: -1
+    property string dragWindowAddr: ""
+    property bool isDragging: false
+    property real dragGhostX: 0
+    property real dragGhostY: 0
+    property real dragGhostW: 120
+    property real dragGhostH: 80
+    property string dragGhostCls: ""
+    property string dragGhostTitle: ""
+    property string dragGhostAddr: ""
+
+    Component.onCompleted: {
+        if (!clientProcess.running) clientProcess.running = true;
+        if (!monProcess.running) monProcess.running = true;
+    }
 
+    // ── Grid layout ──
     Item {
-        id: overviewBackground
+        id: gridContainer
         anchors.centerIn: parent
+        width: gridTotalW
+        height: gridTotalH
 
-        implicitWidth: workspaceColumnLayout.implicitWidth
-        implicitHeight: workspaceColumnLayout.implicitHeight
+        Repeater {
+            model: workspacesShown
 
-        ColumnLayout {
-            id: workspaceColumnLayout
-            anchors.centerIn: parent
-            spacing: workspaceSpacing
+            Rectangle {
+                id: cell
+                required property int index
+                readonly property int wsNum: index + 1
+                readonly property int col: index % columns
+                readonly property int row: Math.floor(index / columns)
+                readonly property var cellWindows: overviewRoot.winsForWs(wsNum)
+                readonly property int staggerDelay: (row * columns + col) * 40
+                // findCardAt walks children directly, no need for windowCards
+
+                x: col * (wsCellW + workspaceSpacing) + workspacePadding
+                y: row * (wsCellH + workspaceSpacing) + workspacePadding
+                width: wsCellW
+                height: wsCellH
+                color: Qt.rgba(Colors.surfaceContainer.r, Colors.surfaceContainer.g, Colors.surfaceContainer.b, 0.12)
+                radius: Styling.radius(2)
+                clip: !overviewRoot.isDragging
+                // Cell z: drag target > hovered > normal
+                z: overviewRoot.dragToWorkspace === wsNum ? 99999 : (dragTracker._hoveredWs === wsNum ? 99998 : 0)
+
+                // Staggered entrance
+                opacity: 0; scale: 0.85
+                Component.onCompleted: { opacity = 1; scale = 1; }
+                Behavior on opacity {
+                    enabled: Anim.animationsEnabled
+                    SequentialAnimation {
+                        PauseAnimation { duration: cell.staggerDelay }
+                        NumberAnimation {
+                            duration: Anim.emphasizedNormal
+                            easing.type: Anim.easing("decelerate").type
+                            easing.bezierCurve: Anim.easing("decelerate").bezierCurve
+                        }
+                    }
+                }
+                Behavior on scale {
+                    enabled: Anim.animationsEnabled
+                    SequentialAnimation {
+                        PauseAnimation { duration: cell.staggerDelay }
+                        NumberAnimation {
+                            duration: Anim.emphasizedNormal
+                            easing.type: Anim.springSnappy().type
+                            easing.bezierCurve: Anim.springSnappy().bezierCurve
+                        }
+                    }
+                }
 
-            Repeater {
-                model: overviewRoot.rows
-                delegate: RowLayout {
-                    id: row
-                    property int rowIndex: index
-                    spacing: workspaceSpacing
+                // ── Wallpaper background (no ScreencopyView - QJSValue limitation) ──
+                TintedWallpaper {
+                    anchors.fill: parent; radius: Styling.radius(2)
+                    tintEnabled: GlobalStates.wallpaperManager ? GlobalStates.wallpaperManager.tintEnabled : false
+                    property string lfp: GlobalStates.wallpaperManager ? GlobalStates.wallpaperManager.getLockscreenFramePath(GlobalStates.wallpaperManager.currentWallpaper) : ""
+                    source: lfp ? "file://" + lfp : ""
+                    visible: true
+                }
 
-                    Repeater {
-                        model: overviewRoot.columns
+                // ── Window cards: positioned by % of monitor ──
+                Repeater {
+                    model: cellWindows
+
+                    Item {
+                        required property var modelData
+                        readonly property var win: modelData
+                        readonly property var mon: overviewRoot.monMap[String(win.monitor)]
+
+                        // Window position & size as fraction of its monitor
+                        // Note: hyprctl reports at[] in logical coords but size[]
+                        // in physical coords when scale != 1.0. We multiply
+                        // size by scale to normalize to logical coordinates.
+                        readonly property real _monScale: mon ? (mon.scale || 1.0) : 1.0
+                        readonly property real monW: mon ? (mon.width || 1920) : 1920
+                        readonly property real monH: mon ? (mon.height || 1080) : 1080
+                        readonly property real relX: monW > 0 ? ((win.at?.[0] || 0) - (mon?.x || 0)) / monW : 0
+                        readonly property real relY: monH > 0 ? ((win.at?.[1] || 0) - (mon?.y || 0)) / monH : 0
+                        readonly property real relW: monW > 0 ? Math.max(0.05, Math.min(1, ((win.size?.[0] || 100) * _monScale) / monW)) : 0.85
+                        readonly property real relH: monH > 0 ? Math.max(0.05, Math.min(1, ((win.size?.[1] || 100) * _monScale) / monH)) : 0.85
+
+                        // Fill to neighbor: expand until hitting another window edge
+                        readonly property real fillW: {
+                            var base = relW;
+                            var r = 1.0; // stretch to right edge of monitor
+                            var others = cellWindows;
+                            for (var i = 0; i < others.length; i++) {
+                                if (others[i].address === win.address) continue;
+                                var ox = ((others[i].at?.[0] || 0) - (mon?.x || 0)) / monW;
+                                var oy = ((others[i].at?.[1] || 0) - (mon?.y || 0)) / monH;
+                                var ow = Math.max(0.05, ((others[i].size?.[0] || 100) * _monScale) / monW);
+                                var oh = Math.max(0.05, ((others[i].size?.[1] || 100) * _monScale) / monH);
+                                if (ox > relX && oy < relY + relH && oy + oh > relY)
+                                    r = Math.min(r, ox);
+                            }
+                            return Math.max(base, r - relX);
+                        }
+                        readonly property real fillH: {
+                            var base = relH;
+                            var b = 1.0; // stretch to bottom edge of monitor
+                            var others = cellWindows;
+                            for (var i = 0; i < others.length; i++) {
+                                if (others[i].address === win.address) continue;
+                                var ox = ((others[i].at?.[0] || 0) - (mon?.x || 0)) / monW;
+                                var oy = ((others[i].at?.[1] || 0) - (mon?.y || 0)) / monH;
+                                var ow = Math.max(0.05, ((others[i].size?.[0] || 100) * _monScale) / monW);
+                                var oh = Math.max(0.05, ((others[i].size?.[1] || 100) * _monScale) / monH);
+                                if (oy > relY && ox < relX + relW && ox + ow > relX)
+                                    b = Math.min(b, oy);
+                            }
+                            return Math.max(base, b - relY);
+                        }
+
+                        readonly property real cardX: Math.round(relX * wsCellW)
+                        readonly property real cardY: Math.round(relY * wsCellH)
+                        readonly property real cardW: Math.max(12, Math.round(fillW * wsCellW))
+                        readonly property real cardH: Math.max(12, Math.round(fillH * wsCellH))
+
+                        readonly property string cls: win.class || ""
+                        readonly property string addr: win.address || ""
+                        readonly property string title: win.title || cls
+
+                        // Expose card info for the root dragTracker
+                        property bool _isCard: true
+                        property var _cardData: ({ wsNum: wsNum, addr: addr, cls: cls, title: title, cardW: cardW, cardH: cardH, cardX: cardX, cardY: cardY, cellX: cell.x, cellY: cell.y })
+                        // No Component.onCompleted - findCardAt walks children directly
+
+                        // Drag: card se queda en su sitio, overlay replica la sigue
+                        property bool _dragActive: false
+                        x: cardX; y: cardY; z: 1; width: cardW; height: cardH
+                        scale: _dragActive ? 1.04 : 1.0
+                        visible: !(overviewRoot.isDragging && addr === overviewRoot.dragWindowAddr)
+
+                        Behavior on scale {
+                            enabled: Anim.animationsEnabled
+                            SpringAnimation { spring: 4.0; damping: 0.35; mass: 0.3 }
+                        }
+
+                        // ── Live per-window preview via WlrToplevelMapper ──
+                        readonly property var toplevel: WlrToplevelMapper ? WlrToplevelMapper.find(cls, title) : null
+
+                        // Card background
                         Rectangle {
-                            id: workspace
-                            property int colIndex: index
-                            property int workspaceValue: overviewRoot.workspaceGroup * workspacesShown + rowIndex * overviewRoot.columns + colIndex + 1
-                            property color defaultWorkspaceColor: Colors.background
-                            property color hoveredWorkspaceColor: Colors.surfaceContainer
-                            property color hoveredBorderColor: Colors.outline
-                            property bool hoveredWhileDragging: false
-
-                            implicitWidth: overviewRoot.workspaceImplicitWidth + workspacePadding
-                            implicitHeight: overviewRoot.workspaceImplicitHeight + workspacePadding
-                            color: "transparent"
-                            radius: Styling.radius(2)
-                            border.width: 2
-                            border.color: hoveredWhileDragging ? hoveredBorderColor : "transparent"
-                            clip: true
-
-                            // Wallpaper background for each workspace
-                            TintedWallpaper {
-                                id: workspaceWallpaper
-                                anchors.fill: parent
-                                radius: Styling.radius(2)
-                                tintEnabled: GlobalStates.wallpaperManager ? GlobalStates.wallpaperManager.tintEnabled : false
+                            anchors.fill: parent
+                            radius: Styling.radius(-2)
+                            color: Qt.rgba(Colors.surfaceContainer.r, Colors.surfaceContainer.g, Colors.surfaceContainer.b, 0.45)
+                            border.color: Qt.rgba(Colors.onSurface.r, Colors.onSurface.g, Colors.onSurface.b, 0.15)
+                            border.width: 1
+
+                            // Accent strip
+                            Rectangle {
+                                anchors.top: parent.top; anchors.left: parent.left; anchors.right: parent.right
+                                height: Math.max(2, Math.round(parent.height * 0.04))
+                                color: overviewRoot.colorForClass(cls); radius: parent.radius
+                            }
 
-                                property string lockscreenFramePath: {
-                                    if (!GlobalStates.wallpaperManager)
-                                        return "";
-                                    return GlobalStates.wallpaperManager.getLockscreenFramePath(GlobalStates.wallpaperManager.currentWallpaper);
+                            // Gradient overlay for depth
+                            Rectangle {
+                                anchors.fill: parent; radius: parent.radius
+                                gradient: Gradient {
+                                    orientation: Gradient.Horizontal
+                                    GradientStop { position: 0.0; color: Qt.rgba(1, 1, 1, 0.03) }
+                                    GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.12) }
                                 }
-
-                                source: lockscreenFramePath ? "file://" + lockscreenFramePath : ""
                             }
+                        }
+
+                        // ── Live window preview (when Toplevel available) ──
+                        Loader {
+                            anchors.fill: parent
+                            active: Config.performance.windowPreview && toplevel != null
+                            visible: status === Loader.Ready
+                            asynchronous: true
 
-                            MouseArea {
+                            sourceComponent: ClippingRectangle {
                                 anchors.fill: parent
-                                acceptedButtons: Qt.LeftButton
-                                onClicked: {
-                                    if (overviewRoot.draggingTargetWorkspace === -1) {
-                                        // Only switch workspace, don't close overview
-                                        AxctlService.dispatch(`workspace ${workspaceValue}`);
+                                radius: Styling.radius(-2)
+                                antialiasing: true
+                                color: "transparent"
+
+                                ScreencopyView {
+                                    id: winPreview
+                                    width: Math.max(1, win.size?.[0] || 640)
+                                    height: Math.max(1, win.size?.[1] || 480)
+                                    captureSource: toplevel
+                                    live: GlobalStates.overviewOpen
+
+                                    transform: Scale {
+                                        origin.x: 0; origin.y: 0
+                                        xScale: parent.width / winPreview.width
+                                        yScale: parent.height / winPreview.height
                                     }
                                 }
-                                onDoubleClicked: {
-                                    if (overviewRoot.draggingTargetWorkspace === -1) {
-                                        // Double click closes overview and switches workspace
-                                        Visibilities.setActiveModule("");
-                                        AxctlService.dispatch(`workspace ${workspaceValue}`);
-                                    }
+
+                                // Dim overlay so text is readable
+                                Rectangle {
+                                    anchors.fill: parent; color: Qt.rgba(0, 0, 0, 0.15)
                                 }
                             }
+                        }
 
-                            DropArea {
-                                anchors.fill: parent
-                                onEntered: {
-                                    overviewRoot.draggingTargetWorkspace = workspaceValue;
-                                    if (overviewRoot.draggingFromWorkspace == overviewRoot.draggingTargetWorkspace)
-                                        return;
-                                    hoveredWhileDragging = true;
-                                }
-                                onExited: {
-                                    hoveredWhileDragging = false;
-                                    if (overviewRoot.draggingTargetWorkspace == workspaceValue)
-                                        overviewRoot.draggingTargetWorkspace = -1;
-                                }
+                        // ── App icon (shown when no live preview) ──
+                        Image {
+                            anchors.centerIn: parent
+                            anchors.verticalCenterOffset: Math.round(-parent.height * 0.02)
+                            width: Math.round(Math.min(parent.width, parent.height) * 0.30)
+                            height: width
+                            source: Quickshell.iconPath(overviewRoot.iconForClass(cls), "image-missing")
+                            sourceSize: Qt.size(width, height)
+                            asynchronous: true
+                            opacity: 0.6
+                            visible: !Config.performance.windowPreview || toplevel == null
+                        }
+
+                        // ── Window title ──
+                        Text {
+                            anchors.bottom: parent.bottom
+                            anchors.bottomMargin: Math.max(1, Math.round(parent.height * 0.02))
+                            anchors.left: parent.left; anchors.right: parent.right
+                            anchors.leftMargin: Math.max(1, Math.round(parent.width * 0.02))
+                            anchors.rightMargin: Math.max(1, Math.round(parent.width * 0.02))
+                            text: title
+                            font.family: Config.theme.font
+                            font.pixelSize: Math.max(5, Math.round(parent.height * 0.07))
+                            color: Colors.onSurface
+                            opacity: 0.5
+                            elide: Text.ElideRight; maximumLineCount: 1
+                            horizontalAlignment: Text.AlignHCenter
+                            visible: parent.height > 35
+                        }
+
+                        // ── Dim original during drag ──
+                        Rectangle {
+                            anchors.fill: parent
+                            radius: Styling.radius(-2)
+                            color: overviewRoot.isDragging && overviewRoot.dragWindowAddr === addr
+                                ? Qt.rgba(0, 0, 0, 0.4) : "transparent"
+                            z: 5
+                            Behavior on color {
+                                enabled: Anim.animationsEnabled
+                                ColorAnimation { duration: 120 }
                             }
                         }
                     }
                 }
+
+                // ── Drop target highlight ──
+                Rectangle {
+                    anchors.fill: parent
+                    radius: Styling.radius(2)
+                    color: "transparent"
+                    border.color: overviewRoot.dragToWorkspace === wsNum ? Colors.primary : "transparent"
+                    border.width: overviewRoot.dragToWorkspace === wsNum ? 3 : 0
+                    opacity: overviewRoot.dragToWorkspace === wsNum ? 0.7 : 0
+                    z: 10
+                    Behavior on opacity {
+                        enabled: Anim.animationsEnabled
+                        NumberAnimation { duration: 100 }
+                    }
+                    Behavior on border.width {
+                        enabled: Anim.animationsEnabled
+                        NumberAnimation { duration: 100 }
+                    }
+                }
+
+                // ── Workspace number ──
+                Text {
+                    anchors.right: parent.right; anchors.bottom: parent.bottom
+                    anchors.margins: 4
+                    text: String(wsNum)
+                    font.family: Config.theme.font
+                    font.pixelSize: Math.max(10, Math.round(wsCellH * 0.08))
+                    font.bold: true; color: Colors.onSurface; opacity: 0.2; z: 5
+                }
+
             }
         }
 
-        Item {
-            id: windowSpace
-            anchors.centerIn: parent
-            implicitWidth: workspaceColumnLayout.implicitWidth
-            implicitHeight: workspaceColumnLayout.implicitHeight
-
-            // Pre-filter windows for this monitor and workspace group
-            readonly property var filteredWindowData: {
-                const minWs = overviewRoot.workspaceGroup * overviewRoot.workspacesShown;
-                const maxWs = (overviewRoot.workspaceGroup + 1) * overviewRoot.workspacesShown;
-                const monId = overviewRoot.monitorId;
-                const toplevels = ToplevelManager.toplevels.values;
-
-                return overviewRoot.windowList.filter(win => {
-                    const wsId = win?.workspace?.id;
-                    return wsId > minWs && wsId <= maxWs && win.monitor === monId;
-                }).map(win => ({
-                            windowData: win,
-                            toplevel: (() => {
-                                const cls = win.class || "";
-                                if (!cls) return null;
-                                const candidates = toplevels.filter(t => t.appId === cls);
-                                if (candidates.length <= 1) return candidates[0] || null;
-                                return candidates.find(t => t.title === (win.title || "")) || candidates[0];
-                            })()
-                        }));
+    }
+
+    // ── Drag overlay: replica visual de la card que sigue al mouse ──
+    // Se renderiza a nivel root (z:100001) entre cells (0) y dragTracker (100002)
+    Item {
+        id: dragOverlay
+        visible: overviewRoot.isDragging && overviewRoot.dragGhostAddr.length > 0
+        z: 100001
+        x: overviewRoot.dragGhostX
+        y: overviewRoot.dragGhostY
+        width: overviewRoot.dragGhostW
+        height: overviewRoot.dragGhostH
+        clip: true
+
+        // Live preview via WlrToplevelMapper
+        readonly property var _toplevel: Config.performance.windowPreview && overviewRoot.dragGhostCls
+            ? (WlrToplevelMapper ? WlrToplevelMapper.find(overviewRoot.dragGhostCls, overviewRoot.dragGhostTitle) : null) : null
+
+        // Live ScreencopyView
+        Loader {
+            anchors.fill: parent
+            active: dragOverlay._toplevel != null
+            visible: status === Loader.Ready
+            asynchronous: true
+
+            sourceComponent: ClippingRectangle {
+                anchors.fill: parent
+                radius: Styling.radius(-2)
+                antialiasing: true; color: "transparent"
+
+                ScreencopyView {
+                    id: ovPreview
+                    width: Math.max(1, overviewRoot.dragGhostW * 1.2)
+                    height: Math.max(1, overviewRoot.dragGhostH * 1.2)
+                    captureSource: dragOverlay._toplevel
+                    live: true
+                    transform: Scale {
+                        origin.x: 0; origin.y: 0
+                        xScale: parent.width / ovPreview.width
+                        yScale: parent.height / ovPreview.height
+                    }
+                }
+                // Dim overlay so text is readable
+                Rectangle { anchors.fill: parent; color: Qt.rgba(0, 0, 0, 0.15) }
             }
+        }
 
-            Repeater {
-                model: windowSpace.filteredWindowData
-
-                delegate: OverviewWindow {
-                    id: window
-                    required property var modelData
-                    windowData: modelData.windowData
-                    toplevel: modelData.toplevel
-                    scale: overviewRoot.scale
-                    availableWorkspaceWidth: overviewRoot.workspaceImplicitWidth
-                    availableWorkspaceHeight: overviewRoot.workspaceImplicitHeight
-                    monitorData: overviewRoot.monitorData
-                    barPosition: overviewRoot.barPosition
-                    barReserved: overviewRoot.barReserved
-
-                    // Search highlighting
-                    isSearchMatch: overviewRoot.isWindowMatched(windowData?.address)
-                    isSearchSelected: overviewRoot.isWindowSelected(windowData?.address)
-
-                    property int workspaceColIndex: (windowData?.workspace.id - 1) % overviewRoot.columns
-                    property int workspaceRowIndex: Math.floor((windowData?.workspace.id - 1) % overviewRoot.workspacesShown / overviewRoot.columns)
-
-                    xOffset: Math.round((overviewRoot.workspaceImplicitWidth + workspacePadding + workspaceSpacing) * workspaceColIndex + workspacePadding / 2)
-                    yOffset: Math.round((overviewRoot.workspaceImplicitHeight + workspacePadding + workspaceSpacing) * workspaceRowIndex + workspacePadding / 2)
-
-                    onDragStarted: overviewRoot.draggingFromWorkspace = windowData?.workspace.id || -1
-                    onDragFinished: targetWorkspace => {
-                        overviewRoot.draggingFromWorkspace = -1;
-                        if (targetWorkspace !== -1 && targetWorkspace !== windowData?.workspace.id) {
-                            AxctlService.dispatch(`movetoworkspacesilent ${targetWorkspace}, address:${windowData?.address}`);
-                        }
+        // Grim screenshot fallback
+        Image {
+            anchors.fill: parent
+            source: Config.performance.windowPreview && dragOverlay._toplevel == null && overviewRoot.dragGhostAddr
+                ? WlrToplevelMapper.screenshotPath(overviewRoot.dragGhostAddr) : ""
+            sourceSize: Qt.size(parent.width, parent.height)
+            asynchronous: true; fillMode: Image.PreserveAspectCrop
+            visible: status === Image.Ready && dragOverlay._toplevel == null
+            opacity: 0.5
+        }
+
+        // Card background (always visible)
+        Rectangle {
+            anchors.fill: parent
+            radius: Styling.radius(-2)
+            color: Qt.rgba(Colors.surfaceContainer.r, Colors.surfaceContainer.g, Colors.surfaceContainer.b, 0.5)
+            border.color: Styling.srItem("overprimary"); border.width: 2
+            z: 0
+
+            Rectangle {
+                anchors.top: parent.top; anchors.left: parent.left; anchors.right: parent.right
+                height: Math.max(2, Math.round(parent.height * 0.04))
+                color: overviewRoot.colorForClass(overviewRoot.dragGhostCls)
+                radius: parent.radius
+            }
+
+            Image {
+                anchors.centerIn: parent
+                anchors.verticalCenterOffset: Math.round(-parent.height * 0.02)
+                width: Math.round(Math.min(parent.width, parent.height) * 0.30); height: width
+                source: Quickshell.iconPath(overviewRoot.iconForClass(overviewRoot.dragGhostCls), "image-missing")
+                sourceSize: Qt.size(width, height)
+                asynchronous: true; opacity: 0.7
+            }
+
+            Text {
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: Math.max(1, Math.round(parent.height * 0.02))
+                anchors.left: parent.left; anchors.right: parent.right
+                anchors.leftMargin: 2; anchors.rightMargin: 2
+                text: overviewRoot.dragGhostTitle
+                font.family: Config.theme.font
+                font.pixelSize: Math.max(5, Math.round(parent.height * 0.07))
+                color: Colors.onSurface; opacity: 0.6
+                elide: Text.ElideRight; maximumLineCount: 1
+                horizontalAlignment: Text.AlignHCenter
+                visible: parent.height > 35
+            }
+        }
+    }
+
+    // ── SINGLE MouseArea: handles ALL interactions ──
+    // Finds cards via childAt + _isCard property walk.
+    // No mouse event conflicts because this is the only MouseArea.
+    MouseArea {
+        id: dragTracker
+        anchors.fill: parent
+        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+        hoverEnabled: true
+        z: 100002
+        cursorShape: overviewRoot.isDragging ? Qt.ClosedHandCursor : Qt.ArrowCursor
+
+        // Find card at mouse position by walking cell children directly
+        function findCardAt(mx, my) {
+            var gx = mx - gridContainer.x;
+            var gy = my - gridContainer.y;
+
+            for (var ws = 1; ws <= overviewRoot.workspacesShown; ws++) {
+                var cellEl = gridContainer.children.find(function(c) {
+                    return c.wsNum === ws;
+                });
+                if (!cellEl) continue;
+
+                var cx = gx - cellEl.x;
+                var cy = gy - cellEl.y;
+
+                // Walk cell's visual children looking for _isCard
+                var kids = cellEl.children;
+                for (var ki = 0; ki < kids.length; ki++) {
+                    var card = kids[ki];
+                    if (!card._isCard) continue;
+                    if (cx >= card.x && cx <= card.x + card.width &&
+                        cy >= card.y && cy <= card.y + card.height) {
+                        return card;
                     }
-                    onWindowClicked: {
-                        // Close overview and focus the specific clicked window
-                        // Skip generic focus restoration since we're handling it specifically
-                        Visibilities.setActiveModule("", true);
-                        Qt.callLater(() => {
-                            AxctlService.dispatch(`focuswindow address:${windowData.address}`);
-                        });
+                }
+            }
+            return null;
+        }
+
+        // ── Hover + Press state ──
+        property var _pendingCard: null
+        property var _pendingData: null
+        property bool _holding: false
+        property bool _dragging: false
+        // Updated on every mouse move: workspace number under cursor
+        property int _hoveredWs: -1
+
+        // Helper: find workspace number from root-level coordinates
+        function wsAt(mx, my) {
+            var gx = mx - gridContainer.x;
+            var gy = my - gridContainer.y;
+            var cw = overviewRoot.wsCellW + overviewRoot.workspaceSpacing;
+            var ch = overviewRoot.wsCellH + overviewRoot.workspaceSpacing;
+            var col = Math.floor((gx - overviewRoot.workspacePadding) / cw);
+            var row = Math.floor((gy - overviewRoot.workspacePadding) / ch);
+            if (col >= 0 && col < overviewRoot.columns && row >= 0 && row < overviewRoot.rows) {
+                return row * overviewRoot.columns + col + 1;
+            }
+            return -1;
+        }
+
+        // Track drag type: 'single' (left) or 'batch' (right)
+        property string _dragType: ""
+
+        onPressed: mouse => {
+            var card = findCardAt(mouse.x, mouse.y);
+
+            if (card) {
+                dragTracker._pendingCard = card;
+                dragTracker._pendingData = card._cardData;
+                dragTracker._holding = true;
+                dragTracker._startX = mouse.x;
+                dragTracker._startY = mouse.y;
+
+                if (mouse.button === Qt.RightButton) {
+                    // Right click: start BATCH drag immediately (move all windows)
+                    dragTracker._dragging = true;
+                    dragTracker._dragType = "batch";
+                    var d = card._cardData;
+                    card._dragActive = true;
+                    overviewRoot.isDragging = true;
+                    overviewRoot.dragFromWorkspace = d.wsNum;
+                    overviewRoot.dragWindowAddr = d.addr;
+                    overviewRoot.dragGhostCls = d.cls;
+                    overviewRoot.dragGhostTitle = "Mover todas las ventanas";
+                    overviewRoot.dragGhostAddr = d.addr;
+                    overviewRoot.dragGhostW = 140;
+                    overviewRoot.dragGhostH = 60;
+                    overviewRoot.dragGhostX = mouse.x - 70;
+                    overviewRoot.dragGhostY = mouse.y - 30;
+                } else {
+                    // Left click: normal drag (starts on movement)
+                    dragTracker._dragType = "single";
+                }
+            } else {
+                dragTracker._holding = false;
+                dragTracker._pendingCard = null;
+                dragTracker._pendingData = null;
+            }
+        }
+        // Cancel hold on significant movement
+        property real _startX: 0
+        property real _startY: 0
+
+        onPositionChanged: mouse => {
+            // Track which workspace cell the mouse is over
+            dragTracker._hoveredWs = dragTracker.wsAt(mouse.x, mouse.y);
+
+            if (dragTracker._dragging) {
+                // Overlay replica follows mouse at root level (floats above all cells)
+                overviewRoot.dragGhostX = mouse.x - overviewRoot.dragGhostW / 2;
+                overviewRoot.dragGhostY = mouse.y - overviewRoot.dragGhostH / 2;
+
+                // Target cell
+                var gx = mouse.x - gridContainer.x;
+                var gy = mouse.y - gridContainer.y;
+                var cw = overviewRoot.wsCellW + overviewRoot.workspaceSpacing;
+                var ch = overviewRoot.wsCellH + overviewRoot.workspaceSpacing;
+                var col = Math.floor((gx - overviewRoot.workspacePadding) / cw);
+                var row = Math.floor((gy - overviewRoot.workspacePadding) / ch);
+                if (col >= 0 && col < overviewRoot.columns && row >= 0 && row < overviewRoot.rows) {
+                    var target = row * overviewRoot.columns + col + 1;
+                    if (target !== overviewRoot.dragToWorkspace) {
+                        overviewRoot.dragToWorkspace = target;
                     }
-                    onWindowClosed: {
-                        AxctlService.dispatch(`closewindow address:${windowData.address}`);
+                } else {
+                    overviewRoot.dragToWorkspace = -1;
+                }
+            } else if (dragTracker._holding && !dragTracker._dragging) {
+                var dx = mouse.x - dragTracker._startX;
+                var dy = mouse.y - dragTracker._startY;
+                if (Math.sqrt(dx*dx + dy*dy) > 12) {
+                    // Movement detected → start drag instantly
+                    dragTracker._dragging = true;
+                    var d = dragTracker._pendingData;
+                    var card = dragTracker._pendingCard;
+                    if (d && card) {
+                        card._dragActive = true;
+                        // Overlay muestra la card en el mouse (flota sobre todos los cells)
+                        overviewRoot.isDragging = true;
+                        overviewRoot.dragFromWorkspace = d.wsNum;
+                        overviewRoot.dragWindowAddr = d.addr;
+                        overviewRoot.dragGhostCls = d.cls;
+                        overviewRoot.dragGhostTitle = d.title;
+                        overviewRoot.dragGhostAddr = d.addr;
+                        overviewRoot.dragGhostW = d.cardW;
+                        overviewRoot.dragGhostH = d.cardH;
+                        overviewRoot.dragGhostX = mouse.x - d.cardW / 2;
+                        overviewRoot.dragGhostY = mouse.y - d.cardH / 2;
                     }
                 }
             }
+        }
 
-            Rectangle {
-                id: focusedWorkspaceIndicator
-                property int activeWorkspaceInGroup: (monitor?.activeWorkspace?.id || 1) - (overviewRoot.workspaceGroup * overviewRoot.workspacesShown)
-                property int activeWorkspaceRowIndex: Math.floor((activeWorkspaceInGroup - 1) / overviewRoot.columns)
-                property int activeWorkspaceColIndex: (activeWorkspaceInGroup - 1) % overviewRoot.columns
-
-                x: Math.round((overviewRoot.workspaceImplicitWidth + workspacePadding + workspaceSpacing) * activeWorkspaceColIndex)
-                y: Math.round((overviewRoot.workspaceImplicitHeight + workspacePadding + workspaceSpacing) * activeWorkspaceRowIndex)
-                width: Math.round(overviewRoot.workspaceImplicitWidth + workspacePadding)
-                height: Math.round(overviewRoot.workspaceImplicitHeight + workspacePadding)
-                color: "transparent"
-                radius: Styling.radius(2)
-                border.width: 2
-                border.color: overviewRoot.activeBorderColor
-
-                Behavior on x {
-                    enabled: Config.animDuration > 0
-                    NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+        onReleased: mouse => {
+            if (dragTracker._dragging) {
+                var targetWs = overviewRoot.dragToWorkspace;
+                var origWs = overviewRoot.dragFromWorkspace;
+                var dragAddr = overviewRoot.dragWindowAddr;
+                var card = dragTracker._pendingCard;
+                if (card) { card._dragActive = false; }
+
+                dragTracker._dragging = false;
+                dragTracker._holding = false;
+                dragTracker._pendingCard = null;
+                dragTracker._pendingData = null;
+                overviewRoot.isDragging = false;
+                overviewRoot.dragToWorkspace = -1;
+                overviewRoot.dragFromWorkspace = -1;
+                overviewRoot.dragWindowAddr = "";
+
+                if (targetWs > 0 && targetWs !== origWs && dragAddr) {
+                    if (dragTracker._dragType === "batch") {
+                        // Batch move: move ALL windows from source to target
+                        var allWins = overviewRoot.winsForWs(origWs);
+                        for (var bi = 0; bi < allWins.length; bi++) {
+                            if (allWins[bi].address) {
+                                AxctlService.dispatch("movetoworkspacesilent " + targetWs + ",address:" + allWins[bi].address);
+                            }
+                        }
+                    } else {
+                        // Single move
+                        AxctlService.dispatch("movetoworkspacesilent " + targetWs + ",address:" + dragAddr);
                     }
                 }
-                Behavior on y {
-                    enabled: Config.animDuration > 0
-                    NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
-                    }
+
+                // Wait 200ms for axctl to process the move before refreshing
+                delayedRefreshTimer.restart();
+
+            } else if (dragTracker._holding && mouse.button === Qt.LeftButton) {
+                // Quick release → click: focus window
+                var d = dragTracker._pendingData;
+                if (d && d.addr) {
+                    Visibilities.setActiveModule("", true);
+                    Qt.callLater(function() {
+                        AxctlService.dispatch("focuswindow address:" + d.addr);
+                        wsSwitchProcess.command = ["hyprctl", "dispatch", "workspace", String(d.wsNum)];
+                        wsSwitchProcess.running = true;
+                    });
+                }
+
+            } else if (mouse.button === Qt.MiddleButton) {
+                var card = findCardAt(mouse.x, mouse.y);
+                if (card && card._cardData && card._cardData.addr) {
+                    AxctlService.dispatch("closewindow address:" + card._cardData.addr);
+                }
+
+            } else if (mouse.button === Qt.LeftButton && !dragTracker._holding) {
+                var ws = dragTracker.wsAt(mouse.x, mouse.y);
+                if (ws > 0) {
+                    wsSwitchProcess.command = ["hyprctl", "dispatch", "workspace", String(ws)];
+                    wsSwitchProcess.running = true;
                 }
             }
+
+            dragTracker._holding = false;
+            dragTracker._pendingCard = null;
+            dragTracker._pendingData = null;
         }
     }
-}
+
+
+
+}
\ No newline at end of file
diff --git a/modules/widgets/overview/OverviewButton.qml b/modules/widgets/overview/OverviewButton.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/overview/OverviewPopup.qml b/modules/widgets/overview/OverviewPopup.qml
old mode 100644
new mode 100755
index 6ad80557..33fa09ce
--- a/modules/widgets/overview/OverviewPopup.qml
+++ b/modules/widgets/overview/OverviewPopup.qml
@@ -67,20 +67,12 @@ PanelWindow {
         }
     }
 
-    // Semi-transparent backdrop
+    // Semi-transparent backdrop — fully transparent (no scrim)
     Rectangle {
         id: backdrop
         anchors.fill: parent
-        color: Colors.scrim
-        opacity: overviewOpen ? 0.5 : 0
-
-        Behavior on opacity {
-            enabled: Config.animDuration > 0
-            NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutQuart
-            }
-        }
+        color: "transparent"
+        opacity: 0
 
         MouseArea {
             anchors.fill: parent
@@ -90,297 +82,63 @@ PanelWindow {
         }
     }
 
-    // Main content column (search + overview)
+    // Fullscreen overview — covers entire screen, no search bar
     Item {
         id: mainContainer
-        anchors.centerIn: parent
-        width: Math.max(searchContainer.width, overviewContainer.width + (scrollbarContainer.visible ? scrollbarContainer.width + 8 : 0))
-        height: searchContainer.height + 8 + overviewContainer.height
+        anchors.fill: parent
+        anchors.margins: 16
 
         opacity: overviewOpen ? 1 : 0
-        scale: overviewOpen ? 1 : 0.9
+        scale: overviewOpen ? 1 : 0.95
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutQuart
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("standard").type
+                easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
         Behavior on scale {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutBack
-                easing.overshoot: 1.2
-            }
-        }
-
-        // Search input container
-        StyledRect {
-            id: searchContainer
-            variant: "bg"
-            anchors.top: parent.top
-            anchors.horizontalCenter: parent.horizontalCenter
-            width: Math.min(400, overviewContainer.width)
-            height: 80
-            radius: Styling.radius(24)
-
-            layer.enabled: true
-            layer.effect: Shadow {}
-
-            RowLayout {
-                anchors.fill: parent
-                anchors.margins: 16
-                spacing: 8
-
-                // Icon container
-                Rectangle {
-                    Layout.preferredWidth: 48
-                    Layout.preferredHeight: 48
-                    Layout.alignment: Qt.AlignVCenter
-                    color: "transparent"
-
-                    Text {
-                        anchors.centerIn: parent
-                        text: Icons.overview
-                        font.family: Icons.font
-                        font.pixelSize: 24
-                        color: Styling.srItem("overprimary")
-                    }
-                }
-
-                // Search input
-                SearchInput {
-                    id: searchInput
-                    Layout.fillWidth: true
-                    Layout.preferredHeight: 48
-                    Layout.alignment: Qt.AlignVCenter
-
-                    variant: "common"
-                    placeholderText: qsTr("Search windows...")
-                    handleTabNavigation: true
-                    clearOnEscape: false
-
-                    // Match counter suffix
-                    Text {
-                        id: matchCounter
-                        visible: overviewLoader.item && overviewLoader.item.searchQuery.length > 0
-                        anchors.right: parent.right
-                        anchors.rightMargin: 16
-                        anchors.verticalCenter: parent.verticalCenter
-                        text: {
-                            if (!overviewLoader.item)
-                                return "0";
-                            const matches = overviewLoader.item.matchingWindows.length;
-                            if (matches > 0) {
-                                return `${overviewLoader.item.selectedMatchIndex + 1}/${matches}`;
-                            }
-                            return "0";
-                        }
-                        font.family: Config.theme.font
-                        font.pixelSize: Config.theme.fontSize - 2
-                        color: (overviewLoader.item && overviewLoader.item.matchingWindows.length > 0) ? Styling.srItem("overprimary") : Colors.error
-                        opacity: 0.8
-                    }
-
-                    onSearchTextChanged: text => {
-                        if (overviewLoader.item) {
-                            overviewLoader.item.searchQuery = text;
-                        }
-                    }
-
-                    onAccepted: {
-                        if (overviewLoader.item) {
-                            overviewLoader.item.navigateToSelectedWindow();
-                        }
-                    }
-
-                    onTabPressed: {
-                        if (searchInput.text.length === 0) {
-                            const current = AxctlService.focusedWorkspace?.id || 1;
-                            const next = current + 1;
-                            if (next > Config.workspaces.shown) {
-                                AxctlService.dispatch("workspace 1");
-                            } else {
-                                AxctlService.dispatch("workspace r+1");
-                            }
-                        } else if (overviewLoader.item) {
-                            overviewLoader.item.selectNextMatch();
-                        }
-                    }
-                    
-                    onShiftTabPressed: {
-                        if (searchInput.text.length === 0) {
-                            const current = AxctlService.focusedWorkspace?.id || 1;
-                            const prev = current - 1;
-                            if (prev < 1) {
-                                AxctlService.dispatch("workspace " + Config.workspaces.shown);
-                            } else {
-                                AxctlService.dispatch("workspace r-1");
-                            }
-                        } else if (overviewLoader.item) {
-                            overviewLoader.item.selectPrevMatch();
-                        }
-                    }
-
-                    onDownPressed: {
-                        if (overviewLoader.item) {
-                            overviewLoader.item.selectNextMatch();
-                        }
-                    }
-
-                    onUpPressed: {
-                        if (overviewLoader.item) {
-                            overviewLoader.item.selectPrevMatch();
-                        }
-                    }
-
-                    onEscapePressed: {
-                        if (searchInput.text.length > 0) {
-                            searchInput.clear();
-                            if (overviewLoader.item) {
-                                overviewLoader.item.searchQuery = "";
-                            }
-                        } else {
-                            Visibilities.setActiveModule("");
-                        }
-                    }
-
-                    onLeftPressed: {
-                        if (searchInput.text.length === 0) {
-                            const current = AxctlService.focusedWorkspace?.id || 1;
-                            const prev = current - 1;
-                            if (prev < 1) {
-                                AxctlService.dispatch("workspace " + Config.workspaces.shown);
-                            } else {
-                                AxctlService.dispatch("workspace r-1");
-                            }
-                        } else if (overviewLoader.item) {
-                            overviewLoader.item.selectPrevMatch();
-                        }
-                    }
-
-                    onRightPressed: {
-                        if (searchInput.text.length === 0) {
-                            const current = AxctlService.focusedWorkspace?.id || 1;
-                            const next = current + 1;
-                            if (next > Config.workspaces.shown) {
-                                AxctlService.dispatch("workspace 1");
-                            } else {
-                                AxctlService.dispatch("workspace r+1");
-                            }
-                        } else if (overviewLoader.item) {
-                            overviewLoader.item.selectNextMatch();
-                        }
-                    }
-                }
+                duration: Anim.emphasizedLarge
+                easing.type: Anim.easing("emphasized").type
+                easing.bezierCurve: Anim.easing("emphasized").bezierCurve
             }
         }
 
-        // Overview container
+        // Overview grid — fills available space
         Item {
             id: overviewContainer
-            anchors.top: searchContainer.bottom
-            anchors.topMargin: 8
-            anchors.horizontalCenter: parent.horizontalCenter
-            width: overviewLoader.item ? overviewLoader.item.implicitWidth + 48 : 400
-            height: overviewLoader.item ? overviewLoader.item.implicitHeight + 48 : 300
-
-            // Background panel
-            StyledRect {
-                id: overviewBackground
-                variant: "bg"
-                anchors.fill: parent
-                radius: Styling.radius(20)
-
-                layer.enabled: true
-                layer.effect: Shadow {}
-            }
+            anchors.fill: parent
 
-            // Loader for Overview to prevent issues during destruction
+            // Loader for Overview
             Loader {
                 id: overviewLoader
                 anchors.centerIn: parent
+                width: parent.width
+                height: parent.height
                 active: overviewOpen
+                asynchronous: true
 
-                sourceComponent: OverviewView {
-                    currentScreen: overviewPopup.screen
-                }
-            }
-        }
-
-        // External scrollbar for scrolling mode (to the right of overview)
-        StyledRect {
-            id: scrollbarContainer
-            visible: overviewLoader.item && overviewLoader.item.needsScrollbar
-            variant: "bg"
-            anchors.left: overviewContainer.right
-            anchors.leftMargin: 8
-            anchors.verticalCenter: overviewContainer.verticalCenter
-            width: 32
-            height: Math.max(overviewContainer.height * 0.6, 200)
-            radius: Styling.radius(0)
-
-            layer.enabled: true
-            layer.effect: Shadow {}
-
-            MouseArea {
-                anchors.fill: parent
-                acceptedButtons: Qt.NoButton
-                onWheel: wheel => {
-                    if (overviewLoader.item && overviewLoader.item.flickable) {
-                        const flickable = overviewLoader.item.flickable;
-                        const delta = wheel.angleDelta.y > 0 ? -150 : 150;
-                        flickable.contentY = Math.max(0, Math.min(flickable.contentY + delta, flickable.contentHeight - flickable.height));
+                sourceComponent: Component {
+                    OverviewView {
+                        currentScreen: overviewPopup.screen
                     }
                 }
-            }
-
-            ScrollBar {
-                id: externalScrollBar
-                anchors.centerIn: parent
-                height: parent.height - 16
-                width: 12
-                orientation: Qt.Vertical
-                policy: ScrollBar.AlwaysOn
-
-                position: overviewLoader.item && overviewLoader.item.flickable ? overviewLoader.item.flickable.visibleArea.yPosition : 0
-                size: overviewLoader.item && overviewLoader.item.flickable ? overviewLoader.item.flickable.visibleArea.heightRatio : 1
 
-                // Notify flickable when manually scrolling to disable animation
-                onActiveChanged: {
-                    if (overviewLoader.item) {
-                        overviewLoader.item.isManualScrolling = active;
-                    }
+                onLoaded: {
+                    console.log("OverviewView loaded asynchronously");
                 }
 
-                onPositionChanged: {
-                    if (active && overviewLoader.item && overviewLoader.item.flickable) {
-                        overviewLoader.item.flickable.contentY = position * overviewLoader.item.flickable.contentHeight;
-                    }
-                }
-
-                contentItem: Rectangle {
-                    implicitWidth: 12
-                    radius: Styling.radius(-10)
-                    color: externalScrollBar.pressed ? Styling.srItem("overprimary") : (externalScrollBar.hovered ? Qt.lighter(Styling.srItem("overprimary"), 1.2) : Styling.srItem("overprimary"))
-
-                    Behavior on color {
-                        enabled: Config.animDuration > 0
-                        ColorAnimation {
-                            duration: Config.animDuration / 2
-                        }
+                onActiveChanged: {
+                    if (!active && item) {
+                        item.destroy();
+                        console.log("OverviewView resources released");
                     }
                 }
-
-                background: Rectangle {
-                    implicitWidth: 12
-                    radius: Styling.radius(-10)
-                    color: Colors.surfaceContainer
-                    opacity: 0.3
-                }
             }
         }
     }
@@ -389,11 +147,9 @@ PanelWindow {
     onOverviewOpenChanged: {
         if (overviewOpen) {
             Qt.callLater(() => {
-                searchInput.clear();
-                if (overviewLoader.item) {
+                if (overviewLoader.item && overviewLoader.item.resetSearch) {
                     overviewLoader.item.resetSearch();
                 }
-                searchInput.focusInput();
             });
         }
     }
diff --git a/modules/widgets/overview/OverviewView.qml b/modules/widgets/overview/OverviewView.qml
old mode 100644
new mode 100755
index 6576d823..175f0e69
--- a/modules/widgets/overview/OverviewView.qml
+++ b/modules/widgets/overview/OverviewView.qml
@@ -2,6 +2,7 @@ import QtQuick
 import qs.modules.widgets.overview
 import qs.modules.services
 import qs.modules.globals
+import qs.modules.theme
 import qs.config
 
 Item {
@@ -11,9 +12,6 @@ Item {
     // Detect if we're in scrolling layout mode
     readonly property bool isScrollingLayout: GlobalStates.compositorLayout === "scrolling"
 
-    implicitWidth: overviewLoader.item ? overviewLoader.item.implicitWidth : 400
-    implicitHeight: overviewLoader.item ? overviewLoader.item.implicitHeight : 300
-
     // Expose flickable and scrollbar needs for scrolling mode
     readonly property var flickable: isScrollingLayout && overviewLoader.item ? overviewLoader.item.flickable : null
     readonly property bool needsScrollbar: isScrollingLayout && overviewLoader.item ? overviewLoader.item.needsScrollbar : false
@@ -26,29 +24,48 @@ Item {
         }
     }
 
-    Behavior on implicitWidth {
-        enabled: Config.animDuration > 0
-        NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
-        }
-    }
-
-    Behavior on implicitHeight {
-        enabled: Config.animDuration > 0
-        NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
-        }
-    }
-
     // Dynamic loader for the appropriate overview component
     Loader {
         id: overviewLoader
-        anchors.centerIn: parent
+        anchors.fill: parent
         active: true
-        
+        asynchronous: true
+
         sourceComponent: isScrollingLayout ? scrollingOverviewComponent : standardOverviewComponent
+
+        opacity: status === Loader.Ready ? 1 : 0
+
+        Behavior on opacity {
+            enabled: Anim.animationsEnabled
+            NumberAnimation {
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("decelerate").type
+                easing.bezierCurve: Anim.easing("decelerate").bezierCurve
+            }
+        }
+
+        scale: status === Loader.Ready ? 1 : 0.92
+
+        Behavior on scale {
+            enabled: Anim.animationsEnabled
+            NumberAnimation {
+                duration: Anim.emphasizedNormal
+                easing.type: Anim.springSnappy().type
+                easing.bezierCurve: Anim.springSnappy().bezierCurve
+            }
+        }
+
+        transform: Translate {
+            y: overviewLoader.status === Loader.Ready ? 0 : 24
+            Behavior on y {
+                enabled: Anim.animationsEnabled
+                NumberAnimation {
+                    duration: Anim.emphasizedNormal
+                    easing.type: Anim.springSnappy().type
+                    easing.bezierCurve: Anim.springSnappy().bezierCurve
+                }
+            }
+        }
     }
 
     // Standard grid overview
@@ -88,41 +105,4 @@ Item {
             }
         }
     }
-
-    // Expose search-related properties for parent components (read from child)
-    readonly property var matchingWindows: overviewLoader.item ? overviewLoader.item.matchingWindows : []
-    readonly property int selectedMatchIndex: overviewLoader.item ? overviewLoader.item.selectedMatchIndex : 0
-
-    // Search query - writable, synced to child
-    property string searchQuery: ""
-    onSearchQueryChanged: {
-        if (overviewLoader.item) {
-            overviewLoader.item.searchQuery = searchQuery;
-        }
-    }
-
-    function resetSearch() {
-        searchQuery = "";
-        if (overviewLoader.item && overviewLoader.item.resetSearch) {
-            overviewLoader.item.resetSearch();
-        }
-    }
-
-    function navigateToSelectedWindow() {
-        if (overviewLoader.item && overviewLoader.item.navigateToSelectedWindow) {
-            overviewLoader.item.navigateToSelectedWindow();
-        }
-    }
-
-    function selectNextMatch() {
-        if (overviewLoader.item && overviewLoader.item.selectNextMatch) {
-            overviewLoader.item.selectNextMatch();
-        }
-    }
-
-    function selectPrevMatch() {
-        if (overviewLoader.item && overviewLoader.item.selectPrevMatch) {
-            overviewLoader.item.selectPrevMatch();
-        }
-    }
 }
diff --git a/modules/widgets/overview/OverviewWindow.qml b/modules/widgets/overview/OverviewWindow.qml
old mode 100644
new mode 100755
index 8943a6ee..c58f18e4
--- a/modules/widgets/overview/OverviewWindow.qml
+++ b/modules/widgets/overview/OverviewWindow.qml
@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
+import Quickshell.Io
 import Quickshell.Widgets
 import Quickshell.Wayland
 import qs.modules.globals
@@ -15,7 +16,6 @@ Item {
     property var windowData
     property var toplevel
     property var monitorData: null
-    property real scale
     property real availableWorkspaceWidth
     property real availableWorkspaceHeight
     property real xOffset: 0
@@ -28,39 +28,108 @@ Item {
     property string barPosition: "top"
     property int barReserved: 0
 
-    // Search highlighting
+    property Item overviewRootRef: null
+
     property bool isSearchMatch: false
     property bool isSearchSelected: false
 
-    // Override position tracking for immediate visual update
     property real overrideX: -1
     property real overrideY: -1
     property bool useOverridePosition: false
 
-    // Cache calculated values
-    readonly property real initX: {
-        if (useOverridePosition && overrideX >= 0)
-            return overrideX;
+    readonly property string _windowGeometryKey: windowData ?
+        (windowData.address + "|" + (windowData.at?.[0] ?? 0) + "," + (windowData.at?.[1] ?? 0) + "|" +
+         (windowData.size?.[0] ?? 0) + "," + (windowData.size?.[1] ?? 0) + "|" + (windowData.workspace?.id ?? 0)) : ""
+    on_WindowGeometryKeyChanged: {
+        if (useOverridePosition) resetOverrideTimer.restart();
+    }
 
-        let base = (windowData?.at?.[0] || 0) - (monitorData?.x || 0);
-        if (barPosition === "left")
-            base -= barReserved;
-        return Math.round(Math.max(base * scale, 0) + xOffset);
+    readonly property real monitorEffectiveW: {
+        if (!monitorData) return 1920;
+        var ro = (monitorData.transform % 2 === 1);
+        var mw = ro ? (monitorData.height || 1080) : (monitorData.width || 1920);
+        return mw > 0 ? mw : 1920;
+    }
+    readonly property real monitorEffectiveH: {
+        if (!monitorData) return 1080;
+        var ro = (monitorData.transform % 2 === 1);
+        var mh = ro ? (monitorData.width || 1920) : (monitorData.height || 1080);
+        return mh > 0 ? mh : 1080;
+    }
+
+    readonly property real gutter: 0.02
+    readonly property real effectiveCellW: availableWorkspaceWidth * (1 - gutter)
+    readonly property real effectiveCellH: availableWorkspaceHeight * (1 - gutter)
+
+    readonly property real relX: {
+        var mx = monitorData?.x ?? 0;
+        var base = (windowData?.at?.[0] ?? 0) - mx;
+        if (barPosition === "left") base -= barReserved;
+        return Math.max(0, Math.min(1, monitorEffectiveW > 0 ? base / monitorEffectiveW : 0));
+    }
+    readonly property real relY: {
+        var my = monitorData?.y ?? 0;
+        var base = (windowData?.at?.[1] ?? 0) - my;
+        if (barPosition === "top") base -= barReserved;
+        return Math.max(0, Math.min(1, monitorEffectiveH > 0 ? base / monitorEffectiveH : 0));
+    }
+    readonly property real relW: {
+        var w = windowData?.size?.[0] ?? 0;
+        return w > 200 && monitorEffectiveW > 0
+            ? Math.max(0.05, Math.min(1, w / monitorEffectiveW))
+            : 0.85;
+    }
+    readonly property real relH: {
+        var h = windowData?.size?.[1] ?? 0;
+        return h > 200 && monitorEffectiveH > 0
+            ? Math.max(0.05, Math.min(1, h / monitorEffectiveH))
+            : 0.85;
+    }
+    readonly property real fillW: (modelData && modelData.fillW !== undefined) ? modelData.fillW : relW
+    readonly property real fillH: (modelData && modelData.fillH !== undefined) ? modelData.fillH : relH
+
+    function clampToCell(val, size, cellSize) {
+        if (size >= cellSize) return 0;
+        return Math.max(0, Math.min(val, cellSize - size));
+    }
+
+    readonly property real initX: {
+        if (useOverridePosition && overrideX >= 0) return overrideX;
+        var pos = Math.round(relX * effectiveCellW + availableWorkspaceWidth * gutter / 2);
+        return Math.round(clampToCell(pos, targetWindowWidth, availableWorkspaceWidth) + xOffset);
     }
     readonly property real initY: {
-        if (useOverridePosition && overrideY >= 0)
-            return overrideY;
-        let base = (windowData?.at?.[1] || 0) - (monitorData?.y || 0);
-        if (barPosition === "top")
-            base -= barReserved;
-        return Math.round(Math.max(base * scale, 0) + yOffset);
-    }
-    readonly property real targetWindowWidth: Math.round((windowData?.size[0] || 100) * scale)
-    readonly property real targetWindowHeight: Math.round((windowData?.size[1] || 100) * scale)
+        if (useOverridePosition && overrideY >= 0) return overrideY;
+        var pos = Math.round(relY * effectiveCellH + availableWorkspaceHeight * gutter / 2);
+        return Math.round(clampToCell(pos, targetWindowHeight, availableWorkspaceHeight) + yOffset);
+    }
+
+    readonly property real targetWindowWidth: Math.max(24, Math.round(fillW * effectiveCellW))
+    readonly property real targetWindowHeight: Math.max(24, Math.round(fillH * effectiveCellH))
     readonly property bool compactMode: targetWindowHeight < 60 || targetWindowWidth < 60
     readonly property string iconPath: AppSearch.guessIcon(windowData?.class || "")
     readonly property int calculatedRadius: Styling.radius(-2)
 
+    // Accent color determinista por clase de app
+    readonly property color accentColor: {
+        var cls = (windowData?.class || "").toLowerCase();
+        var hash = 0;
+        for (var i = 0; i < cls.length; i++) hash = ((hash << 5) - hash) + cls.charCodeAt(i);
+        var hue = ((hash % 360) + 360) % 360;
+        return Qt.hsla(hue / 360, 0.5, 0.4, 1.0);
+    }
+
+    // Title formateado (primeras 2 lineas)
+    readonly property string displayTitle: {
+        var t = windowData?.title || windowData?.class || "";
+        return t.length > 60 ? t.substring(0, 57) + "..." : t;
+    }
+
+    property bool _isDragging: false
+    property bool _entered: false
+    property bool _closing: false
+    Component.onCompleted: _entered = true
+
     signal dragStarted
     signal dragFinished(int targetWorkspace)
     signal windowClicked
@@ -72,326 +141,408 @@ Item {
     height: targetWindowHeight
     z: atInitPosition ? 1 : 99999
 
-    Drag.active: false
-    Drag.hotSpot.x: width / 2
-    Drag.hotSpot.y: height / 2
+    readonly property real hoverScale: !_isDragging && hovered && !_closing ? 1.03 : 1.0
+    scale: _closing ? 0.3 : (_entered ? hoverScale : 0.85)
+
+    Behavior on scale {
+        enabled: Anim.animationsEnabled
+        NumberAnimation {
+            property var _ease: _closing ? Anim.easing("emphasized", "exit") : Anim.springSnappy()
+            duration: _closing ? Anim.standardSmall : Anim.standardNormal
+            easing.type: _ease.type
+            easing.bezierCurve: _ease.bezierCurve
+        }
+    }
+
+    opacity: _closing ? 0.0 : (_entered ? 1.0 : 0.0)
+    Behavior on opacity {
+        enabled: Anim.animationsEnabled
+        NumberAnimation {
+            duration: _closing ? Anim.standardSmall : Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+            easing.bezierCurve: Anim.easing("standard").bezierCurve
+        }
+    }
 
     clip: true
 
-    // Timer to reset override position after a delay (waiting for AxctlService update)
     Timer {
         id: resetOverrideTimer
         interval: 200
-        onTriggered: {
-            root.useOverridePosition = false;
-        }
+        onTriggered: { root.useOverridePosition = false; }
     }
 
-    // Watch for windowData changes to reset override when real data updates
     onWindowDataChanged: {
-        if (useOverridePosition) {
-            resetOverrideTimer.restart();
-        }
+        if (useOverridePosition) resetOverrideTimer.restart();
     }
 
     Behavior on x {
-        enabled: Config.animDuration > 0 && !root.useOverridePosition
+        enabled: Anim.animationsEnabled && !root.useOverridePosition
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.gpuFriendly("spatial", "default").duration
+            easing.type: Anim.gpuFriendly("spatial", "default").easing.type
+            easing.bezierCurve: Anim.gpuFriendly("spatial", "default").easing.bezierCurve
         }
     }
     Behavior on y {
-        enabled: Config.animDuration > 0 && !root.useOverridePosition
+        enabled: Anim.animationsEnabled && !root.useOverridePosition
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.gpuFriendly("spatial", "default").duration
+            easing.type: Anim.gpuFriendly("spatial", "default").easing.type
+            easing.bezierCurve: Anim.gpuFriendly("spatial", "default").easing.bezierCurve
         }
     }
     Behavior on width {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.gpuFriendly("spatial", "default").duration
+            easing.type: Anim.gpuFriendly("spatial", "default").easing.type
+            easing.bezierCurve: Anim.gpuFriendly("spatial", "default").easing.bezierCurve
         }
     }
     Behavior on height {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.gpuFriendly("spatial", "default").duration
+            easing.type: Anim.gpuFriendly("spatial", "default").easing.type
+            easing.bezierCurve: Anim.gpuFriendly("spatial", "default").easing.bezierCurve
         }
     }
 
-    ClippingRectangle {
-        anchors.fill: parent
-        radius: root.calculatedRadius
-        antialiasing: true
-        border.color: Colors.background
-        border.width: 0
-
-        ScreencopyView {
-            id: windowPreview
-            anchors.fill: parent
-            captureSource: Config.performance.windowPreview && GlobalStates.overviewOpen ? root.toplevel : null
-            live: GlobalStates.overviewOpen
-            visible: Config.performance.windowPreview
-        }
-    }
+    // ═══════════════════════════════════════════════════
+    // WINDOW CARD
+    // ═══════════════════════════════════════════════════
 
-    // Background rectangle with rounded corners
+    // Main card background
     Rectangle {
-        id: previewBackground
+        id: cardBg
         anchors.fill: parent
         radius: root.calculatedRadius
-        color: pressed ? Colors.surfaceBright : hovered ? Colors.surface : Colors.background
-        border.color: root.isSearchSelected ? Colors.tertiary : root.isSearchMatch ? Styling.srItem("overprimary") : Styling.srItem("overprimary")
-        border.width: root.isSearchSelected ? 3 : root.isSearchMatch ? 2 : (hovered ? 2 : 0)
-        visible: !windowPreview.hasContent || !Config.performance.windowPreview
-
+        color: Qt.rgba(Colors.surfaceContainer.r, Colors.surfaceContainer.g, Colors.surfaceContainer.b, 0.35)
+        border.color: root.isSearchSelected ? Colors.tertiary
+            : root.isSearchMatch ? Styling.srItem("overprimary")
+            : hovered ? Qt.rgba(Colors.onSurface.r, Colors.onSurface.g, Colors.onSurface.b, 0.25)
+            : Qt.rgba(Colors.onSurface.r, Colors.onSurface.g, Colors.onSurface.b, 0.08)
+        border.width: root.isSearchSelected ? 2 : root.isSearchMatch ? 2 : 1
+
+        Behavior on border.color {
+            enabled: Anim.animationsEnabled
+            ColorAnimation { duration: Anim.standardSmall }
+        }
         Behavior on color {
-            enabled: Config.animDuration > 0
-            ColorAnimation {
-                duration: Config.animDuration / 2
-            }
+            enabled: Anim.animationsEnabled
+            ColorAnimation { duration: Anim.standardSmall }
         }
 
-        Behavior on border.width {
-            enabled: Config.animDuration > 0
-            NumberAnimation {
-                duration: Config.animDuration / 2
+        // Color accent strip at top
+        Rectangle {
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: Math.max(3, Math.round(parent.height * 0.05))
+            color: root.accentColor
+            radius: root.calculatedRadius
+            visible: !root.compactMode
+        }
+
+        // Diagonal gradient overlay for depth
+        Rectangle {
+            anchors.fill: parent
+            radius: root.calculatedRadius
+            gradient: Gradient {
+                orientation: Gradient.Horizontal
+                GradientStop { position: 0.0; color: Qt.rgba(1, 1, 1, 0.04) }
+                GradientStop { position: 0.5; color: "transparent" }
+                GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.15) }
             }
+            visible: !root.compactMode
         }
     }
 
-    // Overlay content when preview is not available
+    // App icon
     Image {
         mipmap: true
         id: windowIcon
-        readonly property real iconSize: Math.round(Math.min(root.targetWindowWidth, root.targetWindowHeight) * (root.compactMode ? 0.6 : 0.35))
+        readonly property real iconSize: Math.round(Math.min(root.targetWindowWidth, root.targetWindowHeight) * (root.compactMode ? 0.55 : 0.32))
         anchors.centerIn: parent
+        anchors.verticalCenterOffset: root.compactMode ? 0 : Math.round(-parent.height * 0.04)
         width: iconSize
         height: iconSize
         source: Quickshell.iconPath(root.iconPath, "image-missing")
         sourceSize: Qt.size(iconSize, iconSize)
         asynchronous: true
-        visible: !windowPreview.hasContent || !Config.performance.windowPreview
-        z: 10
+        opacity: 0.85
+        z: 2
+    }
+
+    // Window title
+    Text {
+        id: winTitle
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: Math.max(2, Math.round(parent.height * 0.03))
+        anchors.left: parent.left
+        anchors.leftMargin: Math.max(2, Math.round(parent.width * 0.03))
+        anchors.right: parent.right
+        anchors.rightMargin: Math.max(2, Math.round(parent.width * 0.03))
+        text: root.displayTitle
+        font.family: Config.theme.font
+        font.pixelSize: Math.max(6, Math.round(parent.height * 0.08))
+        font.weight: Font.Medium
+        color: Colors.onSurface
+        opacity: 0.75
+        elide: Text.ElideRight
+        maximumLineCount: 1
+        horizontalAlignment: Text.AlignHCenter
+        visible: !root.compactMode && text.length > 0
+    }
+
+    // Window class label (small, on top of title)
+    Text {
+        id: winClass
+        anchors.bottom: winTitle.visible ? winTitle.top : parent.bottom
+        anchors.bottomMargin: 1
+        anchors.left: winTitle.left
+        anchors.right: winTitle.right
+        text: (windowData?.class || "").split(".").pop() || ""
+        font.family: Config.theme.font
+        font.pixelSize: Math.max(5, Math.round(parent.height * 0.05))
+        font.weight: Font.Light
+        color: Colors.onSurface
+        opacity: 0.45
+        elide: Text.ElideRight
+        maximumLineCount: 1
+        horizontalAlignment: Text.AlignHCenter
+        visible: !root.compactMode && text.length > 0
+    }
+
+    // XWayland indicator dot
+    Rectangle {
+        visible: root.windowData?.xwayland || false
+        anchors.top: parent.top
+        anchors.right: parent.right
+        anchors.margins: 2
+        width: 5
+        height: 5
+        radius: 3
+        color: Colors.error
+        z: 4
     }
 
-    // Overlay border and effects when preview is available
+    // Hover/selection glow border
     Rectangle {
-        id: previewOverlay
+        id: borderOverlay
         anchors.fill: parent
         radius: root.calculatedRadius
-        color: pressed ? Qt.rgba(Colors.surfaceContainerHighest.r, Colors.surfaceContainerHighest.g, Colors.surfaceContainerHighest.b, 0.5) : hovered ? Qt.rgba(Colors.surfaceContainer.r, Colors.surfaceContainer.g, Colors.surfaceContainer.b, 0.2) : "transparent"
-        border.color: root.isSearchSelected ? Colors.tertiary : root.isSearchMatch ? Styling.srItem("overprimary") : Styling.srItem("overprimary")
+        color: "transparent"
+        border.color: root.isSearchSelected ? Colors.tertiary
+            : root.isSearchMatch ? Styling.srItem("overprimary")
+            : hovered ? Styling.srItem("overprimary")
+            : "transparent"
         border.width: root.isSearchSelected ? 3 : root.isSearchMatch ? 2 : (hovered ? 2 : 0)
-        visible: windowPreview.hasContent && Config.performance.windowPreview
-        z: 5
+        z: 3
 
+        Behavior on border.color {
+            enabled: Anim.animationsEnabled
+            ColorAnimation { duration: Anim.standardSmall }
+        }
         Behavior on border.width {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration / 2
+                duration: Anim.standardSmall
+                easing.type: Anim.easing("standard").type
+                easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
     }
 
-    // Search match glow effect
+    // Hover tint overlay
+    Rectangle {
+        anchors.fill: parent
+        radius: root.calculatedRadius
+        color: pressed ? Qt.rgba(1, 1, 1, 0.10) : hovered ? Qt.rgba(1, 1, 1, 0.05) : "transparent"
+        z: 1
+        Behavior on color {
+            enabled: Anim.animationsEnabled
+            ColorAnimation { duration: Anim.standardSmall }
+        }
+    }
+
+    // Search selection glow ring
     Rectangle {
-        visible: root.isSearchSelected && !root.Drag.active
+        visible: root.isSearchSelected && !root._isDragging
         anchors.fill: parent
-        anchors.margins: -4
-        radius: root.calculatedRadius + 4
+        anchors.margins: -3
+        radius: root.calculatedRadius + 3
         color: "transparent"
         border.color: Colors.tertiary
         border.width: 2
-        opacity: 0.6
+        opacity: 0.5
         z: -1
     }
 
-    // Overlay icon when preview is available (smaller, in corner)
-    Image {
-        mipmap: true
-        visible: windowPreview.hasContent && !root.compactMode && Config.performance.windowPreview
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.margins: 4
-        width: 16
-        height: 16
-        source: Quickshell.iconPath(root.iconPath, "image-missing")
-        sourceSize: Qt.size(16, 16)
+    // ═══════════════════════════════════════════════════
+    // LIVE PREVIEW (opcional — si ToplevelManager tiene el handle)
+    // ═══════════════════════════════════════════════════
+    Loader {
+        id: previewLoader
+        anchors.fill: parent
+        active: Config.performance.windowPreview && root.toplevel != null
+        visible: active && status === Loader.Ready
         asynchronous: true
-        opacity: 0.8
-        z: 10
+
+        sourceComponent: ClippingRectangle {
+            id: liveClip
+            anchors.fill: parent
+            radius: root.calculatedRadius
+            antialiasing: true
+            color: "transparent"
+
+            ScreencopyView {
+                id: livePreview
+                width: Math.max(1, windowData?.size?.[0] || 640)
+                height: Math.max(1, windowData?.size?.[1] || 480)
+                captureSource: root.toplevel
+                live: true
+
+                transform: Scale {
+                    origin.x: 0; origin.y: 0
+                    xScale: liveClip.width / livePreview.width
+                    yScale: liveClip.height / livePreview.height
+                }
+            }
+
+            // Dark overlay on top of live preview so text is readable
+            Rectangle {
+                anchors.fill: parent
+                color: Qt.rgba(0, 0, 0, 0.20)
+                visible: true
+            }
+        }
     }
 
-    // XWayland indicator
-    Rectangle {
-        visible: root.windowData?.xwayland || false
-        anchors.top: parent.top
-        anchors.right: parent.right
-        anchors.margins: 2
-        width: 6
-        height: 6
-        radius: 3
-        color: Colors.error
-        z: 10
+    // ═══════════════════════════════════════════════════
+    // INTERACTIONS
+    // ═══════════════════════════════════════════════════
+
+    Drag.active: root._isDragging
+    Drag.hotSpot.x: width / 2
+    Drag.hotSpot.y: height / 2
+
+    Process {
+        id: wsProcess
+    }
+
+    Timer {
+        id: holdTimer
+        interval: 180
+        onTriggered: {
+            if (root.pressed && !root._isDragging) {
+                root._isDragging = true;
+                root.dragStarted();
+            }
+        }
     }
 
+    property int _interactButton: Qt.NoButton
+
     MouseArea {
         id: dragArea
         anchors.fill: parent
         hoverEnabled: true
-        acceptedButtons: Qt.LeftButton | Qt.MiddleButton
+        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
         drag.target: parent
 
-        onEntered: {
-            root.hovered = true;
-            // Only focus window on hover if it's in the current workspace
-            if (root.windowData) {
-                // Get current active workspace from AxctlService
-                let currentWorkspace = AxctlService.focusedMonitor?.activeWorkspace?.id;
-                let windowWorkspace = root.windowData?.workspace?.id;
-
-                // Only focus if the window is in the current workspace
-                if (currentWorkspace && windowWorkspace && currentWorkspace === windowWorkspace) {
-                    AxctlService.dispatch(`focuswindow address:${windowData.address}`);
-                }
-            }
-        }
+        onEntered: { root.hovered = true; }
         onExited: root.hovered = false
 
         onPressed: mouse => {
             root.pressed = true;
-            root.Drag.active = true;
-            root.Drag.source = root;
-            root.dragStarted();
+            root._interactButton = mouse.button;
+            if (mouse.button === Qt.LeftButton) {
+                holdTimer.start();
+            } else if (mouse.button === Qt.RightButton) {
+                root._isDragging = true;
+                root.dragStarted();
+            }
         }
 
         onReleased: mouse => {
-            const overviewRoot = parent.parent.parent.parent;
-            let targetWorkspace = overviewRoot.draggingTargetWorkspace;
-
             root.pressed = false;
             root.Drag.active = false;
 
-            if (mouse.button === Qt.LeftButton) {
-                // If targetWorkspace is -1, calculate it from current position
-                if (targetWorkspace === -1) {
-                    // Calculate which workspace we're over based on position
-                    const workspaceColIndex = Math.floor((root.x - root.xOffset + root.availableWorkspaceWidth / 2) / (root.availableWorkspaceWidth + overviewRoot.workspacePadding + overviewRoot.workspaceSpacing));
-                    const workspaceRowIndex = Math.floor((root.y - root.yOffset + root.availableWorkspaceHeight / 2) / (root.availableWorkspaceHeight + overviewRoot.workspacePadding + overviewRoot.workspaceSpacing));
-                    
-                    if (workspaceColIndex >= 0 && workspaceColIndex < overviewRoot.columns && 
-                        workspaceRowIndex >= 0 && workspaceRowIndex < overviewRoot.rows) {
-                        targetWorkspace = overviewRoot.workspaceGroup * overviewRoot.workspacesShown + 
-                                        workspaceRowIndex * overviewRoot.columns + workspaceColIndex + 1;
-                    } else {
-                        // Out of bounds, default to current workspace
-                        targetWorkspace = windowData?.workspace.id;
-                    }
-                }
-
-                root.dragFinished(targetWorkspace);
-                overviewRoot.draggingTargetWorkspace = -1;
-
-                // Check if moving to different workspace
-                if (targetWorkspace !== -1 && targetWorkspace !== windowData?.workspace.id) {
-                    // Moving to different workspace
-                    if (windowData?.floating && (root.x !== root.initX || root.y !== root.initY)) {
-                        // Calculate position in the target workspace
-                        // Get target workspace offset
-                        const targetColIndex = (targetWorkspace - 1) % overviewRoot.columns;
-                        const targetRowIndex = Math.floor((targetWorkspace - 1) % overviewRoot.workspacesShown / overviewRoot.columns);
-                        const targetXOffset = Math.round((overviewRoot.workspaceImplicitWidth + overviewRoot.workspacePadding + overviewRoot.workspaceSpacing) * targetColIndex + overviewRoot.workspacePadding / 2);
-                        const targetYOffset = Math.round((overviewRoot.workspaceImplicitHeight + overviewRoot.workspacePadding + overviewRoot.workspaceSpacing) * targetRowIndex + overviewRoot.workspacePadding / 2);
-                        
-                        // Calculate relative position in target workspace
-                        const relativeX = root.x - targetXOffset;
-                        const relativeY = root.y - targetYOffset;
-                        
-                        // Convert to percentage
-                        const percentageX = Math.round((relativeX / root.availableWorkspaceWidth) * 100);
-                        const percentageY = Math.round((relativeY / root.availableWorkspaceHeight) * 100);
-                        
-                        // Move to workspace and set position
-                        AxctlService.dispatch(`movetoworkspacesilent ${targetWorkspace}, address:${windowData?.address}`);
-                        AxctlService.dispatch(`movewindowpixel exact ${percentageX}% ${percentageY}%, address:${windowData?.address}`);
-                        
-                        // Force immediate window data update
-                        CompositorData.updateWindowList();
-                    } else {
-                        // Just move workspace without repositioning
-                        AxctlService.dispatch(`movetoworkspacesilent ${targetWorkspace}, address:${windowData?.address}`);
-                        
-                        // Force immediate window data update
-                        CompositorData.updateWindowList();
+            var ov = root.overviewRootRef;
+            var targetWs = -1;
+
+            if (ov && ov.columns && ov.rows) {
+                var mx = root.x + mouse.x;
+                var my = root.y + mouse.y;
+                var cw = root.availableWorkspaceWidth + ov.workspacePadding + ov.workspaceSpacing;
+                var ch = root.availableWorkspaceHeight + ov.workspacePadding + ov.workspaceSpacing;
+                var colIdx = Math.floor((mx - ov.workspacePadding / 2) / cw);
+                var rowIdx = Math.floor((my - ov.workspacePadding / 2) / ch);
+                if (colIdx >= 0 && colIdx < ov.columns && rowIdx >= 0 && rowIdx < ov.rows)
+                    targetWs = rowIdx * ov.columns + colIdx + 1;
+            }
+            if (targetWs <= 0 && ov) targetWs = ov.draggingTargetWorkspace;
+            if (targetWs <= 0) targetWs = windowData?.workspace?.id || -1;
+
+            if (mouse.button === Qt.LeftButton && root._isDragging) {
+                root._isDragging = false;
+                if (ov) ov.draggingTargetWorkspace = -1;
+                root.dragFinished(targetWs);
+            } else if (mouse.button === Qt.RightButton && root._isDragging) {
+                root._isDragging = false;
+                if (ov) ov.draggingTargetWorkspace = -1;
+                var srcWs = windowData?.workspace?.id || -1;
+                if (targetWs > 0 && targetWs !== srcWs) {
+                    var allWindows = ov.filteredWindows || [];
+                    for (var i = 0; i < allWindows.length; i++) {
+                        var w = allWindows[i];
+                        if (w && w.windowData && w.windowData.workspace && w.windowData.workspace.id === srcWs && w.windowData.address) {
+                            AxctlService.dispatch("movetoworkspacesilent " + targetWs + ",address:" + w.windowData.address);
+                        }
                     }
-                    
-                    // Reset position in overview
-                    root.x = root.initX;
-                    root.y = root.initY;
-                } else if (windowData?.floating && (root.x !== root.initX || root.y !== root.initY)) {
-                    // Dropped on same workspace and floating - reposition
-                    const relativeX = root.x - root.xOffset;
-                    const relativeY = root.y - root.yOffset;
-                    
-                    const percentageX = Math.round((relativeX / root.availableWorkspaceWidth) * 100);
-                    const percentageY = Math.round((relativeY / root.availableWorkspaceHeight) * 100);
-                    
-                    const draggedX = root.x;
-                    const draggedY = root.y;
-                    
-                    AxctlService.dispatch(`movewindowpixel exact ${percentageX}% ${percentageY}%, address:${windowData?.address}`);
-                    
-                    // Force immediate window data update
-                    CompositorData.updateWindowList();
-                    
-                    // Set override position for immediate visual update
-                    root.overrideX = draggedX;
-                    root.overrideY = draggedY;
-                    root.useOverridePosition = true;
-                    
-                    root.x = draggedX;
-                    root.y = draggedY;
-                    
-                    resetOverrideTimer.restart();
-                } else {
-                    // Reset position for non-floating or non-moved windows
-                    root.x = root.initX;
-                    root.y = root.initY;
                 }
+                if (ov && ov.refreshOverview) Qt.callLater(ov.refreshOverview);
             }
-        }
 
-        onClicked: mouse => {
-            if (!root.windowData)
-                return;
-
-            if (mouse.button === Qt.LeftButton) {
-                // Single click just focuses the window without closing overview
-                AxctlService.dispatch(`focuswindow address:${windowData.address}`);
-            } else if (mouse.button === Qt.MiddleButton) {
-                root.windowClosed();
-            }
+            root.x = Qt.binding(function() { return root.initX; });
+            root.y = Qt.binding(function() { return root.initY; });
+            root._interactButton = Qt.NoButton;
         }
 
-        onDoubleClicked: mouse => {
-            if (!root.windowData)
-                return;
+        onCanceled: {
+            root.pressed = false;
+            root._isDragging = false;
+            root.Drag.active = false;
+            holdTimer.stop();
+            root.x = Qt.binding(function() { return root.initX; });
+            root.y = Qt.binding(function() { return root.initY; });
+            root._interactButton = Qt.NoButton;
+        }
 
-            if (mouse.button === Qt.LeftButton) {
-                // Double click closes overview and focuses window
-                root.windowClicked();
+        onClicked: mouse => {
+            if (!root.windowData) return;
+
+            if (mouse.button === Qt.LeftButton && !root._isDragging) {
+                holdTimer.stop();
+                var wsId = windowData?.workspace?.id;
+                if (wsId && wsId > 0) {
+                    wsProcess.command = ["hyprctl", "dispatch", "workspace", String(wsId)];
+                    wsProcess.running = true;
+                    var ov = root.overviewRootRef;
+                    if (ov && ov.refreshOverview) Qt.callLater(ov.refreshOverview);
+                }
+            } else if (mouse.button === Qt.MiddleButton) {
+                root._closing = true;
+                Qt.callLater(function() { root.windowClosed(); });
             }
         }
     }
 
     // Tooltip
     Rectangle {
-        visible: dragArea.containsMouse && !root.Drag.active && root.windowData
+        visible: dragArea.containsMouse && !root._isDragging && root.windowData
         anchors.bottom: parent.top
         anchors.bottomMargin: 8
         anchors.horizontalCenter: parent.horizontalCenter
diff --git a/modules/widgets/overview/ScrollingOverview.qml b/modules/widgets/overview/ScrollingOverview.qml
old mode 100644
new mode 100755
index 66b6a465..33790c4f
--- a/modules/widgets/overview/ScrollingOverview.qml
+++ b/modules/widgets/overview/ScrollingOverview.qml
@@ -228,10 +228,11 @@ Item {
         flickableDirection: Flickable.VerticalFlick
 
         Behavior on contentY {
-            enabled: Config.animDuration > 0 && !scrollingOverviewRoot.isManualScrolling
+            enabled: Anim.animationsEnabled && !scrollingOverviewRoot.isManualScrolling
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutQuart
+                duration: Anim.spatialDefault
+                easing.type: Anim.easing("spatial").type
+                easing.bezierCurve: Anim.easing("spatial").bezierCurve
             }
         }
 
@@ -319,10 +320,11 @@ Item {
                 z: 10
 
                 Behavior on y {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.spatialDefault
+                        easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                     }
                 }
             }
diff --git a/modules/widgets/overview/ScrollingWorkspace.qml b/modules/widgets/overview/ScrollingWorkspace.qml
old mode 100644
new mode 100755
index 3047e559..5dc04c83
--- a/modules/widgets/overview/ScrollingWorkspace.qml
+++ b/modules/widgets/overview/ScrollingWorkspace.qml
@@ -20,7 +20,7 @@ Item {
     required property real workspaceWidth
     required property real workspaceHeight
     required property real workspacePadding
-    required property real scale_
+    property real scale_: 0  // legacy, no longer used (uniformScale is computed from monitor+viewport)
     required property int monitorId
     required property var monitorData
     required property string barPosition
@@ -50,43 +50,57 @@ Item {
     readonly property real viewportWidth: workspaceWidth / 3
     readonly property real viewportOffset: viewportWidth  // Offset to center third
 
-    // Filter windows for this workspace and monitor
+    // Filter windows for this workspace and monitor.
+    // Defensive: if workspace or monitor metadata is missing, still show the window.
     readonly property var workspaceWindows: {
         return windowList.filter(win => {
-            return (win && win.workspace ? win.workspace.id : null) === workspaceId && win.monitor === monitorId;
+            if (!win) return false;
+            const wsOk = win.workspace?.id === workspaceId || win.workspace?.id === undefined;
+            const monOk = monitorId < 0 || win.monitor === undefined || win.monitor === monitorId;
+            return wsOk && monOk;
         });
     }
 
-    // Calculate content bounds based on actual window positions
-    // Windows are positioned relative to monitor, scaled, then offset by viewportOffset
+    // Monitor effective dimensions for bounds calculation
+    readonly property real monitorEffW: {
+        const md = root.monitorData;
+        if (!md) return 1920;
+        const ro = (md.transform % 2 === 1);
+        const mw = ro ? (md.height || 1080) : (md.width || 1920);
+        return mw > 0 ? mw : 1920;
+    }
+    readonly property real monitorEffH: {
+        const md = root.monitorData;
+        if (!md) return 1080;
+        const ro = (md.transform % 2 === 1);
+        const mh = ro ? (md.width || 1920) : (md.height || 1080);
+        return mh > 0 ? mh : 1080;
+    }
+
+    // ── Pure proportion-based content bounds ──
     readonly property var contentBounds: {
         if (workspaceWindows.length === 0) {
-            return {
-                minX: 0,
-                maxX: 0,
-                hasOverflow: false
-            };
+            return { minX: 0, maxX: 0, hasOverflow: false };
         }
 
-        let minX = Infinity;
-        let maxX = -Infinity;
+        const gutter = 0.02;
+        const evpw = root.viewportWidth * (1 - gutter);
+        let minX = Infinity, maxX = -Infinity;
 
         for (const win of workspaceWindows) {
-            // Calculate window position the same way as in the delegate
-            let baseX = ((win && win.at && win.at[0] !== undefined ? win.at[0] : 0) || 0) - ((monitorData && monitorData.x !== undefined ? monitorData.x : 0) || 0);
-            if (barPosition === "left")
-                baseX -= barReserved;
-            const scaledX = baseX * scale_;
-            const winWidth = ((win && win.size && win.size[0] !== undefined ? win.size[0] : 100) || 100) * scale_;
+            const mx = (monitorData && monitorData.x !== undefined ? monitorData.x : 0) || 0;
+            let baseX = ((win && win.at && win.at[0] !== undefined ? win.at[0] : 0) || 0) - mx;
+            if (barPosition === "left") baseX -= barReserved;
+            const relX = Math.max(0, Math.min(1, baseX / root.monitorEffW));
+            const wSize = (win && win.size && win.size[0] !== undefined ? win.size[0] : 0) || 0;
+            const relW = wSize > 200 ? Math.max(0.05, Math.min(1, wSize / root.monitorEffW)) : 0.85;
+            const scaledX = relX * evpw + root.viewportWidth * gutter / 2 + root.viewportOffset;
+            const winWidth = relW * evpw;
 
             minX = Math.min(minX, scaledX);
             maxX = Math.max(maxX, scaledX + winWidth);
         }
 
-        // The full workspace width is 3x viewport (workspaceWidth = viewportWidth * 3)
-        // Content in local coords spans from minX to maxX
-        // The full scrollable area in local coords is [-viewportWidth, 2*viewportWidth]
-        // Overflow exists only if content extends beyond the full workspace width
         const hasOverflow = minX < -viewportWidth || maxX > (viewportWidth * 2);
 
         return {
@@ -124,6 +138,17 @@ Item {
         onTriggered: root.isWheelScrolling = false
     }
 
+    // Timer to wait for axctl to process the move before refreshing window data
+    Timer {
+        id: delayedRefreshTimer
+        interval: 200
+        onTriggered: {
+            if (typeof CompositorData !== "undefined") {
+                CompositorData.refreshFromHyprctl();
+            }
+        }
+    }
+
     // Reset scroll when windows change (added, removed, or moved)
     onWorkspaceWindowsChanged: resetScroll()
     onContentBoundsChanged: {
@@ -138,10 +163,11 @@ Item {
     }
 
     Behavior on horizontalScrollOffset {
-        enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0 && !root.isScrollDragging && !root.isWheelScrolling
+        enabled: Anim.animationsEnabled && !root.isScrollDragging && !root.isWheelScrolling
         NumberAnimation {
-            duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 2
-            easing.type: Easing.OutQuart
+            duration: Anim.spatialFast
+            easing.type: Anim.easing("spatial").type
+            easing.bezierCurve: Anim.easing("spatial").bezierCurve
         }
     }
 
@@ -184,6 +210,18 @@ Item {
                 color: Colors.background
                 opacity: 0.3
             }
+
+            // Workspace number label
+            Text {
+                anchors.centerIn: parent
+                text: String(root.workspaceId)
+                font.family: Config.theme.font
+                font.pixelSize: Math.max(24, Math.round(workspaceHeight * 0.15))
+                font.bold: true
+                color: Colors.onSurface
+                opacity: 0.5
+                z: 5
+            }
         }
 
         // Border indicator for drag target
@@ -201,6 +239,7 @@ Item {
             id: windowsContainer
             anchors.fill: parent
             anchors.margins: root.workspacePadding
+            clip: true
 
             // Horizontal scroll handler - right-click drag
             MouseArea {
@@ -266,7 +305,10 @@ Item {
             TapHandler {
                 acceptedButtons: Qt.LeftButton
                 onDoubleTapped: {
-                    AxctlService.dispatch(`workspace ${root.workspaceId}`);
+                    if (root.overviewRoot && root.overviewRoot.wsProcess) {
+                        root.overviewRoot.wsProcess.command = ["hyprctl", "dispatch", "workspace", String(root.workspaceId)];
+                        root.overviewRoot.wsProcess.running = true;
+                    }
                     Visibilities.setActiveModule("", true);
                 }
             }
@@ -284,8 +326,16 @@ Item {
                         const cls = windowData.class || "";
                         if (!cls) return null;
                         const candidates = toplevels.filter(t => t.appId === cls);
-                        if (candidates.length <= 1) return candidates[0] || null;
-                        return candidates.find(t => t.title === (windowData.title || "")) || candidates[0];
+                        if (candidates.length === 0) return null;
+                        // Try exact title match first
+                        const titleMatch = candidates.find(t => t.title === (windowData.title || ""));
+                        if (titleMatch) return titleMatch;
+                        // Try partial title match
+                        const wt = (windowData.title || "").toLowerCase();
+                        const partial = candidates.find(t => { const tt = (t.title || "").toLowerCase(); return wt.includes(tt) || tt.includes(wt); });
+                        if (partial) return partial;
+                        // Return null to avoid same-class windows sharing a toplevel
+                        return null;
                     }
 
                     // Override position tracking for immediate visual update
@@ -293,25 +343,111 @@ Item {
                     property real overrideBaseY: -1
                     property bool useOverridePosition: false
 
-                    // Position calculations relative to center viewport
+                    readonly property real viewportWidth: root.viewportWidth
+                    readonly property real viewportHeight: root.workspaceHeight - root.workspacePadding * 2
+
+                    // ── Pure proportion-based coordinates (0.0..1.0) ──
+                    readonly property real gutter: 0.02
+                    readonly property real effectiveVpW: viewportWidth * (1 - gutter)
+                    readonly property real effectiveVpH: viewportHeight * (1 - gutter)
+
+                    readonly property real relX: {
+                        const mx = monitorData?.x ?? 0;
+                        let base = (windowData?.at?.[0] ?? 0) - mx;
+                        if (barPosition === "left") base -= barReserved;
+                        return Math.max(0, Math.min(1, root.monitorEffW > 0 ? base / root.monitorEffW : 0));
+                    }
+                    readonly property real relY: {
+                        const my = monitorData?.y ?? 0;
+                        let base = (windowData?.at?.[1] ?? 0) - my;
+                        if (barPosition === "top") base -= barReserved;
+                        return Math.max(0, Math.min(1, root.monitorEffH > 0 ? base / root.monitorEffH : 0));
+                    }
+                    readonly property real relW: {
+                        var w = windowData?.size?.[0] ?? 0;
+                        return w > 200 && root.monitorEffW > 0
+                            ? Math.max(0.05, Math.min(1, w / root.monitorEffW))
+                            : 0.85;
+                    }
+                    readonly property real relH: {
+                        var h = windowData?.size?.[1] ?? 0;
+                        return h > 200 && root.monitorEffH > 0
+                            ? Math.max(0.05, Math.min(1, h / root.monitorEffH))
+                            : 0.85;
+                    }
+                    // Fill dimensions: extend to neighbor without overlapping.
+                    // Must match the same coordinate system as relX/relY
+                    // (bar-adjusted, rotation-aware) for consistency.
+                    readonly property real fillW: {
+                        var neighbors = root.workspaceWindows;
+                        if (!neighbors || neighbors.length <= 1) return relW;
+                        var mx = monitorData?.x ?? 0;
+                        var my = monitorData?.y ?? 0;
+                        var ax = (windowData?.at?.[0] ?? 0) - mx;
+                        var ay = (windowData?.at?.[1] ?? 0) - my;
+                        if (barPosition === "left") ax -= barReserved;
+                        if (barPosition === "top") ay -= barReserved;
+                        var aw = windowData?.size?.[0] ?? root.monitorEffW;
+                        var ah = windowData?.size?.[1] ?? root.monitorEffH;
+                        var limit = root.monitorEffW - (barPosition === "left" || barPosition === "right" ? barReserved : 0);
+                        for (var n = 0; n < neighbors.length; n++) {
+                            var nb = neighbors[n];
+                            if (!nb || nb.address === (windowData?.address ?? "")) continue;
+                            var bx = (nb.at?.[0] ?? 0) - mx;
+                            var by = (nb.at?.[1] ?? 0) - my;
+                            if (barPosition === "left") bx -= barReserved;
+                            if (barPosition === "top") by -= barReserved;
+                            var bw = nb.size?.[0] ?? root.monitorEffW;
+                            var bh = nb.size?.[1] ?? root.monitorEffH;
+                            var nbContained = (bx >= ax && by >= ay && bx + bw <= ax + aw && by + bh <= ay + ah);
+                            if (!nbContained && bx > ax && by < ay + ah && by + bh > ay)
+                                limit = Math.min(limit, bx);
+                        }
+                        var effW = root.monitorEffW - (barPosition === "left" || barPosition === "right" ? barReserved : 0);
+                        var neighborW = effW > 0 ? (limit - ax) / effW : 1;
+                        return Math.max(relW, Math.max(0.05, Math.min(1, neighborW)));
+                    }
+                    readonly property real fillH: {
+                        var neighbors = root.workspaceWindows;
+                        if (!neighbors || neighbors.length <= 1) return relH;
+                        var mx = monitorData?.x ?? 0;
+                        var my = monitorData?.y ?? 0;
+                        var ax = (windowData?.at?.[0] ?? 0) - mx;
+                        var ay = (windowData?.at?.[1] ?? 0) - my;
+                        if (barPosition === "left") ax -= barReserved;
+                        if (barPosition === "top") ay -= barReserved;
+                        var aw = windowData?.size?.[0] ?? root.monitorEffW;
+                        var ah = windowData?.size?.[1] ?? root.monitorEffH;
+                        var limit = root.monitorEffH - (barPosition === "top" || barPosition === "bottom" ? barReserved : 0);
+                        for (var n = 0; n < neighbors.length; n++) {
+                            var nb = neighbors[n];
+                            if (!nb || nb.address === (windowData?.address ?? "")) continue;
+                            var bx = (nb.at?.[0] ?? 0) - mx;
+                            var by = (nb.at?.[1] ?? 0) - my;
+                            if (barPosition === "left") bx -= barReserved;
+                            if (barPosition === "top") by -= barReserved;
+                            var bw = nb.size?.[0] ?? root.monitorEffW;
+                            var bh = nb.size?.[1] ?? root.monitorEffH;
+                            var nbContained = (bx >= ax && by >= ay && bx + bw <= ax + aw && by + bh <= ay + ah);
+                            if (!nbContained && by > ay && bx < ax + aw && bx + bw > ax)
+                                limit = Math.min(limit, by);
+                        }
+                        var effH = root.monitorEffH - (barPosition === "top" || barPosition === "bottom" ? barReserved : 0);
+                        var neighborH = effH > 0 ? (limit - ay) / effH : 1;
+                        return Math.max(relH, Math.max(0.05, Math.min(1, neighborH)));
+                    }
+
                     readonly property real baseX: {
-                        if (useOverridePosition && overrideBaseX >= 0)
-                            return overrideBaseX;
-                        let base = ((windowData && windowData.at && windowData.at[0] !== undefined ? windowData.at[0] : 0) || 0) - ((monitorData && monitorData.x !== undefined ? monitorData.x : 0) || 0);
-                        if (barPosition === "left")
-                            base -= barReserved;
-                        return (base * scale_) + root.viewportOffset + root.horizontalScrollOffset;
+                        if (useOverridePosition && overrideBaseX >= 0) return overrideBaseX;
+                        return Math.round(relX * effectiveVpW + viewportWidth * gutter / 2 + root.viewportOffset + root.horizontalScrollOffset);
                     }
                     readonly property real baseY: {
-                        if (useOverridePosition && overrideBaseY >= 0)
-                            return overrideBaseY;
-                        let base = ((windowData && windowData.at && windowData.at[1] !== undefined ? windowData.at[1] : 0) || 0) - ((monitorData && monitorData.y !== undefined ? monitorData.y : 0) || 0);
-                        if (barPosition === "top")
-                            base -= barReserved;
-                        return Math.max(base * scale_, 0);
+                        if (useOverridePosition && overrideBaseY >= 0) return overrideBaseY;
+                        return Math.round(relY * effectiveVpH + viewportHeight * gutter / 2);
                     }
-                    readonly property real targetWidth: Math.round(((windowData && windowData.size && windowData.size[0] !== undefined ? windowData.size[0] : 100) || 100) * scale_)
-                    readonly property real targetHeight: Math.round(((windowData && windowData.size && windowData.size[1] !== undefined ? windowData.size[1] : 100) || 100) * scale_)
+
+                    readonly property real targetWidth: Math.max(24, Math.round(fillW * effectiveVpW))
+                    readonly property real targetHeight: Math.max(24, Math.round(fillH * effectiveVpH))
                     readonly property bool compactMode: targetHeight < 60 || targetWidth < 60
                     readonly property string iconPath: AppSearch.guessIcon((windowData && windowData.class !== undefined ? windowData.class : "") || "")
                     readonly property int calculatedRadius: Styling.radius(-2)
@@ -332,10 +468,33 @@ Item {
                     property point pressPos: Qt.point(0, 0)
                     readonly property real dragThreshold: 5
 
-                    Drag.active: dragging
-                    Drag.source: windowDelegate
-                    Drag.hotSpot.x: width / 2
-                    Drag.hotSpot.y: height / 2
+                    // Entry / hover / close animations
+                    property bool _entered: false
+                    property bool _closing: false
+                    Component.onCompleted: _entered = true
+
+                    readonly property real hoverScale: !dragging && hovered && !_closing ? 1.03 : 1.0
+                    scale: _closing ? 0.3 : (_entered ? hoverScale : 0.85)
+
+                    Behavior on scale {
+                        enabled: Anim.animationsEnabled
+                        NumberAnimation {
+                            property var _ease: _closing ? Anim.easing("emphasized", "exit") : Anim.easing("emphasized")
+                            duration: _closing ? Anim.standardSmall : Anim.standardNormal
+                            easing.type: _ease.type
+                            easing.bezierCurve: _ease.bezierCurve
+                        }
+                    }
+
+                    opacity: _closing ? 0.0 : (_entered ? 1.0 : 0.0)
+                    Behavior on opacity {
+                        enabled: Anim.animationsEnabled
+                        NumberAnimation {
+                            duration: _closing ? Anim.standardSmall : Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                            easing.bezierCurve: Anim.easing("standard").bezierCurve
+                        }
+                    }
 
                     // Timer to reset override position after AxctlService update
                     Timer {
@@ -353,161 +512,168 @@ Item {
                         }
                     }
 
-                    Behavior on x {
-                        enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0 && !windowDelegate.dragging && !windowDelegate.useOverridePosition
-                        NumberAnimation {
-                            duration: (Config.animDuration !== undefined ? Config.animDuration : 0)
-                            easing.type: Easing.OutQuart
-                        }
-                    }
-                    Behavior on y {
-                        enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0 && !windowDelegate.dragging && !windowDelegate.useOverridePosition
-                        NumberAnimation {
-                            duration: (Config.animDuration !== undefined ? Config.animDuration : 0)
-                            easing.type: Easing.OutQuart
-                        }
-                    }
+                    // ═══════════════════════════════════════════════════
+                    // VISUAL: Clean dark card, no white background
+                    // ═══════════════════════════════════════════════════
 
+                    // ── Live window preview: render at source size, Scale to fill card ──
                     ClippingRectangle {
+                        id: swClipRect
                         anchors.fill: parent
                         radius: windowDelegate.calculatedRadius
                         antialiasing: true
                         color: "transparent"
-                        border.color: Colors.background
+                        border.color: "transparent"
                         border.width: 0
 
                         ScreencopyView {
                             id: windowPreview
-                            anchors.fill: parent
+                            width: Math.max(1, (windowData && windowData.size && windowData.size[0] !== undefined ? windowData.size[0] : 0) || 640)
+                            height: Math.max(1, (windowData && windowData.size && windowData.size[1] !== undefined ? windowData.size[1] : 0) || 480)
                             captureSource: Config.performance.windowPreview && GlobalStates.overviewOpen ? windowDelegate.toplevel : null
                             live: GlobalStates.overviewOpen
                             visible: Config.performance.windowPreview
+
+                            transform: Scale {
+                                origin.x: 0; origin.y: 0
+                                xScale: swClipRect.width / windowPreview.width
+                                yScale: swClipRect.height / windowPreview.height
+                            }
                         }
                     }
 
-                    // Background when no preview
+                    // ── Dark fallback card ──
                     Rectangle {
-                        id: previewBackground
+                        id: fallbackCard
                         anchors.fill: parent
                         radius: windowDelegate.calculatedRadius
-                        color: windowDelegate.dragging ? Colors.surfaceBright : windowDelegate.hovered ? Colors.surface : Colors.background
-                        border.color: windowDelegate.isSelected ? Colors.tertiary : windowDelegate.isMatched ? Styling.srItem("overprimary") : Styling.srItem("overprimary")
-                        border.width: windowDelegate.isSelected ? 3 : windowDelegate.isMatched ? 2 : (windowDelegate.hovered ? 2 : 0)
-                        visible: !Config.performance.windowPreview
-
-                        Behavior on color {
-                            enabled: (Config.animDuration !== undefined ? Config.animDuration : 0) > 0
-                            ColorAnimation {
-                                duration: (Config.animDuration !== undefined ? Config.animDuration : 0) / 2
-                            }
+                        color: Qt.rgba(Colors.surfaceContainer.r, Colors.surfaceContainer.g, Colors.surfaceContainer.b, 0.35)
+                        visible: !windowPreview.hasContent || !Config.performance.windowPreview
+                        border.color: windowDelegate.isSelected ? Colors.tertiary
+                            : windowDelegate.isMatched ? Styling.srItem("overprimary")
+                            : windowDelegate.hovered ? Qt.rgba(Colors.onSurface.r, Colors.onSurface.g, Colors.onSurface.b, 0.25)
+                            : Qt.rgba(Colors.onSurface.r, Colors.onSurface.g, Colors.onSurface.b, 0.10)
+                        border.width: windowDelegate.isSelected ? 2 : windowDelegate.isMatched ? 2 : 1
+                        Behavior on border.color {
+                            enabled: Anim.animationsEnabled
+                            ColorAnimation { duration: Anim.standardSmall }
                         }
                     }
 
-                    // Icon
+                    // ── App icon ──
                     Image {
                         mipmap: true
                         id: windowIcon
-                        readonly property real iconSize: Math.round(Math.min(windowDelegate.targetWidth, windowDelegate.targetHeight) * (windowDelegate.compactMode ? 0.6 : 0.35))
+                        readonly property real iconSize: Math.round(Math.min(windowDelegate.targetWidth, windowDelegate.targetHeight) * (windowDelegate.compactMode ? 0.55 : 0.30))
                         anchors.centerIn: parent
                         width: iconSize
                         height: iconSize
                         source: Quickshell.iconPath(windowDelegate.iconPath, "image-missing")
                         sourceSize: Qt.size(iconSize, iconSize)
                         asynchronous: true
-                        visible: !Config.performance.windowPreview
-                        z: 10
+                        visible: !windowPreview.hasContent || !Config.performance.windowPreview
+                        opacity: 0.7
+                        z: 2
                     }
 
-                    // Overlay when preview is available (only show on interaction)
+                    // ── Hover / selection border ──
                     Rectangle {
-                        id: previewOverlay
+                        id: borderOverlay
                         anchors.fill: parent
                         radius: windowDelegate.calculatedRadius
-                        color: windowDelegate.dragging ? Qt.rgba(Colors.surfaceContainerHighest.r, Colors.surfaceContainerHighest.g, Colors.surfaceContainerHighest.b, 0.5) : windowDelegate.hovered ? Qt.rgba(Colors.surfaceContainer.r, Colors.surfaceContainer.g, Colors.surfaceContainer.b, 0.2) : "transparent"
-                        border.color: windowDelegate.isSelected ? Colors.tertiary : windowDelegate.isMatched ? Styling.srItem("overprimary") : Styling.srItem("overprimary")
+                        color: "transparent"
+                        border.color: windowDelegate.isSelected ? Colors.tertiary
+                            : windowDelegate.isMatched ? Styling.srItem("overprimary")
+                            : windowDelegate.hovered ? Styling.srItem("overprimary")
+                            : "transparent"
                         border.width: windowDelegate.isSelected ? 3 : windowDelegate.isMatched ? 2 : (windowDelegate.hovered ? 2 : 0)
-                        visible: Config.performance.windowPreview && (windowDelegate.hovered || windowDelegate.dragging || windowDelegate.isMatched || windowDelegate.isSelected)
-                        z: 5
+                        z: 3
+                        Behavior on border.color {
+                            enabled: Anim.animationsEnabled
+                            ColorAnimation { duration: Anim.standardSmall }
+                        }
+                        Behavior on border.width {
+                            enabled: Anim.animationsEnabled
+                            NumberAnimation {
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("standard").type
+                                easing.bezierCurve: Anim.easing("standard").bezierCurve
+                            }
+                        }
                     }
 
-                    // Corner icon when preview available
+                    // ── Hover tint ──
+                    Rectangle {
+                        anchors.fill: parent
+                        radius: windowDelegate.calculatedRadius
+                        color: windowDelegate.dragging ? Qt.rgba(1, 1, 1, 0.10) : windowDelegate.hovered ? Qt.rgba(1, 1, 1, 0.05) : "transparent"
+                        z: 1
+                        Behavior on color {
+                            enabled: Anim.animationsEnabled
+                            ColorAnimation { duration: Anim.standardSmall }
+                        }
+                    }
+
+                    // ── Corner icon (when preview active) ──
                     Image {
                         mipmap: true
                         visible: windowPreview.hasContent && !windowDelegate.compactMode && Config.performance.windowPreview
                         anchors.bottom: parent.bottom
                         anchors.right: parent.right
-                        anchors.margins: 4
-                        width: 16
-                        height: 16
+                        anchors.margins: 3
+                        width: 14
+                        height: 14
                         source: Quickshell.iconPath(windowDelegate.iconPath, "image-missing")
-                        sourceSize: Qt.size(16, 16)
+                        sourceSize: Qt.size(14, 14)
                         asynchronous: true
-                        opacity: 0.8
-                        z: 10
+                        opacity: 0.6
+                        z: 4
                     }
 
-                    // XWayland indicator
+                    // ── XWayland indicator ──
                     Rectangle {
                         visible: (windowDelegate.windowData && windowDelegate.windowData.xwayland !== undefined ? windowDelegate.windowData.xwayland : false) || false
                         anchors.top: parent.top
                         anchors.right: parent.right
                         anchors.margins: 2
-                        width: 6
-                        height: 6
+                        width: 5
+                        height: 5
                         radius: 3
                         color: Colors.error
-                        z: 10
+                        z: 4
                     }
 
+                    // ═══════════════════════════════════════════════════════
+                    // RIGHT-CLICK DRAG TO MOVE WINDOW BETWEEN WORKSPACES
+                    // Left clicks pass through to workspace cells below.
+                    // ═══════════════════════════════════════════════════════
                     MouseArea {
                         id: dragArea
                         anchors.fill: parent
                         hoverEnabled: true
-                        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
-                        drag.target: windowDelegate.dragging ? windowDelegate : null
-                        drag.threshold: 0
-
-                        // Right-click drag state for horizontal scroll
-                        property real rightDragStartX: 0
-                        property real rightScrollStartOffset: 0
+                        acceptedButtons: Qt.RightButton
 
                         onEntered: windowDelegate.hovered = true
                         onExited: windowDelegate.hovered = false
 
                         onPressed: mouse => {
-                            if (mouse.button === Qt.LeftButton) {
-                                windowDelegate.pressPos = Qt.point(mouse.x, mouse.y);
-                                windowDelegate.initX = windowDelegate.x;
-                                windowDelegate.initY = windowDelegate.y;
-                            } else if (mouse.button === Qt.RightButton && root.contentBounds.hasOverflow) {
-                                rightDragStartX = mouse.x;
-                                rightScrollStartOffset = root.horizontalScrollOffset;
-                                root.isScrollDragging = true;
-                            }
+                            if (mouse.button !== Qt.RightButton) return;
+                            windowDelegate.pressPos = Qt.point(mouse.x, mouse.y);
+                            windowDelegate.initX = windowDelegate.x;
+                            windowDelegate.initY = windowDelegate.y;
                         }
 
                         onPositionChanged: mouse => {
-                            // Handle right-click drag for horizontal scroll
-                            if (root.isScrollDragging && (mouse.buttons & Qt.RightButton) && root.contentBounds.hasOverflow) {
-                                const delta = mouse.x - rightDragStartX;
-                                root.horizontalScrollOffset = root.clampHorizontalScroll(rightScrollStartOffset + delta);
+                            if (!(mouse.buttons & Qt.RightButton))
                                 return;
-                            }
 
-                            if (!(mouse.buttons & Qt.LeftButton))
-                                return;
-
-                            // Check if we should start dragging
                             if (!windowDelegate.dragging) {
                                 const dx = mouse.x - windowDelegate.pressPos.x;
                                 const dy = mouse.y - windowDelegate.pressPos.y;
                                 const distance = Math.sqrt(dx * dx + dy * dy);
-
                                 if (distance > windowDelegate.dragThreshold) {
-                                    // Start dragging
                                     windowDelegate.dragging = true;
                                     root.draggingFromWorkspace = root.workspaceId;
-
                                     // Reparent to drag overlay
                                     if (root.dragOverlay) {
                                         windowDelegate.originalParent = windowDelegate.parent;
@@ -516,191 +682,44 @@ Item {
                                         windowDelegate.x = globalPos.x;
                                         windowDelegate.y = globalPos.y;
                                     }
+                                } else {
+                                    return;
                                 }
-                            } else {
-                                // Update target workspace indicator while dragging
-                                if (root.overviewRoot && root.overviewRoot.getWorkspaceAtY) {
-                                    const globalPos = dragArea.mapToItem(null, mouse.x, mouse.y);
-                                    const targetWs = root.overviewRoot.getWorkspaceAtY(globalPos.y);
-                                    if (targetWs !== -1 && targetWs !== root.workspaceId) {
-                                        root.draggingTargetWorkspace = targetWs;
-                                    } else {
-                                        root.draggingTargetWorkspace = -1;
-                                    }
-                                }
+                            }
+
+                            // Update target workspace while dragging
+                            if (root.overviewRoot && root.overviewRoot.getWorkspaceAtY) {
+                                const globalPos = dragArea.mapToItem(null, mouse.x, mouse.y);
+                                const targetWs = root.overviewRoot.getWorkspaceAtY(globalPos.y);
+                                root.draggingTargetWorkspace = (targetWs !== -1 && targetWs !== root.workspaceId) ? targetWs : -1;
                             }
                         }
 
                         onReleased: mouse => {
-                            if (mouse.button === Qt.LeftButton) {
-                                if (windowDelegate.dragging) {
-                                    windowDelegate.dragging = false;
-
-                                    // Calculate target workspace from cursor position
-                                    let targetWs = root.workspaceId; // Default to current workspace
-                                    if (root.overviewRoot && root.overviewRoot.getWorkspaceAtY) {
-                                        const globalPos = dragArea.mapToItem(null, mouse.x, mouse.y);
-                                        const calculatedWs = root.overviewRoot.getWorkspaceAtY(globalPos.y);
-                                        if (calculatedWs !== -1) {
-                                            targetWs = calculatedWs;
-                                        }
-                                    }
+                            if (mouse.button !== Qt.RightButton) return;
 
-                                    if (targetWs !== root.workspaceId) {
-                                        // Moving to different workspace
-                                        if ((windowDelegate.windowData && windowDelegate.windowData.floating !== undefined ? windowDelegate.windowData.floating : false)) {
-                                            // Calculate position for floating window in target workspace
-                                            const draggedX = windowDelegate.x;
-                                            const draggedY = windowDelegate.y;
-                                            
-                                            const workspaceGlobalPos = windowsContainer.mapToItem(root.dragOverlay, 0, 0);
-                                            const relativeX = draggedX - workspaceGlobalPos.x;
-                                            const relativeY = draggedY - workspaceGlobalPos.y;
-                                            
-                                            const workspaceX = relativeX - root.horizontalScrollOffset - root.viewportOffset;
-                                            const workspaceY = relativeY;
-                                            
-                                            const monitorWidth = ((monitorData && monitorData.width !== undefined ? monitorData.width : 1920) || 1920) / ((monitorData && monitorData.scale !== undefined ? monitorData.scale : 1.0) || 1.0);
-                                            const monitorHeight = ((monitorData && monitorData.height !== undefined ? monitorData.height : 1080) || 1080) / ((monitorData && monitorData.scale !== undefined ? monitorData.scale : 1.0) || 1.0);
-                                            
-                                            let adjustedMonitorWidth = monitorWidth;
-                                            let adjustedMonitorHeight = monitorHeight;
-                                            if (barPosition === "left" || barPosition === "right") {
-                                                adjustedMonitorWidth -= barReserved;
-                                            }
-                                            if (barPosition === "top" || barPosition === "bottom") {
-                                                adjustedMonitorHeight -= barReserved;
-                                            }
-                                            
-                                            const actualX = workspaceX / scale_;
-                                            const actualY = workspaceY / scale_;
-                                            
-                                            const percentageX = Math.round((actualX / adjustedMonitorWidth) * 100);
-                                            const percentageY = Math.round((actualY / adjustedMonitorHeight) * 100);
-                                            
-                                            // Move to workspace and set position
-                                            AxctlService.dispatch(`movetoworkspacesilent ${targetWs}, address:${(windowDelegate.windowData && windowDelegate.windowData.address !== undefined ? windowDelegate.windowData.address : "")}`);
-                                            AxctlService.dispatch(`movewindowpixel exact ${percentageX}% ${percentageY}%, address:${(windowDelegate.windowData && windowDelegate.windowData.address !== undefined ? windowDelegate.windowData.address : "")}`);
-                                            
-                                            // Force immediate window data update
-                                            CompositorData.updateWindowList();
-                                        } else {
-                                            // Just move workspace without repositioning for tiled windows
-                                            AxctlService.dispatch(`movetoworkspacesilent ${targetWs}, address:${(windowDelegate.windowData && windowDelegate.windowData.address !== undefined ? windowDelegate.windowData.address : "")}`);
-                                            
-                                            // Force immediate window data update
-                                            CompositorData.updateWindowList();
-                                        }
-                                        
-                                        // Restore original parent and reset position
-                                        if (windowDelegate.originalParent) {
-                                            windowDelegate.parent = windowDelegate.originalParent;
-                                            windowDelegate.originalParent = null;
-                                        }
-                                        windowDelegate.x = windowDelegate.initX;
-                                        windowDelegate.y = windowDelegate.initY;
-                                        
-                                    } else if ((windowDelegate.windowData && windowDelegate.windowData.floating !== undefined ? windowDelegate.windowData.floating : false) && (windowDelegate.x !== windowDelegate.initX || windowDelegate.y !== windowDelegate.initY)) {
-                                        // Dropped on same workspace and window is floating - reposition it
-                                        // The window is currently in the drag overlay with global coordinates
-                                        
-                                        // Store current drag position
-                                        const draggedX = windowDelegate.x;
-                                        const draggedY = windowDelegate.y;
-                                        
-                                        // Get the workspace container position
-                                        const workspaceGlobalPos = windowsContainer.mapToItem(root.dragOverlay, 0, 0);
-                                        
-                                        // Calculate position relative to workspace
-                                        const relativeX = draggedX - workspaceGlobalPos.x;
-                                        const relativeY = draggedY - workspaceGlobalPos.y;
-                                        
-                                        // Remove horizontal scroll offset to get actual position in workspace
-                                        const workspaceX = relativeX - root.horizontalScrollOffset - root.viewportOffset;
-                                        const workspaceY = relativeY;
-                                        
-                                        // Convert to percentage of workspace dimensions (in scaled space)
-                                        const monitorWidth = ((monitorData && monitorData.width !== undefined ? monitorData.width : 1920) || 1920) / ((monitorData && monitorData.scale !== undefined ? monitorData.scale : 1.0) || 1.0);
-                                        const monitorHeight = ((monitorData && monitorData.height !== undefined ? monitorData.height : 1080) || 1080) / ((monitorData && monitorData.scale !== undefined ? monitorData.scale : 1.0) || 1.0);
-                                        
-                                        // Adjust for bar reserved space
-                                        let adjustedMonitorWidth = monitorWidth;
-                                        let adjustedMonitorHeight = monitorHeight;
-                                        if (barPosition === "left" || barPosition === "right") {
-                                            adjustedMonitorWidth -= barReserved;
-                                        }
-                                        if (barPosition === "top" || barPosition === "bottom") {
-                                            adjustedMonitorHeight -= barReserved;
-                                        }
-                                        
-                                        // Convert from scaled overview space to actual position
-                                        const actualX = workspaceX / scale_;
-                                        const actualY = workspaceY / scale_;
-                                        
-                                        // Calculate percentage
-                                        const percentageX = Math.round((actualX / adjustedMonitorWidth) * 100);
-                                        const percentageY = Math.round((actualY / adjustedMonitorHeight) * 100);
-                                        
-                                        // Dispatch movewindowpixel command
-                                        AxctlService.dispatch(`movewindowpixel exact ${percentageX}% ${percentageY}%, address:${(windowDelegate.windowData && windowDelegate.windowData.address !== undefined ? windowDelegate.windowData.address : "")}`);
-                                        
-                                        // Force immediate window data update
-                                        CompositorData.updateWindowList();
-                                        
-                                        // Restore original parent
-                                        if (windowDelegate.originalParent) {
-                                            windowDelegate.parent = windowDelegate.originalParent;
-                                            windowDelegate.originalParent = null;
-                                        }
-                                        
-                                        // Set override position for immediate visual update
-                                        // Calculate what baseX/baseY should be at the dropped position
-                                        windowDelegate.overrideBaseX = relativeX;
-                                        windowDelegate.overrideBaseY = relativeY;
-                                        windowDelegate.useOverridePosition = true;
-                                        
-                                        // Force position to dropped location
-                                        windowDelegate.x = relativeX;
-                                        windowDelegate.y = relativeY;
-                                        
-                                        // Start timer to clear override
-                                        resetOverrideTimer.restart();
-                                    } else {
-                                        // Not a floating window or didn't move - restore original parent and position
-                                        if (windowDelegate.originalParent) {
-                                            windowDelegate.parent = windowDelegate.originalParent;
-                                            windowDelegate.originalParent = null;
-                                        }
-                                        windowDelegate.x = windowDelegate.initX;
-                                        windowDelegate.y = windowDelegate.initY;
-                                    }
+                            if (windowDelegate.dragging) {
+                                windowDelegate.dragging = false;
+                                const targetWs = root.draggingTargetWorkspace !== -1 ? root.draggingTargetWorkspace : root.workspaceId;
 
-                                    root.draggingFromWorkspace = -1;
-                                    root.draggingTargetWorkspace = -1;
+                                if (targetWs !== root.workspaceId && windowDelegate.windowData) {
+                                    AxctlService.dispatch(`movetoworkspacesilent ${targetWs}, address:${windowDelegate.windowData.address || ""}`);
+                                    // Wait 200ms for axctl to process the move before refreshing
+                                    delayedRefreshTimer.restart();
                                 }
-                            } else if (mouse.button === Qt.RightButton) {
-                                root.isScrollDragging = false;
-                            }
-                        }
 
-                        onClicked: mouse => {
-                            if (!windowDelegate.windowData)
-                                return;
-                            if (mouse.button === Qt.LeftButton && !windowDelegate.dragging) {
-                                AxctlService.dispatch(`focuswindow address:${windowDelegate.windowData.address}`);
-                            } else if (mouse.button === Qt.MiddleButton) {
-                                AxctlService.dispatch(`closewindow address:${windowDelegate.windowData.address}`);
-                            }
-                        }
+                                // Restore original parent and re-bind position.
+                                // Setting x/y directly breaks the baseX/baseY bindings;
+                                // Qt.binding restores them so the thumbnail follows window data.
+                                if (windowDelegate.originalParent) {
+                                    windowDelegate.parent = windowDelegate.originalParent;
+                                    windowDelegate.originalParent = null;
+                                }
+                                windowDelegate.x = Qt.binding(function() { return windowDelegate.baseX; });
+                                windowDelegate.y = Qt.binding(function() { return windowDelegate.baseY; });
 
-                        onDoubleClicked: mouse => {
-                            if (!windowDelegate.windowData)
-                                return;
-                            if (mouse.button === Qt.LeftButton) {
-                                Visibilities.setActiveModule("", true);
-                                Qt.callLater(() => {
-                                    AxctlService.dispatch(`focuswindow address:${windowDelegate.windowData.address}`);
-                                });
+                                root.draggingFromWorkspace = -1;
+                                root.draggingTargetWorkspace = -1;
                             }
                         }
                     }
diff --git a/modules/widgets/powermenu/PowerButton.qml b/modules/widgets/powermenu/PowerButton.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/powermenu/PowerMenu.qml b/modules/widgets/powermenu/PowerMenu.qml
old mode 100644
new mode 100755
index ad0af53d..1deb8059
--- a/modules/widgets/powermenu/PowerMenu.qml
+++ b/modules/widgets/powermenu/PowerMenu.qml
@@ -27,7 +27,7 @@ ActionGrid {
         {
             icon: Icons.lock,
             tooltip: "Lock Session",
-            command: "loginctl lock-session"
+            command: "ambxst lock"
         },
         {
             icon: Icons.suspend,
diff --git a/modules/widgets/powermenu/PowerMenuView.qml b/modules/widgets/powermenu/PowerMenuView.qml
old mode 100644
new mode 100755
index 9966607a..15ce8057
--- a/modules/widgets/powermenu/PowerMenuView.qml
+++ b/modules/widgets/powermenu/PowerMenuView.qml
@@ -2,24 +2,27 @@ import QtQuick
 import qs.modules.components
 import qs.modules.services
 import qs.config
+import qs.modules.theme
 
 Item {
     implicitWidth: powerMenu.implicitWidth
     implicitHeight: powerMenu.implicitHeight
 
     Behavior on implicitWidth {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
     Behavior on implicitHeight {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
diff --git a/modules/widgets/presets/PresetsButton.qml b/modules/widgets/presets/PresetsButton.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/presets/PresetsPopup.qml b/modules/widgets/presets/PresetsPopup.qml
old mode 100644
new mode 100755
index 5afcc42b..dc69e795
--- a/modules/widgets/presets/PresetsPopup.qml
+++ b/modules/widgets/presets/PresetsPopup.qml
@@ -75,10 +75,11 @@ PanelWindow {
         opacity: presetsOpen ? 0.5 : 0
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutQuart
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
@@ -101,19 +102,20 @@ PanelWindow {
         scale: presetsOpen ? 1 : 0.9
 
         Behavior on opacity {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutQuart
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
             }
         }
 
         Behavior on scale {
-            enabled: Config.animDuration > 0
+            enabled: Anim.animationsEnabled
             NumberAnimation {
-                duration: Config.animDuration
-                easing.type: Easing.OutBack
-                easing.overshoot: 1.2
+                duration: Anim.standardNormal
+                easing.type: Anim.easing("emphasized").type
+                        easing.bezierCurve: Anim.easing("emphasized").bezierCurve
             }
         }
 
@@ -202,9 +204,9 @@ PanelWindow {
                     color: externalScrollBar.pressed ? Styling.srItem("overprimary") : (externalScrollBar.hovered ? Qt.lighter(Styling.srItem("overprimary"), 1.2) : Styling.srItem("overprimary"))
 
                     Behavior on color {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         ColorAnimation {
-                            duration: Config.animDuration / 2
+                            duration: Anim.standardSmall
                         }
                     }
                 }
diff --git a/modules/widgets/presets/PresetsTab.qml b/modules/widgets/presets/PresetsTab.qml
old mode 100644
new mode 100755
index 03d42de4..c2cd4530
--- a/modules/widgets/presets/PresetsTab.qml
+++ b/modules/widgets/presets/PresetsTab.qml
@@ -410,10 +410,11 @@ Item {
     }
 
     Behavior on height {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
@@ -543,10 +544,11 @@ Item {
             currentIndex: root.selectedIndex
 
             Behavior on contentY {
-                enabled: Config.animDuration > 0 && resultsList.enableScrollAnimation && !resultsList.moving
+                enabled: Anim.animationsEnabled && resultsList.enableScrollAnimation && !resultsList.moving
                 NumberAnimation {
-                    duration: Config.animDuration / 2
-                    easing.type: Easing.OutCubic
+                    duration: Anim.standardSmall
+                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                 }
             }
 
@@ -609,18 +611,20 @@ Item {
                 radius: 16
 
                 Behavior on y {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
                 Behavior on height {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
                 clip: true
@@ -731,10 +735,11 @@ Item {
                     opacity: (isExpanded && !isInDeleteMode && !isInRenameMode && !isInUpdateMode) ? 1 : 0
 
                     Behavior on opacity {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -811,10 +816,11 @@ Item {
                                             }
 
                                             Behavior on color {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 ColorAnimation {
-                                                    duration: Config.animDuration / 2
-                                                    easing.type: Easing.OutQuart
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
                                         }
@@ -835,10 +841,11 @@ Item {
                                             maximumLineCount: 1
 
                                             Behavior on color {
-                                                enabled: Config.animDuration > 0
+                                                enabled: Anim.animationsEnabled
                                                 ColorAnimation {
-                                                    duration: Config.animDuration / 2
-                                                    easing.type: Easing.OutQuart
+                                                    duration: Anim.standardSmall
+                                                    easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                                 }
                                             }
                                         }
@@ -884,19 +891,21 @@ Item {
                         x: isInRenameMode ? 0 : 80
 
                         Behavior on x {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
 
                     Behavior on opacity {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -917,17 +926,19 @@ Item {
                         height: 32 - activeButtonMargin * 2
 
                         Behavior on idx1X {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration / 3
-                                easing.type: Easing.OutSine
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                             }
                         }
                         Behavior on idx2X {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutSine
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                             }
                         }
                     }
@@ -961,10 +972,11 @@ Item {
                                 textFormat: Text.RichText
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -995,10 +1007,11 @@ Item {
                                 textFormat: Text.RichText
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -1023,19 +1036,21 @@ Item {
                         x: isInDeleteMode ? 0 : 80
 
                         Behavior on x {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutQuart
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                             }
                         }
                     }
 
                     Behavior on opacity {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -1056,17 +1071,19 @@ Item {
                         height: 32 - activeButtonMargin * 2
 
                         Behavior on idx1X {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration / 3
-                                easing.type: Easing.OutSine
+                                duration: Anim.standardSmall
+                                easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                             }
                         }
                         Behavior on idx2X {
-                            enabled: Config.animDuration > 0
+                            enabled: Anim.animationsEnabled
                             NumberAnimation {
-                                duration: Config.animDuration
-                                easing.type: Easing.OutSine
+                                duration: Anim.standardNormal
+                                easing.type: Anim.easing("spatial").type
+                        easing.bezierCurve: Anim.easing("spatial").bezierCurve
                             }
                         }
                     }
@@ -1100,10 +1117,11 @@ Item {
                                 textFormat: Text.RichText
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -1134,10 +1152,11 @@ Item {
                                 textFormat: Text.RichText
 
                                 Behavior on color {
-                                    enabled: Config.animDuration > 0
+                                    enabled: Anim.animationsEnabled
                                     ColorAnimation {
-                                        duration: Config.animDuration / 2
-                                        easing.type: Easing.OutQuart
+                                        duration: Anim.standardSmall
+                                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                                     }
                                 }
                             }
@@ -1157,10 +1176,11 @@ Item {
                     spacing: 8
 
                     Behavior on anchors.rightMargin {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         NumberAnimation {
-                            duration: Config.animDuration
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardNormal
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
 
@@ -1369,18 +1389,20 @@ Item {
                 }
 
                 Behavior on y {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration / 2
-                        easing.type: Easing.OutCubic
+                        duration: Anim.standardSmall
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
                 Behavior on height {
-                    enabled: Config.animDuration > 0
+                    enabled: Anim.animationsEnabled
                     NumberAnimation {
-                        duration: Config.animDuration
-                        easing.type: Easing.OutQuart
+                        duration: Anim.standardNormal
+                        easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                     }
                 }
 
@@ -1409,10 +1431,11 @@ Item {
                     visible: root.selectedIndex >= 0
 
                     Behavior on color {
-                        enabled: Config.animDuration > 0
+                        enabled: Anim.animationsEnabled
                         ColorAnimation {
-                            duration: Config.animDuration / 2
-                            easing.type: Easing.OutQuart
+                            duration: Anim.standardSmall
+                            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
                         }
                     }
                 }
diff --git a/modules/widgets/tools/ToolsMenu.qml b/modules/widgets/tools/ToolsMenu.qml
old mode 100644
new mode 100755
diff --git a/modules/widgets/tools/ToolsMenuView.qml b/modules/widgets/tools/ToolsMenuView.qml
old mode 100644
new mode 100755
index 06da1392..1822e601
--- a/modules/widgets/tools/ToolsMenuView.qml
+++ b/modules/widgets/tools/ToolsMenuView.qml
@@ -2,24 +2,27 @@ import QtQuick
 import qs.modules.components
 import qs.modules.services
 import qs.config
+import qs.modules.theme
 
 Item {
     implicitWidth: toolsMenu.implicitWidth
     implicitHeight: toolsMenu.implicitHeight
 
     Behavior on implicitWidth {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
     Behavior on implicitHeight {
-        enabled: Config.animDuration > 0
+        enabled: Anim.animationsEnabled
         NumberAnimation {
-            duration: Config.animDuration
-            easing.type: Easing.OutQuart
+            duration: Anim.standardNormal
+            easing.type: Anim.easing("standard").type
+                        easing.bezierCurve: Anim.easing("standard").bezierCurve
         }
     }
 
diff --git a/nix/lib.nix b/nix/lib.nix
old mode 100644
new mode 100755
diff --git a/nix/modules/default.nix b/nix/modules/default.nix
old mode 100644
new mode 100755
diff --git a/nix/packages/apps.nix b/nix/packages/apps.nix
old mode 100644
new mode 100755
index e603298c..f962f1c4
--- a/nix/packages/apps.nix
+++ b/nix/packages/apps.nix
@@ -19,4 +19,9 @@ with pkgs; [
   # Icons
   kdePackages.breeze-icons
   hicolor-icon-theme
+
+  # Utilities
+  translate-shell
+  libqalculate
+  songrec
 ]
diff --git a/nix/packages/core.nix b/nix/packages/core.nix
old mode 100644
new mode 100755
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
old mode 100644
new mode 100755
index db5da2d8..52524ce9
--- a/nix/packages/default.nix
+++ b/nix/packages/default.nix
@@ -1,10 +1,23 @@
 # Main Ambxst package
-{ pkgs, lib, self, system, axctl, version }:
+{
+  pkgs,
+  lib,
+  self,
+  system,
+  axctl,
+  version,
+}:
 
 let
-  quickshellPkg = pkgs.quickshell;
   axctlPkg = axctl.packages.${system}.default;
-
+  quickshellPkg = pkgs.quickshell.overrideAttrs (old: {
+    buildInputs = (old.buildInputs or [ ]) ++ [
+      pkgs.kdePackages.kirigami
+      pkgs.kdePackages.kirigami-addons
+      pkgs.kdePackages.qqc2-desktop-style
+      pkgs.kdePackages.syntax-highlighting
+    ];
+  });
   # Import sub-packages
   ttf-phosphor-icons = import ./phosphor-icons.nix { inherit pkgs; };
 
@@ -17,13 +30,8 @@ let
   tesseractPkgs = import ./tesseract.nix { inherit pkgs; };
 
   # Combine all packages (NixOS-specific deps handled by the module)
-  baseEnv = corePkgs
-    ++ [ axctlPkg ]
-    ++ toolsPkgs
-    ++ mediaPkgs
-    ++ appsPkgs
-    ++ fontsPkgs
-    ++ tesseractPkgs;
+  baseEnv =
+    corePkgs ++ [ axctlPkg ] ++ toolsPkgs ++ mediaPkgs ++ appsPkgs ++ fontsPkgs ++ tesseractPkgs;
 
   envAmbxst = pkgs.buildEnv {
     name = "Ambxst-env";
@@ -52,7 +60,7 @@ let
   };
 
   launcher = pkgs.writeShellScriptBin "ambxst" ''
-    export AMBXST_QS="${quickshellPkg}/bin/qs"
+    export NOTHINGLESS_QS="${quickshellPkg}/bin/qs"
     export PATH="${envAmbxst}/bin:$PATH"
 
     # Set QML2_IMPORT_PATH to include modules from envAmbxst (like syntax-highlighting)
@@ -66,8 +74,12 @@ let
     exec ${shellSrc}/cli.sh "$@"
   '';
 
-in pkgs.buildEnv {
+in
+pkgs.buildEnv {
   name = "Ambxst-${version}";
-  paths = [ envAmbxst launcher ];
+  paths = [
+    envAmbxst
+    launcher
+  ];
   meta.mainProgram = "ambxst";
 }
diff --git a/nix/packages/fonts.nix b/nix/packages/fonts.nix
old mode 100644
new mode 100755
diff --git a/nix/packages/media.nix b/nix/packages/media.nix
old mode 100644
new mode 100755
diff --git a/nix/packages/phosphor-icons.nix b/nix/packages/phosphor-icons.nix
old mode 100644
new mode 100755
diff --git a/nix/packages/tesseract.nix b/nix/packages/tesseract.nix
old mode 100644
new mode 100755
diff --git a/nix/packages/tools.nix b/nix/packages/tools.nix
old mode 100644
new mode 100755
diff --git a/scripts/AGENTS.md b/scripts/AGENTS.md
old mode 100644
new mode 100755
diff --git a/scripts/ambfps-launcher.sh b/scripts/ambfps-launcher.sh
new file mode 100755
index 00000000..afdde481
--- /dev/null
+++ b/scripts/ambfps-launcher.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# ambxst-fps — Launch any program with built-in FPS monitoring
+#
+# Sets LD_PRELOAD=libambfps.so so the game's frame presents are
+# intercepted and FPS is written to /dev/shm/ambxst_fps.
+# Ambxst's fps_monitor.py reads that file and shows FPS in the notch.
+#
+# The library only activates when ambxst-fps=1 is in the environment,
+# which this script also sets automatically.
+#
+# Usage:
+#   ambxst-fps ./my-game
+#   ambxst-fps steam steam://rungameid/730
+#   ambxst-fps %command%            (Steam launch options)
+#
+# Env vars:
+#   ambxst-fps=1                    Set automatically by this script
+#   AMBXST_FPS_LIB                   Override library path (backward compat)
+#   AMBXST_FPS_LIB              Override library path
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# ── Locate libambfps.so ──────────────────────────────────────────
+# Search order: env override > next to script > standard install paths
+# Check AMBXST_FPS_LIB first, then fall back to AMBXST_FPS_LIB
+if [ -n "${AMBXST_FPS_LIB:-}" ] && [ -f "$AMBXST_FPS_LIB" ]; then
+    AMBFPS_LIB="$AMBXST_FPS_LIB"
+elif [ -n "${AMBXST_FPS_LIB:-}" ] && [ -f "$AMBXST_FPS_LIB" ]; then
+    AMBFPS_LIB="$AMBXST_FPS_LIB"
+elif [ -f "$SCRIPT_DIR/libambfps.so" ]; then
+    AMBFPS_LIB="$SCRIPT_DIR/libambfps.so"
+elif [ -f "$HOME/.local/lib/libambfps.so" ]; then
+    AMBFPS_LIB="$HOME/.local/lib/libambfps.so"
+elif [ -f "/usr/local/lib/libambfps.so" ]; then
+    AMBFPS_LIB="/usr/local/lib/libambfps.so"
+elif libambfps="$(command -v libambfps.so 2>/dev/null)"; then
+    AMBFPS_LIB="$libambfps"
+else
+    echo "ambxst-fps: libambfps.so not found." >&2
+    echo "  Compile: gcc -shared -fPIC -O2 -o libambfps.so fps_preload.c -lm -ldl" >&2
+    echo "  Install: cp libambfps.so ~/.local/lib/" >&2
+    echo "  Or run: ambxst install" >&2
+    exit 1
+fi
+
+if [ $# -eq 0 ]; then
+    echo "Usage: ambxst-fps <command> [args...]" >&2
+    echo "" >&2
+    echo "  Launch a program with built-in FPS monitoring." >&2
+    echo "  FPS will appear in the Ambxst notch (enable metrics view)." >&2
+    echo "" >&2
+    echo "Examples:" >&2
+    echo "  ambxst-fps ./my-game" >&2
+    echo "  ambxst-fps steam steam://rungameid/730" >&2
+    echo "  ambxst-fps vkcube" >&2
+    exit 1
+fi
+
+# ── Activate FPS interception ────────────────────────────────────
+# AMBXST_FPS is the underscore variant (POSIX shell compatible).
+# libambfps.so checks both AMBXST_FPS, AMBXST_FPS and ambxst-fps env vars.
+AMBXST_FPS=1
+AMBXST_FPS=1
+LD_PRELOAD="$AMBFPS_LIB${LD_PRELOAD:+:$LD_PRELOAD}"
+export AMBXST_FPS AMBXST_FPS LD_PRELOAD
+
+# ── Ensure /dev/shm is writable ──────────────────────────────────
+mkdir -p /dev/shm 2>/dev/null || true
+
+# ── Launch the game ──────────────────────────────────────────────
+exec "$@"
diff --git a/scripts/ambxst-fps b/scripts/ambxst-fps
new file mode 100755
index 00000000..a6704f0e
--- /dev/null
+++ b/scripts/ambxst-fps
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# nothing-fps — Launch any program with FPS monitoring
+#
+# Incluye MangoHud modificado (con output SHM). Auto-instala
+# las librerías si no están en ~/.local/lib/.
+# FPS escrito a /dev/shm/ambxst_fps para el notch.
+#
+# Usage:
+#   nothing-fps %command%            Steam launch options / normal
+#   nothing-fps --quiet %command%    Hidden overlay, only sends data to notch
+#   nothing-fps --visible %command%  Show overlay
+
+SHM_FILE="/dev/shm/ambxst_fps"
+cleanup() { rm -f "$SHM_FILE" 2>/dev/null; }
+trap cleanup EXIT
+
+# ── Locate MangoHud libraries ──
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd)"
+LHOME="$HOME/.local/lib"
+LREPO=""
+
+# Search order: (1) junto al script, (2) repo scripts/, (3) ~/.local/lib/
+for dir in "$SCRIPT_DIR" "$HOME/.local/src/ambxst/scripts" "$HOME/.local/src/Test-NothingLess/scripts"; do
+    if [ -f "$dir/libMangoHud_shim.so" ]; then
+        LREPO="$dir"
+        break
+    fi
+done
+
+# If found in repo but not in home, copy
+if [ -n "$LREPO" ]; then
+    mkdir -p "$LHOME"
+    for lib in libMangoHud.so libMangoHud_shim.so libMangoHud_opengl.so; do
+        [ -f "$LREPO/$lib" ] && cp -n "$LREPO/$lib" "$LHOME/$lib" 2>/dev/null || true
+    done
+fi
+
+if [ ! -f "$LHOME/libMangoHud_shim.so" ]; then
+    echo "nothing-fps: error — libMangoHud_shim.so no encontrado." >&2
+    echo "Reinstalá NothingLess o copiá los archivos a ~/.local/lib/" >&2
+    exec "$@"
+fi
+
+# ── Environment ──
+export LD_LIBRARY_PATH="${LHOME}:${LD_LIBRARY_PATH:-}"
+export LD_PRELOAD="${LHOME}/libMangoHud_shim.so${LD_PRELOAD:+:$LD_PRELOAD}"
+# ── Parse flags ──
+SHOW_OVERLAY=false
+ARGS=()
+for arg in "$@"; do
+    case "$arg" in
+        --quiet|--hidden)  ;;
+        --visible)  SHOW_OVERLAY=true ;;
+        *) ARGS+=("$arg") ;;
+    esac
+done
+
+# ── MangoHud config ──
+if [ "$SHOW_OVERLAY" = true ]; then
+    export MANGOHUD_CONFIG="fps_only,font_size=14,background_alpha=0.2,position=top-right,offset_x=8,offset_y=8"
+else
+    export MANGOHUD_CONFIG="fps_only,no_display,font_size=14"
+fi
+export MANGOHUD=1
+
+exec env 'ambxst-fps=1' "${ARGS[@]}"
diff --git a/scripts/ambxst-resize b/scripts/ambxst-resize
new file mode 100755
index 00000000..86a3e893
--- /dev/null
+++ b/scripts/ambxst-resize
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Wrapper para ambxst-resize.py
+set -euo pipefail
+SCRIPT_DIR="$(cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )")" && pwd)"
+exec python3 "${SCRIPT_DIR}/ambxst-resize.py" "$@"
diff --git a/scripts/ambxst-resize.py b/scripts/ambxst-resize.py
new file mode 100755
index 00000000..74e40a18
--- /dev/null
+++ b/scripts/ambxst-resize.py
@@ -0,0 +1,187 @@
+#!/usr/bin/env python3
+"""
+Ambxst Smart Resize
+Resize una ventana desde el borde más cercano al cursor,
+manteniendo la orilla opuesta anclada. No mueve la ventana.
+
+Uso: ambxst resize [right|left|top|bottom|corner]
+  Si no se especifica borde, detecta el más cercano al cursor
+"""
+import json, os, subprocess, sys, time, math
+
+def hyprctl(cmd):
+    try:
+        return subprocess.run(
+            ["hyprctl"] + cmd.split(),
+            capture_output=True, text=True, timeout=1
+        ).stdout.strip()
+    except: return ""
+
+def hyprctl_j(cmd):
+    try:
+        out = subprocess.run(
+            ["hyprctl"] + cmd.split(),
+            capture_output=True, text=True, timeout=1
+        ).stdout.strip()
+        return json.loads(out) if out else {}
+    except: return {}
+
+def dispatch(cmd):
+    subprocess.run(["hyprctl", "dispatch"] + cmd.split(),
+                   capture_output=True, timeout=1)
+
+def get_active_window():
+    return hyprctl_j("activewindow -j")
+
+def get_cursor():
+    out = hyprctl("cursorpos")
+    if out:
+        parts = out.split(",")
+        return (int(parts[0]), int(parts[1]))
+    return (0, 0)
+
+def get_edges(win):
+    """Return (left, right, top, bottom, center_x, center_y)"""
+    if not win or not win.get("at") or not win.get("size"):
+        return None
+    at = win["at"]
+    size = win["size"]
+    x, y = at[0], at[1]
+    w, h = size[0], size[1]
+    return {
+        "left": x, "right": x + w,
+        "top": y, "bottom": y + h,
+        "center_x": x + w / 2,
+        "center_y": y + h / 2,
+        "w": w, "h": h
+    }
+
+def nearest_edge(edges, cursor):
+    """Determina el borde/corner más cercano al cursor"""
+    cx, cy = cursor
+    e = edges
+
+    dist_left = abs(cx - e["left"])
+    dist_right = abs(cx - e["right"])
+    dist_top = abs(cy - e["top"])
+    dist_bottom = abs(cy - e["bottom"])
+
+    # Corner threshold: if within 30px of a corner, use corner anchor
+    corner_threshold = 30
+    near_topleft = dist_left < corner_threshold and dist_top < corner_threshold
+    near_topright = dist_right < corner_threshold and dist_top < corner_threshold
+    near_bottomleft = dist_left < corner_threshold and dist_bottom < corner_threshold
+    near_bottomright = dist_right < corner_threshold and dist_bottom < corner_threshold
+
+    if near_topleft: return "top-left"
+    if near_topright: return "top-right"
+    if near_bottomleft: return "bottom-left"
+    if near_bottomright: return "bottom-right"
+
+    # Edge detection
+    min_dist = min(dist_left, dist_right, dist_top, dist_bottom)
+
+    if min_dist == dist_left: return "left"
+    if min_dist == dist_right: return "right"
+    if min_dist == dist_top: return "top"
+    return "bottom"
+
+def resize_from_edge(edge, dx, dy):
+    """
+    Resize manteniendo la orilla opuesta anclada.
+    Usa movewindow + resizeactive para compensar.
+    """
+    if edge == "right":
+        # Anchor: left, resize right
+        dispatch(f"resizeactive {dx} {dy}")
+    elif edge == "left":
+        # Anchor: right, resize left
+        # Move window right (or left), then compensate with resize
+        dispatch(f"movewindow {dx} 0")
+        dispatch(f"resizeactive {-dx} 0")
+        if dy != 0:
+            dispatch(f"resizeactive 0 {dy}")
+    elif edge == "bottom":
+        # Anchor: top, resize bottom
+        dispatch(f"resizeactive {dx} {dy}")
+    elif edge == "top":
+        # Anchor: bottom, resize top
+        dispatch(f"movewindow 0 {dy}")
+        dispatch(f"resizeactive 0 {-dy}")
+        if dx != 0:
+            dispatch(f"resizeactive {dx} 0")
+    elif edge == "top-left":
+        # Anchor: bottom-right
+        dispatch(f"movewindow {dx} {dy}")
+        dispatch(f"resizeactive {-dx} {-dy}")
+    elif edge == "top-right":
+        # Anchor: bottom-left
+        dispatch(f"movewindow 0 {dy}")
+        dispatch(f"resizeactive {dx} {-dy}")
+    elif edge == "bottom-left":
+        # Anchor: top-right
+        dispatch(f"movewindow {dx} 0")
+        dispatch(f"resizeactive {-dx} {dy}")
+    elif edge == "bottom-right":
+        # Anchor: top-left
+        dispatch(f"resizeactive {dx} {dy}")
+
+
+def interactive_resize():
+    """Interactive resize: follow cursor movement"""
+    # Get initial state
+    win = get_active_window()
+    if not win or not win.get("at") or not win.get("size"):
+        print("No active window")
+        return
+
+    edges = get_edges(win)
+    if not edges:
+        return
+
+    cursor = get_cursor()
+    anchor_edge = nearest_edge(edges, cursor)
+    print(f"Anchor: {anchor_edge}")
+
+    # Initial cursor position for tracking deltas
+    prev_cx, prev_cy = cursor
+    
+    # Track mouse movement for a short time
+    # We poll cursor position and apply resize
+    start = time.time()
+    while time.time() - start < 30:  # 30 second timeout
+        current = get_cursor()
+        if current == (0, 0):
+            continue
+            
+        cx, cy = current
+        dx = cx - prev_cx
+        dy = cy - prev_cy
+
+        if dx != 0 or dy != 0:
+            # Invert delta if anchoring from top/left
+            if anchor_edge in ("left", "top-left", "bottom-left"):
+                dx = -dx
+            if anchor_edge in ("top", "top-left", "top-right"):
+                dy = -dy
+                
+            resize_from_edge(anchor_edge, dx, dy)
+            prev_cx, prev_cy = cx, cy
+
+        time.sleep(0.016)  # ~60fps polling
+        # Check if a mouse button is still pressed
+        # We can't easily check this, so we check if cursor has moved recently
+        if abs(dx) > 0 or abs(dy) > 0:
+            start = time.time()  # Reset timeout on movement
+        
+
+if __name__ == "__main__":
+    if len(sys.argv) > 1 and sys.argv[1] == "start":
+        interactive_resize()
+    elif len(sys.argv) > 1:
+        edge = sys.argv[1]
+        dx = int(sys.argv[2]) if len(sys.argv) > 2 else 0
+        dy = int(sys.argv[3]) if len(sys.argv) > 3 else 0
+        resize_from_edge(edge, dx, dy)
+    else:
+        interactive_resize()
diff --git a/scripts/apply-config.sh b/scripts/apply-config.sh
new file mode 100755
index 00000000..f0b67475
--- /dev/null
+++ b/scripts/apply-config.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+# Apply Ambxst compositor config to Hyprland
+# Called from the shell when user saves compositor settings
+
+# 1. Sync to hyprland.conf and hyprland.lua
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+python3 "$SCRIPT_DIR/sync-hyprland-conf.py"
+
+# 2. Read compositor.json and apply via axctl
+CONFIG="$HOME/.config/ambxst/config/compositor.json"
+if [ -f "$CONFIG" ]; then
+    python3 -c "
+import json, subprocess
+with open('$CONFIG') as f:
+    cfg = json.load(f)
+
+# Known compositor keywords to apply
+kw_map = {
+    'borderSize': 'general:border_size', 'gapsIn': 'general:gaps_in',
+    'gapsOut': 'general:gaps_out', 'rounding': 'decoration:rounding',
+    'shadowEnabled': 'decoration:shadow:enabled',
+    'shadowRange': 'decoration:shadow:range',
+    'shadowRenderPower': 'decoration:shadow:render_power',
+    'blurEnabled': 'decoration:blur:enabled',
+    'blurSize': 'decoration:blur:size',
+    'blurPasses': 'decoration:blur:passes',
+    'activeOpacity': 'decoration:active_opacity',
+    'inactiveOpacity': 'decoration:inactive_opacity',
+    'fullscreenOpacity': 'decoration:fullscreen_opacity',
+    'dimInactive': 'decoration:dim_inactive',
+    'dimStrength': 'decoration:dim_strength',
+    'kbLayout': 'input:kb_layout',
+    'repeatRate': 'input:repeat_rate',
+    'repeatDelay': 'input:repeat_delay',
+    'mouseSensitivity': 'input:sensitivity',
+    'followMouse': 'input:follow_mouse',
+    'xwaylandEnabled': 'xwayland:enabled',
+    'xwaylandForceZeroScaling': 'xwayland:force_zero_scaling',
+    'disableAutoreload': 'misc:disable_autoreload',
+}
+
+def fmt(v):
+    if isinstance(v, bool):
+        return 'true' if v else 'false'
+    return str(v)
+
+parts = []
+for ck, kw in kw_map.items():
+    if ck in cfg:
+        parts.append(f'keyword {kw} {fmt(cfg[ck])}')
+
+if parts:
+    batch = ' ; '.join(parts)
+    r = subprocess.run(['axctl', 'config', 'raw-batch', batch], capture_output=True, text=True)
+    print(f'axctl: {r.stdout or r.stderr}')
+"
+fi
diff --git a/scripts/bluetooth_helper.py b/scripts/bluetooth_helper.py
new file mode 100755
index 00000000..efcb1d20
--- /dev/null
+++ b/scripts/bluetooth_helper.py
@@ -0,0 +1,217 @@
+#!/usr/bin/env python3
+"""
+Bluetooth helper for Ambxst.
+Uses PTY-based bluetoothctl for reliable device discovery.
+
+Commands: power on|off|status / scan find [secs] / devices / info / connect / disconnect / pair / trust / remove
+"""
+
+import sys, json, subprocess, os, pty, time, re, select, threading
+
+
+def run_btctl(*args, timeout=10):
+    cmd = ["bluetoothctl", "--"] + list(args)
+    try:
+        r = subprocess.run(cmd, capture_output=True, text=True, timeout=timeout)
+        return r.stdout.strip(), r.stderr.strip(), r.returncode
+    except subprocess.TimeoutExpired:
+        return "", "timeout", 124
+    except FileNotFoundError:
+        return "", "bluetoothctl not found", 127
+
+
+def parse_devices(text):
+    devs = []
+    for line in text.split("\n"):
+        line = line.strip()
+        if line.startswith("Device "):
+            p = line.split(" ", 2)
+            if len(p) >= 3:
+                devs.append({"address": p[1], "name": p[2], "alias": p[2],
+                             "paired": True, "connected": False, "trusted": False,
+                             "icon": "bluetooth", "rssi": 0})
+    return devs
+
+
+def parse_info(text, addr):
+    info = {"address": addr, "name": "Unknown", "alias": "Unknown",
+            "paired": False, "connected": False, "trusted": False,
+            "icon": "bluetooth", "rssi": 0}
+    for line in text.split("\n"):
+        line = line.strip()
+        if line.startswith("Name: "): info["name"] = line[6:]
+        elif line.startswith("Alias: "): info["alias"] = line[7:]
+        elif line.startswith("Paired: "): info["paired"] = "yes" in line
+        elif line.startswith("Connected: "): info["connected"] = "yes" in line
+        elif line.startswith("Trusted: "): info["trusted"] = "yes" in line
+        elif line.startswith("Icon: "): info["icon"] = line[6:]
+    return info
+
+
+def cmd_power(action):
+    if action == "status":
+        out, _, _ = run_btctl("show")
+        print(json.dumps({"powered": "Powered: yes" in out}))
+    elif action in ("on", "off"):
+        run_btctl("power", action)
+        out, _, _ = run_btctl("show")
+        print(json.dumps({"powered": "Powered: yes" in out}))
+
+
+def cmd_devices():
+    out, _, _ = run_btctl("devices")
+    devs = parse_devices(out)
+    out2, _, _ = run_btctl("devices", "Connected")
+    for line in out2.split("\n"):
+        if line.strip().startswith("Device "):
+            parts = line.strip().split(" ", 2)
+            if len(parts) >= 2:
+                for d in devs:
+                    if d["address"] == parts[1]:
+                        d["connected"] = True
+    print(json.dumps(devs))
+
+
+def cmd_info(addr):
+    out, _, _ = run_btctl("info", addr)
+    print(json.dumps(parse_info(out, addr)))
+
+
+def cmd_connect(addr):
+    out, err, rc = run_btctl("connect", addr)
+    print(json.dumps({"connected": rc == 0, "error": err or None}))
+
+
+def cmd_disconnect(addr):
+    out, err, rc = run_btctl("disconnect", addr)
+    print(json.dumps({"connected": False, "error": err or None}))
+
+
+def cmd_pair(addr):
+    out, err, rc = run_btctl("pair", addr)
+    print(json.dumps({"paired": rc == 0, "error": err or None}))
+
+
+def cmd_trust(addr):
+    out, err, rc = run_btctl("trust", addr)
+    print(json.dumps({"trusted": rc == 0, "error": err or None}))
+
+
+def cmd_remove(addr):
+    out, err, rc = run_btctl("remove", addr)
+    print(json.dumps({"removed": rc == 0, "error": err or None}))
+
+
+# ── PTY-based scan: spawns bluetoothctl with pseudo-terminal ──
+def cmd_scan_find(duration=8):
+    try: duration = int(duration)
+    except: duration = 8
+    duration = max(3, min(duration, 30))
+
+    discovered = {}
+    new_re = re.compile(r"\[NEW\]\s+Device\s+([0-9A-Fa-f:]{17})\s+(.*)")
+
+    try:
+        master_fd, slave_fd = pty.openpty()
+        proc = subprocess.Popen(
+            ["bluetoothctl"],
+            stdin=slave_fd, stdout=slave_fd, stderr=slave_fd,
+            close_fds=True, preexec_fn=os.setsid
+        )
+        os.close(slave_fd)
+
+        time.sleep(0.3)
+        os.write(master_fd, b"power on\n")
+        time.sleep(0.2)
+        os.write(master_fd, b"scan on\n")
+
+        deadline = time.time() + duration
+        buf = b""
+        while time.time() < deadline:
+            r, _, _ = select.select([master_fd], [], [], 0.5)
+            if r:
+                try:
+                    data = os.read(master_fd, 4096)
+                    if not data: break
+                    buf += data
+                    lines = buf.split(b"\n")
+                    buf = lines.pop()
+                    for line in lines:
+                        m = new_re.match(line.decode(errors="replace").strip())
+                        if m:
+                            discovered[m.group(1).upper()] = {
+                                "address": m.group(1).upper(),
+                                "name": m.group(2).strip()
+                            }
+                except OSError: break
+
+        os.write(master_fd, b"scan off\nquit\n")
+        time.sleep(0.5)
+        try: os.close(master_fd)
+        except: pass
+        try: proc.wait(timeout=3)
+        except: proc.kill()
+    except Exception as e:
+        print(json.dumps({"error": str(e), "devices": []}))
+        return
+
+    # Merge known devices — only mark as paired if in the Paired list
+    out, _, _ = run_btctl("devices", "Paired")
+    paired_set = set()
+    for line in out.split("\n"):
+        if line.strip().startswith("Device "):
+            parts = line.strip().split(" ", 2)
+            if len(parts) >= 2:
+                paired_set.add(parts[1])
+
+    out, _, _ = run_btctl("devices")
+    for line in out.split("\n"):
+        if line.strip().startswith("Device "):
+            parts = line.strip().split(" ", 2)
+            if len(parts) >= 3 and parts[1] not in discovered:
+                discovered[parts[1]] = {"address": parts[1], "name": parts[2],
+                                         "paired": parts[1] in paired_set}
+    # Mark connected
+    out2, _, _ = run_btctl("devices", "Connected")
+    for line in out2.split("\n"):
+        if line.strip().startswith("Device "):
+            parts = line.strip().split(" ", 2)
+            if len(parts) >= 2 and parts[1] in discovered:
+                discovered[parts[1]]["connected"] = True
+
+    print(json.dumps(list(discovered.values())))
+
+
+def cmd_scan(action="find"):
+    if action == "on":
+        run_btctl("scan", "on")
+        print(json.dumps({"scanning": True}))
+    elif action == "off":
+        run_btctl("scan", "off")
+        print(json.dumps({"scanning": False}))
+    else:
+        cmd_scan_find(action)
+
+
+def main():
+    if len(sys.argv) < 2:
+        print("Usage: bluetooth_helper.py <command> [args...]", file=sys.stderr)
+        sys.exit(1)
+    cmd, args = sys.argv[1], sys.argv[2:]
+    try:
+        {"power": lambda: cmd_power(args[0] if args else "status"),
+         "scan": lambda: cmd_scan(args[0] if args else "find"),
+         "devices": cmd_devices, "info": lambda: cmd_info(args[0] if args else ""),
+         "connect": lambda: cmd_connect(args[0] if args else ""),
+         "disconnect": lambda: cmd_disconnect(args[0] if args else ""),
+         "pair": lambda: cmd_pair(args[0] if args else ""),
+         "trust": lambda: cmd_trust(args[0] if args else ""),
+         "remove": lambda: cmd_remove(args[0] if args else ""),
+        }.get(cmd, lambda: print(json.dumps({"error": f"Unknown: {cmd}"})))()
+    except Exception as e:
+        print(json.dumps({"error": str(e)}))
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/desktop_thumbgen.py b/scripts/desktop_thumbgen.py
old mode 100644
new mode 100755
diff --git a/scripts/fps_monitor.py b/scripts/fps_monitor.py
new file mode 100755
index 00000000..037ca5d1
--- /dev/null
+++ b/scripts/fps_monitor.py
@@ -0,0 +1,391 @@
+#!/usr/bin/env python3
+"""
+Metrics overlay provider for Ambxst.
+Pure Python 3, no external dependencies.
+
+Monitors:
+  - CPU temp via sysfs hwmon
+  - CPU power via RAPL energy counters
+  - GPU temp/power/usage via sysfs or nvidia-smi
+  - FPS via built-in libambfps.so (LD_PRELOAD) - primary
+  - FPS via MangoHud CSV, gsr-fps, lsfgvk - optional fallbacks
+
+Usage:
+  ./fps_monitor.py                # continuous output
+"""
+import os
+import json
+import sys
+import time
+import struct
+import re
+
+# ═══════════════════════════════════════════════════════════════════
+#  Hardware monitoring helpers
+# ═══════════════════════════════════════════════════════════════════
+
+def _read_sysfs(path, default=None):
+    try:
+        with open(path, 'r') as f:
+            return f.read().strip()
+    except (FileNotFoundError, PermissionError, OSError):
+        return default
+
+def _get_cpu_temp():
+    hwmon_base = '/sys/class/hwmon'
+    if not os.path.isdir(hwmon_base):
+        return -1
+    for hwmon in sorted(os.listdir(hwmon_base)):
+        path = os.path.join(hwmon_base, hwmon)
+        try:
+            name = _read_sysfs(os.path.join(path, 'name'))
+            if name in ('coretemp', 'k10temp', 'zenpower', 'cpu_thermal',
+                        'x86_pkg_temp', 'amd_energy'):
+                for item in sorted(os.listdir(path)):
+                    if item.endswith('_input') and item.startswith('temp'):
+                        raw = _read_sysfs(os.path.join(path, item))
+                        if raw:
+                            val = int(raw)
+                            if 10000 < val < 120000:
+                                return val // 1000
+        except OSError:
+            continue
+    return -1
+
+# ── CPU power from RAPL (rate of change, not cumulative) ──
+_rapl_cache = {'uj': None, 'time': 0.0}
+_rapl_last_watts = 0.0
+
+def _get_cpu_power():
+    """Read CPU package power from RAPL.
+    Calculates power from the rate of energy change over time.
+    Returns last valid reading between samples to avoid flicker.
+    Needs udev rule: see config/99-rapl-permissions.rules
+    """
+    global _rapl_cache, _rapl_last_watts
+    try:
+        p = '/sys/class/powercap/intel-rapl:0/energy_uj'
+        if not os.path.exists(p):
+            return 0.0
+        with open(p) as f:
+            v = f.read().strip()
+        if not v or not v.isdigit():
+            return 0.0
+
+        uj_now = int(v)
+        t_now = time.monotonic()
+
+        prev_uj = _rapl_cache['uj']
+        prev_t = _rapl_cache['time']
+
+        if prev_uj is not None:
+            dt = t_now - prev_t
+            if dt >= 0.8:
+                diff = uj_now - prev_uj
+                if diff > 0:
+                    watts = (diff / 1_000_000.0) / dt
+                    if 0 < watts < 500:
+                        _rapl_last_watts = round(watts, 1)
+                    _rapl_cache['uj'] = uj_now
+                    _rapl_cache['time'] = t_now
+
+        if prev_uj is None:
+            _rapl_cache['uj'] = uj_now
+            _rapl_cache['time'] = t_now
+
+        return _rapl_last_watts
+    except (OSError, ValueError, PermissionError):
+        return 0.0
+
+def _get_gpu_stats():
+    usages, temps, powers = [], [], []
+    if os.path.exists('/proc/driver/nvidia/gpus'):
+        try:
+            out = os.popen(
+                'nvidia-smi --query-gpu=utilization.gpu,temperature.gpu,power.draw'
+                ' --format=csv,noheader,nounits 2>/dev/null'
+            ).read().strip()
+            if out:
+                parts = out.split(',')
+                if len(parts) >= 3:
+                    usages.append(float(parts[0]))
+                    temps.append(int(parts[1]))
+                    powers.append(float(parts[2]))
+                elif len(parts) >= 2:
+                    usages.append(float(parts[0]))
+                    temps.append(int(parts[1]))
+                    powers.append(0.0)
+        except (ValueError, OSError):
+            pass
+        if usages:
+            return usages, temps, powers
+
+    drm_base = '/sys/class/drm'
+    if os.path.exists(drm_base):
+        for card in sorted(os.listdir(drm_base)):
+            if not card.startswith('card') or '-' in card:
+                continue
+            vendor = _read_sysfs(f'{drm_base}/{card}/device/vendor')
+            if vendor == '0x1002':
+                usage = 0.0
+                gpu_busy = _read_sysfs(f'{drm_base}/{card}/device/gpu_busy_percent')
+                if gpu_busy:
+                    try: usage = float(gpu_busy)
+                    except ValueError: pass
+                temp = -1
+                hwmon_base = f'{drm_base}/{card}/device/hwmon'
+                if os.path.isdir(hwmon_base):
+                    dirs = os.listdir(hwmon_base)
+                    if dirs:
+                        t = _read_sysfs(f'{hwmon_base}/{dirs[0]}/temp1_input')
+                        if t:
+                            try: temp = int(t) // 1000
+                            except ValueError: pass
+                power = 0.0
+                if os.path.isdir(hwmon_base):
+                    dirs = os.listdir(hwmon_base)
+                    if dirs:
+                        for pname in ('power1_average', 'power2_average'):
+                            p = _read_sysfs(f'{hwmon_base}/{dirs[0]}/{pname}')
+                            if p:
+                                try: power = int(p) / 1000000.0; break
+                                except ValueError: pass
+                usages.append(usage); temps.append(temp); powers.append(power)
+                break
+    if not usages:
+        usages.append(0.0); temps.append(-1); powers.append(0.0)
+    return usages, temps, powers
+
+# ═══════════════════════════════════════════════════════════════════
+#  FPS - Primary: Built-in libambfps.so via LD_PRELOAD (shm)
+# ═══════════════════════════════════════════════════════════════════
+# This is the recommended way: ambxst-fps ./game sets LD_PRELOAD
+# and the library writes actual app FPS to /dev/shm/ambxst_fps.
+# No external tools needed - ships with Ambxst.
+
+SHM_FPS_FILE = '/dev/shm/ambxst_fps'
+
+def _get_fps_shm():
+    """Primary FPS source: built-in libambfps.so LD_PRELOAD library.
+    
+    Reads from /dev/shm/ambxst_fps which contains:
+      fps=<value>
+      pid=<process-id>
+      frames=<count>
+      source=ambxst-preload
+    
+    Checks /proc/<pid> to detect if the game is still running.
+    Returns None if no data or process is gone.
+    """
+    if not os.path.exists(SHM_FPS_FILE):
+        return None
+    try:
+        age = time.time() - os.path.getmtime(SHM_FPS_FILE)
+        if age > 5:
+            return None  # Stale: game probably exited
+
+        with open(SHM_FPS_FILE, 'r') as f:
+            data = {}
+            for line in f:
+                if '=' in line:
+                    k, v = line.strip().split('=', 1)
+                    data[k] = v
+
+        fps_val = data.get('fps', '0.0')
+        fps = float(fps_val)
+
+        # Verify the process is still alive
+        pid_str = data.get('pid', '')
+        if pid_str:
+            try:
+                pid = int(pid_str)
+                if not os.path.isdir(f'/proc/{pid}'):
+                    return None  # Process exited
+            except ValueError:
+                pass
+
+        if fps > 0:
+            return fps
+        return 0.0
+    except (OSError, ValueError, IndexError):
+        return None
+
+# ═══════════════════════════════════════════════════════════════════
+#  FPS - Optional fallbacks
+# ═══════════════════════════════════════════════════════════════════
+# These require external tools but are kept as optional alternatives.
+
+LSFGVK_FILE = '/dev/shm/lsfgvk-fps'
+
+def _get_fps_lsfgvk():
+    """Optional: Read post-LSFG FPS from modified lsfg-vk layer.
+    Only used as fallback when libambfps.so is not active.
+    """
+    if not os.path.exists(LSFGVK_FILE):
+        return None
+    try:
+        age = time.time() - os.path.getmtime(LSFGVK_FILE)
+        if age > 3:
+            return None
+        with open(LSFGVK_FILE, 'r') as f:
+            val = f.read().strip()
+        if val:
+            fps = float(val)
+            if fps > 0:
+                return fps
+        return 0.0
+    except (OSError, ValueError):
+        return None
+
+# ── gpu-screen-recorder fallback ──────────────────────────────────
+GSR_FILE = '/dev/shm/gsr-fps-stats'
+_gsr_fps_re = re.compile(rb'update fps: (\d+)')
+
+def _get_fps_gsr():
+    """Optional fallback: Read FPS from gpu-screen-recorder stats.
+    Requires gpu-screen-recorder running separately.
+    """
+    if not os.path.exists(GSR_FILE):
+        return None
+    try:
+        age = time.time() - os.path.getmtime(GSR_FILE)
+        if age > 10:
+            return None
+        with open(GSR_FILE, 'rb') as f:
+            f.seek(0, 2)
+            size = f.tell()
+            chunk_size = min(size, 4096)
+            f.seek(-chunk_size, 2)
+            data = f.read()
+        for line in reversed(data.split(b'\n')):
+            m = _gsr_fps_re.search(line)
+            if m:
+                fps_val = float(m.group(1))
+                if fps_val > 0:
+                    return fps_val
+                return 0.0
+        return None
+    except (OSError, ValueError):
+        return None
+
+# ── MangoHud fallback ─────────────────────────────────────────────
+MANGOHUD_LOG_DIR = '/dev/shm/mangohud'
+
+def _get_fps_mangohud():
+    """Optional fallback: Read FPS from MangoHud CSV log."""
+    if not os.path.isdir(MANGOHUD_LOG_DIR):
+        return None
+    try:
+        csv_files = [f for f in os.listdir(MANGOHUD_LOG_DIR)
+                     if f.endswith('.csv')]
+        if not csv_files:
+            return None
+        latest = max(csv_files, key=lambda f:
+                     os.path.getmtime(os.path.join(MANGOHUD_LOG_DIR, f)))
+        csv_path = os.path.join(MANGOHUD_LOG_DIR, latest)
+        age = time.time() - os.path.getmtime(csv_path)
+        if age > 10:
+            return None
+        with open(csv_path, 'r') as f:
+            lines = f.readlines()
+        if not lines:
+            return None
+        for line in reversed(lines):
+            line = line.strip()
+            if not line:
+                continue
+            parts = line.split(',')
+            if len(parts) >= 1:
+                try:
+                    fps_val = float(parts[0])
+                    if fps_val > 0:
+                        return fps_val
+                    return 0.0
+                except (ValueError, IndexError):
+                    continue
+        return None
+    except (OSError, ValueError, IndexError, PermissionError):
+        return None
+
+# ═══════════════════════════════════════════════════════════════════
+#  FPS resolution: try sources in order of preference
+# ═══════════════════════════════════════════════════════════════════
+
+def _get_fps():
+    """Resolve FPS from available sources.
+
+    Priority:
+      1. Built-in libambfps.so (via LD_PRELOAD) - PRIMARY
+      2. Modified LSFG-VK (optional, if available)
+      3. gpu-screen-recorder (optional fallback)
+      4. MangoHud CSV (optional fallback)
+    """    
+    # 1. PRIMARY: Built-in ambxst preload library
+    fps = _get_fps_shm()
+    if fps is not None:
+        return fps, True
+
+    # 2. Modified LSFG-VK (optional external)
+    fps = _get_fps_lsfgvk()
+    if fps is not None:
+        return fps, True
+
+    # 3. gpu-screen-recorder (optional external)
+    fps = _get_fps_gsr()
+    if fps is not None:
+        return fps, True
+
+    # 4. MangoHud CSV (optional external)
+    fps = _get_fps_mangohud()
+    if fps is not None:
+        return fps, True
+
+    return None, False
+
+# ═══════════════════════════════════════════════════════════════════
+#  Main loop
+# ═══════════════════════════════════════════════════════════════════
+
+def main():
+    fps_samples = []
+    output_interval = 0.3  # Update notch every 300ms
+
+    try:
+        while True:
+            tick_start = time.monotonic()
+            cpu_temp = _get_cpu_temp()
+            cpu_power = _get_cpu_power()
+            gpu_usages, gpu_temps, gpu_powers = _get_gpu_stats()
+
+            fps_val, fps_active = _get_fps()
+
+            result = {
+                'cpu_temp': cpu_temp,
+                'cpu_power': cpu_power,
+                'gpu_usage': round(gpu_usages[0], 1) if gpu_usages else 0.0,
+                'gpu_temp': gpu_temps[0] if gpu_temps else -1,
+                'gpu_power': round(gpu_powers[0], 1) if gpu_powers else 0.0,
+            }
+
+            if fps_val is not None and fps_val > 0:
+                # FPS from libambfps.so is already smoothed (EMA).
+                # FPS from other sources may be raw - cap and average.
+                capped = min(fps_val, 500.0)
+                fps_samples.append(capped)
+                if len(fps_samples) > 10:
+                    fps_samples.pop(0)
+                avg_fps = sum(fps_samples) / len(fps_samples)
+                result['fps'] = round(avg_fps, 1)
+                result['fps_active'] = True
+            else:
+                result['fps'] = 0.0
+                result['fps_active'] = fps_active
+
+            print(json.dumps(result), flush=True)
+            elapsed = time.monotonic() - tick_start
+            time.sleep(max(0.01, output_interval - elapsed))
+    except KeyboardInterrupt:
+        pass
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/fps_preload.c b/scripts/fps_preload.c
new file mode 100755
index 00000000..1dec05d5
--- /dev/null
+++ b/scripts/fps_preload.c
@@ -0,0 +1,182 @@
+/**
+ * fps_preload.c — Built-in FPS counter for Ambxst
+ * Funciona como capa Vulkan+VK_LAYER con encadenamiento correcto.
+ * También hooks OpenGL/EGL via LD_PRELOAD.
+ *
+ * Compile: gcc -shared -fPIC -O2 -o libambfps.so fps_preload.c -lm -ldl
+ */
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <math.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <dlfcn.h>
+
+#define EXPORT __attribute__((visibility("default")))
+
+static int enabled = 0;
+static void check_env(void) {
+    const char *v = getenv("ambxst-fps");
+    if (!v || strcmp(v, "0") == 0) v = getenv("NOTHINGLESS_FPS");
+    if (!v || strcmp(v, "0") == 0) v = getenv("ENABLE_VK_LAYER_ambxst_fps");
+    if (v && v[0] && strcmp(v, "0") != 0) enabled = 1;
+}
+
+/* ── FPS tracking ──────────────────────────────────────────────── */
+#define MAX_SAMPLES 32
+static double fps_samples[MAX_SAMPLES];
+static int sample_count = 0, sample_idx = 0;
+static uint64_t last_present_ns = 0, frame_count = 0;
+static double fps_smoothed = 0.0;
+static int smooth_init = 0;
+
+static uint64_t get_ns(void) {
+    struct timespec ts;
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+    return (uint64_t)ts.tv_sec * 1000000000ULL + (uint64_t)ts.tv_nsec;
+}
+
+static void write_fps(double fps) {
+    FILE *f = fopen("/dev/shm/ambxst_fps", "we");
+    if (f) {
+        fprintf(f, "fps=%.1f\npid=%d\nframes=%lu\nsource=ambxst-preload\n",
+                fps, getpid(), (unsigned long)frame_count);
+        fclose(f);
+    }
+}
+
+static void record_present(void) {
+    if (!enabled) return;
+    uint64_t now = get_ns();
+    if (last_present_ns > 0) {
+        uint64_t dt = now - last_present_ns;
+        if (dt > 500000ULL) {
+            double fps = 1000000000.0 / (double)dt;
+            if (fps > 0.0 && fps < 2000.0) {
+                fps_samples[sample_idx] = fps;
+                sample_idx = (sample_idx + 1) % MAX_SAMPLES;
+                if (sample_count < MAX_SAMPLES) sample_count++;
+                if (!smooth_init) { fps_smoothed = fps; smooth_init = 1; }
+                else { fps_smoothed = fps_smoothed * (1.0 - 0.08) + fps * 0.08; }
+                frame_count++;
+                if (frame_count % 8 == 0) {
+                    int n = sample_count < MAX_SAMPLES ? sample_count : MAX_SAMPLES;
+                    double sum = 0.0;
+                    for (int i = 0; i < n; i++) sum += fps_samples[i];
+                    double blended = fps_smoothed * 0.7 + (sum / n) * 0.3;
+                    write_fps(blended);
+                }
+            }
+        }
+    }
+    last_present_ns = now;
+}
+
+/* ── Vulkan layer: intercept vkQueuePresentKHR ─────────────────── */
+/* These functions are called by the Vulkan loader AS a layer */
+
+/* Store pointers to the NEXT layer's functions */
+static void *next_gipa = NULL;
+static void *next_gdpa = NULL;
+static void *next_qpresent = NULL;
+
+/* Forward decls */
+EXPORT void *vkGetDeviceProcAddr(void *device, const char *pName);
+EXPORT int vkQueuePresentKHR(void *queue, void *pPresentInfo);
+
+EXPORT void *vkGetInstanceProcAddr(void *instance, const char *pName) {
+    if (!enabled) goto fallback;
+    if (!pName) goto fallback;
+    if (strcmp(pName, "vkGetInstanceProcAddr") == 0) return (void*)vkGetInstanceProcAddr;
+    if (strcmp(pName, "vkGetDeviceProcAddr") == 0) return (void*)vkGetDeviceProcAddr;
+    if (strcmp(pName, "vkQueuePresentKHR") == 0) return (void*)vkQueuePresentKHR;
+fallback:
+    if (!next_gipa) {
+        void *h = dlopen("libvulkan.so.1", RTLD_LAZY | RTLD_NOLOAD);
+        if (!h) h = dlopen("libvulkan.so", RTLD_LAZY | RTLD_NOLOAD);
+        if (h) next_gipa = dlsym(h, "vkGetInstanceProcAddr");
+    }
+    if (next_gipa) {
+        typedef void *(*PFN)(void*, const char*);
+        return ((PFN)next_gipa)(instance, pName);
+    }
+    return NULL;
+}
+
+EXPORT void *vkGetDeviceProcAddr(void *device, const char *pName) {
+    if (enabled && pName) {
+        if (strcmp(pName, "vkQueuePresentKHR") == 0) return (void*)vkQueuePresentKHR;
+    }
+    if (!next_gdpa) {
+        void *h = dlopen("libvulkan.so.1", RTLD_LAZY | RTLD_NOLOAD);
+        if (!h) h = dlopen("libvulkan.so", RTLD_LAZY | RTLD_NOLOAD);
+        if (h) next_gdpa = dlsym(h, "vkGetDeviceProcAddr");
+    }
+    if (next_gdpa) {
+        typedef void *(*PFN)(void*, const char*);
+        return ((PFN)next_gdpa)(device, pName);
+    }
+    return NULL;
+}
+
+EXPORT int vkQueuePresentKHR(void *queue, void *pPresentInfo) {
+    record_present();
+    if (!next_qpresent) {
+        /* Get the next layer's vkQueuePresentKHR via the chain */
+        if (next_gdpa) {
+            typedef void *(*PFN)(void*, const char*);
+            next_qpresent = ((PFN)next_gdpa)(NULL, "vkQueuePresentKHR");
+        }
+        if (!next_qpresent) {
+            void *h = dlopen("libvulkan.so.1", RTLD_LAZY | RTLD_NOLOAD);
+            if (!h) h = dlopen("libvulkan.so", RTLD_LAZY | RTLD_NOLOAD);
+            if (h) next_qpresent = dlsym(h, "vkQueuePresentKHR");
+        }
+    }
+    if (next_qpresent) {
+        typedef int (*PFN)(void*, void*);
+        return ((PFN)next_qpresent)(queue, pPresentInfo);
+    }
+    return 0;
+}
+
+/* ── OpenGL hooks (LD_PRELOAD only) ────────────────────────────── */
+static void *resolve(const char *lib, const char *sym) {
+    void *h = dlopen(lib, RTLD_LAZY | RTLD_NOLOAD);
+    if (!h) h = dlopen(lib, RTLD_LAZY);
+    if (!h) return NULL;
+    void *p = dlsym(h, sym);
+    dlclose(h);
+    return p;
+}
+
+EXPORT int eglSwapBuffers(void *display, void *surface) {
+    record_present();
+    static int (*real)(void*, void*) = NULL;
+    if (!real) real = resolve("libEGL.so.1", "eglSwapBuffers");
+    if (!real) real = resolve("libEGL.so", "eglSwapBuffers");
+    return real ? real(display, surface) : 0;
+}
+
+EXPORT void glXSwapBuffers(void *display, uint64_t drawable) {
+    record_present();
+    static void (*real)(void*, uint64_t) = NULL;
+    if (!real) real = resolve("libGL.so.1", "glXSwapBuffers");
+    if (!real) real = resolve("libGL.so", "glXSwapBuffers");
+    if (real) real(display, drawable);
+}
+
+/* ── Constructor ───────────────────────────────────────────────── */
+static void __attribute__((constructor)) init(void) {
+    check_env();
+    if (enabled) {
+        write_fps(0.0);
+    }
+}
+
+static void __attribute__((destructor)) fini(void) {
+    if (enabled) remove("/dev/shm/ambxst_fps");
+}
diff --git a/scripts/gsr-fps.sh b/scripts/gsr-fps.sh
new file mode 100755
index 00000000..d3ec7c02
--- /dev/null
+++ b/scripts/gsr-fps.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# gsr-fps.sh — Lanza juego con monitoreo de FPS post-LSFG
+# Integrado en Ambxst. Usar: ambxst fps <comando del juego>
+#
+# Escribe FPS a /dev/shm/gsr-fps-stats para que fps_monitor.py lo lea
+# y los muestre en el notch.
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+GSR_FILE="/dev/shm/gsr-fps-stats"
+GSR_PID=""
+
+trap "rm -f $GSR_FILE; kill $GSR_PID 2>/dev/null; rm -f /tmp/ambxst-gsr-fps.mp4" EXIT INT TERM
+
+# Iniciar gpu-screen-recorder en modo verbose
+# -w screen: captura pantalla completa
+# -v yes: verbose mode (genera "update fps: N" a stderr)
+# stderr al archivo para fps_monitor.py
+gpu-screen-recorder \
+    -w screen \
+    -f 999 \
+    -s 1920x1080 \
+    -c mkv \
+    -o /tmp/ambxst-gsr-fps.mp4 \
+    -v yes \
+    -df no \
+    2>"$GSR_FILE" &
+GSR_PID=$!
+
+# Ejecutar el juego (todos los argumentos)
+"$@"
+GAME_EXIT=$?
+
+# Cleanup
+kill $GSR_PID 2>/dev/null
+wait $GSR_PID 2>/dev/null
+rm -f "$GSR_FILE" /tmp/ambxst-gsr-fps.mp4
+exit $GAME_EXIT
diff --git a/scripts/keystore.py b/scripts/keystore.py
old mode 100644
new mode 100755
diff --git a/scripts/libMangoHud.so b/scripts/libMangoHud.so
new file mode 100755
index 00000000..44d03f3e
Binary files /dev/null and b/scripts/libMangoHud.so differ
diff --git a/scripts/libMangoHud_opengl.so b/scripts/libMangoHud_opengl.so
new file mode 100755
index 00000000..a85a894e
Binary files /dev/null and b/scripts/libMangoHud_opengl.so differ
diff --git a/scripts/libMangoHud_shim.so b/scripts/libMangoHud_shim.so
new file mode 100755
index 00000000..a0bff8e4
Binary files /dev/null and b/scripts/libMangoHud_shim.so differ
diff --git a/scripts/libambfps.so b/scripts/libambfps.so
new file mode 100755
index 00000000..a1335d66
Binary files /dev/null and b/scripts/libambfps.so differ
diff --git a/scripts/mangohud-patch/build-mangohud.sh b/scripts/mangohud-patch/build-mangohud.sh
new file mode 100755
index 00000000..ad7ebcd6
--- /dev/null
+++ b/scripts/mangohud-patch/build-mangohud.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+# Build MangoHud modificado con output SHM para Ambxst
+set -euo pipefail
+
+MANGOHUD_VERSION="v0.8.3"
+MANGOHUD_DIR="/tmp/mangohud-build"
+INSTALL_DIR="$HOME/.local/lib"
+
+echo "=== Building MangoHud $MANGOHUD_VERSION with Ambxst FPS output ==="
+
+# Clone MangoHud source
+if [ ! -d "$MANGOHUD_DIR/MangoHud" ]; then
+    mkdir -p "$MANGOHUD_DIR"
+    git clone --depth 1 --branch "$MANGOHUD_VERSION" https://github.com/flightlessmango/MangoHud.git "$MANGOHUD_DIR/MangoHud"
+fi
+
+# Apply the FPS output patch
+cd "$MANGOHUD_DIR/MangoHud"
+if ! grep -q "ambxst_fps" src/overlay.cpp 2>/dev/null; then
+    echo "Applying FPS output patch..."
+    # Find the line where fps is calculated
+    LINE=$(grep -n "sw_stats.fps = " src/overlay.cpp | head -1 | cut -d: -f1)
+    if [ -n "$LINE" ]; then
+        sed -i "${LINE}a\\
+        // Write FPS to /dev/shm/ambxst_fps for Ambxst notch\\
+        FILE *nfps = fopen(\"/dev/shm/ambxst_fps\", \"w\");\\
+        if (nfps) {\
+            fprintf(nfps, \"fps=%.1f\\npid=%d\\nframes=%lu\\nsource=mangohud\\n\",\\
+                    sw_stats.fps, getpid(), (unsigned long)sw_stats.n_frames_since_update);\\
+            fclose(nfps);\\
+        }" src/overlay.cpp
+        echo "Patch applied."
+    fi
+fi
+
+# Build
+echo "Building..."
+pip3 install --user mako --break-system-packages 2>/dev/null || true
+meson setup build --buildtype=release
+ninja -C build
+
+# Install
+echo "Installing to $INSTALL_DIR..."
+cp build/src/libMangoHud.so "$INSTALL_DIR/"
+cp build/src/libMangoHud_shim.so "$INSTALL_DIR/"
+cp build/src/libMangoHud_opengl.so "$INSTALL_DIR/"
+cp build/src/mangohud "$INSTALL_DIR/../bin/mangohud-ambxst" 2>/dev/null || true
+
+echo "✓ Done. MangoHud modificado instalado en $INSTALL_DIR"
diff --git a/scripts/monitors_writer.py b/scripts/monitors_writer.py
new file mode 100755
index 00000000..a09a0923
--- /dev/null
+++ b/scripts/monitors_writer.py
@@ -0,0 +1,271 @@
+#!/usr/bin/env python3
+"""
+MonitorsWriter — nwg-displays compatible backend for Ambxst
+===============================================================
+Reads:  hyprctl monitors -j
+Writes: ~/.config/hypr/monitors.conf  (monitor=DP-1,3440x1440@144,0x0,1)
+        ~/.config/hypr/monitors.lua   (hl.monitor({...}))
+Applies: hyprctl reload
+
+Commands:
+  list              Print current monitors as JSON (from hyprctl)
+  sync              Write monitors.conf + monitors.lua + reload
+  sync --data JSON  Write from explicit data + reload
+  sync --no-apply   Write files only, no reload
+"""
+
+import json, os, re, shutil, subprocess, sys
+from datetime import datetime
+
+CONF = os.path.join(os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config")), "hypr", "monitors.conf")
+LUA  = os.path.join(os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config")), "hypr", "monitors.lua")
+NL   = os.path.expanduser("~/.local/share/ambxst")
+AXCTL_TOML = os.path.join(NL, "axctl.toml")
+
+# ─── hyprctl ───────────────────────────────────────────────────────────────────
+
+def hyprctl_json(cmd):
+    """Run 'hyprctl monitors -j' and return parsed JSON."""
+    r = subprocess.run(["hyprctl", "monitors", "-j"], capture_output=True, text=True, timeout=5)
+    if r.returncode == 0 and r.stdout.strip():
+        return json.loads(r.stdout)
+    # fallback
+    r = subprocess.run(["axctl", "monitor", "list"], capture_output=True, text=True, timeout=5)
+    if r.returncode == 0 and r.stdout.strip():
+        return json.loads(r.stdout)
+    return []
+
+def hyprctl_reload():
+    try:
+        r = subprocess.run(["hyprctl", "reload"], capture_output=True, timeout=10)
+        return r.returncode == 0
+    except Exception:
+        return False
+
+# ─── Normalize / Generate ─────────────────────────────────────────────────────
+
+def normalize(m):
+    """Normalize one monitor dict from hyprctl JSON → standard keys."""
+    return {
+        "name":        str(m.get("name","")),
+        "width":       int(m.get("width",0) or 0),
+        "height":      int(m.get("height",0) or 0),
+        "x":           int(m.get("x",0) or 0),
+        "y":           int(m.get("y",0) or 0),
+        "scale":       float(m.get("scale",1.0) or 1.0),
+        "refreshRate": float(m.get("refreshRate",m.get("refresh_rate",60)) or 60),
+        "transform":   int(m.get("transform",0) or 0),
+        "enabled":     True,  # hyprctl only reports active monitors
+        "focused":     bool(m.get("focused",False)),
+        "make":        str(m.get("make","")),
+        "model":       str(m.get("model","")),
+        "description": str(m.get("description","")),
+        # Available modes
+        "modes":       m.get("availableModes", m.get("available_modes", [])),
+    }
+
+def normalize_custom(m):
+    """Normalize a monitor dict received from QML (--data)."""
+    return {
+        "name":        str(m.get("name","")),
+        "width":       int(m.get("width",0) or 0),
+        "height":      int(m.get("height",0) or 0),
+        "x":           int(m.get("x",0) or 0),
+        "y":           int(m.get("y",0) or 0),
+        "scale":       float(m.get("scale",1.0) or 1.0),
+        "refreshRate": float(m.get("refreshRate",60) or 60),
+        "transform":   int(m.get("transform",0) or 0),
+        "enabled":     bool(m.get("enabled",True)),
+        "focused":     bool(m.get("focused",False)),
+        "make":        str(m.get("make","")),
+        "model":       str(m.get("model","")),
+        "description": str(m.get("description","")),
+        "modes":       [],
+    }
+
+def conf_line(m):
+    """Generate one monitor= line (nwg-displays format)."""
+    n = m["name"]
+    if not m["enabled"]:
+        return f"monitor={n},disable"
+    mode = f"{m['width']}x{m['height']}@{m['refreshRate']:.2f}".rstrip('0').rstrip('.')
+    pos  = f"{m['x']}x{m['y']}"
+    return f"monitor={n},{mode},{pos},{m['scale']}"
+
+def lua_block(m):
+    """Generate hl.monitor({...}) block."""
+    n = m["name"]
+    if not m["enabled"]:
+        return f'hl.monitor({{\n    output = "{n}",\n    disabled = true\n}})\n'
+    mode = f"{m['width']}x{m['height']}@{m['refreshRate']:.2f}".rstrip('0').rstrip('.')
+    pos  = f"{m['x']}x{m['y']}"
+    return (
+        f'hl.monitor({{\n'
+        f'    output = "{n}",\n'
+        f'    mode = "{mode}",\n'
+        f'    position = "{pos}",\n'
+        f'    scale = {m["scale"]}\n'
+        f'}})\n'
+    )
+
+def generate(monitors):
+    ts = datetime.now().strftime("%Y-%m-%d at %H:%M:%S")
+    hdr = f"# Generated by Ambxst on {ts}. Do not edit manually."
+    conf = [hdr, ""]
+    lua  = ["-- " + hdr[2:], ""]
+    for m in monitors:
+        conf.append(conf_line(m))
+        lua.append(lua_block(m))
+    return conf, lua
+
+# ─── File I/O ─────────────────────────────────────────────────────────────────
+
+def write(path, lines):
+    path = os.path.expanduser(path)
+    if os.path.isfile(path):
+        shutil.copy2(path, path + ".bak")
+    os.makedirs(os.path.dirname(path) or ".", exist_ok=True)
+    with open(path, "w") as f:
+        f.write("\n".join(lines) + "\n")
+
+def inject_nl(conf_lines, lua_lines):
+    for ext, lines, sm, em in [
+        ("hyprland.conf", conf_lines, "# === AMBXST MONITORS ===", "# === END MONITORS ==="),
+        ("hyprland.lua",  lua_lines,  "-- === AMBXST MONITORS ===", "-- === END MONITORS ==="),
+    ]:
+        path = os.path.join(NL, ext)
+        if not os.path.isfile(path):
+            continue
+        filtered = [l for l in lines if l.startswith("monitor=")] if ext.endswith(".conf") \
+              else [l for l in lines if l.startswith("hl.monitor")]
+        block = f"{sm}\n" + "\n".join(filtered) + f"\n{em}"
+        with open(path) as f:
+            content = f.read()
+        if sm in content:
+            content = content.split(sm)[0] + content.split(em)[1]
+        content = content.rstrip() + "\n\n" + block + "\n"
+        with open(path, "w") as f:
+            f.write(content)
+
+def toml_entry(m):
+    """Generate one [[monitors]] TOML block."""
+    n = m["name"]
+    if not m.get("enabled", True):
+        return (
+            f"[[monitors]]\n"
+            f'name = "{n}"\n'
+            f"enabled = false\n"
+        )
+    mode = f"{m['width']}x{m['height']}@{m['refreshRate']:.2f}Hz"
+    pos = f"{m['x']}x{m['y']}"
+    return (
+        f"[[monitors]]\n"
+        f'name = "{n}"\n'
+        f'mode = "{mode}"\n'
+        f'position = "{pos}"\n'
+        f'scale = {m["scale"]}\n'
+        f"enabled = true\n"
+    )
+
+def write_axctl_monitors(monitors):
+    """Update [[monitors]] section in axctl.toml with correct data."""
+    path = AXCTL_TOML
+    if not os.path.isfile(path):
+        return
+
+    # Generate the new monitors block
+    toml_mons = ""
+    for m in monitors:
+        toml_mons += toml_entry(m) + "\n"
+
+    with open(path) as f:
+        content = f.read()
+
+    # Remove old [[monitors]] sections
+    content = re.sub(
+        r'\n?\[\[monitors\]\].*?(?=\n?\[|\Z)',
+        '', content, flags=re.DOTALL
+    ).strip()
+
+    # Insert monitors block after [startup] section (before [appearance] or first section)
+    if toml_mons:
+        # Find insertion point: after the first section header
+        match = re.search(r'^\[.*?\]', content, re.MULTILINE)
+        if match:
+            first_section_end = content.find('\n', match.start())
+            if first_section_end == -1:
+                first_section_end = len(content)
+            after_startup = content[:first_section_end + 1]
+            rest = content[first_section_end + 1:]
+            content = after_startup + '\n' + toml_mons.strip() + '\n\n' + rest
+        else:
+            content += '\n\n' + toml_mons + '\n'
+
+    with open(path, "w") as f:
+        f.write(content + "\n")
+
+# ─── Commands ─────────────────────────────────────────────────────────────────
+
+def cmd_list():
+    """Output current monitors as JSON (nwg-displays format)."""
+    raw = hyprctl_json("monitors -j")
+    monitors = [normalize(m) for m in raw]
+    json.dump(monitors, sys.stdout)
+    return 0
+
+def cmd_sync(args):
+    """Write monitors.conf + monitors.lua + reload."""
+    # Get data
+    if args.data:
+        raw = json.loads(args.data)
+        monitors = [normalize_custom(m) for m in raw]
+    elif args.json and os.path.isfile(args.json):
+        with open(args.json) as f:
+            raw = json.load(f)
+        monitors = [normalize_custom(m) for m in raw]
+    else:
+        raw = hyprctl_json("monitors -j")
+        monitors = [normalize(m) for m in raw]
+
+    if not monitors:
+        print("[WARN] No monitors", file=sys.stderr)
+        return 1
+
+    print(f"[sync] {len(monitors)} monitors: " + ", ".join(
+        f"{m['name']} {m['width']}x{m['height']}@{m['refreshRate']:.0f}Hz {m['x']},{m['y']}" for m in monitors))
+
+    conf, lua = generate(monitors)
+    write(args.conf or CONF, conf)
+    write(args.lua or LUA, lua)
+    inject_nl(conf, lua)
+
+    # Write monitors section to axctl.toml with the correct data (no stale QML state)
+    write_axctl_monitors(monitors)
+
+    if not args.no_apply:
+        ok = hyprctl_reload()
+        print("[OK] reload" if ok else "[WARN] reload failed")
+    print("[OK] Done")
+    return 0
+
+def main():
+    import argparse
+    p = argparse.ArgumentParser()
+    sp = p.add_subparsers(dest="cmd")
+    sp.add_parser("list", help="Output monitors as JSON")
+    s = sp.add_parser("sync", help="Write config + reload")
+    s.add_argument("--data")
+    s.add_argument("--json")
+    s.add_argument("--conf")
+    s.add_argument("--lua")
+    s.add_argument("--no-apply", action="store_true")
+    args = p.parse_args()
+    if args.cmd == "list":
+        return cmd_list()
+    if args.cmd == "sync":
+        return cmd_sync(args)
+    p.print_help()
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/scripts/sync-hyprland-conf.py b/scripts/sync-hyprland-conf.py
new file mode 100755
index 00000000..b01718db
--- /dev/null
+++ b/scripts/sync-hyprland-conf.py
@@ -0,0 +1,867 @@
+#!/usr/bin/env python3
+"""Sync Ambxst compositor config + keybinds to hyprland.conf and hyprland.lua"""
+import json, re, os
+
+BASE = os.path.expanduser('~/.config/ambxst/config')
+BINDS_PATH = os.path.expanduser('~/.config/ambxst/binds.json')
+CONF_PATH = os.path.expanduser('~/.local/share/ambxst/hyprland.conf')
+LUA_PATH = os.path.expanduser('~/.local/share/ambxst/hyprland.lua')
+AXCTL_TOML_PATH = os.path.expanduser('~/.local/share/ambxst/axctl.toml')
+COMPOSITOR_PATH = os.path.join(BASE, 'compositor.json')
+
+with open(COMPOSITOR_PATH) as f:
+    cfg = json.load(f)
+
+# ============================================================================
+#  ACTION RESOLVER — mirrors KeybindActions.js
+# ============================================================================
+
+def direction_letter(direction):
+    d = (direction or "").lower()
+    if d in ("up", "u"): return "u"
+    if d in ("down", "d"): return "d"
+    if d in ("left", "l"): return "l"
+    if d in ("right", "r"): return "r"
+    return ""
+
+ACTION_MAP = {
+    # Ambxst core actions
+    "ambxst.launcher":        ("exec", "ambxst run launcher", "r"),
+    "ambxst.dashboard":       ("exec", "ambxst run dashboard"),
+    "ambxst.assistant":       ("exec", "ambxst run assistant"),
+    "ambxst.clipboard":       ("exec", "ambxst run clipboard"),
+    "ambxst.emoji":           ("exec", "ambxst run emoji"),
+    "ambxst.notes":           ("exec", "ambxst run notes"),
+    "ambxst.tmux":            ("exec", "ambxst run tmux"),
+    "ambxst.wallpapers":      ("exec", "ambxst run wallpapers"),
+    "ambxst.config":          ("exec", "ambxst run config"),
+    "ambxst.overview":        ("exec", "ambxst run overview"),
+    "ambxst.powermenu":       ("exec", "ambxst run powermenu"),
+    "ambxst.tools":           ("exec", "ambxst run tools"),
+    "ambxst.screenshot":      ("exec", "ambxst run screenshot"),
+    "ambxst.screenrecord":    ("exec", "ambxst run screenrecord"),
+    "ambxst.lens":            ("exec", "ambxst run lens"),
+    "ambxst.reload":          ("exec", "ambxst reload"),
+    "ambxst.quit":            ("exec", "ambxst quit"),
+    "ambxst.toggle-metrics":  ("exec", "ambxst run toggle-metrics"),
+    "ambxst.lock":            ("exec", "ambxst lock"),
+
+    # Window actions
+    # Window movement: SUPER + drag = MOVE (via m flag)
+    # Window resize: click border + drag = RESIZE nativo (via resize_on_border)
+    # resize-drag no genera bind nativo - lo maneja resize_on_border
+    "window.close":                ("killactive", ""),
+    "window.focus":                ("movefocus", "direction"),
+    "window.move":                 ("movewindow", "direction"),
+    "window.drag":                 ("movewindow", "", "m"),
+    "window.resize-drag":          ("", ""),  # No bind nativo - lo maneja resize_on_border
+    "window.resize":               ("resizeactive", "delta"),
+    "window.resize-expand":        ("resizeactive", "50 50"),
+    "window.resize-shrink":        ("resizeactive", "-50 -50"),
+
+    # Workspace actions
+    "workspace.switch":            ("workspace", "index"),
+    "workspace.switch-relative":   ("workspace", "offset"),
+    "workspace.switch-occupied":   ("workspace", "offset", "", "e"),
+    "workspace.move-window":       ("movetoworkspace", "index"),
+    "workspace.move-window-silent":("movetoworkspacesilent", "index"),
+    "workspace.toggle-special":    ("togglespecialworkspace", ""),
+    "workspace.move-window-special":("movetoworkspace", "special"),
+    "workspace.move-window-special-silent":("movetoworkspacesilent", "special"),
+
+    # Scrolling layout actions
+    "scrolling.focus":             ("movefocus", "direction"),
+    "scrolling.move-window":       ("movewindow", "direction"),
+    "scrolling.resize-column":     ("layoutmsg", "delta", "", "colresize "),
+    "scrolling.promote":           ("layoutmsg", "promote"),
+    "scrolling.toggle-fit":        ("layoutmsg", "togglefit"),
+    "scrolling.toggle-full-column":("layoutmsg", "colresize +conf"),
+    "scrolling.swap-column":       ("layoutmsg", "direction", "", "swapcol "),
+    "scrolling.move-column-workspace":("layoutmsg", "index", "", "movecoltoworkspace "),
+
+    # Free Layout actions (Windows-style hyprctl commands)
+    "free.snap-left":              ("exec", "hyprctl dispatch centerwindow && hyprctl dispatch resizeactive -50% 0"),
+    "free.snap-right":             ("exec", "hyprctl dispatch centerwindow && hyprctl dispatch resizeactive 50% 0"),
+    "free.snap-top":               ("exec", "hyprctl dispatch centerwindow && hyprctl dispatch resizeactive 0 -50%"),
+    "free.snap-bottom":            ("exec", "hyprctl dispatch centerwindow && hyprctl dispatch resizeactive 0 50%"),
+    "free.snap-center":            ("exec", "hyprctl dispatch centerwindow"),
+    "free.snap-maximize":          ("fullscreen", "1"),
+    "free.snap-restore":           ("fullscreen", "0"),
+    "free.snap-top-left":          ("exec", "hyprctl dispatch movewindow pixel exact 0 0,active && hyprctl dispatch resizeactive 50% 50%"),
+    "free.snap-top-right":         ("exec", "hyprctl dispatch movewindow pixel exact 50% 0,active && hyprctl dispatch resizeactive 50% 50%"),
+    "free.snap-bottom-left":       ("exec", "hyprctl dispatch movewindow pixel exact 0 50%,active && hyprctl dispatch resizeactive 50% 50%"),
+    "free.snap-bottom-right":      ("exec", "hyprctl dispatch movewindow pixel exact 50% 50%,active && hyprctl dispatch resizeactive 50% 50%"),
+    "free.toggle-tile":            ("togglefloating", ""),
+    "free.show-desktop":           ("exec", "hyprctl dispatch workspaceopt allfloat"),
+    "free.workspace-left":         ("exec", "hyprctl dispatch movewindow m:-1"),
+    "free.workspace-right":        ("exec", "hyprctl dispatch movewindow m:+1"),
+
+    # Media actions
+    "media.play-pause":            ("exec", "playerctl play-pause"),
+    "media.play-pause-locked":     ("exec", "playerctl play-pause", "l"),
+    "media.prev":                  ("exec", "playerctl previous"),
+    "media.next":                  ("exec", "playerctl next"),
+    "media.stop-locked":           ("exec", "playerctl stop", "l"),
+
+    # Audio actions
+    "audio.volume-up":             ("exec", "wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%+", "le"),
+    "audio.volume-down":           ("exec", "wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%-", "le"),
+    "audio.mute-toggle":           ("exec", "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", "le"),
+
+    # Brightness actions
+    "brightness.up":               ("exec", "ambxst brightness +5", "le"),
+    "brightness.down":             ("exec", "ambxst brightness -5", "le"),
+
+    # System actions
+    "system.calculator":           ("exec", "notify-send \"Soon\""),
+    "system.lock":                 ("exec", "loginctl lock-session"),
+    "system.lock-locked":          ("exec", "loginctl lock-session", "l"),
+    "system.dpms-off":             ("exec", "axctl monitor set-dpms 0 0", "l"),
+    "system.dpms-on":              ("exec", "axctl monitor set-dpms 0 1", "l"),
+
+    # Custom command
+    "command.run":                 ("exec", "command"),
+}
+
+
+def resolve_action(action):
+    """Resolve an action dict to (dispatcher, argument, flags)."""
+    if not action:
+        return None
+
+    # Already resolved form
+    if action.get("dispatcher"):
+        return (action["dispatcher"], action.get("argument", ""), action.get("flags", ""))
+
+    action_id = action.get("id", "")
+    args = action.get("args", {})
+    entry = ACTION_MAP.get(action_id)
+
+    if not entry:
+        return None
+
+    dispatcher = entry[0]
+    arg_spec = entry[1] if len(entry) > 1 else ""
+    flags = entry[2] if len(entry) > 2 else ""
+    prefix = entry[3] if len(entry) > 3 else ""
+
+    # Resolve argument
+    if arg_spec == "direction":
+        argument = direction_letter(args.get("direction", ""))
+    elif arg_spec == "index":
+        argument = str(args.get("index", ""))
+    elif arg_spec == "offset":
+        raw = str(args.get("offset", ""))
+        if raw and (raw.startswith("+") or raw.startswith("-")):
+            argument = raw
+        else:
+            num = int(raw) if raw else 0
+            argument = f"+{num}" if num >= 0 else str(num)
+    elif arg_spec == "delta":
+        argument = str(args.get("delta", ""))
+    elif arg_spec == "command":
+        argument = str(args.get("command", ""))
+    elif arg_spec == "special":
+        argument = "special"
+    else:
+        argument = str(arg_spec) if arg_spec else ""
+
+    # Handle prefix (layoutmsg commands)
+    if prefix and argument:
+        argument = prefix + argument
+
+    return (dispatcher, argument, flags)
+
+
+def build_bind_line(modifiers, key, dispatcher, argument, flags):
+    """Build a hyprland.conf bind line."""
+    if not key:
+        return None
+
+    mods_str = " ".join(modifiers) if modifiers else ""
+
+    if not dispatcher:
+        return None
+
+    # Mouse bind with 'm' flag (for move only)
+    if "m" in flags:
+        if argument:
+            if not mods_str:
+                return f"bind = , {key}, {dispatcher}, {argument}, m"
+            return f"bind = {mods_str}, {key}, {dispatcher}, {argument}, m"
+        else:
+            if not mods_str:
+                return f"bind = , {key}, {dispatcher}, m"
+            return f"bind = {mods_str}, {key}, {dispatcher}, m"
+
+    bind_type = "bind"
+    if "r" in flags:
+        bind_type = "bindr"
+    elif "l" in flags:
+        bind_type = "bindl"
+    # 'e' (floating) — keep as bind since hyprland doesn't have a native single-char flag for that
+
+    # Build the argument part (skip if empty to avoid trailing comma)
+    arg_part = f", {argument}" if argument else ""
+
+    if not mods_str:
+        return f"{bind_type} = , {key}, {dispatcher}{arg_part}"
+
+    return f"{bind_type} = {mods_str}, {key}, {dispatcher}{arg_part}"
+
+
+def build_lua_bind(modifiers, key, dispatcher, argument, flags):
+    """Build a hyprland.lua hl.bind() call."""
+    if not key or not dispatcher:
+        return None
+
+    mods_lua = "{ " + ", ".join(f'"{m}"' for m in (modifiers or [])) + " }" if modifiers else "{}"
+
+    # Build flags for lua
+    lua_flags = []
+    if "l" in flags:
+        lua_flags.append("locked = true")
+    if "r" in flags:
+        lua_flags.append("release = true")
+    if "m" in flags:
+        lua_flags.append("mouse = true")
+
+    flags_str = ", " + ", ".join(lua_flags) if lua_flags else ""
+
+    return f'hl.bind({{ mods = {mods_lua}, key = "{key}", dispatcher = "{dispatcher}", arg = "{argument}"{flags_str} }})'
+
+
+def process_ambxst_binds(binds_data):
+    """Process the 'ambxst' section of binds.json."""
+    lines = []
+    lua_lines = []
+
+    ambxst = binds_data.get("ambxst", {})
+
+    # Process core keys (launcher, dashboard, etc.)
+    core_keys = ["launcher", "dashboard", "assistant", "clipboard", "emoji",
+                  "notes", "tmux", "wallpapers"]
+    for key_name in core_keys:
+        bind = ambxst.get(key_name)
+        if not bind:
+            continue
+        resolved = resolve_action(bind.get("action", {}))
+        if not resolved:
+            continue
+        dispatcher, argument, flags = resolved
+        line = build_bind_line(bind.get("modifiers", []), bind.get("key", ""), dispatcher, argument, flags)
+        lua = build_lua_bind(bind.get("modifiers", []), bind.get("key", ""), dispatcher, argument, flags)
+        if line:
+            lines.append(line)
+        if lua:
+            lua_lines.append(lua)
+
+    # Process system keys
+    system = ambxst.get("system", {})
+    sys_keys = ["overview", "powermenu", "config", "lockscreen", "tools",
+                 "screenshot", "screenrecord", "lens", "reload", "quit", "toggle-metrics"]
+    for key_name in sys_keys:
+        bind = system.get(key_name)
+        if not bind:
+            continue
+        resolved = resolve_action(bind.get("action", {}))
+        if not resolved:
+            continue
+        dispatcher, argument, flags = resolved
+        line = build_bind_line(bind.get("modifiers", []), bind.get("key", ""), dispatcher, argument, flags)
+        lua = build_lua_bind(bind.get("modifiers", []), bind.get("key", ""), dispatcher, argument, flags)
+        if line:
+            lines.append(line)
+        if lua:
+            lua_lines.append(lua)
+
+    return lines, lua_lines
+
+
+def process_custom_binds(binds_data):
+    """Process the 'custom' array of binds.json."""
+    lines = []
+    lua_lines = []
+    custom = binds_data.get("custom", [])
+
+    for bind in custom:
+        if bind.get("enabled") is False:
+            continue
+
+        keys = bind.get("keys", [])
+        actions = bind.get("actions", [])
+
+        if not keys or not actions:
+            continue
+
+        for key_obj in keys:
+            if not key_obj or not key_obj.get("key"):
+                continue
+
+            for action in actions:
+                resolved = resolve_action(action)
+                if not resolved:
+                    continue
+                dispatcher, argument, flags = resolved
+                line = build_bind_line(key_obj.get("modifiers", []), key_obj.get("key", ""), dispatcher, argument, flags)
+                lua = build_lua_bind(key_obj.get("modifiers", []), key_obj.get("key", ""), dispatcher, argument, flags)
+                if line:
+                    lines.append(line)
+                if lua:
+                    lua_lines.append(lua)
+
+    return lines, lua_lines
+
+
+def build_binds_block():
+    """Build the keybinds section for hyprland.conf and .lua."""
+    try:
+        with open(BINDS_PATH) as f:
+            binds_data = json.load(f)
+    except (FileNotFoundError, json.JSONDecodeError):
+        return "", ""
+
+    core_lines, core_lua = process_ambxst_binds(binds_data)
+    custom_lines, custom_lua = process_custom_binds(binds_data)
+
+    # Remove duplicates while preserving order
+    seen = set()
+    deduped = []
+    for line in core_lines + custom_lines:
+        if line not in seen:
+            deduped.append(line)
+            seen.add(line)
+
+    if not deduped:
+        return "", ""
+
+    block = "# === AMBXST KEYBINDS ===\n"
+    block += "# Synced from Ambxst binds.json\n"
+    for line in deduped:
+        block += line + "\n"
+
+    # Windows-style default keybinds for Free layout
+    if cfg.get('layout') == 'free':
+        block += "\n# Windows-style keybinds (Free layout)\n"
+        block += "bind = SUPER, Left, exec, hyprctl dispatch centerwindow && hyprctl dispatch resizeactive -50% 0\n"
+        block += "bind = SUPER, Right, exec, hyprctl dispatch centerwindow && hyprctl dispatch resizeactive 50% 0\n"
+        block += "bind = SUPER, Up, exec, hyprctl dispatch fullscreen 1\n"
+        block += "bind = SUPER, Down, exec, hyprctl dispatch fullscreen 0\n"
+        block += "bind = SUPER SHIFT, Left, exec, hyprctl dispatch movewindow m:-1\n"
+        block += "bind = SUPER SHIFT, Right, exec, hyprctl dispatch movewindow m:+1\n"
+        block += "bind = SUPER, D, exec, hyprctl dispatch workspaceopt allfloat\n"
+        block += "\n"
+
+    block += "# === END KEYBINDS ===\n"
+
+    seen_lua = set()
+    deduped_lua = []
+    for line in core_lua + custom_lua:
+        if line not in seen_lua:
+            deduped_lua.append(line)
+            seen_lua.add(line)
+
+    lua_block = "-- === AMBXST KEYBINDS ===\n"
+    lua_block += "-- Synced from Ambxst binds.json\n"
+    for line in deduped_lua:
+        lua_block += line + "\n"
+    lua_block += "-- === END KEYBINDS ===\n"
+
+    return block, lua_block
+
+
+# ============================================================================
+#  Format helpers
+# ============================================================================
+def fmt(val):
+    if isinstance(val, bool):
+        return 'true' if val else 'false'
+    if isinstance(val, list):
+        return ' '.join(str(v) for v in val)
+    if isinstance(val, float):
+        s = f'{val:.2f}'.rstrip('0').rstrip('.')
+        return s if '.' in s else s + '.0'
+    if isinstance(val, str) and val == '':
+        return ''
+    return str(val)
+
+def fmt_lua(val):
+    if isinstance(val, bool):
+        return 'true' if val else 'false'
+    if isinstance(val, list):
+        return '{ "' + '", "'.join(str(v) for v in val) + '" }'
+    if isinstance(val, float):
+        s = f'{val:.2f}'.rstrip('0').rstrip('.')
+        return s if '.' in s else s + '.0'
+    if isinstance(val, str):
+        return '"' + val + '"'
+    return str(val)
+
+def resolve_color(name):
+    if not name or name == 'shadow':
+        return '0xee1a1a1a'
+    return name
+
+# ============================================================================
+#  hyprland.conf - BLOCK syntax
+# ============================================================================
+def build_conf_block():
+    lines = ['# === AMBXST COMPOSITOR ===', '# Applied by Ambxst', '']
+
+    def sec(name, keys, indent=''):
+        lines.append(indent + name + ' {')
+        for ck, kw in keys:
+            if ck in cfg:
+                lines.append(indent + '  ' + kw + ' = ' + fmt(cfg[ck]))
+        lines.append(indent + '}')
+
+    # Determine if Free Layout (floating mode)
+    _is_free = cfg.get('layout') == 'free'
+
+    if _is_free:
+        # Free Layout: windowrule float ALL windows
+        lines.append('windowrule = match:class .*, float on')
+        lines.append('')
+
+    # Smart Resize Anchors: override resize_on_border + grab area
+    _smart = cfg.get('smartResizeAnchors', True)
+    if _smart:
+        cfg.update({'resizeOnBorder': True, 'extendBorderGrabArea': 10})
+    else:
+        cfg.update({'resizeOnBorder': False, 'extendBorderGrabArea': 0})
+
+    sec('general', [
+        ('borderSize','border_size'), ('gapsIn','gaps_in'), ('gapsOut','gaps_out'),
+        ('allowTearing','allow_tearing'),
+        ('hoverIconOnBorder','hover_icon_on_border'),
+        ('resizeOnBorder','resize_on_border'),
+        ('extendBorderGrabArea','extend_border_grab_area'),
+    ] + ([] if _is_free else [('layout','layout')]))
+
+    lines.append('')
+
+    lines.append('decoration {')
+    for k, kw in [('rounding','rounding'), ('roundingPower','rounding_power'),
+                  ('activeOpacity','active_opacity'), ('inactiveOpacity','inactive_opacity'),
+                  ('fullscreenOpacity','fullscreen_opacity'),
+                  ('dimInactive','dim_inactive'), ('dimStrength','dim_strength'),
+                  ('dimAround','dim_around'), ('dimSpecial','dim_special')]:
+        if k in cfg: lines.append('  ' + kw + ' = ' + fmt(cfg[k]))
+    lines.append('')
+    lines.append('  shadow {')
+    for k, kw in [('shadowRange','range'), ('shadowRenderPower','render_power'),
+                  ]:
+        if k in cfg: lines.append('    ' + kw + ' = ' + fmt(cfg[k]))
+    lines.append('    color = ' + resolve_color(cfg.get('shadowColor', 'shadow')))
+    lines.append('    color_inactive = ' + resolve_color(cfg.get('shadowColorInactive', 'shadow')))
+    lines.append('  }')
+    lines.append('')
+    lines.append('  blur {')
+    for k, kw in [('blurSize','size'), ('blurPasses','passes'),
+                  ('blurIgnoreOpacity','ignore_opacity'),
+                  ('blurNewOptimizations','new_optimizations'),
+                  ('blurXray','xray'), ('blurNoise','noise'), ('blurContrast','contrast'),
+                  ('blurBrightness','brightness'), ('blurVibrancy','vibrancy'),
+                  ('blurVibrancyDarkness','vibrancy_darkness')]:
+        if k in cfg: lines.append('    ' + kw + ' = ' + fmt(cfg[k]))
+    lines.append('  }')
+    lines.append('}')
+
+    lines.append('')
+    lines.append('input {')
+    for k, kw in [('kbLayout','kb_layout'), ('kbVariant','kb_variant'),
+                  ('kbOptions','kb_options'),
+                  ('numlockByDefault','numlock_by_default'),
+                  ('repeatRate','repeat_rate'), ('repeatDelay','repeat_delay'),
+                  ('mouseSensitivity','sensitivity'),
+                  ('followMouse','follow_mouse'),
+                  ('mouseNaturalScroll','natural_scroll'),
+                  ('mouseScrollFactor','scroll_factor'),
+                  ('mouseLeftHanded','left_handed'),
+                  ('mouseRefocus','mouse_refocus'),
+                  ('floatSwitchOverrideFocus','float_switch_override_focus')]:
+        if k in cfg: lines.append('  ' + kw + ' = ' + fmt(cfg[k]))
+    if cfg.get('mouseAccelProfile'): lines.append('  accel_profile = ' + cfg['mouseAccelProfile'])
+    lines.append('')
+    lines.append('  touchpad {')
+    for k, kw in [('touchpadDisableWhileTyping','disable_while_typing'),
+                  ('touchpadNaturalScroll','natural_scroll'),
+
+                  ('touchpadClickfingerBehavior','clickfinger_behavior'),
+                  ('touchpadMiddleButtonEmulation','middle_button_emulation'),
+                  ('touchpadDragLock','drag_lock'),
+                  ('touchpadScrollFactor','scroll_factor')]:
+        if k in cfg: lines.append('    ' + kw + ' = ' + fmt(cfg[k]))
+    if cfg.get('touchpadTapButtonMap'): lines.append('    tap_button_map = ' + cfg['touchpadTapButtonMap'])
+    lines.append('  }')
+    lines.append('}')
+
+    for sec_name, keys in [
+        ('cursor', [('noHardwareCursors','no_hardware_cursors'),
+                    ('enableHyprcursor','enable_hyprcursor'), ('noWarps','no_warps'),
+                    ('persistentWarps','persistent_warps'),
+                    ('warpOnChangeWorkspace','warp_on_change_workspace'),
+                    ('cursorZoomFactor','zoom_factor'),
+                    ('cursorInactiveTimeout','inactive_timeout'),
+                    ('cursorHideOnKeyPress','hide_on_key_press'),
+                    ('cursorHideOnTouch','hide_on_touch'),
+                    ('cursorHideOnTablet','hide_on_tablet')]),
+        ('gestures', [('workspaceSwipeCreateNew','workspace_swipe_create_new'),
+                      ('workspaceSwipeForever','workspace_swipe_forever'),
+                      ('workspaceSwipeCancelRatio','workspace_swipe_cancel_ratio'),
+                      ('workspaceSwipeMinSpeedToForce','workspace_swipe_min_speed_to_force'),
+                      ('workspaceSwipeDirectionLock','workspace_swipe_direction_lock'),
+                      ('workspaceSwipeDistance','workspace_swipe_distance'),
+                      ('workspaceSwipeInvert','workspace_swipe_invert'),
+                      ('workspaceSwipeTouch','workspace_swipe_touch'),
+                      ('workspaceSwipeTouchInvert','workspace_swipe_touch_invert')]),
+        ('misc', [('vrr','vrr'), ('mouseMoveEnablesDpms','mouse_move_enables_dpms'),
+                  ('mouseMoveEnablesDpms','mouse_move_enables_dpms'),
+                  ('keyPressEnablesDpms','key_press_enables_dpms'),
+                  ('disableAutoreload','disable_autoreload'),
+                  ('focusOnActivate','focus_on_activate'),
+                  ('animateManualResizes','animate_manual_resizes'),
+                  ('animateMouseWindowdragging','animate_mouse_windowdragging'),
+                  ('disableHyprlandLogo','disable_hyprland_logo'),
+                  ('disableSplashRendering','disable_splash_rendering'),
+                  ('forceDefaultWallpaper','force_default_wallpaper'),
+                  ]),
+        ('xwayland', [('xwaylandEnabled','enabled'),
+                      ('xwaylandForceZeroScaling','force_zero_scaling'),
+                      ('xwaylandUseNearestNeighbor','use_nearest_neighbor')]),
+    ]:
+        lines.append('')
+        lines.append(sec_name + ' {')
+        for ck, kw in keys:
+            if ck in cfg: lines.append('  ' + kw + ' = ' + fmt(cfg[ck]))
+        lines.append('}')
+
+    lines.append('# === END COMPOSITOR ===')
+    return '\n'.join(lines) + '\n'
+
+# ============================================================================
+#  hyprland.lua - hl.config() syntax  
+# ============================================================================
+def build_lua_block():
+    lines = [
+        '-- === AMBXST COMPOSITOR ===',
+        '-- Ambxst compositor settings',
+        'hl.config({',
+    ]
+
+    _is_free = cfg.get('layout') == 'free'
+
+    sections = {
+        'general': [('borderSize','border_size'), ('gapsIn','gaps_in'), ('gapsOut','gaps_out'),
+                    ('allowTearing','allow_tearing'), ('resizeOnBorder','resize_on_border'),
+                    ('extendBorderGrabArea','extend_border_grab_area'),
+                    ('hoverIconOnBorder','hover_icon_on_border'),
+        ] + ([] if _is_free else [('layout','layout')]),
+        'decoration': [('rounding','rounding'), ('roundingPower','rounding_power'),
+                       ('activeOpacity','active_opacity'), ('inactiveOpacity','inactive_opacity'),
+                       ('fullscreenOpacity','fullscreen_opacity'),
+                       ('dimInactive','dim_inactive'), ('dimStrength','dim_strength'),
+                       ('dimAround','dim_around'), ('dimSpecial','dim_special')],
+        'input': [('kbLayout','kb_layout'), ('kbVariant','kb_variant'),
+                  ('kbOptions','kb_options'),
+                  ('numlockByDefault','numlock_by_default'),
+                  ('repeatRate','repeat_rate'), ('repeatDelay','repeat_delay'),
+                  ('mouseSensitivity','sensitivity'),
+                  ('followMouse','follow_mouse'),
+                  ('mouseNaturalScroll','natural_scroll'),
+                  ('mouseScrollFactor','scroll_factor'),
+                  ('mouseLeftHanded','left_handed'),
+                  ('mouseRefocus','mouse_refocus'),
+                  ('floatSwitchOverrideFocus','float_switch_override_focus')],
+        'cursor': [('noHardwareCursors','no_hardware_cursors'),
+                   ('enableHyprcursor','enable_hyprcursor'), ('noWarps','no_warps'),
+                   ('persistentWarps','persistent_warps'),
+                   ('warpOnChangeWorkspace','warp_on_change_workspace'),
+                   ('cursorZoomFactor','zoom_factor'),
+                   ('cursorInactiveTimeout','inactive_timeout'),
+                   ('cursorHideOnKeyPress','hide_on_key_press'),
+                   ('cursorHideOnTouch','hide_on_touch'),
+                   ('cursorHideOnTablet','hide_on_tablet')],
+        'gestures': [('workspaceSwipeCreateNew','workspace_swipe_create_new'),
+                     ('workspaceSwipeForever','workspace_swipe_forever'),
+                     ('workspaceSwipeCancelRatio','workspace_swipe_cancel_ratio'),
+                     ('workspaceSwipeMinSpeedToForce','workspace_swipe_min_speed_to_force'),
+                     ('workspaceSwipeDirectionLock','workspace_swipe_direction_lock'),
+                     ('workspaceSwipeDistance','workspace_swipe_distance'),
+                     ('workspaceSwipeInvert','workspace_swipe_invert'),
+                     ('workspaceSwipeTouch','workspace_swipe_touch'),
+                     ('workspaceSwipeTouchInvert','workspace_swipe_touch_invert')],
+        'misc': [('vrr','vrr'),
+                 ('mouseMoveEnablesDpms','mouse_move_enables_dpms'),
+                 ('keyPressEnablesDpms','key_press_enables_dpms'),
+                 ('disableAutoreload','disable_autoreload'),
+                 ('focusOnActivate','focus_on_activate'),
+                 ('animateManualResizes','animate_manual_resizes'),
+                 ('animateMouseWindowdragging','animate_mouse_windowdragging'),
+                 ('disableHyprlandLogo','disable_hyprland_logo'),
+                 ('disableSplashRendering','disable_splash_rendering'),
+                 ('forceDefaultWallpaper','force_default_wallpaper'),
+                 ],
+        'xwayland': [('xwaylandEnabled','enabled'),
+                     ('xwaylandForceZeroScaling','force_zero_scaling'),
+                     ('xwaylandUseNearestNeighbor','use_nearest_neighbor')],
+        'dwindle': [('dwindlePreserveSplit','preserve_split'),
+                    ('dwindlePseudotile','pseudotile'),
+                    ('dwindleForceSplit','force_split'),
+                    ('dwindleSmartSplit','smart_split'),
+                    ('dwindleDefaultSplitRatio','default_split_ratio'),
+                    ('dwindleSplitWidthMultiplier','split_width_multiplier'),
+                    ('dwindlePermanentDirectionOverride','permanent_direction_override'),
+                    ('dwindleUseActiveForSplits','use_active_for_splits'),
+                    ('dwindleSmartResizing','smart_resizing')],
+        'master': [('masterOrientation','orientation'), ('masterMfact','mfact'),
+                   ('masterNewStatus','new_status'), ('masterNewOnTop','new_on_top'),
+                   ('masterNewOnActive','new_on_active'),
+                   ('masterSmartResizing','smart_resizing'),
+                   ('masterAllowSmallSplit','allow_small_split')],
+        'scrolling': [('scrollingColumnWidth','column_width'),
+                      ('scrollingExplicitColumnWidths','explicit_column_widths'),
+                      ('scrollingDirection','direction'),
+                      ('scrollingFullscreenOnOneColumn','fullscreen_on_one_column'),
+                      ('scrollingFocusFitMethod','focus_fit_method'),
+                      ('scrollingFollowFocus','follow_focus'),
+                      ('scrollingFollowMinVisible','follow_min_visible')],
+    }
+
+    for section, keys in sections.items():
+        lines.append(f'    {section} = {{')
+        for ck, kw in keys:
+            if ck in cfg:
+                lines.append(f'        {kw} = {fmt_lua(cfg[ck])},')
+        lines.append('    },')
+
+    lines.append('})')
+
+    # Free Layout: windowrule float for all windows (lua syntax)
+    if _is_free:
+        # Insert at the top, right after the marker
+        lines.insert(2, '-- Free Layout: float all windows')
+        lines.insert(3, '-- hl.windowrule("float, class:.*") - old syntax')
+        lines.insert(4, 'hl.windowrule("match:class .*, float on")')
+        lines.insert(4, '')
+
+    lines.append('-- === END COMPOSITOR ===')
+    return '\n'.join(lines) + '\n'
+
+# ============================================================================
+#  axctl.toml - TOML format (syncs compositor settings to axctl daemon)
+# ============================================================================
+def build_toml_block():
+    """Build the compositor settings section for axctl.toml."""
+    lines = ['# === AMBXST COMPOSITOR ===', '# Synced from compositor.json', '']
+
+    def toml_val(val):
+        if isinstance(val, bool):
+            return 'true' if val else 'false'
+        if isinstance(val, list):
+            return '[' + ', '.join(toml_val(v) for v in val) + ']'
+        if isinstance(val, float):
+            s = f'{val:.2f}'.rstrip('0').rstrip('.')
+            return s if '.' in s else s + '.0'
+        if isinstance(val, str):
+            return '"' + val.replace('\\', '\\\\').replace('"', '\\"') + '"'
+        return str(val)
+
+    def fmt_t(val, fixed=None):
+        if isinstance(val, bool):
+            return 'true' if val else 'false'
+        if isinstance(val, float):
+            if fixed:
+                return f'{val:.{fixed}f}'
+            return str(val)
+        if isinstance(val, int):
+            return str(val)
+        return str(val)
+
+    # Gaps
+    if 'gapsIn' in cfg or 'gapsOut' in cfg:
+        lines.append('[appearance.gaps]')
+        if 'gapsIn' in cfg: lines.append(f'inner = {cfg["gapsIn"]}')
+        if 'gapsOut' in cfg: lines.append(f'outer = {cfg["gapsOut"]}')
+        lines.append('')
+
+    # Border
+    lines.append('[appearance.border]')
+    if 'borderSize' in cfg: lines.append(f'width = {cfg["borderSize"]}')
+    if 'rounding' in cfg: lines.append(f'rounding = {cfg["rounding"]}')
+    if 'roundingPower' in cfg: lines.append(f'rounding_power = {fmt_t(cfg["roundingPower"], 1)}')
+    lines.append('')
+
+    # Opacity
+    lines.append('[appearance.opacity]')
+    if 'activeOpacity' in cfg: lines.append(f'active = {fmt_t(cfg["activeOpacity"], 2)}')
+    if 'inactiveOpacity' in cfg: lines.append(f'inactive = {fmt_t(cfg["inactiveOpacity"], 2)}')
+    if 'fullscreenOpacity' in cfg: lines.append(f'fullscreen = {fmt_t(cfg["fullscreenOpacity"], 2)}')
+    lines.append('')
+
+    # Dim
+    lines.append('[appearance.dim]')
+    if 'dimInactive' in cfg: lines.append(f'enabled = {fmt_t(cfg["dimInactive"])}')
+    if 'dimStrength' in cfg: lines.append(f'strength = {fmt_t(cfg["dimStrength"], 2)}')
+    if 'dimAround' in cfg: lines.append(f'around = {fmt_t(cfg["dimAround"], 2)}')
+    if 'dimSpecial' in cfg: lines.append(f'special = {fmt_t(cfg["dimSpecial"], 2)}')
+    lines.append('')
+
+    # Blur
+    lines.append('[appearance.blur]')
+    if 'blurEnabled' in cfg: lines.append(f'enabled = {fmt_t(cfg["blurEnabled"])}')
+    if 'blurSize' in cfg: lines.append(f'size = {cfg["blurSize"]}')
+    if 'blurPasses' in cfg: lines.append(f'passes = {cfg["blurPasses"]}')
+    if 'blurIgnoreOpacity' in cfg: lines.append(f'ignore_opacity = {fmt_t(cfg["blurIgnoreOpacity"])}')
+    if 'blurNewOptimizations' in cfg: lines.append(f'new_optimizations = {fmt_t(cfg["blurNewOptimizations"])}')
+    if 'blurXray' in cfg: lines.append(f'xray = {fmt_t(cfg["blurXray"])}')
+    if 'blurNoise' in cfg: lines.append(f'noise = {fmt_t(cfg["blurNoise"], 3)}')
+    if 'blurContrast' in cfg: lines.append(f'contrast = {fmt_t(cfg["blurContrast"], 2)}')
+    if 'blurBrightness' in cfg: lines.append(f'brightness = {fmt_t(cfg["blurBrightness"], 2)}')
+    if 'blurVibrancy' in cfg: lines.append(f'vibrancy = {fmt_t(cfg["blurVibrancy"], 2)}')
+    if 'blurVibrancyDarkness' in cfg: lines.append(f'vibrancy_darkness = {fmt_t(cfg["blurVibrancyDarkness"], 2)}')
+    if 'blurSpecial' in cfg: lines.append(f'special = {fmt_t(cfg["blurSpecial"])}')
+    if 'blurPopups' in cfg: lines.append(f'popups = {fmt_t(cfg["blurPopups"])}')
+    lines.append('')
+
+    # Shadow
+    lines.append('[appearance.shadow]')
+    if 'shadowEnabled' in cfg: lines.append(f'enabled = {fmt_t(cfg["shadowEnabled"])}')
+    if 'shadowRange' in cfg: lines.append(f'range = {cfg["shadowRange"]}')
+    if 'shadowRenderPower' in cfg: lines.append(f'render_power = {cfg["shadowRenderPower"]}')
+    if 'shadowOffset' in cfg: lines.append(f'offset = {toml_val(cfg["shadowOffset"])}')
+    if 'shadowScale' in cfg: lines.append(f'scale = {fmt_t(cfg["shadowScale"], 2)}')
+    lines.append('')
+
+    # Animations
+    lines.append('[appearance.animations]')
+    if 'animationsEnabled' in cfg: lines.append(f'enabled = {fmt_t(cfg["animationsEnabled"])}')
+    lines.append('')
+
+    # General
+    _is_free = cfg.get('layout') == 'free'
+    lines.append('[general]')
+    if 'layout' in cfg and not _is_free: lines.append(f'layout = {toml_val(cfg["layout"])}')
+    if 'allowTearing' in cfg: lines.append(f'allow_tearing = {fmt_t(cfg["allowTearing"])}')
+    if 'resizeOnBorder' in cfg: lines.append(f'resize_on_border = {fmt_t(cfg["resizeOnBorder"])}')
+    if 'extendBorderGrabArea' in cfg: lines.append(f'extend_border_grab_area = {cfg["extendBorderGrabArea"]}')
+    if 'hoverIconOnBorder' in cfg: lines.append(f'hover_icon_on_border = {fmt_t(cfg["hoverIconOnBorder"])}')
+    lines.append('')
+
+    # Free Layout grid & snap config
+    if _is_free:
+        lines.append('[general.free]')
+        if 'freeGridSize' in cfg: lines.append(f'grid_size = {cfg["freeGridSize"]}')
+        if 'freeSnapSensitivity' in cfg: lines.append(f'snap_sensitivity = {cfg["freeSnapSensitivity"]}')
+        if 'freeSnapEdges' in cfg: lines.append(f'snap_edges = {fmt_t(cfg["freeSnapEdges"])}')
+        if 'freeSnapCenter' in cfg: lines.append(f'snap_center = {fmt_t(cfg["freeSnapCenter"])}')
+        if 'freeSnapGaps' in cfg: lines.append(f'snap_gaps = {cfg["freeSnapGaps"]}')
+        if 'freeTileByDefault' in cfg: lines.append(f'tile_by_default = {fmt_t(cfg["freeTileByDefault"])}')
+        if 'freeMaximizedByDefault' in cfg: lines.append(f'maximized_by_default = {fmt_t(cfg["freeMaximizedByDefault"])}')
+        lines.append('')
+
+    # Snap
+    lines.append('[general.snap]')
+    if 'snapEnabled' in cfg: lines.append(f'enabled = {fmt_t(cfg["snapEnabled"])}')
+    if 'snapWindowGap' in cfg: lines.append(f'window_gap = {cfg["snapWindowGap"]}')
+    if 'snapMonitorGap' in cfg: lines.append(f'monitor_gap = {cfg["snapMonitorGap"]}')
+    if 'snapBorderOverlap' in cfg: lines.append(f'border_overlap = {fmt_t(cfg["snapBorderOverlap"])}')
+    if 'snapRespectGaps' in cfg: lines.append(f'respect_gaps = {fmt_t(cfg["snapRespectGaps"])}')
+    lines.append('')
+
+    lines.append('# === END COMPOSITOR ===')
+    return '\n'.join(lines) + '\n'
+
+
+# ============================================================================
+#  FILE WRITING
+# ============================================================================
+
+marker = '# === AMBXST COMPOSITOR ==='
+end_marker = '# === END COMPOSITOR ==='
+lua_marker = '-- === AMBXST COMPOSITOR ==='
+lua_end_marker = '-- === END COMPOSITOR ==='
+
+binds_marker = '# === AMBXST KEYBINDS ==='
+binds_end_marker = '# === END KEYBINDS ==='
+lua_binds_marker = '-- === AMBXST KEYBINDS ==='
+lua_binds_end_marker = '-- === END KEYBINDS ==='
+
+conf_block = build_conf_block()
+lua_block = build_lua_block()
+binds_block, lua_binds_block = build_binds_block()
+
+# --- hyprland.conf ---
+with open(CONF_PATH) as f:
+    content = f.read()
+
+# Remove and re-insert compositor block
+content = re.sub(re.escape(marker) + '.*?' + re.escape(end_marker), '', content, flags=re.DOTALL).strip()
+content += '\n' + conf_block
+
+# Remove and re-insert keybinds block
+if binds_block:
+    content = re.sub(re.escape(binds_marker) + '.*?' + re.escape(binds_end_marker), '', content, flags=re.DOTALL).strip()
+    content += '\n' + binds_block
+
+with open(CONF_PATH, 'w') as f:
+    f.write(content)
+print(f'hyprland.conf: {len(conf_block)} chars (compositor), {len(binds_block)} chars (keybinds)')
+
+# --- hyprland.lua ---
+with open(LUA_PATH) as f:
+    content = f.read()
+
+content = re.sub(re.escape(lua_marker) + '.*?' + re.escape(lua_end_marker), '', content, flags=re.DOTALL).strip()
+content += '\n' + lua_block
+
+if lua_binds_block:
+    content = re.sub(re.escape(lua_binds_marker) + '.*?' + re.escape(lua_binds_end_marker), '', content, flags=re.DOTALL).strip()
+    content += '\n' + lua_binds_block
+
+with open(LUA_PATH, 'w') as f:
+    f.write(content)
+print(f'hyprland.lua: {len(lua_block)} chars (compositor), {len(lua_binds_block)} chars (keybinds)')
+
+# --- axctl.toml ---
+toml_block = build_toml_block()
+
+try:
+    with open(AXCTL_TOML_PATH) as f:
+        toml_content = f.read()
+
+    # Remove everything from [appearance] through the last section before [[keybinds]]
+    # This clears old values from CompositorTomlWriter that may conflict
+    pattern = re.compile(
+        r'\n?\[appearance\].*?(?=\n?\[\[keybinds\]\]|\n?# === AMBXST|\Z)',
+        re.DOTALL
+    )
+    toml_content = pattern.sub('', toml_content).strip()
+
+    # Also remove old marker block if present
+    toml_content = re.sub(
+        re.escape('# === AMBXST COMPOSITOR ===') + '.*?' + re.escape('# === END COMPOSITOR ==='),
+        '', toml_content, flags=re.DOTALL
+    ).strip()
+
+    # Insert the new block after [startup] section, before [[keybinds]]
+    # Find insertion point: either before [[keybinds]] or at end of file
+    keybinds_match = re.search(r'^\[\[keybinds\]\]', toml_content, re.MULTILINE)
+    if keybinds_match:
+        # Find the line before [[keybinds]] and insert there
+        before = toml_content[:keybinds_match.start()].rstrip()
+        after = toml_content[keybinds_match.start():]
+        toml_content = before + '\n\n' + toml_block.strip() + '\n\n' + after
+    else:
+        toml_content += '\n\n' + toml_block
+
+    with open(AXCTL_TOML_PATH, 'w') as f:
+        f.write(toml_content)
+    print(f'axctl.toml: {len(toml_block)} chars (synced)')
+except FileNotFoundError:
+    print(f'axctl.toml: CREATED at {AXCTL_TOML_PATH}')
+    with open(AXCTL_TOML_PATH, 'w') as f:
+        f.write(toml_block)
+    print(f'axctl.toml: {len(toml_block)} chars')
+
+print('Done - hyprctl reload & axctl config reload recommended')
diff --git a/scripts/system_monitor.py b/scripts/system_monitor.py
index 5b24c8b3..213f36f0 100755
--- a/scripts/system_monitor.py
+++ b/scripts/system_monitor.py
@@ -15,6 +15,7 @@ def __init__(self, disks=[]):
         self.cpu_model = self._detect_cpu_model()
         self.gpu_info = self._detect_gpus()
         self.disk_types = self._detect_disk_types(disks)
+        self._cpu_temp_path = None  # cached hwmon path for CPU temp
 
     def _detect_cpu_model(self):
         try:
@@ -97,27 +98,32 @@ def _detect_gpus(self):
 
     def _detect_disk_types(self, disks):
         types = {}
+        # Build mount lookup map in one pass over /proc/mounts
+        mount_dev = {}
+        try:
+            with open("/proc/mounts", "r") as f:
+                for line in f:
+                    parts = line.split()
+                    if len(parts) >= 2 and parts[1] in disks:
+                        mount_dev[parts[1]] = parts[0]
+        except:
+            pass
+
+        # Precompile regex for device base name extraction
+        import re as _re
+        _dev_re = _re.compile(r"p?\d*$")
+
         for mount in disks:
             types[mount] = "unknown"
-            try:
-                with open("/proc/mounts", "r") as f:
-                    for line in f:
-                        parts = line.split()
-                        if parts[1] == mount:
-                            dev = parts[0]
-                            if dev.startswith("/dev/"):
-                                base = re.sub(
-                                    r"p?[0-9]*$", "", dev.replace("/dev/", "")
-                                )
-                                rota_path = f"/sys/block/{base}/queue/rotational"
-                                if os.path.exists(rota_path):
-                                    with open(rota_path, "r") as f2:
-                                        types[mount] = (
-                                            "hdd" if f2.read().strip() == "1" else "ssd"
-                                        )
-                            break
-            except:
-                pass
+            dev = mount_dev.get(mount)
+            if dev and dev.startswith("/dev/"):
+                base = _dev_re.sub("", dev[5:])  # dev.replace("/dev/", "")
+                rota_path = f"/sys/block/{base}/queue/rotational"
+                try:
+                    with open(rota_path, "r") as f:
+                        types[mount] = "hdd" if f.read().strip() == "1" else "ssd"
+                except:
+                    pass
         return types
 
     def get_cpu(self):
@@ -142,8 +148,22 @@ def get_cpu(self):
             return 0.0
 
     def get_cpu_temp(self):
+        # Use cached hwmon path (found once, reused)
+        if self._cpu_temp_path is not None:
+            try:
+                for item in os.listdir(self._cpu_temp_path):
+                    if item.endswith("_input") and item.startswith("temp"):
+                        with open(os.path.join(self._cpu_temp_path, item), "r") as f:
+                            val = int(f.read().strip())
+                            if 10000 < val < 120000:
+                                return val // 1000
+            except:
+                self._cpu_temp_path = None  # invalidate cache on error
+                return -1
+
         base = "/sys/class/hwmon"
         if not os.path.exists(base):
+            self._cpu_temp_path = None
             return -1
         for hwmon in os.listdir(base):
             path = os.path.join(base, hwmon)
@@ -158,6 +178,7 @@ def get_cpu_temp(self):
                     "x86_pkg_temp",
                     "amd_energy",
                 ]:
+                    self._cpu_temp_path = path  # cache for subsequent calls
                     for item in os.listdir(path):
                         if item.endswith("_input") and item.startswith("temp"):
                             with open(os.path.join(path, item), "r") as f:
@@ -166,6 +187,7 @@ def get_cpu_temp(self):
                                     return val // 1000
             except:
                 continue
+        self._cpu_temp_path = None
         return -1
 
     def get_mem(self):
@@ -202,6 +224,34 @@ def get_disk_usage(self, disks):
                 usage_map[mount] = 0.0
         return usage_map
 
+    def get_fps(self):
+        """Read FPS from SHM file, returns 0 if file is stale (>5s old)."""
+        import os
+        try:
+            mtime = os.path.getmtime("/dev/shm/ambxst_fps")
+            if time.time() - mtime > 5:
+                return 0.0
+            with open("/dev/shm/ambxst_fps") as f:
+                for line in f:
+                    line = line.strip()
+                    if not line or line.startswith("#") or line.startswith("time"):
+                        continue
+                    if line.startswith("fps="):
+                        val = float(line.split("=", 1)[1])
+                        return max(0.0, val)
+                    parts = line.split(",")
+                    if len(parts) >= 2:
+                        try:
+                            val = float(parts[1].strip())
+                            if val > 0:
+                                return val
+                        except:
+                            pass
+        except:
+            pass
+        return 0.0
+
+
     def get_gpu_stats(self):
         usages = []
         temps = []
@@ -301,6 +351,7 @@ def get_gpu_stats(self):
             ram_usage, ram_total, ram_used, ram_avail = monitor.get_mem()
             disk_usage = monitor.get_disk_usage(disks)
             gpu_usages, gpu_temps = monitor.get_gpu_stats()
+            fps = monitor.get_fps()
 
             print(
                 json.dumps(
@@ -319,6 +370,7 @@ def get_gpu_stats(self):
                             "usages": gpu_usages,
                             "temps": gpu_temps,
                         },
+                        "fps": fps,
                     }
                 ),
                 flush=True,
diff --git a/scripts/toggle-metrics.sh b/scripts/toggle-metrics.sh
new file mode 100755
index 00000000..b8d93fd9
--- /dev/null
+++ b/scripts/toggle-metrics.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Toggle notch metrics overlay
+# IPC call handled by GlobalShortcuts - this triggers the QML handler
+qs ipc --pid "$(pidof ambxst)" call ambxst run toggle-metrics 2>/dev/null || true
diff --git a/shell.qml b/shell.qml
old mode 100644
new mode 100755
index 44a22dd5..810caca5
--- a/shell.qml
+++ b/shell.qml
@@ -5,6 +5,7 @@
 
 import QtQuick
 import Quickshell
+import Quickshell.Io
 import Quickshell.Wayland
 import qs.modules.bar
 import qs.modules.bar.workspaces
@@ -87,21 +88,34 @@ ShellRoot {
             ReservationWindows {
                 screen: screenShellContainer.modelData
 
+                // Island mode detection
+                readonly property bool _islandActive: (Config.bar && Config.bar.barMode === "dynamic") && (Config.notchTheme || "default") === "island" && unifiedPanel.barPosition === (Config.notchPosition || "top")
+
                 // Bar status for reservations
                 barEnabled: {
                     const list = (Config.bar && Config.bar.screenList !== undefined ? Config.bar.screenList : []);
-                    return (!list || list.length === 0 || list.indexOf(screen.name) !== -1);
+                    const isOnList = !list || list.length === 0 || list.indexOf(screen.name) !== -1;
+                    // In island mode: only reserve if island is pinned
+                    if (_islandActive) return isOnList && unifiedPanel.notchPinned;
+                    return isOnList;
                 }
                 barPosition: unifiedPanel.barPosition
-                barPinned: unifiedPanel.pinned
-                barSize: (unifiedPanel.barPosition === "left" || unifiedPanel.barPosition === "right") ? unifiedPanel.barTargetWidth : unifiedPanel.barTargetHeight
-                barOuterMargin: unifiedPanel.barOuterMargin
+                barPinned: _islandActive ? unifiedPanel.notchPinned : unifiedPanel.pinned
+                barSize: _islandActive ? 44 : (unifiedPanel.barPosition === "left" || unifiedPanel.barPosition === "right") ? unifiedPanel.barTargetWidth : unifiedPanel.barTargetHeight
+                barOuterMargin: _islandActive ? 0 : unifiedPanel.barOuterMargin
 
                 // Dock status for reservations
                 dockEnabled: {
                     if (!((Config.dock && Config.dock.enabled !== undefined ? Config.dock.enabled : false)) || (Config.dock && Config.dock.theme !== undefined ? Config.dock.theme : "default") === "integrated")
                         return false;
 
+                    // In island mode: only reserve dock space if island is pinned
+                    if (_islandActive) {
+                        if (!unifiedPanel.notchPinned) return false;
+                        const dp = (Config.dock && Config.dock.position) || "center";
+                        if (dp === "center" || dp === unifiedPanel.barPosition) return false;
+                    }
+
                     const list = (Config.dock && Config.dock.screenList !== undefined ? Config.dock.screenList : []);
                     if (!list || list.length === 0)
                         return true;
@@ -177,6 +191,10 @@ ShellRoot {
         id: compositorConfig
     }
 
+    CompositorKeybinds {
+        id: compositorKeybinds
+    }
+
     // Screenshot tool
     Variants {
         model: Quickshell.screens
@@ -287,6 +305,7 @@ ShellRoot {
                 let _ = CaffeineService.inhibit;
                 _ = IdleService.lockCmd; // Force init
                 _ = GlobalShortcuts.appId; // Force init (IPC pipe listener)
+                _ = BatteryAlertService.enabled; // Force init (battery notifications)
             });
         }
     }
@@ -300,4 +319,72 @@ ShellRoot {
             _ = GameModeService.toggled;
         }
     }
+
+    // --- Boot Splash (NOTHING animation with chroma key) ---
+    Loader {
+        id: bootSplash
+        active: true
+        sourceComponent: Component {
+            Variants {
+                model: Quickshell.screens
+                PanelWindow {
+                    required property var modelData
+                    screen: modelData
+                    anchors { top: true; left: true; right: true; bottom: true }
+                    color: "#000000"
+                    WlrLayershell.layer: WlrLayer.Overlay
+                    WlrLayershell.namespace: "ambxst:splash-overlay"
+                    exclusionMode: ExclusionMode.Ignore
+
+                    Rectangle {
+                        id: splashBg
+                        anchors.fill: parent
+                        color: "#000000"
+
+                        Image {
+                            id: splashLogo
+                            anchors.centerIn: parent
+                            width: Math.min(parent.width, parent.height) * 0.4
+                            height: width
+                            source: "assets/ambxst/ambxst-logo-color.svg"
+                            fillMode: Image.PreserveAspectFit
+                            asynchronous: true
+                        }
+
+                        // Fade in, hold, fade out
+                        opacity: splashVisible ? 1.0 : 0.0
+                        Behavior on opacity { NumberAnimation { duration: 500 } }
+
+                        property bool splashVisible: false
+
+                        Timer {
+                            interval: 300
+                            running: true
+                            onTriggered: {
+                                splashBg.splashVisible = true
+                            }
+                        }
+
+                        Timer {
+                            interval: 2500
+                            running: true
+                            onTriggered: {
+                                splashBg.splashVisible = false
+                            }
+                        }
+
+                        Timer {
+                            interval: 3200
+                            running: true
+                            onTriggered: {
+                                bootSplash.active = false
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // toggle-metrics bind is in the sourced config (cli.sh) and managed by the config system
 }
diff --git a/version b/version
old mode 100644
new mode 100755