diff --git a/.github/README.md b/.github/README.md
index e759d38ac..cb95945b3 100755
--- a/.github/README.md
+++ b/.github/README.md
@@ -47,19 +47,19 @@ For installation instructions, system requirements, and complete guides, please
 
 <!-- COUNT-STATS:START -->
 
-_Last updated: 2026-05-14T21:32:57.470Z_
+_Last updated: 2026-05-20T18:10:33.759Z_
 
 | Extension | Files | Lines |
 | --- | ---: | ---: |
-| `.php` | 504 | 126,711 |
-| `.tsx` | 355 | 112,571 |
-| `.ts` | 70 | 7,661 |
-| `.yaml` | 3 | 5,940 |
+| `.php` | 518 | 132,170 |
+| `.tsx` | 368 | 118,043 |
+| `.ts` | 77 | 9,333 |
+| `.yaml` | 3 | 5,950 |
 | `.rs` | 16 | 3,395 |
-| `.sql` | 130 | 2,034 |
+| `.sql` | 140 | 2,403 |
 | `.yml` | 18 | 1,877 |
 | `.css` | 7 | 445 |
-| **Total** | 1,103 | 260,634 |
+| **Total** | 1,147 | 273,616 |
 
 <!-- COUNT-STATS:END -->
 
diff --git a/.gitignore b/.gitignore
index 362dd3165..dc22b2f3b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,5 @@ TODO.txt
 .install_mode
 todo.txt
 backend/storage/config/panel_integrity_baseline.json
-build.log
\ No newline at end of file
+build.log
+crack/
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b58f05552..993cadaac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,47 @@
 # Changelog
 
+## v1.3.7.3 STABLE
+
+### Added
+
+- Plugin sidebar priority system by to control the order of the sidebar items. by @nayskutzu
+- Verify button on the admin user edit page to force verify the user's email by @nayskutzu
+- Verification email resend system in case the user didn't receive the email by @nayskutzu
+- Custom server variables system so users can set variables for their servers and also encrypt them. by @nayskutzu
+- GDPR compliance system for user data export by @nayskutzu
+- Per-user timezone preference in account settings, with browser auto-detection on first visit, so all dates and "X ago" labels render in each user's preferred zone. by @nayskutzu
+- Per-server-schedule timezone selector. Each cron schedule now stores its own IANA timezone by @nayskutzu
+- Server archives can now be opened and even viewed in the file manager. by @nayskutzu
+- Trash bin support in the file manager. by @nayskutzu
+- Preview support for archive contents in the file manager. by @nayskutzu
+- Added detailed ban and suspension reason tracking for both servers and users, providing greater clarity for the staff team. by @nayskutzu
+- Added a copyright notice to acknowledge the creators of the panel. by @nayskutzu
+- Introduced a sleek and intuitive server switcher for seamless navigation between servers. by @nayskutzu
+- Mass move servers from a node to another with automatic allocation assignment, selectable servers or move-all, and a per-request batch limit for large fleets. by @nayskutzu
+- Custom sort order for spells within a realm so admins can control display order (e.g. Node.js before Python before Java). by @nayskutzu
+
+### Fixed
+
+- FIFO (First In, First Out) rotation scheme for log file rotation and cleanup. by @nayskutzu
+- Resolved an issue where your avatar would reload 100 times when you type in the chat box. by @nayskutzu
+- Admins with admin.dashboard.view permission can now view the dashboard. by @nayskutzu
+- Fixed an issue where the chatbot would sometimes get stuck in a loop when trying to do stuff. by @nayskutzu
+- Added missing translations to the translations file. by @nayskutzu
+- The default theme from admin was not applied if you didn't lock it. by @nayskutzu
+- Buch of timezone issues were fixed. by @nayskutzu
+- Color issues with vds settings page were fixed. by @nayskutzu
+- Further enhanced the plugin installer for improved performance and reliability. by @nayskutzu
+- Resolved a significant issue that previously prevented searching for allocations within the admin area. by @nayskutzu
+
+### Improved
+
+- Tickets were pretty cramped and didn't look good on big screens. by @nayskutzu
+- Chatbot now supports the ability to get the article content by its ID. by @nayskutzu
+- Chatbot token usage has been cut in half by @nayskutzu
+- Enhanced Minecraft server compatibility and features to fully support the latest release version. by @nayskutzu
+- Added a white (light) mode option for Wings server configuration files, enhancing visibility and user experience in brighter environments. by @nayskutzu
+- Enhanced the console layout for mobile devices, offering a smoother and more intuitive user experience. by @nayskutzu
+
 ## v1.3.7.2 STABLE
 
 ### Fixed
diff --git a/app b/app
index 57b5c3686..2fbc3bcd6 100755
--- a/app
+++ b/app
@@ -48,7 +48,7 @@ define('APP_ADDONS_DIR', APP_STORAGE_DIR . 'addons');
 define('APP_SOURCECODE_DIR', APP_DIR . 'app');
 define('APP_ROUTES_DIR', APP_SOURCECODE_DIR . '/Api');
 define('SYSTEM_KERNEL_NAME', php_uname('s'));
-define('APP_VERSION', 'v1.3.7.2');
+define('APP_VERSION', 'v1.3.7.3');
 define('APP_UPSTREAM', 'stable');
 define('TELEMETRY', true);
 define('IS_CLI', true);
diff --git a/backend/app/App.php b/backend/app/App.php
index 2dc8e9a45..577ef9ae0 100755
--- a/backend/app/App.php
+++ b/backend/app/App.php
@@ -161,11 +161,20 @@ public function __construct(bool $softBoot, bool $isCron = false, bool $isCli =
             return;
         }
 
-        $timezone = $this->getConfig()->getSetting(ConfigInterface::APP_TIMEZONE, 'UTC');
-        if (!@date_default_timezone_set($timezone)) {
-            self::getLogger()->warning("Invalid timezone '$timezone', falling back to UTC.");
-            date_default_timezone_set('UTC');
-        }
+        // Force PHP's default timezone to UTC for the entire request.
+        //
+        // Every datetime that gets persisted to the database is generated from
+        // PHP's `date()`/`DateTime`/`->format(...)` family of helpers, all of
+        // which honour `date_default_timezone_set`. If we leave this on the
+        // admin-configured panel timezone (e.g. Europe/Paris), those helpers
+        // emit local-time literals, MySQL stores them verbatim into DATETIME
+        // columns, and the frontend — which now correctly interprets every API
+        // datetime as UTC — ends up displaying them shifted by the panel
+        // offset (e.g. a row created "now" gets labelled "in 2 hours").
+        //
+        // The `app_timezone` setting is retained as a display fallback in the
+        // frontend, where it belongs. Storage is always UTC.
+        date_default_timezone_set('UTC');
 
         $this->routes = new RouteCollection();
         $this->registerApiRoutes($this->routes);
diff --git a/backend/app/Chat/Allocation.php b/backend/app/Chat/Allocation.php
index 7c5e57462..1f81535f6 100755
--- a/backend/app/Chat/Allocation.php
+++ b/backend/app/Chat/Allocation.php
@@ -215,6 +215,65 @@ public static function getAvailableCount(): int
         return (int) $stmt->fetchColumn();
     }
 
+    /**
+     * Count free (unassigned) allocations on a specific node.
+     */
+    public static function getFreeCountByNodeId(int $nodeId): int
+    {
+        if ($nodeId <= 0) {
+            return 0;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare('SELECT COUNT(*) FROM ' . self::$table . ' WHERE node_id = :node_id AND server_id IS NULL');
+        $stmt->execute(['node_id' => $nodeId]);
+
+        return (int) $stmt->fetchColumn();
+    }
+
+    /**
+     * Pick free allocation IDs on a node for assignment (e.g. server transfers).
+     *
+     * @param array<int> $excludeIds Allocation IDs to skip (already reserved in the same batch)
+     *
+     * @return array<int>
+     */
+    public static function pickFreeAllocationIdsForNode(int $nodeId, int $count, array $excludeIds = []): array
+    {
+        if ($nodeId <= 0 || $count <= 0) {
+            return [];
+        }
+
+        $pdo = Database::getPdoConnection();
+        $sql = 'SELECT id FROM ' . self::$table . ' WHERE node_id = :node_id AND server_id IS NULL';
+        $params = ['node_id' => $nodeId];
+
+        $excludeIds = array_values(array_filter(
+            array_map('intval', $excludeIds),
+            fn (int $id) => $id > 0
+        ));
+
+        if (!empty($excludeIds)) {
+            $placeholders = implode(',', array_fill(0, count($excludeIds), '?'));
+            $sql .= ' AND id NOT IN (' . $placeholders . ')';
+        }
+
+        $sql .= ' ORDER BY ip ASC, port ASC LIMIT ' . (int) $count;
+
+        $stmt = $pdo->prepare($sql);
+        $stmt->bindValue('node_id', $nodeId, \PDO::PARAM_INT);
+
+        $paramIndex = 1;
+        foreach ($excludeIds as $excludeId) {
+            $stmt->bindValue($paramIndex, $excludeId, \PDO::PARAM_INT);
+            ++$paramIndex;
+        }
+
+        $stmt->execute();
+
+        return array_map('intval', $stmt->fetchAll(\PDO::FETCH_COLUMN));
+    }
+
     /**
      * Create a new allocation.
      */
@@ -569,6 +628,135 @@ public static function isUniqueIpPort(int $nodeId, string $ip, int $port, ?int $
         return (int) $stmt->fetchColumn() === 0;
     }
 
+    /**
+     * Count allocations matching a node and IP address.
+     */
+    public static function countByNodeAndIp(int $nodeId, string $ip): int
+    {
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare('SELECT COUNT(*) FROM ' . self::$table . ' WHERE node_id = :node_id AND ip = :ip');
+        $stmt->execute([
+            'node_id' => $nodeId,
+            'ip' => $ip,
+        ]);
+
+        return (int) $stmt->fetchColumn();
+    }
+
+    /**
+     * Update the IP and/or IP alias for every allocation on a node using a specific IP.
+     */
+    public static function updateAddressByNodeAndIp(int $nodeId, string $fromIp, ?string $toIp, mixed $ipAlias, bool $updateAlias): array | false
+    {
+        $set = [];
+        $params = [
+            'node_id' => $nodeId,
+            'from_ip' => $fromIp,
+        ];
+
+        if ($toIp !== null) {
+            $set[] = 'ip = :to_ip';
+            $params['to_ip'] = $toIp;
+        }
+
+        if ($updateAlias) {
+            $set[] = 'ip_alias = :ip_alias';
+            $params['ip_alias'] = $ipAlias;
+        }
+
+        if (empty($set)) {
+            return false;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $deletedTargetConflicts = 0;
+        $deletedSourceConflicts = 0;
+        $assignedConflictCount = 0;
+
+        try {
+            $pdo->beginTransaction();
+
+            if ($toIp !== null && $toIp !== $fromIp) {
+                $conflictStmt = $pdo->prepare('
+                    SELECT
+                        src.id AS source_id,
+                        src.server_id AS source_server_id,
+                        dst.id AS target_id,
+                        dst.server_id AS target_server_id
+                    FROM ' . self::$table . ' src
+                    INNER JOIN ' . self::$table . ' dst
+                        ON dst.node_id = src.node_id
+                        AND dst.ip = :to_ip
+                        AND dst.port = src.port
+                    WHERE src.node_id = :node_id
+                      AND src.ip = :from_ip
+                ');
+                $conflictStmt->execute([
+                    'node_id' => $nodeId,
+                    'from_ip' => $fromIp,
+                    'to_ip' => $toIp,
+                ]);
+                $conflicts = $conflictStmt->fetchAll(\PDO::FETCH_ASSOC);
+
+                $deleteTargetStmt = $pdo->prepare('DELETE FROM ' . self::$table . ' WHERE id = :id AND server_id IS NULL');
+                $deleteSourceStmt = $pdo->prepare('DELETE FROM ' . self::$table . ' WHERE id = :id AND server_id IS NULL');
+                $updateTargetAliasStmt = $pdo->prepare('UPDATE ' . self::$table . ' SET ip_alias = :ip_alias WHERE id = :id');
+
+                foreach ($conflicts as $conflict) {
+                    $sourceAssigned = $conflict['source_server_id'] !== null;
+                    $targetAssigned = $conflict['target_server_id'] !== null;
+
+                    if ($sourceAssigned && $targetAssigned) {
+                        ++$assignedConflictCount;
+                        continue;
+                    }
+
+                    if (!$targetAssigned) {
+                        $deleteTargetStmt->execute(['id' => (int) $conflict['target_id']]);
+                        $deletedTargetConflicts += $deleteTargetStmt->rowCount();
+                    } else {
+                        $deleteSourceStmt->execute(['id' => (int) $conflict['source_id']]);
+                        $deletedSourceConflicts += $deleteSourceStmt->rowCount();
+
+                        if ($updateAlias) {
+                            $updateTargetAliasStmt->execute([
+                                'id' => (int) $conflict['target_id'],
+                                'ip_alias' => $ipAlias,
+                            ]);
+                        }
+                    }
+                }
+
+                if ($assignedConflictCount > 0) {
+                    $pdo->rollBack();
+
+                    return [
+                        'assigned_conflict_count' => $assignedConflictCount,
+                    ];
+                }
+            }
+
+            $stmt = $pdo->prepare('UPDATE ' . self::$table . ' SET ' . implode(', ', $set) . ' WHERE node_id = :node_id AND ip = :from_ip');
+            $stmt->execute($params);
+            $updatedCount = $stmt->rowCount();
+            $pdo->commit();
+
+            return [
+                'updated_count' => $updatedCount,
+                'deleted_target_conflicts' => $deletedTargetConflicts,
+                'deleted_source_conflicts' => $deletedSourceConflicts,
+                'assigned_conflict_count' => 0,
+            ];
+        } catch (\Exception $e) {
+            if ($pdo->inTransaction()) {
+                $pdo->rollBack();
+            }
+            App::getInstance(true)->getLogger()->error('Failed to bulk update allocation address: ' . $e->getMessage());
+
+            return false;
+        }
+    }
+
     /**
      * Get allocation with node information.
      */
diff --git a/backend/app/Chat/ChatConversation.php b/backend/app/Chat/ChatConversation.php
index 279f4f206..68da7b26e 100755
--- a/backend/app/Chat/ChatConversation.php
+++ b/backend/app/Chat/ChatConversation.php
@@ -22,6 +22,7 @@
 class ChatConversation
 {
     private static string $table = 'featherpanel_chatbot_conversations';
+    private static ?array $columns = null;
 
     /**
      * Create a new conversation.
@@ -94,6 +95,10 @@ public static function updateConversation(int $id, array $data): bool
         }
 
         $pdo = Database::getPdoConnection();
+        $data = array_intersect_key($data, array_flip(self::getColumns()));
+        if (empty($data)) {
+            return false;
+        }
         $fields = array_keys($data);
         $set = implode(', ', array_map(fn ($f) => "$f = :$f", $fields));
         $sql = 'UPDATE ' . self::$table . ' SET ' . $set . ' WHERE id = :id';
@@ -144,4 +149,22 @@ public static function deleteUserConversations(string $userUuid): bool
             return false;
         }
     }
+
+    public static function hasColumn(string $column): bool
+    {
+        return in_array($column, self::getColumns(), true);
+    }
+
+    private static function getColumns(): array
+    {
+        if (self::$columns !== null) {
+            return self::$columns;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->query('SHOW COLUMNS FROM ' . self::$table);
+        self::$columns = array_map(static fn (array $column): string => $column['Field'], $stmt->fetchAll(\PDO::FETCH_ASSOC));
+
+        return self::$columns;
+    }
 }
diff --git a/backend/app/Chat/ChatMessage.php b/backend/app/Chat/ChatMessage.php
index 145b54f49..24dd912eb 100755
--- a/backend/app/Chat/ChatMessage.php
+++ b/backend/app/Chat/ChatMessage.php
@@ -22,6 +22,7 @@
 class ChatMessage
 {
     private static string $table = 'featherpanel_chatbot_messages';
+    private static ?array $columns = null;
 
     /**
      * Create a new message.
@@ -32,8 +33,18 @@ class ChatMessage
      */
     public static function createMessage(array $data): int | false
     {
+        foreach (['tool_activity', 'usage_json'] as $jsonField) {
+            if (isset($data[$jsonField]) && is_array($data[$jsonField])) {
+                $data[$jsonField] = json_encode($data[$jsonField]);
+            }
+        }
+
         $pdo = Database::getPdoConnection();
+        $data = array_intersect_key($data, array_flip(self::getColumns()));
         $fields = array_keys($data);
+        if (empty($fields)) {
+            return false;
+        }
         $placeholders = array_map(fn ($f) => ':' . $f, $fields);
         $sql = 'INSERT INTO ' . self::$table . ' (' . implode(',', $fields) . ') VALUES (' . implode(',', $placeholders) . ')';
         $stmt = $pdo->prepare($sql);
@@ -60,7 +71,7 @@ public static function getMessagesByConversation(int $conversationId, int $limit
         $stmt->bindValue(':limit', $limit, \PDO::PARAM_INT);
         $stmt->execute();
 
-        return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+        return array_map([self::class, 'normalizeMessage'], $stmt->fetchAll(\PDO::FETCH_ASSOC));
     }
 
     /**
@@ -92,7 +103,9 @@ public static function getMessageById(int $id): ?array
         $stmt = $pdo->prepare('SELECT * FROM ' . self::$table . ' WHERE id = :id LIMIT 1');
         $stmt->execute(['id' => $id]);
 
-        return $stmt->fetch(\PDO::FETCH_ASSOC) ?: null;
+        $message = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        return $message ? self::normalizeMessage($message) : null;
     }
 
     /**
@@ -115,4 +128,37 @@ public static function deleteMessagesByConversation(int $conversationId): bool
             return false;
         }
     }
+
+    private static function normalizeMessage(array $message): array
+    {
+        foreach (['input_tokens', 'output_tokens', 'total_tokens'] as $field) {
+            if (array_key_exists($field, $message)) {
+                $message[$field] = $message[$field] !== null ? (int) $message[$field] : null;
+            }
+        }
+
+        foreach (['tool_activity', 'usage_json'] as $field) {
+            if (!empty($message[$field]) && is_string($message[$field])) {
+                $decoded = json_decode($message[$field], true);
+                $message[$field] = json_last_error() === JSON_ERROR_NONE ? $decoded : null;
+            } elseif (!array_key_exists($field, $message)) {
+                $message[$field] = null;
+            }
+        }
+
+        return $message;
+    }
+
+    private static function getColumns(): array
+    {
+        if (self::$columns !== null) {
+            return self::$columns;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->query('SHOW COLUMNS FROM ' . self::$table);
+        self::$columns = array_map(static fn (array $column): string => $column['Field'], $stmt->fetchAll(\PDO::FETCH_ASSOC));
+
+        return self::$columns;
+    }
 }
diff --git a/backend/app/Chat/Database.php b/backend/app/Chat/Database.php
index 3a33852cd..704b7f4b5 100755
--- a/backend/app/Chat/Database.php
+++ b/backend/app/Chat/Database.php
@@ -46,6 +46,20 @@ public function __construct($host, $dbName, $username = null, $password = null,
         try {
             $this->pdo = new \PDO($dsn, $username, $password);
             $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+
+            // Force the MySQL session timezone to UTC so that CURRENT_TIMESTAMP / NOW()
+            // and other server-side time functions are deterministic regardless of the
+            // operating system or container default. All datetime columns in the schema
+            // are stored as UTC and converted to the user's preferred timezone at
+            // display time on the frontend.
+            try {
+                $this->pdo->exec("SET time_zone = '+00:00'");
+            } catch (\PDOException $tzException) {
+                // Non-fatal: log and continue. Some constrained MySQL deployments may
+                // not allow SET time_zone; behaviour falls back to the previous (buggy)
+                // semantics in that case rather than refusing to boot.
+                error_log('Failed to set MySQL session timezone to UTC: ' . $tzException->getMessage());
+            }
         } catch (\PDOException $e) {
             throw new \Exception('Connection failed: ' . $e->getMessage());
         }
diff --git a/backend/app/Chat/ServerCustomVariable.php b/backend/app/Chat/ServerCustomVariable.php
new file mode 100644
index 000000000..38050a354
--- /dev/null
+++ b/backend/app/Chat/ServerCustomVariable.php
@@ -0,0 +1,209 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Chat;
+
+use App\App;
+
+/**
+ * ServerCustomVariable service/model for user-managed server environment variables.
+ */
+class ServerCustomVariable
+{
+    private static string $table = 'featherpanel_server_custom_variables';
+
+    private static array $allowedFields = [
+        'server_id',
+        'user_id',
+        'name',
+        'env_variable',
+        'variable_value',
+        'is_encrypted',
+    ];
+
+    public static function createCustomVariable(array $data): int | false
+    {
+        $required = ['server_id', 'user_id', 'name', 'env_variable', 'variable_value'];
+        foreach ($required as $field) {
+            if (!isset($data[$field])) {
+                App::getInstance(true)->getLogger()->error('Missing required field for custom server variable: ' . $field);
+
+                return false;
+            }
+        }
+
+        if (!is_numeric($data['server_id']) || (int) $data['server_id'] <= 0 || !Server::getServerById((int) $data['server_id'])) {
+            return false;
+        }
+
+        if (!is_numeric($data['user_id']) || (int) $data['user_id'] <= 0 || !User::getUserById((int) $data['user_id'])) {
+            return false;
+        }
+
+        $data['name'] = trim((string) $data['name']);
+        $data['env_variable'] = strtoupper(trim((string) $data['env_variable']));
+        $data['variable_value'] = (string) $data['variable_value'];
+        $data['is_encrypted'] = isset($data['is_encrypted']) && filter_var($data['is_encrypted'], FILTER_VALIDATE_BOOLEAN) ? 1 : 0;
+
+        if ($data['name'] === '' || strlen($data['name']) > 191) {
+            return false;
+        }
+
+        if (!self::isValidEnvVariable($data['env_variable']) || strlen($data['env_variable']) > 191) {
+            return false;
+        }
+
+        if (self::envVariableExists((int) $data['server_id'], $data['env_variable'])) {
+            return false;
+        }
+
+        if ((int) $data['is_encrypted'] === 1) {
+            $data['variable_value'] = App::getInstance(true)->encryptValue($data['variable_value']);
+        }
+
+        $filteredData = array_intersect_key($data, array_flip(self::$allowedFields));
+
+        $pdo = Database::getPdoConnection();
+        $fields = array_keys($filteredData);
+        $placeholders = array_map(fn ($f) => ':' . $f, $fields);
+        $sql = 'INSERT INTO ' . self::$table . ' (' . implode(',', $fields) . ') VALUES (' . implode(',', $placeholders) . ')';
+        $stmt = $pdo->prepare($sql);
+
+        if ($stmt->execute($filteredData)) {
+            return (int) $pdo->lastInsertId();
+        }
+
+        return false;
+    }
+
+    public static function getCustomVariableById(int $id, bool $revealEncrypted = false): ?array
+    {
+        if ($id <= 0) {
+            return null;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare('SELECT * FROM ' . self::$table . ' WHERE id = :id LIMIT 1');
+        $stmt->execute(['id' => $id]);
+
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC) ?: null;
+
+        return $row ? self::prepareForOutput($row, $revealEncrypted) : null;
+    }
+
+    public static function getCustomVariablesByServerId(int $serverId, bool $revealEncrypted = false): array
+    {
+        if ($serverId <= 0) {
+            return [];
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare('SELECT * FROM ' . self::$table . ' WHERE server_id = :server_id ORDER BY id ASC');
+        $stmt->execute(['server_id' => $serverId]);
+
+        return array_map(
+            fn (array $row) => self::prepareForOutput($row, $revealEncrypted),
+            $stmt->fetchAll(\PDO::FETCH_ASSOC)
+        );
+    }
+
+    public static function getEnvironmentVariablesByServerId(int $serverId): array
+    {
+        $variables = [];
+        foreach (self::getCustomVariablesByServerId($serverId, true) as $variable) {
+            $variables[$variable['env_variable']] = $variable['variable_value'];
+        }
+
+        return $variables;
+    }
+
+    public static function deleteCustomVariableForServer(int $id, int $serverId): bool
+    {
+        if ($id <= 0 || $serverId <= 0) {
+            return false;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare('DELETE FROM ' . self::$table . ' WHERE id = :id AND server_id = :server_id');
+        $stmt->execute([
+            'id' => $id,
+            'server_id' => $serverId,
+        ]);
+
+        return $stmt->rowCount() > 0;
+    }
+
+    public static function envVariableExists(int $serverId, string $envVariable): bool
+    {
+        if ($serverId <= 0 || trim($envVariable) === '') {
+            return false;
+        }
+
+        $envVariable = strtoupper(trim($envVariable));
+        $server = Server::getServerById($serverId);
+        if (!$server) {
+            return false;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare('SELECT COUNT(*) FROM ' . self::$table . ' WHERE server_id = :server_id AND env_variable = :env_variable');
+        $stmt->execute([
+            'server_id' => $serverId,
+            'env_variable' => $envVariable,
+        ]);
+
+        if ((int) $stmt->fetchColumn() > 0) {
+            return true;
+        }
+
+        $stmt = $pdo->prepare('SELECT COUNT(*) FROM featherpanel_spell_variables WHERE spell_id = :spell_id AND env_variable = :env_variable');
+        $stmt->execute([
+            'spell_id' => (int) $server['spell_id'],
+            'env_variable' => $envVariable,
+        ]);
+
+        return (int) $stmt->fetchColumn() > 0;
+    }
+
+    public static function isValidEnvVariable(string $envVariable): bool
+    {
+        return preg_match('/^[A-Z_][A-Z0-9_]*$/', $envVariable) === 1;
+    }
+
+    private static function prepareForOutput(array $row, bool $revealEncrypted): array
+    {
+        $row['is_encrypted'] = (int) ($row['is_encrypted'] ?? 0);
+        if ($row['is_encrypted'] !== 1) {
+            return $row;
+        }
+
+        if ($revealEncrypted) {
+            try {
+                $row['variable_value'] = App::getInstance(true)->decryptValue((string) $row['variable_value']);
+            } catch (\Throwable $e) {
+                App::getInstance(true)->getLogger()->error('Failed to decrypt custom server variable: ' . $e->getMessage());
+                $row['variable_value'] = '';
+            }
+
+            return $row;
+        }
+
+        $row['variable_value'] = '********';
+
+        return $row;
+    }
+}
diff --git a/backend/app/Chat/ServerSchedule.php b/backend/app/Chat/ServerSchedule.php
index e8f972525..2e4e7af3c 100755
--- a/backend/app/Chat/ServerSchedule.php
+++ b/backend/app/Chat/ServerSchedule.php
@@ -209,13 +209,16 @@ public static function resetStuckProcessing(int $stuckAfterMinutes = 15): int
 
     /**
      * Get schedules that are due to run.
-     * Uses PHP's current time (app timezone) for comparison so timezone matches
-     * the one used when calculating next_run_at, avoiding instant execution.
+     *
+     * Comparison is done in UTC: PHP's `date()` is pinned to UTC by App.php
+     * and `next_run_at` is persisted as a UTC literal by
+     * {@see calculateNextRunTime()}, so this query is timezone-deterministic
+     * regardless of the schedule's authoring zone.
      */
     public static function getDueSchedules(): array
     {
         $pdo = Database::getPdoConnection();
-        $now = date('Y-m-d H:i:s');
+        $now = gmdate('Y-m-d H:i:s');
         $stmt = $pdo->prepare('SELECT * FROM ' . self::$table . ' WHERE is_active = 1 AND next_run_at <= :now AND is_processing = 0');
         $stmt->bindValue(':now', $now, \PDO::PARAM_STR);
         $stmt->execute();
@@ -542,26 +545,37 @@ public static function validateCronExpression(string $dayOfWeek, string $month,
     }
 
     /**
-     * Calculate next run time based on cron expression.
+     * Calculate next run time based on cron expression, evaluated in the
+     * caller-supplied timezone, returned as a literal UTC `Y-m-d H:i:s` string
+     * suitable for storing in a `TIMESTAMP next_run_at` column.
+     *
+     * The cron expression is interpreted in `$timezone` (e.g. "Europe/Paris"),
+     * so "0 3 * * *" means 03:00 local for the schedule owner — not 03:00 UTC.
+     * The returned literal is in UTC so that the database comparison
+     * `next_run_at <= UTC_TIMESTAMP()` in `getDueSchedules()` is sound
+     * regardless of which zone the schedule was authored in.
      *
      * @param string $dayOfWeek Cron expression day of week component
      * @param string $month Cron expression month component
      * @param string $dayOfMonth Cron expression day of month component
      * @param string $hour Cron expression hour component
      * @param string $minute Cron expression minute component
-     * @param string|null $referenceTime Optional reference time (e.g. current next_run_at) to maintain cadence
+     * @param string|null $referenceTime Optional reference time (UTC literal) to maintain cadence
+     * @param string $timezone IANA timezone name the cron expression is authored in (default: UTC)
      */
-    public static function calculateNextRunTime(string $dayOfWeek, string $month, string $dayOfMonth, string $hour, string $minute, ?string $referenceTime = null): string
+    public static function calculateNextRunTime(string $dayOfWeek, string $month, string $dayOfMonth, string $hour, string $minute, ?string $referenceTime = null, string $timezone = 'UTC'): string
     {
         $expression = self::formatCronExpression($dayOfWeek, $month, $dayOfMonth, $hour, $minute);
+        $tz = self::resolveTimezone($timezone);
+        $utc = new \DateTimeZone('UTC');
 
         if (class_exists(CrontabSchedule::class)) {
             try {
                 $schedule = new CrontabSchedule($expression);
                 if (method_exists($schedule, 'getNextRunDate')) {
-                    $base = self::resolveBaseDateTime($referenceTime);
+                    $base = self::resolveBaseDateTime($referenceTime, $tz);
                     $nextRun = $schedule->getNextRunDate($base, 0, false);
-                    $now = new \DateTime();
+                    $now = new \DateTime('now', $tz);
 
                     // Ensure next run is strictly in the future to avoid schedules running instantly
                     if ($nextRun <= $now) {
@@ -569,14 +583,48 @@ public static function calculateNextRunTime(string $dayOfWeek, string $month, st
                         $nextRun = $schedule->getNextRunDate($nextRun, 0, false);
                     }
 
-                    return $nextRun->format('Y-m-d H:i:s');
+                    // Persist as UTC literal so DB comparisons stay deterministic.
+                    return $nextRun->setTimezone($utc)->format('Y-m-d H:i:s');
                 }
             } catch (\Throwable $e) {
                 App::getInstance(true)->getLogger()->error('Failed to calculate next run time for expression ' . $expression . ': ' . $e->getMessage());
             }
         }
 
-        return self::calculateNextRunTimeFallback($dayOfWeek, $month, $dayOfMonth, $hour, $minute, $referenceTime);
+        return self::calculateNextRunTimeFallback($dayOfWeek, $month, $dayOfMonth, $hour, $minute, $referenceTime, $timezone);
+    }
+
+    /**
+     * Resolve a user-supplied timezone string into a DateTimeZone, falling
+     * back to UTC if the identifier is invalid.
+     */
+    public static function resolveTimezone(?string $timezone): \DateTimeZone
+    {
+        if ($timezone === null || $timezone === '') {
+            return new \DateTimeZone('UTC');
+        }
+        try {
+            return new \DateTimeZone($timezone);
+        } catch (\Throwable $e) {
+            return new \DateTimeZone('UTC');
+        }
+    }
+
+    /**
+     * Check that a timezone identifier is a valid IANA name supported by PHP.
+     */
+    public static function isValidTimezone(?string $timezone): bool
+    {
+        if (!is_string($timezone) || $timezone === '') {
+            return false;
+        }
+        try {
+            new \DateTimeZone($timezone);
+
+            return true;
+        } catch (\Throwable $e) {
+            return false;
+        }
     }
 
     /**
@@ -588,16 +636,21 @@ private static function formatCronExpression(string $dayOfWeek, string $month, s
     }
 
     /**
-     * Resolve base date time for cron calculation using the greater of now or reference time.
+     * Resolve base date time for cron calculation using the greater of now or reference time,
+     * evaluated in the schedule's authoring timezone.
+     *
+     * The reference time argument is expected to be a UTC `Y-m-d H:i:s` literal
+     * (the format we persist `next_run_at` in), so it is parsed as UTC before
+     * being shifted into the schedule's zone for comparison.
      */
-    private static function resolveBaseDateTime(?string $referenceTime = null): \DateTime
+    private static function resolveBaseDateTime(?string $referenceTime, \DateTimeZone $tz): \DateTime
     {
-        $currentTime = new \DateTime();
-        $base = clone $currentTime;
+        $base = new \DateTime('now', $tz);
 
         if ($referenceTime !== null) {
             try {
-                $reference = new \DateTime($referenceTime);
+                $reference = new \DateTime($referenceTime, new \DateTimeZone('UTC'));
+                $reference->setTimezone($tz);
                 if ($reference > $base) {
                     $base = $reference;
                 }
@@ -614,14 +667,18 @@ private static function resolveBaseDateTime(?string $referenceTime = null): \Dat
     /**
      * Fallback calculation when external cron library is unavailable.
      */
-    private static function calculateNextRunTimeFallback(string $dayOfWeek, string $month, string $dayOfMonth, string $hour, string $minute, ?string $referenceTime = null): string
+    private static function calculateNextRunTimeFallback(string $dayOfWeek, string $month, string $dayOfMonth, string $hour, string $minute, ?string $referenceTime = null, string $timezone = 'UTC'): string
     {
-        $currentTime = new \DateTime();
+        $tz = self::resolveTimezone($timezone);
+        $utc = new \DateTimeZone('UTC');
+
+        $currentTime = new \DateTime('now', $tz);
         $searchStart = clone $currentTime;
 
         if ($referenceTime !== null) {
             try {
-                $reference = new \DateTime($referenceTime);
+                $reference = new \DateTime($referenceTime, $utc);
+                $reference->setTimezone($tz);
                 if ($reference > $searchStart) {
                     $searchStart = $reference;
                 }
@@ -658,7 +715,7 @@ private static function calculateNextRunTimeFallback(string $dayOfWeek, string $
             $nextRun->add(new \DateInterval('P1D'));
         }
 
-        return $nextRun->format('Y-m-d H:i:s');
+        return $nextRun->setTimezone($utc)->format('Y-m-d H:i:s');
     }
 
     /**
diff --git a/backend/app/Chat/Spell.php b/backend/app/Chat/Spell.php
index 8d1efb93c..30bc1c1cc 100755
--- a/backend/app/Chat/Spell.php
+++ b/backend/app/Chat/Spell.php
@@ -123,6 +123,10 @@ public static function createSpell(array $data): int | false
         // Handle optional ID for migrations
         $hasId = isset($data['id']) && is_int($data['id']) && $data['id'] > 0;
 
+        if (!isset($data['sort_order'])) {
+            $data['sort_order'] = self::getNextSortOrderForRealm((int) $data['realm_id']);
+        }
+
         $pdo = Database::getPdoConnection();
         $fields = array_keys($data);
         $placeholders = array_map(fn ($f) => ':' . $f, $fields);
@@ -177,7 +181,7 @@ public static function getSpellsByRealmId(int $realmId): array
             return [];
         }
         $pdo = Database::getPdoConnection();
-        $stmt = $pdo->prepare('SELECT * FROM ' . self::$table . ' WHERE realm_id = :realm_id ORDER BY name ASC');
+        $stmt = $pdo->prepare('SELECT * FROM ' . self::$table . ' WHERE realm_id = :realm_id ORDER BY sort_order ASC, name ASC');
         $stmt->execute(['realm_id' => $realmId]);
 
         return $stmt->fetchAll(\PDO::FETCH_ASSOC);
@@ -191,13 +195,31 @@ public static function getAllSpells(): array
         $pdo = Database::getPdoConnection();
         $sql = 'SELECT * FROM ' . self::$table;
 
-        $sql .= ' ORDER BY name ASC';
+        $sql .= ' ORDER BY realm_id ASC, sort_order ASC, name ASC';
         $stmt = $pdo->prepare($sql);
         $stmt->execute();
 
         return $stmt->fetchAll(\PDO::FETCH_ASSOC);
     }
 
+    /**
+     * Next sort_order value for a new spell in a realm.
+     */
+    public static function getNextSortOrderForRealm(int $realmId): int
+    {
+        if ($realmId <= 0) {
+            return 0;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare(
+            'SELECT COALESCE(MAX(sort_order), -10) + 10 FROM ' . self::$table . ' WHERE realm_id = :realm_id'
+        );
+        $stmt->execute(['realm_id' => $realmId]);
+
+        return (int) $stmt->fetchColumn();
+    }
+
     /**
      * Search spells with pagination and filtering.
      */
@@ -206,7 +228,7 @@ public static function searchSpells(
         int $limit = 10,
         string $search = '',
         array $fields = [],
-        string $sortBy = 'name',
+        string $sortBy = 'sort_order',
         string $sortOrder = 'ASC',
         ?int $realmId = null,
     ): array {
@@ -228,7 +250,16 @@ public static function searchSpells(
             $params['realm_id'] = $realmId;
         }
 
+        $allowedSort = ['sort_order', 'name', 'created_at', 'id'];
+        if (!in_array($sortBy, $allowedSort, true)) {
+            $sortBy = 'sort_order';
+        }
+        $sortOrder = strtoupper($sortOrder) === 'DESC' ? 'DESC' : 'ASC';
+
         $sql .= ' ORDER BY s.' . $sortBy . ' ' . $sortOrder;
+        if ($sortBy !== 'name') {
+            $sql .= ', s.name ASC';
+        }
         $sql .= ' LIMIT :limit OFFSET :offset';
 
         $stmt = $pdo->prepare($sql);
@@ -495,13 +526,70 @@ public static function getAllSpellsWithRealm(): array
             SELECT s.*, r.name as realm_name, r.description as realm_description 
             FROM ' . self::$table . ' s 
             LEFT JOIN featherpanel_realms r ON s.realm_id = r.id 
-            ORDER BY s.name ASC
+            ORDER BY s.sort_order ASC, s.name ASC
         ');
         $stmt->execute();
 
         return $stmt->fetchAll(\PDO::FETCH_ASSOC);
     }
 
+    /**
+     * Update sort order for multiple spells (batch reorder within a realm).
+     *
+     * @param array $spells Array of ['id' => int, 'sort_order' => int]
+     * @param int|null $realmId When set, every spell must belong to this realm
+     */
+    public static function updateSortOrders(array $spells, ?int $realmId = null): bool
+    {
+        if (empty($spells)) {
+            return false;
+        }
+
+        $pdo = Database::getPdoConnection();
+
+        try {
+            $pdo->beginTransaction();
+
+            $stmt = $pdo->prepare('UPDATE ' . self::$table . ' SET sort_order = :sort_order WHERE id = :id');
+
+            foreach ($spells as $spell) {
+                if (!isset($spell['id']) || !isset($spell['sort_order'])) {
+                    continue;
+                }
+
+                $id = (int) $spell['id'];
+                $sortOrder = (int) $spell['sort_order'];
+
+                if ($id <= 0) {
+                    continue;
+                }
+
+                if ($realmId !== null) {
+                    $row = self::getSpellById($id);
+                    if (!$row || (int) $row['realm_id'] !== $realmId) {
+                        $pdo->rollBack();
+
+                        return false;
+                    }
+                }
+
+                $stmt->execute([
+                    'id' => $id,
+                    'sort_order' => $sortOrder,
+                ]);
+            }
+
+            $pdo->commit();
+
+            return true;
+        } catch (\PDOException $e) {
+            $pdo->rollBack();
+            App::getInstance(true)->getLogger()->error('Failed to update spell sort orders: ' . $e->getMessage());
+
+            return false;
+        }
+    }
+
     public static function count(array $conditions): int
     {
         $pdo = Database::getPdoConnection();
diff --git a/backend/app/Chat/User.php b/backend/app/Chat/User.php
index da92076fb..5199188f9 100755
--- a/backend/app/Chat/User.php
+++ b/backend/app/Chat/User.php
@@ -84,7 +84,23 @@ public static function createUser(array $data, bool $skipEmailValidation = false
         $insert['remember_token'] = $data['remember_token'] ?? self::generateAccountToken();
 
         // Add optional fields if provided
-        $optionalFields = ['role_id', 'avatar', 'first_ip', 'last_ip', 'banned', 'two_fa_enabled', 'two_fa_key', 'external_id', 'ticket_signature', 'oidc_provider', 'oidc_subject', 'oidc_email', 'mail_verify'];
+        $optionalFields = [
+            'role_id',
+            'avatar',
+            'first_ip',
+            'last_ip',
+            'banned',
+            'two_fa_enabled',
+            'two_fa_key',
+            'external_id',
+            'ticket_signature',
+            'oidc_provider',
+            'oidc_subject',
+            'oidc_email',
+            'ldap_provider_uuid',
+            'ldap_dn',
+            'mail_verify',
+        ];
         foreach ($optionalFields as $field) {
             if (isset($data[$field])) {
                 $insert[$field] = $data[$field];
diff --git a/backend/app/Chat/UserDataExport.php b/backend/app/Chat/UserDataExport.php
new file mode 100644
index 000000000..becbe5e56
--- /dev/null
+++ b/backend/app/Chat/UserDataExport.php
@@ -0,0 +1,276 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Chat;
+
+use App\App;
+
+/**
+ * UserDataExport service/model for queued personal data exports.
+ */
+class UserDataExport
+{
+    private static string $table = 'featherpanel_user_data_exports';
+
+    /**
+     * Create a pending export request.
+     */
+    public static function create(array $data): int | false
+    {
+        $required = ['uuid', 'user_uuid', 'ticket_id'];
+        foreach ($required as $field) {
+            if (!isset($data[$field]) || (is_string($data[$field]) && trim($data[$field]) === '')) {
+                App::getInstance(true)->getLogger()->error("Missing required field: $field");
+
+                return false;
+            }
+        }
+
+        if (!preg_match('/^[a-f0-9\-]{36}$/i', (string) $data['uuid'])) {
+            App::getInstance(true)->getLogger()->error('Invalid data export UUID: ' . $data['uuid']);
+
+            return false;
+        }
+
+        if (!preg_match('/^[a-f0-9\-]{36}$/i', (string) $data['user_uuid'])) {
+            App::getInstance(true)->getLogger()->error('Invalid user UUID for data export: ' . $data['user_uuid']);
+
+            return false;
+        }
+
+        if (!Ticket::getById((int) $data['ticket_id'])) {
+            App::getInstance(true)->getLogger()->error('Invalid ticket ID for data export: ' . $data['ticket_id']);
+
+            return false;
+        }
+
+        $insert = [
+            'uuid' => $data['uuid'],
+            'user_uuid' => $data['user_uuid'],
+            'ticket_id' => (int) $data['ticket_id'],
+            'status' => $data['status'] ?? 'pending',
+        ];
+
+        $pdo = Database::getPdoConnection();
+        $fields = array_keys($insert);
+        $fieldList = '`' . implode('`, `', $fields) . '`';
+        $placeholders = ':' . implode(', :', $fields);
+        $stmt = $pdo->prepare('INSERT INTO ' . self::$table . ' (' . $fieldList . ') VALUES (' . $placeholders . ')');
+
+        if ($stmt->execute($insert)) {
+            return (int) $pdo->lastInsertId();
+        }
+
+        return false;
+    }
+
+    /**
+     * Generate a cryptographically secure version 4 UUID.
+     */
+    public static function generateUuid(): string
+    {
+        $bytes = random_bytes(16);
+        $bytes[6] = chr(ord($bytes[6]) & 0x0F | 0x40);
+        $bytes[8] = chr(ord($bytes[8]) & 0x3F | 0x80);
+        $hex = bin2hex($bytes);
+
+        return sprintf(
+            '%s-%s-%s-%s-%s',
+            substr($hex, 0, 8),
+            substr($hex, 8, 4),
+            substr($hex, 12, 4),
+            substr($hex, 16, 4),
+            substr($hex, 20, 12)
+        );
+    }
+
+    /**
+     * Get an export request by ID.
+     */
+    public static function getById(int $id): ?array
+    {
+        if ($id <= 0) {
+            return null;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare('SELECT * FROM ' . self::$table . ' WHERE id = :id LIMIT 1');
+        $stmt->execute(['id' => $id]);
+
+        return $stmt->fetch(\PDO::FETCH_ASSOC) ?: null;
+    }
+
+    /**
+     * Check whether a user already requested an export in the cooldown window.
+     */
+    public static function hasRecentRequestForUser(string $userUuid, int $hours = 24): bool
+    {
+        if (!preg_match('/^[a-f0-9\-]{36}$/i', $userUuid) || $hours < 1) {
+            return false;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare(
+            'SELECT COUNT(*) FROM ' . self::$table . '
+             WHERE user_uuid = :user_uuid
+               AND requested_at >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL :hours HOUR)'
+        );
+        $stmt->bindValue('user_uuid', $userUuid);
+        $stmt->bindValue('hours', $hours, \PDO::PARAM_INT);
+        $stmt->execute();
+
+        return (int) $stmt->fetchColumn() > 0;
+    }
+
+    /**
+     * Atomically claim the next pending or retryable failed export.
+     */
+    public static function claimNextPending(int $maxAttempts = 3): ?array
+    {
+        $pdo = Database::getPdoConnection();
+        $pdo->beginTransaction();
+
+        try {
+            $stmt = $pdo->prepare(
+                'SELECT * FROM ' . self::$table . '
+                 WHERE (status = "pending" OR (status = "failed" AND attempts < :max_attempts))
+                 ORDER BY requested_at ASC, id ASC
+                 LIMIT 1
+                 FOR UPDATE'
+            );
+            $stmt->bindValue('max_attempts', $maxAttempts, \PDO::PARAM_INT);
+            $stmt->execute();
+            $export = $stmt->fetch(\PDO::FETCH_ASSOC) ?: null;
+
+            if ($export === null) {
+                $pdo->commit();
+
+                return null;
+            }
+
+            $update = $pdo->prepare(
+                'UPDATE ' . self::$table . '
+                 SET status = "processing",
+                     attempts = attempts + 1,
+                     processing_started_at = UTC_TIMESTAMP(),
+                     error_message = NULL
+                 WHERE id = :id'
+            );
+            $update->execute(['id' => (int) $export['id']]);
+
+            $pdo->commit();
+
+            return self::getById((int) $export['id']);
+        } catch (\Throwable $e) {
+            if ($pdo->inTransaction()) {
+                $pdo->rollBack();
+            }
+
+            App::getInstance(true)->getLogger()->error('Failed to claim user data export: ' . $e->getMessage());
+
+            return null;
+        }
+    }
+
+    /**
+     * Mark an export as completed.
+     */
+    public static function markCompleted(int $id, string $filePath): bool
+    {
+        if ($id <= 0 || trim($filePath) === '') {
+            return false;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare(
+            'UPDATE ' . self::$table . '
+             SET status = "completed",
+                 file_path = :file_path,
+                 error_message = NULL,
+                 processed_at = UTC_TIMESTAMP()
+             WHERE id = :id'
+        );
+
+        return $stmt->execute([
+            'id' => $id,
+            'file_path' => $filePath,
+        ]);
+    }
+
+    /**
+     * Mark an export as failed.
+     */
+    public static function markFailed(int $id, string $errorMessage): bool
+    {
+        if ($id <= 0) {
+            return false;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare(
+            'UPDATE ' . self::$table . '
+             SET status = "failed",
+                 error_message = :error_message,
+                 processed_at = UTC_TIMESTAMP()
+             WHERE id = :id'
+        );
+
+        return $stmt->execute([
+            'id' => $id,
+            'error_message' => substr($errorMessage, 0, 2000),
+        ]);
+    }
+
+    /**
+     * Get completed or failed exports that are past their retention window.
+     */
+    public static function getExpiredForCleanup(int $hours = 24, int $limit = 25): array
+    {
+        if ($hours < 1 || $limit < 1) {
+            return [];
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare(
+            'SELECT * FROM ' . self::$table . '
+             WHERE status IN ("completed", "failed")
+               AND COALESCE(processed_at, requested_at) < DATE_SUB(UTC_TIMESTAMP(), INTERVAL :hours HOUR)
+             ORDER BY COALESCE(processed_at, requested_at) ASC, id ASC
+             LIMIT :limit'
+        );
+        $stmt->bindValue('hours', $hours, \PDO::PARAM_INT);
+        $stmt->bindValue('limit', $limit, \PDO::PARAM_INT);
+        $stmt->execute();
+
+        return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+    }
+
+    /**
+     * Delete an export queue row.
+     */
+    public static function deleteById(int $id): bool
+    {
+        if ($id <= 0) {
+            return false;
+        }
+
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare('DELETE FROM ' . self::$table . ' WHERE id = :id');
+
+        return $stmt->execute(['id' => $id]);
+    }
+}
diff --git a/backend/app/Chat/VmInstance.php b/backend/app/Chat/VmInstance.php
index 634879377..a3fc1f9c1 100644
--- a/backend/app/Chat/VmInstance.php
+++ b/backend/app/Chat/VmInstance.php
@@ -335,7 +335,7 @@ public static function create(array $data, ?\PDO $pdo = null): ?array
      */
     public static function update(int $id, array $data): bool
     {
-        $allowed = ['hostname', 'notes', 'user_uuid', 'vm_ip_id', 'memory', 'cpus', 'cores', 'disk_gb', 'on_boot', 'suspended', 'backup_limit', 'backup_retention_mode'];
+        $allowed = ['hostname', 'notes', 'user_uuid', 'vm_ip_id', 'memory', 'cpus', 'cores', 'disk_gb', 'on_boot', 'suspended', 'suspension_reason', 'suspended_at', 'suspended_by_uuid', 'backup_limit', 'backup_retention_mode'];
         $updates = [];
         $params = ['id' => $id];
 
@@ -418,6 +418,18 @@ public static function update(int $id, array $data): bool
             if ($key === 'suspended') {
                 $updates[] = 'suspended = :suspended';
                 $params['suspended'] = (int) (bool) $data['suspended'];
+
+                continue;
+            }
+            if ($key === 'suspension_reason' || $key === 'suspended_by_uuid') {
+                $updates[] = $key . ' = :' . $key;
+                $params[$key] = $data[$key] === null ? null : (is_string($data[$key]) ? trim($data[$key]) : $data[$key]);
+
+                continue;
+            }
+            if ($key === 'suspended_at') {
+                $updates[] = 'suspended_at = :suspended_at';
+                $params['suspended_at'] = $data['suspended_at'] === null ? null : $data['suspended_at'];
             }
         }
 
diff --git a/backend/app/Config/ConfigInterface.php b/backend/app/Config/ConfigInterface.php
index 275af30c2..70874bf87 100755
--- a/backend/app/Config/ConfigInterface.php
+++ b/backend/app/Config/ConfigInterface.php
@@ -47,6 +47,8 @@ interface ConfigInterface
     public const APP_THEME_LOCK = 'app_theme_lock';
     public const APP_BACKGROUND_TYPE_DEFAULT = 'app_background_type_default';
     public const APP_BACKGROUND_TYPE_LOCK = 'app_background_type_lock';
+    /** When false, hide FeatherPanel "powered by" branding across the panel (typically via White Label addon). */
+    public const BRANDING_SHOW_POWERED_BY = 'branding_show_powered_by';
     public const APP_BACKDROP_BLUR_DEFAULT = 'app_backdrop_blur_default';
     public const APP_BACKDROP_BLUR_LOCK = 'app_backdrop_blur_lock';
     public const APP_BACKDROP_DARKEN_DEFAULT = 'app_backdrop_darken_default';
@@ -202,6 +204,15 @@ interface ConfigInterface
     /** When false, lifecycle hook UI and execution are disabled (default off until enabled by an administrator). */
     public const SERVER_LIFECYCLE_HOOKS_ENABLED = 'server_lifecycle_hooks_enabled';
 
+    /**
+     * File trash bin (soft-delete via FeatherWings).
+     */
+    public const FILE_TRASH_ENABLED = 'file_trash_enabled';
+    /** Maximum total size of trashed files per server, in megabytes (0 = unlimited). */
+    public const FILE_TRASH_MAX_SIZE_MB = 'file_trash_max_size_mb';
+    /** Automatically purge trashed files older than this many days (0 = never by age). */
+    public const FILE_TRASH_RETENTION_DAYS = 'file_trash_retention_days';
+
     /**
      * User Related Configs.
      */
diff --git a/backend/app/Config/PublicConfig.php b/backend/app/Config/PublicConfig.php
index b033f78a6..8a8c1fb4f 100755
--- a/backend/app/Config/PublicConfig.php
+++ b/backend/app/Config/PublicConfig.php
@@ -66,6 +66,9 @@ public static function getPublicSettingsWithDefaults(): array
             // background type: aurora, gradient, solid, image, pattern
             ConfigInterface::APP_BACKGROUND_TYPE_DEFAULT => 'pattern',
             ConfigInterface::APP_BACKGROUND_TYPE_LOCK => 'false',
+
+            ConfigInterface::BRANDING_SHOW_POWERED_BY => 'true',
+
             // backdrop blur/darken and image fit defaults + locks
             ConfigInterface::APP_BACKDROP_BLUR_DEFAULT => '0',
             ConfigInterface::APP_BACKDROP_BLUR_LOCK => 'false',
@@ -163,6 +166,9 @@ public static function getPublicSettingsWithDefaults(): array
             ConfigInterface::SERVER_ALLOW_USER_MADE_FASTDL => 'false',
             ConfigInterface::SERVER_ALLOW_USER_MADE_SUBDOMAINS => 'false',
             ConfigInterface::SERVER_HIDE_IPS => 'false',
+            ConfigInterface::FILE_TRASH_ENABLED => 'false',
+            ConfigInterface::FILE_TRASH_MAX_SIZE_MB => '512',
+            ConfigInterface::FILE_TRASH_RETENTION_DAYS => '30',
 
             // User related settings
             ConfigInterface::USER_ALLOW_AVATAR_CHANGE => 'true',
diff --git a/backend/app/Controllers/Admin/AllocationsController.php b/backend/app/Controllers/Admin/AllocationsController.php
index 2345ea193..e953c7656 100755
--- a/backend/app/Controllers/Admin/AllocationsController.php
+++ b/backend/app/Controllers/Admin/AllocationsController.php
@@ -908,6 +908,167 @@ public function getAvailable(Request $request): Response
         ], 'Available allocations fetched successfully', 200);
     }
 
+    #[OA\Patch(
+        path: '/api/admin/allocations/bulk-address',
+        summary: 'Bulk update allocation IP or alias',
+        description: 'Update the IP address and/or IP alias for every allocation on a node that currently uses a specific IP address.',
+        tags: ['Admin - Allocations'],
+        requestBody: new OA\RequestBody(
+            required: true,
+            content: new OA\JsonContent(
+                required: ['node_id', 'from_ip'],
+                properties: [
+                    new OA\Property(property: 'node_id', type: 'integer', description: 'Node ID containing the allocations', minimum: 1),
+                    new OA\Property(property: 'from_ip', type: 'string', description: 'Current allocation IP address', example: '0.0.0.0'),
+                    new OA\Property(property: 'to_ip', type: 'string', nullable: true, description: 'New allocation IP address', example: '6.6.6.6'),
+                    new OA\Property(property: 'ip_alias', type: 'string', nullable: true, description: 'New IP alias. Send null or an empty string to clear it.'),
+                ]
+            )
+        ),
+        responses: [
+            new OA\Response(response: 200, description: 'Allocations updated successfully'),
+            new OA\Response(response: 400, description: 'Bad request - Invalid data'),
+            new OA\Response(response: 401, description: 'Unauthorized'),
+            new OA\Response(response: 403, description: 'Forbidden - Insufficient permissions'),
+            new OA\Response(response: 404, description: 'Node or matching allocations not found'),
+            new OA\Response(response: 409, description: 'Target IP has ports already assigned to another server'),
+        ]
+    )]
+    public function bulkUpdateAddress(Request $request): Response
+    {
+        $admin = $request->attributes->get('user');
+        $data = json_decode($request->getContent(), true);
+
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            return ApiResponse::error('Invalid JSON in request body', 'INVALID_JSON', 400);
+        }
+
+        if (!is_array($data)) {
+            return ApiResponse::error('Request body must be a JSON object', 'INVALID_JSON_OBJECT', 400);
+        }
+
+        $allowedFields = ['node_id', 'from_ip', 'to_ip', 'ip_alias'];
+        $invalidFields = array_diff(array_keys($data), $allowedFields);
+        if (!empty($invalidFields)) {
+            return ApiResponse::error(
+                'Invalid fields provided: ' . implode(', ', $invalidFields) . '. Allowed fields: ' . implode(', ', $allowedFields),
+                'INVALID_FIELDS',
+                400
+            );
+        }
+
+        $missingFields = [];
+        foreach (['node_id', 'from_ip'] as $field) {
+            if (!isset($data[$field]) || trim((string) $data[$field]) === '') {
+                $missingFields[] = $field;
+            }
+        }
+
+        if (!empty($missingFields)) {
+            return ApiResponse::error('Missing required fields: ' . implode(', ', $missingFields), 'MISSING_REQUIRED_FIELDS', 400);
+        }
+
+        if (!is_numeric($data['node_id']) || (int) $data['node_id'] <= 0) {
+            return ApiResponse::error('Node ID must be a positive number', 'INVALID_NODE_ID', 400);
+        }
+
+        $nodeId = (int) $data['node_id'];
+        if (!Node::getNodeById($nodeId)) {
+            return ApiResponse::error('Node not found', 'NODE_NOT_FOUND', 404);
+        }
+
+        $fromIp = trim((string) $data['from_ip']);
+        if (!filter_var($fromIp, FILTER_VALIDATE_IP)) {
+            return ApiResponse::error('Invalid source IP address format', 'INVALID_FROM_IP_FORMAT', 400);
+        }
+
+        $toIp = null;
+        if (array_key_exists('to_ip', $data) && trim((string) $data['to_ip']) !== '') {
+            $toIp = trim((string) $data['to_ip']);
+            if (!filter_var($toIp, FILTER_VALIDATE_IP)) {
+                return ApiResponse::error('Invalid target IP address format', 'INVALID_TO_IP_FORMAT', 400);
+            }
+        }
+
+        $updateAlias = array_key_exists('ip_alias', $data);
+        $ipAlias = null;
+        if ($updateAlias) {
+            if ($data['ip_alias'] !== null && !is_string($data['ip_alias'])) {
+                return ApiResponse::error('IP alias must be a string or null', 'INVALID_IP_ALIAS', 400);
+            }
+            $ipAlias = isset($data['ip_alias']) ? trim($data['ip_alias']) : null;
+            if ($ipAlias === '') {
+                $ipAlias = null;
+            }
+        }
+
+        if ($toIp === null && !$updateAlias) {
+            return ApiResponse::error('Provide a target IP address, an IP alias, or both', 'NO_CHANGES_PROVIDED', 400);
+        }
+
+        $matchedCount = Allocation::countByNodeAndIp($nodeId, $fromIp);
+        if ($matchedCount === 0) {
+            return ApiResponse::error('No allocations found for this node and IP address', 'ALLOCATIONS_NOT_FOUND', 404);
+        }
+
+        $result = Allocation::updateAddressByNodeAndIp($nodeId, $fromIp, $toIp, $ipAlias, $updateAlias);
+        if ($result === false) {
+            return ApiResponse::error('Failed to update allocations', 'ALLOCATION_UPDATE_FAILED', 400);
+        }
+
+        if (($result['assigned_conflict_count'] ?? 0) > 0) {
+            return ApiResponse::error(
+                "Cannot merge {$result['assigned_conflict_count']} port(s) because both the source and target allocation are assigned to servers",
+                'ASSIGNED_IP_PORT_CONFLICT',
+                409
+            );
+        }
+
+        $updatedCount = (int) ($result['updated_count'] ?? 0);
+        $deletedTargetConflicts = (int) ($result['deleted_target_conflicts'] ?? 0);
+        $deletedSourceConflicts = (int) ($result['deleted_source_conflicts'] ?? 0);
+
+        $changes = [];
+        if ($toIp !== null) {
+            $changes[] = "IP {$fromIp} to {$toIp}";
+        }
+        if ($updateAlias) {
+            $changes[] = $ipAlias === null ? 'cleared IP alias' : "IP alias to {$ipAlias}";
+        }
+
+        Activity::createActivity([
+            'user_uuid' => $admin['uuid'] ?? null,
+            'name' => 'allocations_address_updated',
+            'context' => 'Updated ' . implode(' and ', $changes) . " for {$matchedCount} allocation(s) on node ID {$nodeId}. Merged {$deletedTargetConflicts} target conflict(s) and {$deletedSourceConflicts} source conflict(s).",
+            'ip_address' => CloudFlareRealIP::getRealIP(),
+        ]);
+
+        global $eventManager;
+        if (isset($eventManager) && $eventManager !== null) {
+            $eventManager->emit(
+                AllocationsEvent::onAllocationUpdated(),
+                [
+                    'node_id' => $nodeId,
+                    'from_ip' => $fromIp,
+                    'to_ip' => $toIp,
+                    'ip_alias' => $ipAlias,
+                    'matched_count' => $matchedCount,
+                    'updated_count' => $updatedCount,
+                    'deleted_target_conflicts' => $deletedTargetConflicts,
+                    'deleted_source_conflicts' => $deletedSourceConflicts,
+                    'updated_by' => $admin,
+                ]
+            );
+        }
+
+        return ApiResponse::success([
+            'matched_count' => $matchedCount,
+            'updated_count' => $updatedCount,
+            'deleted_target_conflicts' => $deletedTargetConflicts,
+            'deleted_source_conflicts' => $deletedSourceConflicts,
+        ], "Updated {$matchedCount} allocation(s)", 200);
+    }
+
     #[OA\Delete(
         path: '/api/admin/allocations/bulk-delete',
         summary: 'Bulk delete allocations',
diff --git a/backend/app/Controllers/Admin/CloudManagementController.php b/backend/app/Controllers/Admin/CloudManagementController.php
index ba9096500..64a95b5e8 100755
--- a/backend/app/Controllers/Admin/CloudManagementController.php
+++ b/backend/app/Controllers/Admin/CloudManagementController.php
@@ -302,15 +302,16 @@ public function rotate(Request $request): Response
             $privateKey = 'FCPRIV-' . base64_encode(random_bytes(48));
             $timestamp = gmdate('c');
 
-            // Rotate FeatherCloud → Panel keys
-            $config->setSetting(ConfigInterface::FEATHERCLOUD_ACCESS_PUBLIC_KEY, $publicKey);
-            $config->setSetting(ConfigInterface::FEATHERCLOUD_ACCESS_PRIVATE_KEY, $privateKey);
-            $config->setSetting(ConfigInterface::FEATHERCLOUD_ACCESS_LAST_ROTATED, $timestamp);
+            // Panel identity keys used during OAuth (`public_identity_key` / `private_key`).
+            $config->setSetting(ConfigInterface::FEATHERCLOUD_CLOUD_PUBLIC_KEY, $publicKey);
+            $config->setSetting(ConfigInterface::FEATHERCLOUD_CLOUD_PRIVATE_KEY, $privateKey);
+            $config->setSetting(ConfigInterface::FEATHERCLOUD_CLOUD_LAST_ROTATED, $timestamp);
 
-            // Clear Panel → FeatherCloud keys (they need to be regenerated)
-            $config->setSetting(ConfigInterface::FEATHERCLOUD_CLOUD_PUBLIC_KEY, null);
-            $config->setSetting(ConfigInterface::FEATHERCLOUD_CLOUD_PRIVATE_KEY, null);
-            $config->setSetting(ConfigInterface::FEATHERCLOUD_CLOUD_LAST_ROTATED, null);
+            // FeatherCloud-issued API keys must come from OAuth; never substitute random values here
+            // or api.featherpanel.com responds with "Invalid panel public key".
+            $config->setSetting(ConfigInterface::FEATHERCLOUD_ACCESS_PUBLIC_KEY, null);
+            $config->setSetting(ConfigInterface::FEATHERCLOUD_ACCESS_PRIVATE_KEY, null);
+            $config->setSetting(ConfigInterface::FEATHERCLOUD_ACCESS_LAST_ROTATED, null);
 
             $user = $request->attributes->get('user');
             $userUuid = $user['uuid'] ?? null;
@@ -318,7 +319,7 @@ public function rotate(Request $request): Response
             Activity::createActivity([
                 'user_uuid' => $userUuid,
                 'name' => 'rotate_cloud_credentials',
-                'context' => 'FeatherCloud → Panel credentials were rotated, Panel → FeatherCloud keys cleared',
+                'context' => 'Panel FeatherCloud identity keys rotated; FeatherCloud-issued credentials cleared - OAuth link required again',
                 'ip_address' => CloudFlareRealIP::getRealIP(),
             ]);
 
diff --git a/backend/app/Controllers/Admin/CloudPluginsController.php b/backend/app/Controllers/Admin/CloudPluginsController.php
index 33120550b..df8ebe29e 100755
--- a/backend/app/Controllers/Admin/CloudPluginsController.php
+++ b/backend/app/Controllers/Admin/CloudPluginsController.php
@@ -1521,9 +1521,12 @@ private static function normalizePackageForResponse(array $pkg, ?array $latestOv
             }
         }
 
+        $premiumLink = isset($pkg['premium_link']) && is_string($pkg['premium_link']) ? $pkg['premium_link'] : null;
+
         return [
             'id' => $pkg['id'] ?? null,
             'identifier' => $pkg['name'] ?? '',
+            'store_slug' => self::extractStoreSlugFromPremiumLink($premiumLink),
             'name' => $pkg['display_name'] ?? ($pkg['name'] ?? ''),
             'description' => $pkg['description'] ?? null,
             'icon' => PanelAssetUrl::rewriteCloudStorageIcon(is_string($iconUrl) ? $iconUrl : null),
@@ -1534,7 +1537,7 @@ private static function normalizePackageForResponse(array $pkg, ?array $latestOv
             'tags' => $pkg['tags'] ?? [],
             'verified' => isset($pkg['verified']) ? (int) $pkg['verified'] === 1 : false,
             'premium' => isset($pkg['premium']) ? (int) $pkg['premium'] : 0,
-            'premium_link' => $pkg['premium_link'] ?? null,
+            'premium_link' => $premiumLink,
             'premium_price' => $pkg['premium_price'] ?? null,
             'downloads' => $pkg['downloads'] ?? 0,
             'created_at' => $pkg['created_at'] ?? null,
@@ -1543,6 +1546,25 @@ private static function normalizePackageForResponse(array $pkg, ?array $latestOv
         ];
     }
 
+    /**
+     * Marketplace slug from the premium purchase URL (last path segment).
+     */
+    private static function extractStoreSlugFromPremiumLink(?string $link): ?string
+    {
+        if ($link === null || trim($link) === '') {
+            return null;
+        }
+
+        $path = parse_url($link, PHP_URL_PATH);
+        if (!is_string($path) || $path === '') {
+            return null;
+        }
+
+        $segments = array_values(array_filter(explode('/', $path), static fn (string $s): bool => $s !== ''));
+
+        return $segments !== [] ? (string) end($segments) : null;
+    }
+
     /**
      * Execute addon-provided SQL migrations from the addon's Migrations directory.
      * Each script will be recorded in featherpanel_migrations with a unique key
diff --git a/backend/app/Controllers/Admin/NodesController.php b/backend/app/Controllers/Admin/NodesController.php
index 38ab02275..168d2e26c 100755
--- a/backend/app/Controllers/Admin/NodesController.php
+++ b/backend/app/Controllers/Admin/NodesController.php
@@ -20,9 +20,12 @@
 use App\App;
 use App\Chat\Node;
 use App\Cache\Cache;
+use App\Chat\Server;
 use App\Chat\Activity;
 use App\Chat\Location;
 use GuzzleHttp\Client;
+use App\Chat\Allocation;
+use App\Chat\ServerTransfer;
 use App\Helpers\ApiResponse;
 use App\Services\Wings\Wings;
 use OpenApi\Attributes as OA;
@@ -31,6 +34,7 @@
 use App\Plugins\Events\Events\NodesEvent;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use App\Services\Servers\ServerTransferInitiator;
 
 #[OA\Schema(
     schema: 'Node',
@@ -604,7 +608,7 @@ public function delete(Request $request, int $id): Response
             return ApiResponse::error('Node not found', 'NODE_NOT_FOUND', 404);
         }
         // Check if the node has any servers assigned before allowing deletion
-        $serversCount = \App\Chat\Server::count(['node_id' => $id]);
+        $serversCount = Server::count(['node_id' => $id]);
         if ($serversCount > 0) {
             return ApiResponse::error('Cannot delete node: there are servers assigned to this node. Please remove or reassign all servers before deleting the node.', 'NODE_HAS_SERVERS', 400);
         }
@@ -1632,4 +1636,179 @@ public function getVersionStatus(Request $request, int $id): Response
             return ApiResponse::error('Failed to check version status', 'VERSION_CHECK_FAILED', 500);
         }
     }
+
+    #[OA\Get(
+        path: '/api/admin/nodes/{id}/mass-transfer/preview',
+        summary: 'Preview mass server transfer from a node',
+        description: 'Lists transferable servers on the source node and free allocation capacity on a destination node.',
+        tags: ['Admin - Nodes'],
+        parameters: [
+            new OA\Parameter(name: 'id', in: 'path', description: 'Source node ID', required: true, schema: new OA\Schema(type: 'integer')),
+            new OA\Parameter(name: 'destination_node_id', in: 'query', description: 'Destination node ID', required: true, schema: new OA\Schema(type: 'integer')),
+        ],
+        responses: [
+            new OA\Response(response: 200, description: 'Preview retrieved successfully'),
+            new OA\Response(response: 400, description: 'Bad request'),
+            new OA\Response(response: 404, description: 'Node not found'),
+        ]
+    )]
+    public function previewMassTransfer(Request $request, int $id): Response
+    {
+        $sourceNode = Node::getNodeById($id);
+        if (!$sourceNode) {
+            return ApiResponse::error('Source node not found', 'NODE_NOT_FOUND', 404);
+        }
+
+        $destinationNodeId = (int) $request->query->get('destination_node_id', 0);
+        if ($destinationNodeId <= 0) {
+            return ApiResponse::error('Invalid or missing destination_node_id', 'INVALID_DESTINATION_NODE', 400);
+        }
+
+        if ($id === $destinationNodeId) {
+            return ApiResponse::error('Cannot transfer to the same node', 'SAME_SOURCE_DESTINATION', 400);
+        }
+
+        $destinationNode = Node::getNodeById($destinationNodeId);
+        if (!$destinationNode) {
+            return ApiResponse::error('Destination node not found', 'DESTINATION_NODE_NOT_FOUND', 404);
+        }
+
+        $servers = Server::getServersByNodeId($id);
+        $transferable = [];
+        $skipped = [];
+        $allocationsRequired = 0;
+
+        foreach ($servers as $server) {
+            $serverId = (int) $server['id'];
+            if ($server['status'] === 'transferring' || ServerTransfer::hasActiveTransfer($serverId)) {
+                $skipped[] = [
+                    'id' => $serverId,
+                    'name' => $server['name'],
+                    'reason' => 'already_transferring',
+                ];
+                continue;
+            }
+            if ($server['status'] === 'installing' || $server['status'] === 'restoring') {
+                $skipped[] = [
+                    'id' => $serverId,
+                    'name' => $server['name'],
+                    'reason' => 'not_transferable',
+                ];
+                continue;
+            }
+
+            $allocationCount = count(Allocation::getByServerId($serverId));
+            $needed = max(1, $allocationCount);
+            $allocationsRequired += $needed;
+
+            $transferable[] = [
+                'id' => $serverId,
+                'name' => $server['name'],
+                'uuid' => $server['uuid'],
+                'status' => $server['status'],
+                'allocations_needed' => $needed,
+            ];
+        }
+
+        $freeOnDestination = Allocation::getFreeCountByNodeId($destinationNodeId);
+
+        return ApiResponse::success([
+            'source_node' => ['id' => $id, 'name' => $sourceNode['name']],
+            'destination_node' => ['id' => $destinationNodeId, 'name' => $destinationNode['name']],
+            'transferable_servers' => $transferable,
+            'skipped_servers' => $skipped,
+            'allocations_required' => $allocationsRequired,
+            'free_allocations_on_destination' => $freeOnDestination,
+            'has_enough_allocations' => $freeOnDestination >= $allocationsRequired,
+            'max_per_request' => 100,
+        ], 'Mass transfer preview', 200);
+    }
+
+    #[OA\Post(
+        path: '/api/admin/nodes/{id}/mass-transfer',
+        summary: 'Mass transfer servers from a node',
+        description: 'Transfer selected servers (or all transferable servers) from this node to another. Free allocations on the destination node are assigned automatically.',
+        tags: ['Admin - Nodes'],
+        parameters: [
+            new OA\Parameter(name: 'id', in: 'path', description: 'Source node ID', required: true, schema: new OA\Schema(type: 'integer')),
+        ],
+        requestBody: new OA\RequestBody(
+            required: true,
+            content: new OA\JsonContent(
+                required: ['destination_node_id'],
+                properties: [
+                    new OA\Property(property: 'destination_node_id', type: 'integer', minimum: 1),
+                    new OA\Property(property: 'server_ids', type: 'array', items: new OA\Items(type: 'integer'), description: 'Server IDs to move (ignored when move_all is true)'),
+                    new OA\Property(property: 'move_all', type: 'boolean', description: 'Move every transferable server on this node'),
+                ]
+            )
+        ),
+        responses: [
+            new OA\Response(response: 200, description: 'Mass transfer processed'),
+            new OA\Response(response: 400, description: 'Bad request'),
+            new OA\Response(response: 404, description: 'Node not found'),
+        ]
+    )]
+    public function massTransfer(Request $request, int $id): Response
+    {
+        $sourceNode = Node::getNodeById($id);
+        if (!$sourceNode) {
+            return ApiResponse::error('Source node not found', 'NODE_NOT_FOUND', 404);
+        }
+
+        $data = json_decode($request->getContent(), true);
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            return ApiResponse::error('Invalid JSON in request body', 'INVALID_JSON', 400);
+        }
+
+        if (!isset($data['destination_node_id']) || !is_numeric($data['destination_node_id'])) {
+            return ApiResponse::error('Invalid or missing destination_node_id', 'INVALID_DESTINATION_NODE', 400);
+        }
+
+        $destinationNodeId = (int) $data['destination_node_id'];
+        $moveAll = !empty($data['move_all']);
+        $serverIds = isset($data['server_ids']) && is_array($data['server_ids'])
+            ? array_map('intval', $data['server_ids'])
+            : [];
+
+        if (!$moveAll && empty($serverIds)) {
+            return ApiResponse::error('Provide server_ids or set move_all to true', 'NO_SERVERS_SELECTED', 400);
+        }
+
+        if ($id === $destinationNodeId) {
+            return ApiResponse::error('Cannot transfer to the same node', 'SAME_SOURCE_DESTINATION', 400);
+        }
+
+        if (!Node::getNodeById($destinationNodeId)) {
+            return ApiResponse::error('Destination node not found', 'DESTINATION_NODE_NOT_FOUND', 404);
+        }
+
+        $initiator = new ServerTransferInitiator();
+        $results = $initiator->massTransfer(
+            $id,
+            $destinationNodeId,
+            $serverIds,
+            $moveAll,
+            $request->attributes->get('user')
+        );
+
+        Activity::createActivity([
+            'user_uuid' => $request->attributes->get('user')['uuid'],
+            'name' => 'mass_transfer_servers',
+            'context' => 'Mass transfer from node ' . $sourceNode['name'] . ': '
+                . count($results['initiated']) . ' initiated, '
+                . count($results['failed']) . ' failed, '
+                . count($results['skipped']) . ' skipped',
+            'ip_address' => CloudFlareRealIP::getRealIP(),
+        ]);
+
+        return ApiResponse::success([
+            'initiated' => $results['initiated'],
+            'failed' => $results['failed'],
+            'skipped' => $results['skipped'],
+            'initiated_count' => count($results['initiated']),
+            'failed_count' => count($results['failed']),
+            'skipped_count' => count($results['skipped']),
+        ], 'Mass transfer processed', 200);
+    }
 }
diff --git a/backend/app/Controllers/Admin/PluginManagerController.php b/backend/app/Controllers/Admin/PluginManagerController.php
index 142922684..1dfe7eb27 100755
--- a/backend/app/Controllers/Admin/PluginManagerController.php
+++ b/backend/app/Controllers/Admin/PluginManagerController.php
@@ -1719,7 +1719,8 @@ public function run()
                     'component' => 'serverui.html',
                     'description' => 'View server logs related to the plugin',
                     'category' => 'server',
-                    'group' => 'Minecraft Java Edition',
+                    'group' => 'files',
+                    'priority' => 350,
                 ],
             ],
         ], JSON_PRETTY_PRINT);
@@ -2303,6 +2304,7 @@ public static function getSubCommands(): array
 ### Server Section
 - **Server Logs**: View plugin-related logs
 - **Scheduled Tasks**: Manage cron jobs and tasks
+- **Sidebar Priority**: Use `group: files` and `priority: 350` to place an item between Backups (300) and Import (400)
 
 ### Routes & Controllers
 - **Routes**: Files in `Routes/` directory are automatically registered
diff --git a/backend/app/Controllers/Admin/ServersController.php b/backend/app/Controllers/Admin/ServersController.php
index effa943db..b12a3f349 100755
--- a/backend/app/Controllers/Admin/ServersController.php
+++ b/backend/app/Controllers/Admin/ServersController.php
@@ -29,6 +29,7 @@
 use App\Chat\Allocation;
 use App\Helpers\UUIDUtils;
 use App\Chat\SpellVariable;
+use App\Helpers\TimeHelper;
 use App\Chat\ServerActivity;
 use App\Chat\ServerDatabase;
 use App\Chat\ServerTransfer;
@@ -38,11 +39,13 @@
 use OpenApi\Attributes as OA;
 use App\Chat\DatabaseInstance;
 use App\Config\ConfigInterface;
+use App\Chat\ServerCustomVariable;
 use App\CloudFlare\CloudFlareRealIP;
 use App\Mail\templates\ServerBanned;
 use App\Mail\templates\ServerCreated;
 use App\Mail\templates\ServerDeleted;
 use App\Mail\templates\ServerUnbanned;
+use App\Helpers\ModerationReasonHelper;
 use App\Plugins\Events\Events\ServerEvent;
 use App\Services\Backup\BackupFifoEviction;
 use Symfony\Component\HttpFoundation\Request;
@@ -386,6 +389,7 @@ public function index(Request $request): Response
             // Remove sensitive data from owner
             if ($server['owner']) {
                 unset($server['owner']['password'], $server['owner']['remember_token'], $server['owner']['two_fa_key']);
+                $server['owner'] = TimeHelper::normaliseRow($server['owner'], ['last_seen', 'first_seen']);
             }
 
             // Remove sensitive node data
@@ -403,6 +407,8 @@ public function index(Request $request): Response
                     $server['node']['daemonBase']
                 );
             }
+
+            $server = TimeHelper::normaliseRow($server, ['installed_at']);
         }
 
         $total = Server::getCount(
@@ -539,6 +545,7 @@ public function show(Request $request, int $id): Response
         }
 
         $server['variables'] = $mergedVariables;
+        $server['custom_variables'] = ServerCustomVariable::getCustomVariablesByServerId((int) $server['id']);
 
         $attachedMounts = Mount::getMountsAttachedToServer((int) $server['id']);
         $server['mounts'] = $attachedMounts;
@@ -558,6 +565,7 @@ public function show(Request $request, int $id): Response
         // Remove sensitive data from related objects
         if ($server['owner']) {
             unset($server['owner']['password'], $server['owner']['remember_token'], $server['owner']['two_fa_key']);
+            $server['owner'] = TimeHelper::normaliseRow($server['owner'], ['last_seen', 'first_seen']);
         }
 
         // Remove sensitive node data
@@ -574,9 +582,116 @@ public function show(Request $request, int $id): Response
             $server['node']['daemonBase']
         );
 
+        $server = ModerationReasonHelper::enrichServerSuspensionMetadata($server);
+        $server = TimeHelper::normaliseRow($server, ['installed_at', 'suspended_at']);
+
         return ApiResponse::success($server, 'Server fetched successfully', 200);
     }
 
+    public function createCustomVariable(Request $request, int $id): Response
+    {
+        $server = Server::getServerById($id);
+        if (!$server) {
+            return ApiResponse::error('Server not found', 'SERVER_NOT_FOUND', 404);
+        }
+
+        $data = json_decode($request->getContent(), true);
+        if (!is_array($data)) {
+            return ApiResponse::error('Invalid request data', 'INVALID_REQUEST', 400);
+        }
+
+        $name = trim((string) ($data['name'] ?? ''));
+        $envVariable = strtoupper(trim((string) ($data['env_variable'] ?? '')));
+        $value = (string) ($data['variable_value'] ?? '');
+        $isEncrypted = isset($data['is_encrypted']) && filter_var($data['is_encrypted'], FILTER_VALIDATE_BOOLEAN);
+
+        if ($name === '' || strlen($name) > 191) {
+            return ApiResponse::error('Variable name is required and must be less than 191 characters', 'INVALID_NAME', 400);
+        }
+
+        if (!ServerCustomVariable::isValidEnvVariable($envVariable) || strlen($envVariable) > 191) {
+            return ApiResponse::error('Environment variable must use only uppercase letters, numbers, and underscores, and cannot start with a number', 'INVALID_ENV_VARIABLE', 400);
+        }
+
+        $reservedVariables = [
+            'P_SERVER_LOCATION',
+            'P_SERVER_UUID',
+            'P_SERVER_ALLOCATION_LIMIT',
+            'SERVER_MEMORY',
+            'SERVER_IP',
+            'SERVER_PORT',
+        ];
+        if (in_array($envVariable, $reservedVariables, true) || str_starts_with($envVariable, 'P_SERVER_')) {
+            return ApiResponse::error('This environment variable name is reserved', 'RESERVED_ENV_VARIABLE', 400);
+        }
+
+        if (ServerCustomVariable::envVariableExists((int) $server['id'], $envVariable)) {
+            return ApiResponse::error('An environment variable with this name already exists', 'ENV_VARIABLE_EXISTS', 409);
+        }
+
+        $user = $request->attributes->get('user');
+        $variableId = ServerCustomVariable::createCustomVariable([
+            'server_id' => (int) $server['id'],
+            'user_id' => (int) ($user['id'] ?? $server['owner_id']),
+            'name' => $name,
+            'env_variable' => $envVariable,
+            'variable_value' => $value,
+            'is_encrypted' => $isEncrypted ? 1 : 0,
+        ]);
+
+        if (!$variableId) {
+            return ApiResponse::error('Failed to create custom variable', 'CUSTOM_VARIABLE_CREATE_FAILED', 500);
+        }
+
+        $syncError = $this->syncServerConfiguration($server);
+        if ($syncError !== null) {
+            return $syncError;
+        }
+
+        Activity::createActivity([
+            'user_uuid' => $user['uuid'] ?? null,
+            'name' => 'create_server_custom_variable',
+            'context' => 'Created custom variable ' . $envVariable . ' for server ' . $server['name'],
+            'ip_address' => CloudFlareRealIP::getRealIP(),
+        ]);
+
+        return ApiResponse::success([
+            'custom_variable' => ServerCustomVariable::getCustomVariableById((int) $variableId),
+        ], 'Custom variable created successfully', 201);
+    }
+
+    public function deleteCustomVariable(Request $request, int $id, int $variableId): Response
+    {
+        $server = Server::getServerById($id);
+        if (!$server) {
+            return ApiResponse::error('Server not found', 'SERVER_NOT_FOUND', 404);
+        }
+
+        $customVariable = ServerCustomVariable::getCustomVariableById($variableId);
+        if (!$customVariable || (int) $customVariable['server_id'] !== (int) $server['id']) {
+            return ApiResponse::error('Custom variable not found', 'CUSTOM_VARIABLE_NOT_FOUND', 404);
+        }
+
+        if (!ServerCustomVariable::deleteCustomVariableForServer($variableId, (int) $server['id'])) {
+            return ApiResponse::error('Failed to delete custom variable', 'CUSTOM_VARIABLE_DELETE_FAILED', 500);
+        }
+
+        $syncError = $this->syncServerConfiguration($server);
+        if ($syncError !== null) {
+            return $syncError;
+        }
+
+        $user = $request->attributes->get('user');
+        Activity::createActivity([
+            'user_uuid' => $user['uuid'] ?? null,
+            'name' => 'delete_server_custom_variable',
+            'context' => 'Deleted custom variable ' . $customVariable['env_variable'] . ' from server ' . $server['name'],
+            'ip_address' => CloudFlareRealIP::getRealIP(),
+        ]);
+
+        return ApiResponse::success([], 'Custom variable deleted successfully', 200);
+    }
+
     #[OA\Get(
         path: '/api/admin/servers/external/{externalId}',
         summary: 'Get server by external ID',
@@ -715,6 +830,9 @@ public function showByExternalId(Request $request, string $externalId): Response
             $server['node']['daemonBase']
         );
 
+        $server = ModerationReasonHelper::enrichServerSuspensionMetadata($server);
+        $server = TimeHelper::normaliseRow($server, ['installed_at', 'suspended_at']);
+
         return ApiResponse::success($server, 'Server fetched successfully', 200);
     }
 
@@ -2403,7 +2521,18 @@ public function suspend(Request $request, int $id): Response
             return ApiResponse::error('Server not found', 'SERVER_NOT_FOUND', 404);
         }
 
-        $ok = Server::updateServerById($id, ['suspended' => 1]);
+        $body = json_decode($request->getContent(), true);
+        if (!is_array($body)) {
+            $body = [];
+        }
+        $parsed = ModerationReasonHelper::parseRequestBody($body);
+        $reasonError = ModerationReasonHelper::validateReason($parsed['reason']);
+        if ($reasonError !== null) {
+            return ApiResponse::error($reasonError, 'MODERATION_REASON_REQUIRED', 400);
+        }
+
+        $staffUser = $request->attributes->get('user');
+        $ok = Server::updateServerById($id, ModerationReasonHelper::suspensionAppliedFields($parsed['reason'], $staffUser));
         if (!$ok) {
             return ApiResponse::error('Failed to suspend server', 'FAILED_TO_SUSPEND', 500);
         }
@@ -2411,9 +2540,9 @@ public function suspend(Request $request, int $id): Response
         $user = User::getUserById($server['owner_id']);
 
         Activity::createActivity([
-            'user_uuid' => $request->attributes->get('user')['uuid'],
+            'user_uuid' => $staffUser['uuid'],
             'name' => 'suspend_server',
-            'context' => 'Suspended server ' . $server['name'],
+            'context' => 'Suspended server ' . $server['name'] . ' — ' . $parsed['reason'],
             'ip_address' => CloudFlareRealIP::getRealIP(),
         ]);
 
@@ -2479,6 +2608,7 @@ public function suspend(Request $request, int $id): Response
                 'uuid' => $user['uuid'],
                 'enabled' => $config->getSetting(ConfigInterface::SMTP_ENABLED, 'false'),
                 'server_name' => $server['name'],
+                'suspension_reason' => $parsed['reason'],
             ]);
         } catch (\Exception $e) {
             App::getInstance(true)->getLogger()->error('Failed to send server suspended email: ' . $e->getMessage());
@@ -2525,7 +2655,7 @@ public function unsuspend(Request $request, int $id): Response
             return ApiResponse::error('Server not found', 'SERVER_NOT_FOUND', 404);
         }
 
-        $ok = Server::updateServerById($id, ['suspended' => 0]);
+        $ok = Server::updateServerById($id, ModerationReasonHelper::suspensionClearedFields());
         if (!$ok) {
             return ApiResponse::error('Failed to unsuspend server', 'FAILED_TO_UNSUSPEND', 500);
         }
@@ -2617,218 +2747,36 @@ public function unsuspend(Request $request, int $id): Response
     )]
     public function initiateTransfer(Request $request, int $id): Response
     {
-        $server = Server::getServerById($id);
-        if (!$server) {
-            return ApiResponse::error('Server not found', 'SERVER_NOT_FOUND', 404);
-        }
-
         $data = json_decode($request->getContent(), true);
         if (json_last_error() !== JSON_ERROR_NONE) {
             return ApiResponse::error('Invalid JSON in request body', 'INVALID_JSON', 400);
         }
 
-        if (!isset($data['destination_node_id']) || !is_numeric($data['destination_node_id'])) {
-            return ApiResponse::error('Invalid or missing destination_node_id', 'INVALID_DESTINATION_NODE', 400);
-        }
-
-        $destinationNodeId = (int) $data['destination_node_id'];
-
-        // Prevent transferring to the same node
-        if ($server['node_id'] === $destinationNodeId) {
-            return ApiResponse::error('Cannot transfer server to the same node', 'SAME_SOURCE_DESTINATION', 400);
-        }
-
-        // Check if server is already transferring or has an active transfer
-        if ($server['status'] === 'transferring' || ServerTransfer::hasActiveTransfer($id)) {
-            return ApiResponse::error('Server is already being transferred', 'ALREADY_TRANSFERRING', 400);
-        }
-
-        // Check if server is in a transferable state (installed, not restoring backup)
-        if ($server['status'] === 'installing' || $server['status'] === 'restoring') {
-            return ApiResponse::error('Server cannot be transferred while installing or restoring', 'SERVER_NOT_TRANSFERABLE', 400);
-        }
-
-        // Get destination node
-        $destinationNode = Node::getNodeById($destinationNodeId);
-        if (!$destinationNode) {
-            return ApiResponse::error('Destination node not found', 'DESTINATION_NODE_NOT_FOUND', 404);
+        $options = $data;
+        if (!array_key_exists('auto_allocate', $options)) {
+            $options['auto_allocate'] = !isset($data['destination_allocation_id']);
         }
 
-        // Get source node for Wings connection
-        $sourceNode = Node::getNodeById($server['node_id']);
-        if (!$sourceNode) {
-            return ApiResponse::error('Source node not found', 'SOURCE_NODE_NOT_FOUND', 404);
-        }
-
-        // Store original values in case we need to revert
-        $originalNodeId = $server['node_id'];
-        $originalAllocationId = $server['allocation_id'];
-
-        // Get server's current allocations (primary + additional)
-        $currentAllocations = Allocation::getByServerId($id);
-        $oldAdditionalAllocations = array_filter(
-            array_column($currentAllocations, 'id'),
-            fn ($allocId) => $allocId != $originalAllocationId
+        $result = (new \App\Services\Servers\ServerTransferInitiator())->initiate(
+            $id,
+            $options,
+            $request->attributes->get('user')
         );
 
-        // Validate and get destination allocation
-        $newAllocationId = null;
-        if (isset($data['destination_allocation_id'])) {
-            $destinationAllocation = Allocation::getAllocationById($data['destination_allocation_id']);
-            if (!$destinationAllocation) {
-                return ApiResponse::error('Destination allocation not found', 'DESTINATION_ALLOCATION_NOT_FOUND', 404);
-            }
-            if ($destinationAllocation['node_id'] !== $destinationNodeId) {
-                return ApiResponse::error('Destination allocation does not belong to destination node', 'ALLOCATION_NODE_MISMATCH', 400);
-            }
-            if ($destinationAllocation['server_id'] !== null) {
-                return ApiResponse::error('Destination allocation is already assigned to another server', 'ALLOCATION_IN_USE', 400);
-            }
-            $newAllocationId = $destinationAllocation['id'];
-        }
-
-        // Get additional allocations for destination (optional)
-        $newAdditionalAllocations = [];
-        if (isset($data['destination_additional_allocations']) && is_array($data['destination_additional_allocations'])) {
-            foreach ($data['destination_additional_allocations'] as $allocId) {
-                $alloc = Allocation::getAllocationById((int) $allocId);
-                if ($alloc && $alloc['node_id'] === $destinationNodeId && $alloc['server_id'] === null) {
-                    $newAdditionalAllocations[] = (int) $allocId;
-                }
-            }
-        }
-
-        // Generate transfer JWT token (subject is the destination server UUID)
-        $config = App::getInstance(true)->getConfig();
-        $panelUrl = $config->getSetting(ConfigInterface::APP_URL, 'https://featherpanel.mythical.systems');
-        $destinationUrl = $destinationNode['scheme'] . '://' . $destinationNode['fqdn'] . ':' . $destinationNode['daemonListen'];
-
-        try {
-            // Temporarily assign new allocations to the server (so they can't be taken during transfer)
-            if ($newAllocationId) {
-                $allocationsToAssign = [$newAllocationId];
-                if (!empty($newAdditionalAllocations)) {
-                    $allocationsToAssign = array_merge($allocationsToAssign, $newAdditionalAllocations);
-                }
-                Allocation::assignMultipleToServer($id, $allocationsToAssign);
-            }
-
-            // Update server status to transferring AND update node_id to destination
-            // This allows destination Wings to query Panel for server configuration
-            $updated = Server::updateServerById($id, [
-                'status' => 'transferring',
-                'node_id' => $destinationNodeId,
-            ]);
-            if (!$updated) {
-                // Revert allocation assignment
-                if ($newAllocationId) {
-                    $allocationsToRevert = [$newAllocationId];
-                    if (!empty($newAdditionalAllocations)) {
-                        $allocationsToRevert = array_merge($allocationsToRevert, $newAdditionalAllocations);
-                    }
-                    Allocation::unassignMultiple($allocationsToRevert);
-                }
-
-                return ApiResponse::error('Failed to update server status', 'UPDATE_FAILED', 500);
-            }
-
-            $wings = new Wings(
-                $sourceNode['fqdn'],
-                $sourceNode['daemonListen'],
-                $sourceNode['scheme'],
-                $sourceNode['daemon_token'],
-                30
-            );
-
-            // Get JWT service and generate transfer token
-            $jwtService = new \App\Services\Wings\Services\JwtService(
-                $destinationNode['daemon_token'],
-                $panelUrl,
-                $destinationUrl,
-                3600 // 1 hour expiration for transfers
-            );
-
-            $transferToken = $jwtService->generateTransferToken(
-                $server['uuid'],
-                $request->attributes->get('user')['uuid'],
-                ['*'] // Full permissions for transfer
+        if (!$result['success']) {
+            return ApiResponse::error(
+                $result['error'] ?? 'Transfer failed',
+                $result['code'] ?? 'TRANSFER_FAILED',
+                $result['http_status'] ?? 500
             );
-
-            // Prepare transfer request data for source node
-            // Wings will extract server UUID from JWT's 'sub' claim
-            $transferData = [
-                'url' => $destinationUrl . '/api/transfers',
-                'token' => 'Bearer ' . $transferToken,
-            ];
-
-            // Initiate transfer on source node
-            $response = $wings->getTransfer()->startTransfer($server['uuid'], $transferData);
-
-            // Create transfer record in database with full allocation tracking
-            $transferId = ServerTransfer::create([
-                'server_id' => $id,
-                'source_node_id' => $originalNodeId,
-                'destination_node_id' => $destinationNodeId,
-                'old_allocation' => $originalAllocationId,
-                'new_allocation' => $newAllocationId,
-                'old_additional_allocations' => $oldAdditionalAllocations,
-                'new_additional_allocations' => $newAdditionalAllocations,
-                'status' => 'in_progress',
-                'progress' => 0.0,
-                'started_at' => date('Y-m-d H:i:s'),
-            ]);
-
-            if (!$transferId) {
-                App::getInstance(true)->getLogger()->error('Failed to create server transfer record');
-                // Don't fail the transfer if database insert fails, but log it
-            }
-
-            // Log activity
-            Activity::createActivity([
-                'user_uuid' => $request->attributes->get('user')['uuid'],
-                'name' => 'initiate_server_transfer',
-                'context' => 'Initiated transfer of server ' . $server['name'] . ' from node ' . $sourceNode['name'] . ' to node ' . $destinationNode['name'],
-                'ip_address' => CloudFlareRealIP::getRealIP(),
-            ]);
-
-            // Emit event
-            global $eventManager;
-            if (isset($eventManager) && $eventManager !== null) {
-                $eventManager->emit(
-                    ServerEvent::onServerTransferInitiated(),
-                    [
-                        'server' => $server,
-                        'source_node' => $sourceNode,
-                        'destination_node' => $destinationNode,
-                        'initiated_by' => $request->attributes->get('user'),
-                    ]
-                );
-            }
-
-            return ApiResponse::success([
-                'message' => 'Server transfer initiated successfully',
-                'transfer_id' => $transferId,
-            ], 'Server transfer initiated', 200);
-        } catch (\Exception $e) {
-            // Revert server status AND node_id if transfer initiation fails
-            Server::updateServerById($id, [
-                'status' => $server['status'],
-                'node_id' => $originalNodeId,
-            ]);
-
-            // Revert allocation assignment
-            if ($newAllocationId) {
-                $allocationsToRevert = [$newAllocationId];
-                if (!empty($newAdditionalAllocations)) {
-                    $allocationsToRevert = array_merge($allocationsToRevert, $newAdditionalAllocations);
-                }
-                Allocation::unassignMultiple($allocationsToRevert);
-            }
-
-            App::getInstance(true)->getLogger()->error('Failed to initiate server transfer: ' . $e->getMessage());
-
-            return ApiResponse::error('Failed to initiate server transfer: ' . $e->getMessage(), 'TRANSFER_INITIATION_FAILED', 500);
         }
+
+        return ApiResponse::success([
+            'message' => 'Server transfer initiated successfully',
+            'transfer_id' => $result['transfer_id'] ?? null,
+            'new_allocation' => $result['new_allocation'] ?? null,
+            'new_additional_allocations' => $result['new_additional_allocations'] ?? [],
+        ], 'Server transfer initiated', 200);
     }
 
     #[OA\Get(
@@ -3044,6 +2992,34 @@ public function cancelTransfer(Request $request, int $id): Response
         }
     }
 
+    private function syncServerConfiguration(array $server): ?Response
+    {
+        $node = Node::getNodeById((int) $server['node_id']);
+        if (!$node) {
+            return ApiResponse::error('Node not found', 'NODE_NOT_FOUND', 404);
+        }
+
+        try {
+            $wings = new Wings(
+                $node['fqdn'],
+                $node['daemonListen'],
+                $node['scheme'],
+                $node['daemon_token'],
+                30
+            );
+            $response = $wings->getServer()->syncServer($server['uuid']);
+            if (!$response->isSuccessful()) {
+                return ApiResponse::error('Failed to sync server configuration: ' . $response->getError(), 'WINGS_ERROR', $response->getStatusCode());
+            }
+        } catch (\Exception $e) {
+            App::getInstance(true)->getLogger()->error('Failed to sync server configuration: ' . $e->getMessage());
+
+            return ApiResponse::error('Failed to sync server configuration: ' . $e->getMessage(), 'SERVER_SYNC_FAILED', 500);
+        }
+
+        return null;
+    }
+
     /**
      * Clean up server databases when deleting a server.
      * This method handles database cleanup gracefully without breaking the deletion process.
diff --git a/backend/app/Controllers/Admin/SettingsController.php b/backend/app/Controllers/Admin/SettingsController.php
index df684aa05..61934b571 100755
--- a/backend/app/Controllers/Admin/SettingsController.php
+++ b/backend/app/Controllers/Admin/SettingsController.php
@@ -313,6 +313,9 @@ class SettingsController
                 ConfigInterface::SERVER_ALLOW_USER_MADE_FASTDL,
                 ConfigInterface::SERVER_ALLOW_USER_MADE_SUBDOMAINS,
                 ConfigInterface::SERVER_HIDE_IPS,
+                ConfigInterface::FILE_TRASH_ENABLED,
+                ConfigInterface::FILE_TRASH_MAX_SIZE_MB,
+                ConfigInterface::FILE_TRASH_RETENTION_DAYS,
             ],
         ],
         'chatbot' => [
@@ -1754,6 +1757,43 @@ public function __construct()
                 'options' => ['true', 'false'],
                 'category' => 'servers',
             ],
+            ConfigInterface::FILE_TRASH_ENABLED => [
+                'name' => ConfigInterface::FILE_TRASH_ENABLED,
+                'value' => $this->app
+                    ->getConfig()
+                    ->getSetting(ConfigInterface::FILE_TRASH_ENABLED, 'false'),
+                'description' => 'Enable a trash bin for server file deletions. Deleted files are moved to trash instead of being permanently removed, and users can restore or empty trash from the file manager.',
+                'type' => 'select',
+                'required' => true,
+                'placeholder' => 'false',
+                'validation' => 'required|string|max:255',
+                'options' => ['true', 'false'],
+                'category' => 'servers',
+            ],
+            ConfigInterface::FILE_TRASH_MAX_SIZE_MB => [
+                'name' => ConfigInterface::FILE_TRASH_MAX_SIZE_MB,
+                'value' => $this->app
+                    ->getConfig()
+                    ->getSetting(ConfigInterface::FILE_TRASH_MAX_SIZE_MB, '512'),
+                'description' => 'Maximum total size of trashed files per server, in megabytes. When exceeded, the oldest trashed items are permanently deleted. Use 0 for no size limit.',
+                'type' => 'number',
+                'required' => true,
+                'placeholder' => '512',
+                'validation' => 'required|integer|min:0',
+                'category' => 'servers',
+            ],
+            ConfigInterface::FILE_TRASH_RETENTION_DAYS => [
+                'name' => ConfigInterface::FILE_TRASH_RETENTION_DAYS,
+                'value' => $this->app
+                    ->getConfig()
+                    ->getSetting(ConfigInterface::FILE_TRASH_RETENTION_DAYS, '30'),
+                'description' => 'Automatically purge trashed files older than this many days. Use 0 to keep items until manually deleted or the size limit is reached.',
+                'type' => 'number',
+                'required' => true,
+                'placeholder' => '30',
+                'validation' => 'required|integer|min:0',
+                'category' => 'servers',
+            ],
             ConfigInterface::CHATBOT_ENABLED => [
                 'name' => ConfigInterface::CHATBOT_ENABLED,
                 'value' => $this->app
diff --git a/backend/app/Controllers/Admin/SpellsController.php b/backend/app/Controllers/Admin/SpellsController.php
index e4170fdf7..57ca07811 100755
--- a/backend/app/Controllers/Admin/SpellsController.php
+++ b/backend/app/Controllers/Admin/SpellsController.php
@@ -830,6 +830,107 @@ public function getByRealm(Request $request, int $realmId): Response
         ], 'Spells for realm fetched successfully', 200);
     }
 
+    #[OA\Post(
+        path: '/api/admin/spells/reorder',
+        summary: 'Reorder spells within a realm',
+        description: 'Update the display sort order of spells in a realm (e.g. Node.js first, then Python, then Java).',
+        tags: ['Admin - Spells'],
+        requestBody: new OA\RequestBody(
+            required: true,
+            content: new OA\JsonContent(
+                required: ['realm_id', 'spells'],
+                properties: [
+                    new OA\Property(property: 'realm_id', type: 'integer', minimum: 1),
+                    new OA\Property(
+                        property: 'spells',
+                        type: 'array',
+                        items: new OA\Items(
+                            properties: [
+                                new OA\Property(property: 'id', type: 'integer'),
+                                new OA\Property(property: 'sort_order', type: 'integer'),
+                            ]
+                        )
+                    ),
+                ]
+            )
+        ),
+        responses: [
+            new OA\Response(response: 200, description: 'Spells reordered successfully'),
+            new OA\Response(response: 400, description: 'Bad request'),
+            new OA\Response(response: 404, description: 'Realm not found'),
+            new OA\Response(response: 500, description: 'Internal server error'),
+        ]
+    )]
+    public function reorder(Request $request): Response
+    {
+        $data = json_decode($request->getContent(), true);
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            return ApiResponse::error('Invalid JSON in request body', 'INVALID_JSON', 400);
+        }
+
+        if (!isset($data['realm_id']) || !is_numeric($data['realm_id'])) {
+            return ApiResponse::error('realm_id is required', 'INVALID_REALM_ID', 400);
+        }
+
+        $realmId = (int) $data['realm_id'];
+        if ($realmId <= 0) {
+            return ApiResponse::error('Invalid realm_id', 'INVALID_REALM_ID', 400);
+        }
+
+        if (!Realm::getById($realmId)) {
+            return ApiResponse::error('Realm not found', 'REALM_NOT_FOUND', 404);
+        }
+
+        if (!isset($data['spells']) || !is_array($data['spells']) || empty($data['spells'])) {
+            return ApiResponse::error('Spells array is required', 'INVALID_REQUEST', 400);
+        }
+
+        $spells = [];
+        foreach ($data['spells'] as $spell) {
+            if (!isset($spell['id']) || !is_numeric($spell['id'])) {
+                continue;
+            }
+            if (!isset($spell['sort_order']) || !is_numeric($spell['sort_order'])) {
+                continue;
+            }
+
+            $spells[] = [
+                'id' => (int) $spell['id'],
+                'sort_order' => (int) $spell['sort_order'],
+            ];
+        }
+
+        if (empty($spells)) {
+            return ApiResponse::error('No valid spell order data provided', 'INVALID_SPELLS', 400);
+        }
+
+        if (!Spell::updateSortOrders($spells, $realmId)) {
+            return ApiResponse::error('Failed to reorder spells', 'REORDER_FAILED', 500);
+        }
+
+        $admin = $request->attributes->get('user');
+        Activity::createActivity([
+            'user_uuid' => $admin['uuid'] ?? null,
+            'name' => 'reorder_spells',
+            'context' => 'Reordered ' . count($spells) . ' spells in realm ' . $realmId,
+            'ip_address' => CloudFlareRealIP::getRealIP(),
+        ]);
+
+        global $eventManager;
+        if (isset($eventManager) && $eventManager !== null) {
+            $eventManager->emit(
+                SpellsEvent::onSpellsReordered(),
+                [
+                    'realm_id' => $realmId,
+                    'spells' => $spells,
+                    'reordered_by' => $admin,
+                ]
+            );
+        }
+
+        return ApiResponse::success([], 'Spells reordered successfully', 200);
+    }
+
     #[OA\Post(
         path: '/api/admin/spells/import',
         summary: 'Import spell from file',
diff --git a/backend/app/Controllers/Admin/UsersController.php b/backend/app/Controllers/Admin/UsersController.php
index d73624490..878bfdea2 100755
--- a/backend/app/Controllers/Admin/UsersController.php
+++ b/backend/app/Controllers/Admin/UsersController.php
@@ -32,6 +32,7 @@
 use App\Chat\Allocation;
 use App\Chat\VmInstance;
 use App\Helpers\UUIDUtils;
+use App\Helpers\TimeHelper;
 use App\Helpers\ApiResponse;
 use OpenApi\Attributes as OA;
 use App\Config\ConfigInterface;
@@ -40,6 +41,7 @@
 use App\Helpers\EmailDomainValidator;
 use App\Mail\templates\AccountBanned;
 use App\Mail\templates\AccountDeleted;
+use App\Helpers\ModerationReasonHelper;
 use App\Mail\templates\AccountUnBanned;
 use App\Plugins\Events\Events\UserEvent;
 use Symfony\Component\HttpFoundation\Request;
@@ -55,6 +57,7 @@
         new OA\Property(property: 'first_name', type: 'string', description: 'First name'),
         new OA\Property(property: 'last_name', type: 'string', description: 'Last name'),
         new OA\Property(property: 'email', type: 'string', format: 'email', description: 'Email address'),
+        new OA\Property(property: 'email_verified', type: 'boolean', description: 'Whether the user email is verified'),
         new OA\Property(property: 'avatar', type: 'string', format: 'uri', description: 'Avatar URL'),
         new OA\Property(property: 'last_seen', type: 'string', format: 'date-time', nullable: true, description: 'Last seen timestamp'),
         new OA\Property(property: 'banned', type: 'boolean', description: 'Banned status'),
@@ -307,6 +310,7 @@ public function index(Request $request): Response
                 'avatar',
                 'last_seen',
                 'email',
+                'mail_verify',
                 'oidc_provider',
                 'oidc_subject',
                 'ldap_provider_uuid',
@@ -332,22 +336,26 @@ public function index(Request $request): Response
         }
 
         foreach ($users as &$user) {
-            $roleId = $user['role_id'];
-            if (isset($rolesMap[$roleId])) {
-                $user['role']['name'] = $rolesMap[$roleId]['name'];
-                $user['role']['display_name'] = $rolesMap[$roleId]['display_name'];
-                $user['role']['color'] = $rolesMap[$roleId]['color'];
+            $userRoleId = $user['role_id'];
+            if (isset($rolesMap[$userRoleId])) {
+                $user['role']['name'] = $rolesMap[$userRoleId]['name'];
+                $user['role']['display_name'] = $rolesMap[$userRoleId]['display_name'];
+                $user['role']['color'] = $rolesMap[$userRoleId]['color'];
             } else {
-                $user['role']['name'] = $roleId;
+                $user['role']['name'] = $userRoleId;
                 $user['role']['display_name'] = 'User';
                 $user['role']['color'] = '#666666';
             }
+            $user['email_verified'] = !isset($user['mail_verify']) || trim((string) $user['mail_verify']) === '';
             if ($app->isDemoMode()) {
                 $user['first_ip'] = $app->getIPIntoFBIFormat();
                 $user['last_ip'] = $app->getIPIntoFBIFormat();
             }
-            unset($user['role_id']);
+            unset($user['role_id'], $user['mail_verify']);
         }
+        unset($user);
+
+        $users = TimeHelper::normaliseRows($users, ['last_seen', 'first_seen']);
 
         $total = User::getCount(
             $search,
@@ -435,7 +443,8 @@ public function show(Request $request, string $uuid): Response
             'color' => $rolesMap[$roleId]['color'] ?? '#666666',
         ];
 
-        unset($user['password']);
+        $user['email_verified'] = !isset($user['mail_verify']) || trim((string) $user['mail_verify']) === '';
+        unset($user['password'], $user['mail_verify']);
 
         $user['activities'] = array_map(function ($activity) use ($app) {
             unset($activity['user_uuid'], $activity['id'], $activity['updated_at']);
@@ -463,6 +472,9 @@ public function show(Request $request, string $uuid): Response
             $user['last_ip'] = $app->getIPIntoFBIFormat();
         }
 
+        $user = ModerationReasonHelper::enrichUserBanMetadata($user);
+        $user = TimeHelper::normaliseRow($user, ['last_seen', 'first_seen', 'banned_at']);
+
         return ApiResponse::success(['user' => $user, 'roles' => $rolesMap], 'User fetched successfully', 200);
     }
 
@@ -525,7 +537,8 @@ public function showByExternalId(Request $request, string $externalId): Response
             'color' => $rolesMap[$roleId]['color'] ?? '#666666',
         ];
 
-        unset($user['password']);
+        $user['email_verified'] = !isset($user['mail_verify']) || trim((string) $user['mail_verify']) === '';
+        unset($user['password'], $user['mail_verify']);
 
         $user['activities'] = array_map(function ($activity) use ($app) {
             unset($activity['user_uuid'], $activity['id'], $activity['updated_at']);
@@ -554,6 +567,9 @@ public function showByExternalId(Request $request, string $externalId): Response
             $user['last_ip'] = $app->getIPIntoFBIFormat();
         }
 
+        $user = ModerationReasonHelper::enrichUserBanMetadata($user);
+        $user = TimeHelper::normaliseRow($user, ['last_seen', 'first_seen', 'banned_at']);
+
         return ApiResponse::success(['user' => $user, 'roles' => $rolesMap], 'User fetched successfully', 200);
     }
 
@@ -822,6 +838,34 @@ public function update(Request $request, string $uuid): Response
             $data['password'] = password_hash($data['password'], PASSWORD_BCRYPT);
             $data['remember_token'] = User::generateAccountToken();
         }
+
+        $staffUser = $request->attributes->get('user');
+        $wasBanned = $user['banned'] === 'true';
+        $becameBanned = false;
+        $becameUnbanned = false;
+        $banReasonForEmail = '';
+
+        if (array_key_exists('banned', $data)) {
+            $wantsBanned = $data['banned'] === 'true' || $data['banned'] === true;
+            unset($data['reason_category'], $data['reason_details'], $data['reason']);
+
+            if ($wantsBanned && !$wasBanned) {
+                $parsed = ModerationReasonHelper::parseRequestBody(json_decode($request->getContent(), true) ?: []);
+                $reasonError = ModerationReasonHelper::validateReason($parsed['reason']);
+                if ($reasonError !== null) {
+                    return ApiResponse::error($reasonError, 'MODERATION_REASON_REQUIRED', 400);
+                }
+                $data = array_merge($data, ModerationReasonHelper::banAppliedFields($parsed['reason'], $staffUser));
+                $banReasonForEmail = $parsed['reason'];
+                $becameBanned = true;
+            } elseif (!$wantsBanned && $wasBanned) {
+                $data = array_merge($data, ModerationReasonHelper::banClearedFields());
+                $becameUnbanned = true;
+            } elseif ($wantsBanned && $wasBanned) {
+                unset($data['banned']);
+            }
+        }
+
         $updated = User::updateUser($user['uuid'], $data);
         if (!$updated) {
             return ApiResponse::error('Failed to update user', 'FAILED_TO_UPDATE_USER', 500, [
@@ -843,36 +887,35 @@ public function update(Request $request, string $uuid): Response
             );
         }
 
-        if (isset($data['banned'])) {
-            if ($data['banned'] == 'true') {
-                AccountBanned::send([
-                    'email' => $user['email'],
-                    'subject' => 'Your account has been suspended on ' . $config->getSetting(ConfigInterface::APP_NAME, 'FeatherPanel'),
-                    'app_name' => $config->getSetting(ConfigInterface::APP_NAME, 'FeatherPanel'),
-                    'app_url' => $config->getSetting(ConfigInterface::APP_URL, 'https://featherpanel.mythical.systems'),
-                    'first_name' => $user['first_name'],
-                    'last_name' => $user['last_name'],
-                    'username' => $user['username'],
-                    'app_support_url' => $config->getSetting(ConfigInterface::APP_SUPPORT_URL, 'https://discord.mythical.systems'),
-                    'uuid' => $user['uuid'],
-                    'enabled' => $config->getSetting(ConfigInterface::SMTP_ENABLED, 'false'),
-                    'suspension_time' => date('Y-m-d H:i:s'),
-                ]);
-            } else {
-                AccountUnBanned::send([
-                    'email' => $user['email'],
-                    'subject' => 'Your account has been unsuspended on ' . $config->getSetting(ConfigInterface::APP_NAME, 'FeatherPanel'),
-                    'app_name' => $config->getSetting(ConfigInterface::APP_NAME, 'FeatherPanel'),
-                    'app_url' => $config->getSetting(ConfigInterface::APP_URL, 'https://featherpanel.mythical.systems'),
-                    'first_name' => $user['first_name'],
-                    'last_name' => $user['last_name'],
-                    'username' => $user['username'],
-                    'app_support_url' => $config->getSetting(ConfigInterface::APP_SUPPORT_URL, 'https://discord.mythical.systems'),
-                    'uuid' => $user['uuid'],
-                    'enabled' => $config->getSetting(ConfigInterface::SMTP_ENABLED, 'false'),
-                    'unsuspension_time' => date('Y-m-d H:i:s'),
-                ]);
-            }
+        if ($becameBanned) {
+            AccountBanned::send([
+                'email' => $user['email'],
+                'subject' => 'Your account has been suspended on ' . $config->getSetting(ConfigInterface::APP_NAME, 'FeatherPanel'),
+                'app_name' => $config->getSetting(ConfigInterface::APP_NAME, 'FeatherPanel'),
+                'app_url' => $config->getSetting(ConfigInterface::APP_URL, 'https://featherpanel.mythical.systems'),
+                'first_name' => $user['first_name'],
+                'last_name' => $user['last_name'],
+                'username' => $user['username'],
+                'app_support_url' => $config->getSetting(ConfigInterface::APP_SUPPORT_URL, 'https://discord.mythical.systems'),
+                'uuid' => $user['uuid'],
+                'enabled' => $config->getSetting(ConfigInterface::SMTP_ENABLED, 'false'),
+                'suspension_time' => date('Y-m-d H:i:s'),
+                'suspension_reason' => $banReasonForEmail,
+            ]);
+        } elseif ($becameUnbanned) {
+            AccountUnBanned::send([
+                'email' => $user['email'],
+                'subject' => 'Your account has been unsuspended on ' . $config->getSetting(ConfigInterface::APP_NAME, 'FeatherPanel'),
+                'app_name' => $config->getSetting(ConfigInterface::APP_NAME, 'FeatherPanel'),
+                'app_url' => $config->getSetting(ConfigInterface::APP_URL, 'https://featherpanel.mythical.systems'),
+                'first_name' => $user['first_name'],
+                'last_name' => $user['last_name'],
+                'username' => $user['username'],
+                'app_support_url' => $config->getSetting(ConfigInterface::APP_SUPPORT_URL, 'https://discord.mythical.systems'),
+                'uuid' => $user['uuid'],
+                'enabled' => $config->getSetting(ConfigInterface::SMTP_ENABLED, 'false'),
+                'unsuspension_time' => date('Y-m-d H:i:s'),
+            ]);
         }
 
         return ApiResponse::success([], 'User updated successfully', 200);
@@ -1391,6 +1434,74 @@ public function sendEmail(Request $request, string $uuid): Response
         ], 'Email queued successfully', 200);
     }
 
+    #[OA\Post(
+        path: '/api/admin/users/{uuid}/verify-email',
+        summary: 'Force verify user email',
+        description: 'Mark a user email address as verified by clearing their pending email verification token.',
+        tags: ['Admin - Users'],
+        parameters: [
+            new OA\Parameter(
+                name: 'uuid',
+                in: 'path',
+                description: 'User UUID',
+                required: true,
+                schema: new OA\Schema(type: 'string', format: 'uuid')
+            ),
+        ],
+        responses: [
+            new OA\Response(response: 200, description: 'User email verified successfully'),
+            new OA\Response(response: 400, description: 'Bad request - User is already verified or demo mode restriction'),
+            new OA\Response(response: 401, description: 'Unauthorized'),
+            new OA\Response(response: 403, description: 'Forbidden - Insufficient permissions'),
+            new OA\Response(response: 404, description: 'User not found'),
+            new OA\Response(response: 500, description: 'Internal server error - Failed to verify email'),
+        ]
+    )]
+    public function forceVerifyEmail(Request $request, string $uuid): Response
+    {
+        $user = User::getUserByUuid($uuid);
+        if (!$user) {
+            return ApiResponse::error('User not found', 'USER_NOT_FOUND', 404);
+        }
+
+        $app = App::getInstance(true);
+        if ($app->isDemoMode() && in_array((int) $user['id'], [1, 2], true)) {
+            return ApiResponse::error('Unmanaged actions are not permitted in demo mode', 'UNMANAGED_ACTIONS_NOT_PERMITTED', 400);
+        }
+
+        if (!isset($user['mail_verify']) || trim((string) $user['mail_verify']) === '') {
+            return ApiResponse::error('User email is already verified', 'EMAIL_ALREADY_VERIFIED', 400);
+        }
+
+        $updated = User::updateUser($user['uuid'], ['mail_verify' => null]);
+        if (!$updated) {
+            return ApiResponse::error('Failed to verify user email', 'FAILED_TO_VERIFY_EMAIL', 500);
+        }
+
+        Activity::createActivity([
+            'user_uuid' => $request->attributes->get('user')['uuid'] ?? null,
+            'name' => 'force_verify_user_email',
+            'context' => 'Force verified email for user ' . ($user['username'] ?? $user['uuid']),
+            'ip_address' => CloudFlareRealIP::getRealIP(),
+        ]);
+
+        global $eventManager;
+        if (isset($eventManager) && $eventManager !== null) {
+            $eventManager->emit(
+                UserEvent::onUserUpdated(),
+                [
+                    'user' => $user,
+                    'updated_data' => ['mail_verify' => null],
+                    'updated_by' => $request->attributes->get('user'),
+                ]
+            );
+        }
+
+        $app->getLogger()->info('User ' . $user['uuid'] . ' email force verified by ' . ($request->attributes->get('user')['uuid'] ?? 'unknown'));
+
+        return ApiResponse::success([], 'User email verified successfully', 200);
+    }
+
     #[OA\Post(
         path: '/api/admin/users/{uuid}/ban',
         summary: 'Ban a user',
@@ -1432,7 +1543,18 @@ public function ban(Request $request, string $uuid): Response
             }
         }
 
-        $updated = User::updateUser($user['uuid'], ['banned' => 'true']);
+        $body = json_decode($request->getContent(), true);
+        if (!is_array($body)) {
+            $body = [];
+        }
+        $parsed = ModerationReasonHelper::parseRequestBody($body);
+        $reasonError = ModerationReasonHelper::validateReason($parsed['reason']);
+        if ($reasonError !== null) {
+            return ApiResponse::error($reasonError, 'MODERATION_REASON_REQUIRED', 400);
+        }
+
+        $staffUser = $request->attributes->get('user');
+        $updated = User::updateUser($user['uuid'], ModerationReasonHelper::banAppliedFields($parsed['reason'], $staffUser));
         if (!$updated) {
             return ApiResponse::error('Failed to ban user', 'FAILED_TO_BAN_USER', 500);
         }
@@ -1443,8 +1565,8 @@ public function ban(Request $request, string $uuid): Response
                 UserEvent::onUserUpdated(),
                 [
                     'user' => $user,
-                    'updated_data' => ['banned' => 'true'],
-                    'updated_by' => $request->attributes->get('user'),
+                    'updated_data' => array_merge(ModerationReasonHelper::banAppliedFields($parsed['reason'], $staffUser), ['ban_reason' => $parsed['reason']]),
+                    'updated_by' => $staffUser,
                 ]
             );
         }
@@ -1462,6 +1584,7 @@ public function ban(Request $request, string $uuid): Response
             'uuid' => $user['uuid'],
             'enabled' => $config->getSetting(ConfigInterface::SMTP_ENABLED, 'false'),
             'suspension_time' => date('Y-m-d H:i:s'),
+            'suspension_reason' => $parsed['reason'],
         ]);
 
         $app->getLogger()->info('User ' . $user['uuid'] . ' banned by ' . ($request->attributes->get('user')['uuid'] ?? 'unknown'));
@@ -1510,7 +1633,7 @@ public function unban(Request $request, string $uuid): Response
             }
         }
 
-        $updated = User::updateUser($user['uuid'], ['banned' => 'false']);
+        $updated = User::updateUser($user['uuid'], ModerationReasonHelper::banClearedFields());
         if (!$updated) {
             return ApiResponse::error('Failed to unban user', 'FAILED_TO_UNBAN_USER', 500);
         }
@@ -1521,7 +1644,7 @@ public function unban(Request $request, string $uuid): Response
                 UserEvent::onUserUpdated(),
                 [
                     'user' => $user,
-                    'updated_data' => ['banned' => 'false'],
+                    'updated_data' => ModerationReasonHelper::banClearedFields(),
                     'updated_by' => $request->attributes->get('user'),
                 ]
             );
diff --git a/backend/app/Controllers/Admin/VmInstancesController.php b/backend/app/Controllers/Admin/VmInstancesController.php
index e5729625e..47c05c15d 100644
--- a/backend/app/Controllers/Admin/VmInstancesController.php
+++ b/backend/app/Controllers/Admin/VmInstancesController.php
@@ -27,6 +27,7 @@
 use App\Chat\VmInstance;
 use App\Chat\VmTemplate;
 use App\Chat\VmInstanceIp;
+use App\Helpers\TimeHelper;
 use App\Helpers\ApiResponse;
 use OpenApi\Attributes as OA;
 use App\Chat\VmInstanceBackup;
@@ -36,6 +37,7 @@
 use App\Services\Vm\VmInstanceUtil;
 use App\CloudFlare\CloudFlareRealIP;
 use App\Mail\templates\VmUnsuspended;
+use App\Helpers\ModerationReasonHelper;
 use App\Plugins\Events\Events\VdsEvent;
 use App\Services\Backup\BackupFifoEviction;
 use Symfony\Component\HttpFoundation\Request;
@@ -615,6 +617,9 @@ public function show(Request $request, int $id): Response
 
         $assignedIps = VmInstanceIp::getByInstanceId($id);
 
+        $instance = ModerationReasonHelper::enrichServerSuspensionMetadata($instance);
+        $instance = TimeHelper::normaliseRow($instance, ['suspended_at', 'created_at', 'updated_at', 'expires_at']);
+
         return ApiResponse::success(
             ['instance' => array_merge($instance, $extra, ['assigned_ips' => $assignedIps])],
             'VM instance fetched successfully',
@@ -2550,7 +2555,18 @@ public function suspend(Request $request, int $id): Response
             return ApiResponse::error('VM instance not found', 'VM_INSTANCE_NOT_FOUND', 404);
         }
 
-        $ok = VmInstance::update($id, ['suspended' => 1]);
+        $body = json_decode($request->getContent(), true);
+        if (!is_array($body)) {
+            $body = [];
+        }
+        $parsed = ModerationReasonHelper::parseRequestBody($body);
+        $reasonError = ModerationReasonHelper::validateReason($parsed['reason']);
+        if ($reasonError !== null) {
+            return ApiResponse::error($reasonError, 'MODERATION_REASON_REQUIRED', 400);
+        }
+
+        $admin = $request->attributes->get('user');
+        $ok = VmInstance::update($id, ModerationReasonHelper::suspensionAppliedFields($parsed['reason'], $admin));
         if (!$ok) {
             return ApiResponse::error('Failed to suspend VM instance', 'FAILED_TO_SUSPEND', 500);
         }
@@ -2561,11 +2577,10 @@ public function suspend(Request $request, int $id): Response
             $user = User::getUserByUuid($instance['user_uuid']);
         }
 
-        $admin = $request->attributes->get('user');
         Activity::createActivity([
             'user_uuid' => $admin['uuid'] ?? null,
             'name' => 'vm_instance_suspend',
-            'context' => 'Suspended VM instance ' . ($instance['hostname'] ?? $id),
+            'context' => 'Suspended VM instance ' . ($instance['hostname'] ?? $id) . ' — ' . $parsed['reason'],
             'ip_address' => CloudFlareRealIP::getRealIP(),
         ]);
 
@@ -2617,6 +2632,7 @@ public function suspend(Request $request, int $id): Response
                     'uuid' => $user['uuid'],
                     'enabled' => $config->getSetting(ConfigInterface::SMTP_ENABLED, 'false'),
                     'vm_hostname' => $instance['hostname'] ?? 'VM-' . $id,
+                    'suspension_reason' => $parsed['reason'],
                 ]);
             } catch (\Exception $e) {
                 App::getInstance(true)->getLogger()->error('Failed to send VM suspended email: ' . $e->getMessage());
@@ -2663,7 +2679,7 @@ public function unsuspend(Request $request, int $id): Response
             return ApiResponse::error('VM instance not found', 'VM_INSTANCE_NOT_FOUND', 404);
         }
 
-        $ok = VmInstance::update($id, ['suspended' => 0]);
+        $ok = VmInstance::update($id, ModerationReasonHelper::suspensionClearedFields());
         if (!$ok) {
             return ApiResponse::error('Failed to unsuspend VM instance', 'FAILED_TO_UNSUSPEND', 500);
         }
diff --git a/backend/app/Controllers/System/PluginSidebarController.php b/backend/app/Controllers/System/PluginSidebarController.php
index 877f86ba1..99ad7947d 100755
--- a/backend/app/Controllers/System/PluginSidebarController.php
+++ b/backend/app/Controllers/System/PluginSidebarController.php
@@ -51,6 +51,7 @@
         new OA\Property(property: 'lucideIcon', type: 'string', nullable: true, description: 'Lucide icon name (e.g., "camera", "search"). If provided, this will be used instead of the icon field. See https://lucide.dev/icons/ for available icons.'),
         new OA\Property(property: 'permission', type: 'string', nullable: true, description: 'Required permission for this item'),
         new OA\Property(property: 'group', type: 'string', nullable: true, description: 'Group name for organizing items (e.g., "Minecraft Java Edition"). Items with the same group name will be grouped together.'),
+        new OA\Property(property: 'priority', type: 'integer', nullable: true, description: 'Sort order within the sidebar group. Lower numbers render first.'),
     ]
 )]
 class PluginSidebarController
diff --git a/backend/app/Controllers/User/Auth/LdapController.php b/backend/app/Controllers/User/Auth/LdapController.php
index acd774f3b..76903f539 100644
--- a/backend/app/Controllers/User/Auth/LdapController.php
+++ b/backend/app/Controllers/User/Auth/LdapController.php
@@ -191,6 +191,94 @@ public function login(Request $request): Response
         return $loginController->completeLogin($userInfo);
     }
 
+    /**
+     * Link an LDAP directory identity to the authenticated account.
+     */
+    public function link(Request $request): Response
+    {
+        $currentUser = $request->attributes->get('user');
+        if (!$currentUser || empty($currentUser['uuid'])) {
+            return ApiResponse::error('Unauthorized', 'UNAUTHORIZED', 401);
+        }
+
+        $data = json_decode($request->getContent(), true);
+        if (!is_array($data)) {
+            return ApiResponse::error('Invalid request data', 'INVALID_REQUEST_DATA', 400);
+        }
+
+        $providerUuid = isset($data['provider_uuid']) ? trim((string) $data['provider_uuid']) : '';
+        $username = isset($data['username']) ? trim((string) $data['username']) : '';
+        $password = isset($data['password']) ? (string) $data['password'] : '';
+
+        if ($providerUuid === '' || $username === '' || $password === '') {
+            return ApiResponse::error(
+                'Provider UUID, username, and password are required',
+                'MISSING_REQUIRED_FIELDS',
+                400
+            );
+        }
+
+        $provider = LdapProvider::getProviderByUuid($providerUuid);
+        if (!$provider) {
+            return ApiResponse::error('LDAP provider not found', 'PROVIDER_NOT_FOUND', 404);
+        }
+
+        if (($provider['enabled'] ?? 'false') !== 'true') {
+            return ApiResponse::error('LDAP provider is disabled', 'PROVIDER_DISABLED', 403);
+        }
+
+        $ldap = new LdapAuthenticator($provider);
+        $ldapUser = $ldap->authenticate($username, $password);
+        if (!$ldapUser) {
+            return ApiResponse::error(
+                'LDAP authentication failed: ' . ($ldap->getLastError() ?? 'Unknown error'),
+                'LDAP_AUTH_FAILED',
+                401
+            );
+        }
+
+        $linkedUser = User::getUserByLdapProviderAndDn($providerUuid, $ldapUser['dn']);
+        if ($linkedUser && $linkedUser['uuid'] !== $currentUser['uuid']) {
+            return ApiResponse::error('LDAP account is already linked to another user', 'LDAP_ALREADY_LINKED', 409);
+        }
+
+        $updated = User::updateUser($currentUser['uuid'], [
+            'ldap_provider_uuid' => $providerUuid,
+            'ldap_dn' => $ldapUser['dn'],
+        ]);
+
+        if (!$updated) {
+            return ApiResponse::error('Failed to link LDAP account', 'LDAP_LINK_FAILED', 500);
+        }
+
+        return ApiResponse::success([
+            'provider_uuid' => $providerUuid,
+            'dn' => $ldapUser['dn'],
+        ], 'LDAP account linked successfully', 200);
+    }
+
+    /**
+     * Unlink LDAP from the authenticated account.
+     */
+    public function unlink(Request $request): Response
+    {
+        $currentUser = $request->attributes->get('user');
+        if (!$currentUser || empty($currentUser['uuid'])) {
+            return ApiResponse::error('Unauthorized', 'UNAUTHORIZED', 401);
+        }
+
+        $updated = User::updateUser($currentUser['uuid'], [
+            'ldap_provider_uuid' => null,
+            'ldap_dn' => null,
+        ]);
+
+        if (!$updated) {
+            return ApiResponse::error('Failed to unlink LDAP account', 'LDAP_UNLINK_FAILED', 500);
+        }
+
+        return ApiResponse::success([], 'LDAP account unlinked successfully', 200);
+    }
+
     /**
      * Provision a new user from LDAP data.
      */
diff --git a/backend/app/Controllers/User/Auth/OidcController.php b/backend/app/Controllers/User/Auth/OidcController.php
index 0420fb565..17dd4026e 100644
--- a/backend/app/Controllers/User/Auth/OidcController.php
+++ b/backend/app/Controllers/User/Auth/OidcController.php
@@ -20,6 +20,7 @@
 use App\App;
 use App\Chat\User;
 use App\Cache\Cache;
+use App\Helpers\ApiResponse;
 use OpenApi\Attributes as OA;
 use App\Config\ConfigInterface;
 use App\Helpers\EmailDomainValidator;
@@ -50,53 +51,22 @@ class OidcController
     )]
     public function login(Request $request): RedirectResponse
     {
-        $app = App::getInstance(true);
-        $providerUuid = $request->query->get('provider');
-
-        if (!is_string($providerUuid) || $providerUuid === '') {
-            return new RedirectResponse('/auth/login?error=oidc_provider_missing');
-        }
-
-        $provider = \App\Chat\OidcProvider::getProviderByUuid($providerUuid);
-        if (!$provider || ($provider['enabled'] ?? 'true') !== 'true') {
-            return new RedirectResponse('/auth/login?error=oidc_provider_not_found');
-        }
-
-        $issuerUrl = rtrim((string) $provider['issuer_url'], '/');
-        $clientId = (string) $provider['client_id'];
-        $scopes = (string) ($provider['scopes'] ?? 'openid email profile');
-
-        if ($issuerUrl === '' || $clientId === '') {
-            return new RedirectResponse('/auth/login?error=oidc_not_configured');
-        }
+        return $this->startOidcFlow($request);
+    }
 
-        $discoveryUrl = $issuerUrl . '/.well-known/openid-configuration';
-        $discovery = $this->fetchJson($discoveryUrl);
-        if (!is_array($discovery) || !isset($discovery['authorization_endpoint'])) {
-            return new RedirectResponse('/auth/login?error=oidc_discovery_failed');
+    /**
+     * Initiate OIDC account linking for an authenticated user.
+     *
+     * GET /api/user/auth/oidc/link.
+     */
+    public function link(Request $request): RedirectResponse
+    {
+        $user = $request->attributes->get('user');
+        if (!$user || empty($user['uuid'])) {
+            return new RedirectResponse('/auth/login?redirect=' . urlencode('/dashboard/account?tab=settings'));
         }
 
-        $authEndpoint = $discovery['authorization_endpoint'];
-
-        $state = bin2hex(random_bytes(16));
-        $nonce = bin2hex(random_bytes(16));
-
-        Cache::put('oidc_state_' . $state, [
-            'nonce' => $nonce,
-            'provider_uuid' => $providerUuid,
-        ], 10);
-
-        $redirectUri = $app->getConfig()->getSetting(ConfigInterface::APP_URL, '') . '/api/user/auth/oidc/callback';
-        $query = http_build_query([
-            'client_id' => $clientId,
-            'redirect_uri' => $redirectUri,
-            'response_type' => 'code',
-            'scope' => $scopes,
-            'state' => $state,
-            'nonce' => $nonce,
-        ]);
-
-        return new RedirectResponse($authEndpoint . '?' . $query);
+        return $this->startOidcFlow($request, (string) $user['uuid']);
     }
 
     /**
@@ -134,19 +104,21 @@ public function callback(Request $request): RedirectResponse | Response
             return new RedirectResponse('/auth/login?error=oidc_missing_code');
         }
 
+        $isLinkFlow = isset($cached['link_user_uuid']) && is_string($cached['link_user_uuid']) && $cached['link_user_uuid'] !== '';
+
         Cache::forget('oidc_state_' . $state);
 
         $providerUuid = (string) $cached['provider_uuid'];
         $provider = \App\Chat\OidcProvider::getProviderByUuid($providerUuid);
         if (!$provider || ($provider['enabled'] ?? 'true') !== 'true') {
-            return new RedirectResponse('/auth/login?error=oidc_provider_not_found');
+            return $this->oidcErrorRedirect('oidc_provider_not_found', $isLinkFlow);
         }
 
         $issuerUrl = rtrim((string) $provider['issuer_url'], '/');
         $clientId = (string) $provider['client_id'];
         $clientSecretRaw = $provider['client_secret'] ?? '';
         if ($clientSecretRaw === '') {
-            return new RedirectResponse('/auth/login?error=oidc_not_configured');
+            return $this->oidcErrorRedirect('oidc_not_configured', $isLinkFlow);
         }
         try {
             $clientSecret = $app->decryptValue((string) $clientSecretRaw);
@@ -156,73 +128,120 @@ public function callback(Request $request): RedirectResponse | Response
         }
 
         if ($issuerUrl === '' || $clientId === '' || $clientSecret === '') {
-            return new RedirectResponse('/auth/login?error=oidc_not_configured');
+            return $this->oidcErrorRedirect('oidc_not_configured', $isLinkFlow);
         }
 
         $discoveryUrl = $issuerUrl . '/.well-known/openid-configuration';
         $discovery = $this->fetchJson($discoveryUrl);
         if (!is_array($discovery) || !isset($discovery['token_endpoint'])) {
-            return new RedirectResponse('/auth/login?error=oidc_discovery_failed');
+            return $this->oidcErrorRedirect('oidc_discovery_failed', $isLinkFlow);
         }
 
         $tokenEndpoint = $discovery['token_endpoint'];
         $redirectUri = $app->getConfig()->getSetting(ConfigInterface::APP_URL, '') . '/api/user/auth/oidc/callback';
 
-        $postData = http_build_query([
+        $basePostFields = [
             'grant_type' => 'authorization_code',
             'code' => $code,
             'redirect_uri' => $redirectUri,
-            'client_id' => $clientId,
-            'client_secret' => $clientSecret,
-        ]);
+        ];
+
+        $supportedTokenAuthMethods = $discovery['token_endpoint_auth_methods_supported'] ?? null;
+        $tokenAuthMethods = ['client_secret_basic'];
+        if (is_array($supportedTokenAuthMethods)) {
+            $tokenAuthMethods = [];
+            foreach (['client_secret_basic', 'client_secret_post'] as $method) {
+                if (in_array($method, $supportedTokenAuthMethods, true)) {
+                    $tokenAuthMethods[] = $method;
+                }
+            }
+            if ($tokenAuthMethods === []) {
+                $tokenAuthMethods = ['client_secret_basic', 'client_secret_post'];
+            }
+        } else {
+            $tokenAuthMethods[] = 'client_secret_post';
+        }
 
-        $ch = curl_init($tokenEndpoint);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_POST, true);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $postData);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/x-www-form-urlencoded']);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
-        curl_setopt($ch, CURLOPT_FAILONERROR, true);
-        $tokenResponse = curl_exec($ch);
-        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $curlErr = curl_errno($ch);
-        $curlErrMsg = curl_error($ch);
-        curl_close($ch);
+        $tokenResponse = false;
+        $httpCode = 0;
+        $curlErr = 0;
+        $curlErrMsg = '';
+        $tokenAuthMethod = $tokenAuthMethods[0];
+
+        foreach ($tokenAuthMethods as $method) {
+            $postFields = $basePostFields;
+            $headers = ['Content-Type: application/x-www-form-urlencoded'];
+
+            if ($method === 'client_secret_post') {
+                $postFields['client_id'] = $clientId;
+                $postFields['client_secret'] = $clientSecret;
+            } else {
+                $basicCredentials = base64_encode(rawurlencode($clientId) . ':' . rawurlencode($clientSecret));
+                $headers[] = 'Authorization: Basic ' . $basicCredentials;
+            }
+
+            $ch = curl_init($tokenEndpoint);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_POST, true);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($postFields));
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+            curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+            $tokenResponse = curl_exec($ch);
+            $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            $curlErr = curl_errno($ch);
+            $curlErrMsg = curl_error($ch);
+            $ch = null;
+            $tokenAuthMethod = $method;
+
+            if ($curlErr === 0 && $tokenResponse !== false && $httpCode >= 200 && $httpCode < 300) {
+                break;
+            }
+
+            $responseSnippet = substr((string) $tokenResponse, 0, 500);
+            $app->getLogger()->warning(
+                'OIDC token request using ' . $method . ' failed with HTTP ' . $httpCode . '. Response: ' . $responseSnippet
+            );
+        }
         if ($curlErr !== 0 || $tokenResponse === false) {
-            $app->getLogger()->warning('OIDC token request failed: ' . ($curlErrMsg ?: 'Unknown cURL error'));
+            $app->getLogger()->warning(
+                'OIDC token request using ' . $tokenAuthMethod . ' failed: ' . ($curlErrMsg ?: 'Unknown cURL error')
+            );
 
-            return new RedirectResponse('/auth/login?error=oidc_token_failed');
+            return $this->oidcErrorRedirect('oidc_token_failed', $isLinkFlow);
         }
         if ($httpCode < 200 || $httpCode >= 300) {
-            $app->getLogger()->warning('OIDC token endpoint returned HTTP ' . $httpCode);
+            $responseSnippet = substr((string) $tokenResponse, 0, 500);
+            $app->getLogger()->warning(
+                'OIDC token endpoint returned HTTP ' . $httpCode . ' using ' . $tokenAuthMethod . '. Response: ' . $responseSnippet
+            );
 
-            return new RedirectResponse('/auth/login?error=oidc_token_failed');
+            return $this->oidcErrorRedirect('oidc_token_failed', $isLinkFlow);
         }
         $tokenData = json_decode($tokenResponse ?: '', true);
 
         if (!is_array($tokenData) || !isset($tokenData['id_token'])) {
-            return new RedirectResponse('/auth/login?error=oidc_token_failed');
+            return $this->oidcErrorRedirect('oidc_token_failed', $isLinkFlow);
         }
 
         $idToken = $tokenData['id_token'];
         $claims = $this->decodeJwtWithoutVerification($idToken);
         if (!is_array($claims)) {
-            return new RedirectResponse('/auth/login?error=oidc_invalid_id_token');
+            return $this->oidcErrorRedirect('oidc_invalid_id_token', $isLinkFlow);
         }
 
         if (!isset($claims['iss']) || !is_string($claims['iss']) || rtrim($claims['iss'], '/') !== $issuerUrl) {
-            return new RedirectResponse('/auth/login?error=oidc_invalid_issuer');
+            return $this->oidcErrorRedirect('oidc_invalid_issuer', $isLinkFlow);
         }
         if (!isset($claims['aud'])) {
-            return new RedirectResponse('/auth/login?error=oidc_invalid_audience');
+            return $this->oidcErrorRedirect('oidc_invalid_audience', $isLinkFlow);
         }
         $aud = $claims['aud'];
         if (is_string($aud) && $aud !== $clientId) {
-            return new RedirectResponse('/auth/login?error=oidc_invalid_audience');
+            return $this->oidcErrorRedirect('oidc_invalid_audience', $isLinkFlow);
         }
         if (is_array($aud) && !in_array($clientId, $aud, true)) {
-            return new RedirectResponse('/auth/login?error=oidc_invalid_audience');
+            return $this->oidcErrorRedirect('oidc_invalid_audience', $isLinkFlow);
         }
 
         $emailClaimKey = (string) ($provider['email_claim'] ?? 'email');
@@ -233,7 +252,7 @@ public function callback(Request $request): RedirectResponse | Response
 
         $subject = $claims[$subjectClaimKey] ?? null;
         if (!is_string($subject) || $subject === '') {
-            return new RedirectResponse('/auth/login?error=oidc_missing_subject');
+            return $this->oidcErrorRedirect('oidc_missing_subject', $isLinkFlow);
         }
 
         $email = $claims[$emailClaimKey] ?? null;
@@ -244,7 +263,7 @@ public function callback(Request $request): RedirectResponse | Response
         if ($requireEmailVerified) {
             $emailVerified = $claims['email_verified'] ?? null;
             if ($emailVerified !== true && $emailVerified !== 'true') {
-                return new RedirectResponse('/auth/login?error=oidc_email_not_verified');
+                return $this->oidcErrorRedirect('oidc_email_not_verified', $isLinkFlow);
             }
         }
 
@@ -257,7 +276,7 @@ public function callback(Request $request): RedirectResponse | Response
                 $allowed = in_array($requiredGroupValue, $groupClaim, true);
             }
             if (!$allowed) {
-                return new RedirectResponse('/auth/login?error=oidc_access_denied');
+                return $this->oidcErrorRedirect('oidc_access_denied', $isLinkFlow);
             }
         }
 
@@ -266,6 +285,10 @@ public function callback(Request $request): RedirectResponse | Response
 
         $providerId = $providerUuid;
 
+        if ($isLinkFlow) {
+            return $this->completeAccountLink($cached['link_user_uuid'], $providerId, $subject, $email);
+        }
+
         $user = $this->findUserByOidcSubject($providerId, $subject);
         if (!$user && $email && $emailVerifiedStrict) {
             $user = User::getUserByEmail($email);
@@ -298,6 +321,116 @@ public function callback(Request $request): RedirectResponse | Response
         return $loginController->completeLogin($user, '/dashboard');
     }
 
+    /**
+     * Unlink OIDC from the authenticated account.
+     *
+     * DELETE /api/user/auth/oidc/unlink.
+     */
+    public function unlink(Request $request): Response
+    {
+        $user = $request->attributes->get('user');
+        if (!$user || empty($user['uuid'])) {
+            return ApiResponse::error('Unauthorized', 'UNAUTHORIZED', 401);
+        }
+
+        $updated = User::updateUser((string) $user['uuid'], [
+            'oidc_provider' => null,
+            'oidc_subject' => null,
+            'oidc_email' => null,
+        ]);
+
+        if (!$updated) {
+            return ApiResponse::error('Failed to unlink OIDC account', 'OIDC_UNLINK_FAILED', 500);
+        }
+
+        return ApiResponse::success([], 'OIDC account unlinked successfully', 200);
+    }
+
+    private function startOidcFlow(Request $request, ?string $linkUserUuid = null): RedirectResponse
+    {
+        $app = App::getInstance(true);
+        $providerUuid = $request->query->get('provider');
+
+        if (!is_string($providerUuid) || $providerUuid === '') {
+            return $this->oidcErrorRedirect('oidc_provider_missing', $linkUserUuid !== null);
+        }
+
+        $provider = \App\Chat\OidcProvider::getProviderByUuid($providerUuid);
+        if (!$provider || ($provider['enabled'] ?? 'true') !== 'true') {
+            return $this->oidcErrorRedirect('oidc_provider_not_found', $linkUserUuid !== null);
+        }
+
+        $issuerUrl = rtrim((string) $provider['issuer_url'], '/');
+        $clientId = (string) $provider['client_id'];
+        $scopes = (string) ($provider['scopes'] ?? 'openid email profile');
+
+        if ($issuerUrl === '' || $clientId === '') {
+            return $this->oidcErrorRedirect('oidc_not_configured', $linkUserUuid !== null);
+        }
+
+        $discoveryUrl = $issuerUrl . '/.well-known/openid-configuration';
+        $discovery = $this->fetchJson($discoveryUrl);
+        if (!is_array($discovery) || !isset($discovery['authorization_endpoint'])) {
+            return $this->oidcErrorRedirect('oidc_discovery_failed', $linkUserUuid !== null);
+        }
+
+        $state = bin2hex(random_bytes(16));
+        $nonce = bin2hex(random_bytes(16));
+        $stateData = [
+            'nonce' => $nonce,
+            'provider_uuid' => $providerUuid,
+        ];
+        if ($linkUserUuid !== null) {
+            $stateData['link_user_uuid'] = $linkUserUuid;
+        }
+
+        Cache::put('oidc_state_' . $state, $stateData, 10);
+
+        $redirectUri = $app->getConfig()->getSetting(ConfigInterface::APP_URL, '') . '/api/user/auth/oidc/callback';
+        $query = http_build_query([
+            'client_id' => $clientId,
+            'redirect_uri' => $redirectUri,
+            'response_type' => 'code',
+            'scope' => $scopes,
+            'state' => $state,
+            'nonce' => $nonce,
+        ]);
+
+        return new RedirectResponse($discovery['authorization_endpoint'] . '?' . $query);
+    }
+
+    private function oidcErrorRedirect(string $errorCode, bool $accountSettings): RedirectResponse
+    {
+        $target = $accountSettings ? '/dashboard/account?tab=settings&error=' : '/auth/login?error=';
+
+        return new RedirectResponse($target . urlencode($errorCode));
+    }
+
+    private function completeAccountLink(string $userUuid, string $providerId, string $subject, ?string $email): RedirectResponse
+    {
+        $user = User::getUserByUuid($userUuid);
+        if (!$user) {
+            return new RedirectResponse('/dashboard/account?tab=settings&error=oidc_user_not_found');
+        }
+
+        $existingLinkedUser = $this->findUserByOidcSubject($providerId, $subject);
+        if ($existingLinkedUser && $existingLinkedUser['uuid'] !== $userUuid) {
+            return new RedirectResponse('/dashboard/account?tab=settings&error=oidc_already_linked');
+        }
+
+        $updated = User::updateUser($userUuid, [
+            'oidc_provider' => $providerId,
+            'oidc_subject' => $subject,
+            'oidc_email' => $email,
+        ]);
+
+        if (!$updated) {
+            return new RedirectResponse('/dashboard/account?tab=settings&error=oidc_link_failed');
+        }
+
+        return new RedirectResponse('/dashboard/account?tab=settings&linked=oidc');
+    }
+
     /**
      * Find a user by OIDC provider and subject.
      */
@@ -426,7 +559,7 @@ private function fetchJson(string $url): ?array
         $response = curl_exec($ch);
         $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
         $curlErr = curl_errno($ch);
-        curl_close($ch);
+        $ch = null;
         if ($curlErr !== 0 || $response === false || $httpCode < 200 || $httpCode >= 300) {
             return null;
         }
diff --git a/backend/app/Controllers/User/Auth/PasskeyController.php b/backend/app/Controllers/User/Auth/PasskeyController.php
index 02ae80397..c0a2007d3 100644
--- a/backend/app/Controllers/User/Auth/PasskeyController.php
+++ b/backend/app/Controllers/User/Auth/PasskeyController.php
@@ -23,6 +23,7 @@
 use App\Permissions;
 use Cose\Algorithms;
 use App\Chat\UserPasskey;
+use App\Helpers\TimeHelper;
 use App\Helpers\ApiResponse;
 use App\Config\ConfigInterface;
 use App\Helpers\WebAuthnHelper;
@@ -260,7 +261,7 @@ public function getList(Request $request): Response
             $out[] = [
                 'id' => (int) $row['id'],
                 'label' => $row['label'],
-                'created_at' => $row['created_at'],
+                'created_at' => TimeHelper::toIso8601($row['created_at'] ?? null),
                 'aaguid' => $row['aaguid'],
             ];
         }
diff --git a/backend/app/Controllers/User/Auth/VerifyEmailController.php b/backend/app/Controllers/User/Auth/VerifyEmailController.php
index c035fc894..e362e386b 100644
--- a/backend/app/Controllers/User/Auth/VerifyEmailController.php
+++ b/backend/app/Controllers/User/Auth/VerifyEmailController.php
@@ -17,13 +17,19 @@
 
 namespace App\Controllers\User\Auth;
 
+use App\App;
 use App\Chat\User;
+use App\Cache\Cache;
 use App\Helpers\ApiResponse;
+use App\Config\ConfigInterface;
+use App\Mail\templates\VerifyEmail;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 class VerifyEmailController
 {
+    private const RESEND_COOLDOWN_MINUTES = 5;
+
     public function get(Request $request): Response
     {
         $token = trim((string) $request->query->get('token', ''));
@@ -42,4 +48,59 @@ public function get(Request $request): Response
 
         return ApiResponse::success([], 'Email verified successfully. You can now log in.', 200);
     }
+
+    public function resend(Request $request): Response
+    {
+        $app = App::getInstance(true);
+        $config = $app->getConfig();
+
+        if ($config->getSetting(ConfigInterface::REGISTRATION_REQUIRE_EMAIL_VERIFICATION, 'false') !== 'true') {
+            return ApiResponse::success([], 'If email verification is needed, a new verification email will be sent.', 200);
+        }
+
+        if ($config->getSetting(ConfigInterface::SMTP_ENABLED, 'false') !== 'true') {
+            return ApiResponse::error('Email verification is enabled, but SMTP is not configured.', 'EMAIL_VERIFICATION_SMTP_REQUIRED', 400);
+        }
+
+        $body = json_decode($request->getContent(), true);
+        if (!is_array($body)) {
+            $body = [];
+        }
+        $identifier = trim((string) ($body['email'] ?? $body['username_or_email'] ?? ''));
+        if ($identifier === '') {
+            return ApiResponse::error('Email or username is required', 'MISSING_IDENTIFIER', 400);
+        }
+
+        $user = filter_var($identifier, FILTER_VALIDATE_EMAIL)
+            ? User::getUserByEmail($identifier)
+            : User::getUserByUsername($identifier);
+
+        if ($user === null || !isset($user['mail_verify']) || trim((string) $user['mail_verify']) === '') {
+            return ApiResponse::success([], 'If email verification is needed, a new verification email will be sent.', 200);
+        }
+
+        $cacheKey = 'auth:email-verification-resend:' . hash('sha256', (string) $user['uuid']);
+        if (Cache::exists($cacheKey)) {
+            return ApiResponse::success([], 'If email verification is needed, a new verification email will be sent.', 200);
+        }
+
+        $verifyUrl = rtrim($config->getSetting(ConfigInterface::APP_URL, 'https://featherpanel.mythical.systems'), '/') . '/auth/verify-email?token=' . urlencode((string) $user['mail_verify']);
+        VerifyEmail::send([
+            'subject' => 'Verify your email for ' . $config->getSetting(ConfigInterface::APP_NAME, 'FeatherPanel'),
+            'app_name' => $config->getSetting(ConfigInterface::APP_NAME, 'FeatherPanel'),
+            'app_url' => $config->getSetting(ConfigInterface::APP_URL, 'https://featherpanel.mythical.systems'),
+            'first_name' => (string) ($user['first_name'] ?? ''),
+            'last_name' => (string) ($user['last_name'] ?? ''),
+            'email' => (string) ($user['email'] ?? ''),
+            'username' => (string) ($user['username'] ?? ''),
+            'app_support_url' => $config->getSetting(ConfigInterface::APP_SUPPORT_URL, 'https://discord.mythical.systems'),
+            'verify_url' => $verifyUrl,
+            'uuid' => (string) $user['uuid'],
+            'enabled' => $config->getSetting(ConfigInterface::SMTP_ENABLED, 'false'),
+        ]);
+
+        Cache::put($cacheKey, true, self::RESEND_COOLDOWN_MINUTES);
+
+        return ApiResponse::success([], 'If email verification is needed, a new verification email will be sent.', 200);
+    }
 }
diff --git a/backend/app/Controllers/User/ChatbotController.php b/backend/app/Controllers/User/ChatbotController.php
index 0afc5cecd..58c02443b 100755
--- a/backend/app/Controllers/User/ChatbotController.php
+++ b/backend/app/Controllers/User/ChatbotController.php
@@ -22,10 +22,12 @@
 use App\Helpers\ApiResponse;
 use OpenApi\Attributes as OA;
 use App\Chat\ChatConversation;
+use App\Services\Chatbot\TokenUsage;
 use App\Services\Chatbot\ChatbotService;
 use App\Plugins\Events\Events\ChatbotEvent;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 #[OA\Schema(
     schema: 'ChatbotRequest',
@@ -70,105 +72,28 @@ class ChatbotController
     )]
     public function chat(Request $request): Response
     {
-        $currentUser = $request->attributes->get('user');
-
-        if (!$currentUser || !isset($currentUser['id'])) {
-            return ApiResponse::error('User not authenticated', 'UNAUTHORIZED', 401);
-        }
-
-        // Check if chatbot is enabled
-        $app = App::getInstance(true);
-        $config = $app->getConfig();
-        $enabled = $config->getSetting(\App\Config\ConfigInterface::CHATBOT_ENABLED, 'true');
-        if ($enabled !== 'true') {
-            return ApiResponse::error('The AI chatbot is currently disabled by the administrator.', 'CHATBOT_DISABLED', 403);
-        }
-
-        $data = json_decode($request->getContent(), true);
-
-        if (!isset($data['message']) || empty(trim($data['message']))) {
-            return ApiResponse::error('Message is required', 'INVALID_REQUEST', 400);
-        }
-
-        $message = trim($data['message']);
-        $history = $data['history'] ?? [];
-        $pageContext = $data['pageContext'] ?? [];
-        $conversationId = $data['conversation_id'] ?? null;
-
         try {
-            // Get or create conversation
-            $conversation = null;
-            if ($conversationId) {
-                $conversation = ChatConversation::getConversationById((int) $conversationId);
-                // Verify conversation belongs to user
-                if ($conversation && $conversation['user_uuid'] !== $currentUser['uuid']) {
-                    return ApiResponse::error('Conversation not found', 'NOT_FOUND', 404);
-                }
-            }
-
-            // Create new conversation if needed
-            if (!$conversation) {
-                $conversationId = ChatConversation::createConversation([
-                    'user_uuid' => $currentUser['uuid'],
-                    'title' => substr($message, 0, 255), // Use first message as title
-                ]);
-                if (!$conversationId) {
-                    return ApiResponse::error('Failed to create conversation', 'SERVER_ERROR', 500);
-                }
-                $conversation = ChatConversation::getConversationById($conversationId);
-            }
-
-            // Load conversation history from database if not provided
-            if (empty($history) && $conversation) {
-                $dbMessages = ChatMessage::getMessagesByConversation($conversation['id'], 50);
-                $history = array_map(function ($msg) {
-                    return [
-                        'role' => $msg['role'],
-                        'content' => $msg['content'],
-                    ];
-                }, $dbMessages);
-            }
-
-            // Save user message to database
-            ChatMessage::createMessage([
-                'conversation_id' => $conversation['id'],
-                'role' => 'user',
-                'content' => $message,
-            ]);
-
-            // Get conversation memory
-            $conversationMemory = $conversation['memory'] ?? '';
-            $pageContext['conversation_memory'] = $conversationMemory;
-
-            // Process message through AI
-            $chatbotService = new ChatbotService();
-            $result = $chatbotService->processMessage($message, $history, $currentUser, $pageContext);
-
-            // Update message count
-            $messageCount = ChatMessage::getMessageCount($conversation['id']);
-            ChatConversation::updateConversation($conversation['id'], [
-                'message_count' => $messageCount,
-            ]);
-
-            // Save AI response to database
-            ChatMessage::createMessage([
-                'conversation_id' => $conversation['id'],
-                'role' => 'assistant',
-                'content' => $result['response'],
-                'model' => $result['model'] ?? null,
-            ]);
-
-            // Update conversation timestamp
-            ChatConversation::updateConversation($conversation['id'], [
-                'updated_at' => date('Y-m-d H:i:s'),
-            ]);
+            $payload = $this->processChatRequest($request);
 
             return ApiResponse::success([
-                'response' => $result['response'],
-                'model' => $result['model'] ?? 'FeatherPanel AI',
-                'conversation_id' => $conversation['id'],
-                'tool_executions' => $result['tool_executions'] ?? [], // Include tool execution results
+                'response' => $payload['response'],
+                'model' => $payload['model'],
+                'conversation_id' => $payload['conversation_id'],
+                'message_id' => $payload['assistant_message_id'],
+                'user_message_id' => $payload['user_message_id'],
+                'usage' => $payload['usage'],
+                'user_usage' => $payload['user_usage'],
+                'tool_executions' => $payload['tool_executions'],
+                'tool_activity' => $payload['tool_activity'],
             ], 'Message processed successfully');
+        } catch (\InvalidArgumentException $e) {
+            return ApiResponse::error($e->getMessage(), 'INVALID_REQUEST', 400);
+        } catch (\RuntimeException $e) {
+            $message = $e->getMessage();
+            $code = $message === 'User not authenticated' ? 401 : ($message === 'Conversation not found' ? 404 : (str_contains($message, 'disabled') ? 403 : 500));
+            $errorCode = $code === 401 ? 'UNAUTHORIZED' : ($code === 404 ? 'NOT_FOUND' : ($code === 403 ? 'CHATBOT_DISABLED' : 'CHATBOT_ERROR'));
+
+            return ApiResponse::error($message, $errorCode, $code);
         } catch (\Exception $e) {
             App::getInstance(true)->getLogger()->error('Chatbot error: ' . $e->getMessage());
 
@@ -180,6 +105,32 @@ public function chat(Request $request): Response
         }
     }
 
+    public function streamChat(Request $request): Response
+    {
+        return new StreamedResponse(function () use ($request): void {
+            $emit = function (string $type, array $payload = []): void {
+                echo "event: {$type}\n";
+                echo 'data: ' . json_encode($payload, JSON_UNESCAPED_SLASHES) . "\n\n";
+                @ob_flush();
+                flush();
+            };
+
+            try {
+                $payload = $this->processChatRequest($request, $emit);
+                $emit('final', $payload);
+            } catch (\Exception $e) {
+                App::getInstance(true)->getLogger()->error('Chatbot stream error: ' . $e->getMessage());
+                $emit('error', [
+                    'message' => 'Failed to process message. Please try again.',
+                ]);
+            }
+        }, 200, [
+            'Content-Type' => 'text/event-stream',
+            'Cache-Control' => 'no-cache',
+            'X-Accel-Buffering' => 'no',
+        ]);
+    }
+
     #[OA\Get(
         path: '/api/user/chatbot/conversations',
         summary: 'Get user conversations',
@@ -414,6 +365,192 @@ public function updateMemory(Request $request, int $id): Response
         }
     }
 
+    private function processChatRequest(Request $request, ?callable $emit = null): array
+    {
+        $currentUser = $request->attributes->get('user');
+
+        if (!$currentUser || !isset($currentUser['id'])) {
+            throw new \RuntimeException('User not authenticated');
+        }
+
+        $app = App::getInstance(true);
+        $config = $app->getConfig();
+        $enabled = $config->getSetting(\App\Config\ConfigInterface::CHATBOT_ENABLED, 'true');
+        if ($enabled !== 'true') {
+            throw new \RuntimeException('The AI chatbot is currently disabled by the administrator.');
+        }
+
+        $data = json_decode($request->getContent(), true) ?: [];
+        if (!isset($data['message']) || empty(trim($data['message']))) {
+            throw new \InvalidArgumentException('Message is required');
+        }
+
+        $message = trim($data['message']);
+        $history = $data['history'] ?? [];
+        $pageContext = $data['pageContext'] ?? [];
+        $conversationId = $data['conversation_id'] ?? null;
+
+        $conversation = null;
+        if ($conversationId) {
+            $conversation = ChatConversation::getConversationById((int) $conversationId);
+            if ($conversation && $conversation['user_uuid'] !== $currentUser['uuid']) {
+                throw new \RuntimeException('Conversation not found');
+            }
+        }
+
+        if (!$conversation) {
+            $conversationId = ChatConversation::createConversation([
+                'user_uuid' => $currentUser['uuid'],
+                'title' => substr($message, 0, 255),
+            ]);
+            if (!$conversationId) {
+                throw new \RuntimeException('Failed to create conversation');
+            }
+            $conversation = ChatConversation::getConversationById($conversationId);
+        }
+
+        $dbMessages = ChatMessage::getMessagesByConversation($conversation['id'], 50);
+        if (empty($history) && $conversation) {
+            $history = $this->buildCompactHistory($dbMessages, $conversation);
+        } else {
+            $history = array_slice($history, -6);
+        }
+
+        $userUsage = TokenUsage::estimate($message);
+        $userMessageId = ChatMessage::createMessage([
+            'conversation_id' => $conversation['id'],
+            'role' => 'user',
+            'content' => $message,
+            'input_tokens' => $userUsage['input_tokens'],
+            'total_tokens' => $userUsage['total_tokens'],
+            'token_source' => $userUsage['source'],
+        ]);
+
+        if ($emit !== null) {
+            $emit('conversation', [
+                'conversation_id' => $conversation['id'],
+                'user_message_id' => $userMessageId,
+                'user_usage' => $userUsage,
+            ]);
+        }
+
+        $summary = $this->refreshContextSummary($conversation, $dbMessages, $message);
+        if ($emit !== null && $summary !== '') {
+            $emit('status', ['message' => 'Compacting conversation context']);
+        }
+        $pageContext['conversation_memory'] = trim(($conversation['memory'] ?? '') . "\n\n" . $summary);
+
+        $chatbotService = new ChatbotService();
+        $result = $chatbotService->processMessage($message, $history, $currentUser, $pageContext, $emit);
+        $usage = $result['usage'] ?? TokenUsage::estimate($message, $result['response'] ?? '');
+        $toolActivity = $result['tool_activity'] ?? [];
+
+        $assistantMessageId = ChatMessage::createMessage([
+            'conversation_id' => $conversation['id'],
+            'role' => 'assistant',
+            'content' => $result['response'],
+            'model' => $result['model'] ?? null,
+            'input_tokens' => $usage['input_tokens'] ?? null,
+            'output_tokens' => $usage['output_tokens'] ?? null,
+            'total_tokens' => $usage['total_tokens'] ?? null,
+            'token_source' => $usage['source'] ?? null,
+            'tool_activity' => $toolActivity,
+            'usage_json' => $usage,
+        ]);
+
+        $messageCount = ChatMessage::getMessageCount($conversation['id']);
+        ChatConversation::updateConversation($conversation['id'], [
+            'message_count' => $messageCount,
+            'updated_at' => date('Y-m-d H:i:s'),
+        ]);
+
+        return [
+            'response' => $result['response'],
+            'model' => $result['model'] ?? 'FeatherPanel AI',
+            'conversation_id' => $conversation['id'],
+            'user_message_id' => $userMessageId,
+            'assistant_message_id' => $assistantMessageId,
+            'usage' => $usage,
+            'user_usage' => $userUsage,
+            'tool_executions' => $result['tool_executions'] ?? [],
+            'tool_activity' => $toolActivity,
+        ];
+    }
+
+    private function buildCompactHistory(array $dbMessages, array $conversation): array
+    {
+        $summary = $conversation['context_summary'] ?? '';
+        $recentMessages = array_slice($dbMessages, -6);
+        $history = [];
+
+        if ($summary !== '') {
+            $history[] = [
+                'role' => 'assistant',
+                'content' => "Conversation context summary:\n{$summary}",
+            ];
+        }
+
+        foreach ($recentMessages as $msg) {
+            $content = $msg['content'];
+            if (!empty($msg['tool_activity']) && is_array($msg['tool_activity'])) {
+                $content .= "\n\n[Tool/activity results from this assistant turn]\n" . $this->formatToolActivityForHistory($msg['tool_activity']);
+            }
+            $history[] = [
+                'role' => $msg['role'],
+                'content' => $content,
+            ];
+        }
+
+        return $history;
+    }
+
+    private function refreshContextSummary(array $conversation, array $dbMessages, string $latestMessage): string
+    {
+        $existing = trim((string) ($conversation['context_summary'] ?? ''));
+        if (count($dbMessages) < 10 || !ChatConversation::hasColumn('context_summary')) {
+            return $existing;
+        }
+
+        $olderMessages = array_slice($dbMessages, 0, -6);
+        $lines = [];
+        foreach ($olderMessages as $message) {
+            $content = trim(preg_replace('/\s+/', ' ', (string) $message['content']));
+            if (!empty($message['tool_activity']) && is_array($message['tool_activity'])) {
+                $content .= ' Tool/activity: ' . preg_replace('/\s+/', ' ', $this->formatToolActivityForHistory($message['tool_activity']));
+            }
+            if ($content === '') {
+                continue;
+            }
+            $lines[] = strtoupper((string) $message['role']) . ': ' . mb_substr($content, 0, 220);
+        }
+
+        $summary = trim($existing . "\n" . implode("\n", array_slice($lines, -12)));
+        $summary = mb_substr($summary, -3500);
+        $summary .= "\nLatest user message: " . mb_substr($latestMessage, 0, 300);
+
+        ChatConversation::updateConversation((int) $conversation['id'], [
+            'context_summary' => $summary,
+            'context_summary_updated_at' => date('Y-m-d H:i:s'),
+        ]);
+
+        return $summary;
+    }
+
+    private function formatToolActivityForHistory(array $toolActivity): string
+    {
+        $lines = [];
+        foreach ($toolActivity as $activity) {
+            if (!is_array($activity)) {
+                continue;
+            }
+            $status = ($activity['success'] ?? null) === false ? 'failed' : (($activity['success'] ?? null) ? 'completed' : 'planned');
+            $summary = isset($activity['summary']) ? ' - ' . $activity['summary'] : '';
+            $lines[] = ($activity['tool'] ?? 'unknown_tool') . ": {$status}{$summary}";
+        }
+
+        return implode("\n", $lines);
+    }
+
     private static function emitEvent(string $eventName, array $payload): void
     {
         global $eventManager;
diff --git a/backend/app/Controllers/User/NodeStatusController.php b/backend/app/Controllers/User/NodeStatusController.php
index fddcd6d6a..353e0c467 100755
--- a/backend/app/Controllers/User/NodeStatusController.php
+++ b/backend/app/Controllers/User/NodeStatusController.php
@@ -75,12 +75,18 @@ public function getStatus(Request $request): Response
         $allowIframe = $config->getSetting(ConfigInterface::STATUS_PAGE_ALLOW_IFRAME, 'false') === 'true';
         $showRawValues = $config->getSetting(ConfigInterface::STATUS_PAGE_SHOW_RAW_VALUES, 'false') === 'true';
         $showPlayerCount = $config->getSetting(ConfigInterface::STATUS_PAGE_SHOW_PLAYER_COUNT, 'false') === 'true';
+        $showPoweredBy = $config->getSetting(ConfigInterface::BRANDING_SHOW_POWERED_BY, 'true') === 'true';
 
         $responseData = [
             'enabled' => true,
             'allow_iframe' => $allowIframe,
             'show_raw_values' => $showRawValues,
             'show_player_count' => $showPlayerCount,
+            'powered_by' => [
+                'show' => $showPoweredBy,
+                'label' => 'FeatherPanel',
+                'url' => 'https://featherpanel.com',
+            ],
         ];
 
         // Get node status if enabled
diff --git a/backend/app/Controllers/User/Server/Files/ServerFilesController.php b/backend/app/Controllers/User/Server/Files/ServerFilesController.php
index e562325cc..140f5ae02 100755
--- a/backend/app/Controllers/User/Server/Files/ServerFilesController.php
+++ b/backend/app/Controllers/User/Server/Files/ServerFilesController.php
@@ -24,6 +24,7 @@
 use App\Helpers\ApiResponse;
 use App\Services\Wings\Wings;
 use OpenApi\Attributes as OA;
+use App\Config\ConfigInterface;
 use App\Plugins\Events\Events\ServerEvent;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -36,7 +37,8 @@
     properties: [
         new OA\Property(property: 'name', type: 'string', description: 'File or directory name'),
         new OA\Property(property: 'type', type: 'string', enum: ['file', 'directory'], description: 'Item type'),
-        new OA\Property(property: 'size', type: 'integer', nullable: true, description: 'File size in bytes'),
+        new OA\Property(property: 'size', type: 'integer', nullable: true, description: 'File size in bytes (directory entry size for folders)'),
+        new OA\Property(property: 'directory_size', type: 'integer', nullable: true, description: 'Recursive size of folder contents in bytes (only when requested from Wings)'),
         new OA\Property(property: 'permissions', type: 'string', nullable: true, description: 'File permissions'),
         new OA\Property(property: 'modified_at', type: 'string', format: 'date-time', nullable: true, description: 'Last modified timestamp'),
         new OA\Property(property: 'path', type: 'string', description: 'Full file path'),
@@ -184,7 +186,7 @@ public function getFiles(Request $request, string $serverUuid): Response
             $path = $this->getPathFromQuery();
 
             $wings = $this->createWingsConnection($node);
-            $response = $wings->getServer()->listDirectory($server['uuid'], $path);
+            $response = $wings->getServer()->listDirectory($server['uuid'], $path, true);
 
             if (!$response->isSuccessful()) {
                 $error = $response->getError();
@@ -222,6 +224,69 @@ public function getFiles(Request $request, string $serverUuid): Response
         }
     }
 
+    #[OA\Get(
+        path: '/api/user/servers/{uuidShort}/archive-list',
+        summary: 'List directory inside an archive',
+        description: 'Browse supported archives (zip, tar, …) on the server without extracting them.',
+        tags: ['User - Server Files'],
+        parameters: [
+            new OA\Parameter(name: 'uuidShort', in: 'path', required: true, schema: new OA\Schema(type: 'string')),
+            new OA\Parameter(name: 'path', in: 'query', required: false, schema: new OA\Schema(type: 'string', default: '/')),
+            new OA\Parameter(name: 'file', in: 'query', required: true, schema: new OA\Schema(type: 'string')),
+            new OA\Parameter(name: 'archive_path', in: 'query', required: false, schema: new OA\Schema(type: 'string')),
+        ],
+        responses: [
+            new OA\Response(response: 200, description: 'Archive listing retrieved'),
+            new OA\Response(response: 400, description: 'Bad request'),
+            new OA\Response(response: 403, description: 'Forbidden'),
+            new OA\Response(response: 500, description: 'Internal server error'),
+        ]
+    )]
+    public function listArchiveDirectory(Request $request, string $serverUuid): Response
+    {
+        try {
+            $user = $this->validateUser($request);
+            $server = $this->validateServer($serverUuid);
+            $node = $this->validateNode($server['node_id']);
+
+            $permissionCheck = $this->checkPermission($request, $server, SubuserPermissions::FILE_READ);
+            if ($permissionCheck !== null) {
+                return $permissionCheck;
+            }
+
+            $directory = $this->getPathFromQuery('/');
+            $file = $_GET['file'] ?? '';
+            if ($file === '' || !is_string($file)) {
+                return ApiResponse::error('Missing file parameter (archive path relative to path).', 'MISSING_FILE', 400);
+            }
+            $innerPath = isset($_GET['archive_path']) && is_string($_GET['archive_path']) ? $_GET['archive_path'] : '';
+
+            $wings = $this->createWingsConnection($node);
+            $response = $wings->getServer()->listArchiveDirectory($server['uuid'], $directory, $file, $innerPath);
+            if (!$response->isSuccessful()) {
+                $error = $response->getError();
+                if ($this->isWingsConnectionUnavailableError($error)) {
+                    return ApiResponse::error(
+                        'Wings Connection Unavailable. Please contact the support team. Technical details: ' . $error,
+                        'WINGS_CONNECTION_UNAVAILABLE',
+                        503
+                    );
+                }
+
+                return ApiResponse::error('Failed to list archive: ' . $error, 'WINGS_ERROR', $response->getStatusCode());
+            }
+
+            $data = $response->getData();
+            if (!is_array($data)) {
+                $data = ['contents' => [], 'truncated' => false];
+            }
+
+            return ApiResponse::success($data, 'Archive listing retrieved successfully');
+        } catch (\Exception $e) {
+            return $this->handleWingsError($e, 'list archive');
+        }
+    }
+
     #[OA\Get(
         path: '/api/user/servers/{uuidShort}/search-files',
         summary: 'Search files with advanced filters',
@@ -738,9 +803,11 @@ public function deleteFiles(Request $request, string $serverUuid): Response
             }
 
             $data = $this->validateJsonBody($request, ['files', 'root']);
+            $permanent = !empty($data['permanent']);
+            $deleteOptions = $this->buildTrashDeleteOptions($permanent);
 
             $wings = $this->createWingsConnection($node);
-            $response = $wings->getServer()->deleteFiles($server['uuid'], $data['root'], $data['files']);
+            $response = $wings->getServer()->deleteFiles($server['uuid'], $data['root'], $data['files'], $deleteOptions);
 
             if (!$response->isSuccessful()) {
                 $error = $response->getError();
@@ -748,12 +815,15 @@ public function deleteFiles(Request $request, string $serverUuid): Response
                 return ApiResponse::error('Failed to delete files: ' . $error, 'WINGS_ERROR', $response->getStatusCode());
             }
 
+            $usedTrash = !empty($deleteOptions['use_trash']) && empty($deleteOptions['permanent']);
+
             // Log activity
-            $this->logActivity($server, $node, 'files_deleted', [
+            $this->logActivity($server, $node, $usedTrash ? 'files_trashed' : 'files_deleted', [
                 'root' => $data['root'],
                 'files' => $data['files'],
 
                 'file_count' => count($data['files']),
+                'trash' => $usedTrash,
             ], $user);
 
             // Emit event
@@ -768,12 +838,152 @@ public function deleteFiles(Request $request, string $serverUuid): Response
                 );
             }
 
-            return ApiResponse::success($response->getData(), 'Files deleted successfully');
+            $message = $usedTrash ? 'Files moved to trash successfully' : 'Files deleted successfully';
+
+            return ApiResponse::success($response->getData(), $message);
         } catch (\Exception $e) {
             return $this->handleWingsError($e, 'delete files');
         }
     }
 
+    public function listTrash(Request $request, string $serverUuid): Response
+    {
+        try {
+            $user = $this->validateUser($request);
+            $server = $this->validateServer($serverUuid);
+            $node = $this->validateNode($server['node_id']);
+
+            $permissionCheck = $this->checkPermission($request, $server, SubuserPermissions::FILE_READ);
+            if ($permissionCheck !== null) {
+                return $permissionCheck;
+            }
+
+            if (!$this->isFileTrashEnabled()) {
+                return ApiResponse::error('File trash is disabled on this panel', 'TRASH_DISABLED', 403);
+            }
+
+            $limits = $this->getTrashLimits();
+            $wings = $this->createWingsConnection($node);
+            $response = $wings->getServer()->listTrash(
+                $server['uuid'],
+                (int) $limits['max_size_bytes'],
+                (int) $limits['retention_days']
+            );
+
+            if (!$response->isSuccessful()) {
+                return ApiResponse::error('Failed to list trash: ' . $response->getError(), 'WINGS_ERROR', $response->getStatusCode());
+            }
+
+            $this->logActivity($server, $node, 'trash_listed', [], $user);
+
+            return ApiResponse::success($response->getData(), 'Trash listed successfully');
+        } catch (\Exception $e) {
+            return $this->handleWingsError($e, 'list trash');
+        }
+    }
+
+    public function restoreTrash(Request $request, string $serverUuid): Response
+    {
+        try {
+            $user = $this->validateUser($request);
+            $server = $this->validateServer($serverUuid);
+            $node = $this->validateNode($server['node_id']);
+
+            $permissionCheck = $this->checkPermission($request, $server, SubuserPermissions::FILE_UPDATE);
+            if ($permissionCheck !== null) {
+                return $permissionCheck;
+            }
+
+            if (!$this->isFileTrashEnabled()) {
+                return ApiResponse::error('File trash is disabled on this panel', 'TRASH_DISABLED', 403);
+            }
+
+            $data = $this->validateJsonBody($request, ['ids']);
+            $overwrite = isset($data['overwrite']) && (bool) $data['overwrite'];
+            $wings = $this->createWingsConnection($node);
+            $response = $wings->getServer()->restoreTrash($server['uuid'], $data['ids'], $overwrite);
+
+            if (!$response->isSuccessful()) {
+                return ApiResponse::error('Failed to restore files: ' . $response->getError(), 'WINGS_ERROR', $response->getStatusCode());
+            }
+
+            $this->logActivity($server, $node, 'trash_restored', [
+                'ids' => $data['ids'],
+                'count' => count($data['ids']),
+            ], $user);
+
+            return ApiResponse::success($response->getData(), 'Files restored successfully');
+        } catch (\Exception $e) {
+            return $this->handleWingsError($e, 'restore trash');
+        }
+    }
+
+    public function deleteTrashEntries(Request $request, string $serverUuid): Response
+    {
+        try {
+            $user = $this->validateUser($request);
+            $server = $this->validateServer($serverUuid);
+            $node = $this->validateNode($server['node_id']);
+
+            $permissionCheck = $this->checkPermission($request, $server, SubuserPermissions::FILE_DELETE);
+            if ($permissionCheck !== null) {
+                return $permissionCheck;
+            }
+
+            if (!$this->isFileTrashEnabled()) {
+                return ApiResponse::error('File trash is disabled on this panel', 'TRASH_DISABLED', 403);
+            }
+
+            $data = $this->validateJsonBody($request, ['ids']);
+            $wings = $this->createWingsConnection($node);
+            $response = $wings->getServer()->deleteTrashEntries($server['uuid'], $data['ids']);
+
+            if (!$response->isSuccessful()) {
+                return ApiResponse::error('Failed to delete trash entries: ' . $response->getError(), 'WINGS_ERROR', $response->getStatusCode());
+            }
+
+            $this->logActivity($server, $node, 'trash_deleted', [
+                'ids' => $data['ids'],
+                'count' => count($data['ids']),
+            ], $user);
+
+            return ApiResponse::success($response->getData(), 'Trash entries deleted permanently');
+        } catch (\Exception $e) {
+            return $this->handleWingsError($e, 'delete trash entries');
+        }
+    }
+
+    public function emptyTrash(Request $request, string $serverUuid): Response
+    {
+        try {
+            $user = $this->validateUser($request);
+            $server = $this->validateServer($serverUuid);
+            $node = $this->validateNode($server['node_id']);
+
+            $permissionCheck = $this->checkPermission($request, $server, SubuserPermissions::FILE_DELETE);
+            if ($permissionCheck !== null) {
+                return $permissionCheck;
+            }
+
+            if (!$this->isFileTrashEnabled()) {
+                return ApiResponse::error('File trash is disabled on this panel', 'TRASH_DISABLED', 403);
+            }
+
+            $wings = $this->createWingsConnection($node);
+            $response = $wings->getServer()->emptyTrash($server['uuid']);
+
+            if (!$response->isSuccessful()) {
+                return ApiResponse::error('Failed to empty trash: ' . $response->getError(), 'WINGS_ERROR', $response->getStatusCode());
+            }
+
+            $this->logActivity($server, $node, 'trash_emptied', [], $user);
+
+            return ApiResponse::success($response->getData(), 'Trash emptied successfully');
+        } catch (\Exception $e) {
+            return $this->handleWingsError($e, 'empty trash');
+        }
+    }
+
     #[OA\Post(
         path: '/api/user/servers/{uuidShort}/wipe-all-files',
         summary: 'Wipe all server files',
@@ -1333,6 +1543,123 @@ public function decompressArchive(Request $request, string $serverUuid): Respons
         }
     }
 
+    #[OA\Post(
+        path: '/api/user/servers/{uuidShort}/extract-archive-selection',
+        summary: 'Extract selected paths from an archive',
+        description: 'Extract specific files or directories from an on-disk archive into a destination folder without unpacking the whole archive.',
+        tags: ['User - Server Files'],
+        parameters: [
+            new OA\Parameter(
+                name: 'uuidShort',
+                in: 'path',
+                description: 'Server short UUID',
+                required: true,
+                schema: new OA\Schema(type: 'string')
+            ),
+        ],
+        requestBody: new OA\RequestBody(
+            required: true,
+            content: new OA\JsonContent(
+                required: ['root', 'file', 'destination', 'entries'],
+                properties: [
+                    new OA\Property(property: 'root', type: 'string', description: 'Directory on the server that contains the archive'),
+                    new OA\Property(property: 'file', type: 'string', description: 'Archive file name relative to root'),
+                    new OA\Property(
+                        property: 'destination',
+                        type: 'string',
+                        description: 'Destination directory relative to server root (use empty string for /)'
+                    ),
+                    new OA\Property(
+                        property: 'entries',
+                        type: 'array',
+                        items: new OA\Items(type: 'string'),
+                        description: 'Paths inside the archive to extract'
+                    ),
+                ]
+            )
+        ),
+        responses: [
+            new OA\Response(response: 200, description: 'Extraction started or completed successfully'),
+            new OA\Response(response: 400, description: 'Bad request'),
+            new OA\Response(response: 403, description: 'Forbidden'),
+            new OA\Response(response: 500, description: 'Internal server error'),
+        ]
+    )]
+    public function extractArchiveSelection(Request $request, string $serverUuid): Response
+    {
+        try {
+            $user = $this->validateUser($request);
+            $server = $this->validateServer($serverUuid);
+            $node = $this->validateNode($server['node_id']);
+
+            $permissionCheck = $this->checkPermission($request, $server, SubuserPermissions::FILE_ARCHIVE);
+            if ($permissionCheck !== null) {
+                return $permissionCheck;
+            }
+
+            $data = $this->validateJsonBody($request, ['root', 'file', 'destination', 'entries']);
+            if (!is_array($data['entries'])) {
+                return ApiResponse::error('Field entries must be an array of strings.', 'INVALID_ENTRIES', 400);
+            }
+            $entries = [];
+            foreach ($data['entries'] as $entry) {
+                if (is_string($entry) && $entry !== '') {
+                    $entries[] = $entry;
+                }
+            }
+            if ($entries === []) {
+                return ApiResponse::error('At least one non-empty archive entry path is required.', 'INVALID_ENTRIES', 400);
+            }
+
+            $root = $this->normalizeDirectoryPath((string) $data['root']);
+            $file = (string) $data['file'];
+
+            $destRaw = $data['destination'];
+            if (!is_string($destRaw)) {
+                return ApiResponse::error('Field destination must be a string.', 'INVALID_DESTINATION', 400);
+            }
+            $destination = ($destRaw === '' || $destRaw === '/') ? '' : ltrim($this->normalizeDirectoryPath($destRaw), '/');
+
+            $wings = $this->createWingsConnection($node);
+            $response = $wings->getServer()->extractArchiveSelection($server['uuid'], $root, $file, $destination, $entries);
+
+            if (!$response->isSuccessful()) {
+                $error = $response->getError();
+                if (strpos(strtolower($error), 'timeout') !== false || strpos(strtolower($error), 'timed out') !== false) {
+                    return ApiResponse::error(
+                        'Archive extraction timed out. Try a smaller selection or extract the full archive instead.',
+                        'ARCHIVE_TIMEOUT',
+                        $response->getStatusCode()
+                    );
+                }
+
+                return ApiResponse::error('Failed to extract from archive: ' . $error, 'WINGS_ERROR', $response->getStatusCode());
+            }
+
+            $this->logActivity($server, $node, 'archive_selection_extracted', [
+                'root' => $root,
+                'file' => $file,
+                'destination' => $destination,
+                'entry_count' => count($entries),
+            ], $user);
+
+            return ApiResponse::success($response->getData(), 'Archive selection extracted successfully');
+        } catch (\App\Services\Wings\Exceptions\WingsConnectionException $e) {
+            $errorMessage = $e->getMessage();
+            if (strpos(strtolower($errorMessage), 'timeout') !== false || strpos(strtolower($errorMessage), 'timed out') !== false) {
+                return ApiResponse::error(
+                    'Archive extraction timed out. Try a smaller selection or extract the full archive instead.',
+                    'ARCHIVE_TIMEOUT',
+                    504
+                );
+            }
+
+            return $this->handleWingsError($e, 'extract archive selection');
+        } catch (\Exception $e) {
+            return $this->handleWingsError($e, 'extract archive selection');
+        }
+    }
+
     #[OA\Post(
         path: '/api/user/servers/{uuidShort}/change-permissions',
         summary: 'Change file permissions',
@@ -2222,4 +2549,42 @@ private function getMimeType(string $path): string
 
         return $mimeTypes[$extension] ?? 'text/plain';
     }
+
+    private function isFileTrashEnabled(): bool
+    {
+        return App::getInstance(true)->getConfig()->getSetting(ConfigInterface::FILE_TRASH_ENABLED, 'false') === 'true';
+    }
+
+    /**
+     * @return array{max_size_bytes: int, retention_days: int}
+     */
+    private function getTrashLimits(): array
+    {
+        $config = App::getInstance(true)->getConfig();
+        $maxMb = (int) $config->getSetting(ConfigInterface::FILE_TRASH_MAX_SIZE_MB, '512');
+        $retentionDays = (int) $config->getSetting(ConfigInterface::FILE_TRASH_RETENTION_DAYS, '30');
+
+        return [
+            'max_size_bytes' => $maxMb > 0 ? $maxMb * 1024 * 1024 : 0,
+            'retention_days' => $retentionDays,
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function buildTrashDeleteOptions(bool $permanent): array
+    {
+        if ($permanent || !$this->isFileTrashEnabled()) {
+            return ['permanent' => true];
+        }
+
+        $limits = $this->getTrashLimits();
+
+        return [
+            'use_trash' => true,
+            'permanent' => false,
+            'trash' => $limits,
+        ];
+    }
 }
diff --git a/backend/app/Controllers/User/Server/ServerActivityController.php b/backend/app/Controllers/User/Server/ServerActivityController.php
index e94e86a6d..efbff7aed 100755
--- a/backend/app/Controllers/User/Server/ServerActivityController.php
+++ b/backend/app/Controllers/User/Server/ServerActivityController.php
@@ -20,6 +20,7 @@
 use App\App;
 use App\Chat\User;
 use App\Chat\Server;
+use App\Helpers\TimeHelper;
 use App\SubuserPermissions;
 use App\Chat\ServerActivity;
 use App\Helpers\ApiResponse;
@@ -171,11 +172,12 @@ public function getServerActivities(Request $request, int $serverId): Response
         // Mask IPs if the setting is enabled
         $app = App::getInstance(true);
         $hideIps = $app->getConfig()->getSetting(ConfigInterface::SERVER_HIDE_IPS, 'false') === 'true';
-        if ($hideIps && isset($result['data'])) {
+        if (isset($result['data'])) {
             foreach ($result['data'] as &$activity) {
-                if (!empty($activity['ip'])) {
+                if ($hideIps && !empty($activity['ip'])) {
                     $activity['ip'] = '***.***.***.***';
                 }
+                $activity = TimeHelper::normaliseRow($activity, ['timestamp']);
             }
             unset($activity);
         }
diff --git a/backend/app/Controllers/User/Server/ServerBackupController.php b/backend/app/Controllers/User/Server/ServerBackupController.php
index 8ad06d04f..22342ad90 100755
--- a/backend/app/Controllers/User/Server/ServerBackupController.php
+++ b/backend/app/Controllers/User/Server/ServerBackupController.php
@@ -355,12 +355,6 @@ public function createBackup(Request $request, string $serverUuid): Response
             }
         }
 
-        // Parse request body
-        $body = json_decode($request->getContent(), true);
-        if (!$body) {
-            return ApiResponse::error('Invalid request body', 'INVALID_REQUEST_BODY', 400);
-        }
-
         // Always use Wings adapter
         $adapter = 'wings';
 
diff --git a/backend/app/Controllers/User/Server/ServerScheduleController.php b/backend/app/Controllers/User/Server/ServerScheduleController.php
index 0dfcc12df..f15f5198b 100755
--- a/backend/app/Controllers/User/Server/ServerScheduleController.php
+++ b/backend/app/Controllers/User/Server/ServerScheduleController.php
@@ -44,6 +44,7 @@
         new OA\Property(property: 'cron_day_of_month', type: 'string', description: 'Cron day of month expression'),
         new OA\Property(property: 'cron_hour', type: 'string', description: 'Cron hour expression'),
         new OA\Property(property: 'cron_minute', type: 'string', description: 'Cron minute expression'),
+        new OA\Property(property: 'timezone', type: 'string', description: 'IANA timezone the cron expression is authored in (e.g. "Europe/Paris", "UTC")'),
         new OA\Property(property: 'is_active', type: 'boolean', description: 'Whether schedule is active'),
         new OA\Property(property: 'is_processing', type: 'boolean', description: 'Whether schedule is currently processing'),
         new OA\Property(property: 'only_when_online', type: 'boolean', description: 'Whether to run only when server is online'),
@@ -75,6 +76,7 @@
         new OA\Property(property: 'cron_day_of_month', type: 'string', description: 'Cron day of month expression'),
         new OA\Property(property: 'cron_hour', type: 'string', description: 'Cron hour expression'),
         new OA\Property(property: 'cron_minute', type: 'string', description: 'Cron minute expression'),
+        new OA\Property(property: 'timezone', type: 'string', nullable: true, description: 'IANA timezone the cron expression is authored in (default: "UTC")', default: 'UTC'),
         new OA\Property(property: 'is_active', type: 'boolean', nullable: true, description: 'Whether schedule is active', default: true),
         new OA\Property(property: 'only_when_online', type: 'boolean', nullable: true, description: 'Whether to run only when server is online', default: false),
     ]
@@ -98,6 +100,7 @@
         new OA\Property(property: 'cron_day_of_month', type: 'string', nullable: true, description: 'Cron day of month expression'),
         new OA\Property(property: 'cron_hour', type: 'string', nullable: true, description: 'Cron hour expression'),
         new OA\Property(property: 'cron_minute', type: 'string', nullable: true, description: 'Cron minute expression'),
+        new OA\Property(property: 'timezone', type: 'string', nullable: true, description: 'IANA timezone the cron expression is authored in'),
         new OA\Property(property: 'is_active', type: 'boolean', nullable: true, description: 'Whether schedule is active'),
         new OA\Property(property: 'only_when_online', type: 'boolean', nullable: true, description: 'Whether to run only when server is online'),
     ]
@@ -371,13 +374,23 @@ public function createSchedule(Request $request, string $serverUuid): Response
             return ApiResponse::error('Invalid cron expression', 'INVALID_CRON_EXPRESSION', 400);
         }
 
-        // Calculate next run time
+        // Resolve & validate timezone (default UTC for backwards compat).
+        $timezone = isset($body['timezone']) && is_string($body['timezone']) && $body['timezone'] !== ''
+            ? $body['timezone']
+            : 'UTC';
+        if (!ServerSchedule::isValidTimezone($timezone)) {
+            return ApiResponse::error('Invalid timezone identifier', 'INVALID_TIMEZONE', 400);
+        }
+
+        // Calculate next run time in the schedule's authoring timezone, persisted as UTC.
         $nextRunAt = ServerSchedule::calculateNextRunTime(
             $body['cron_day_of_week'],
             $body['cron_month'],
             $body['cron_day_of_month'],
             $body['cron_hour'],
-            $body['cron_minute']
+            $body['cron_minute'],
+            null,
+            $timezone
         );
 
         // Create schedule data
@@ -389,6 +402,7 @@ public function createSchedule(Request $request, string $serverUuid): Response
             'cron_day_of_month' => $body['cron_day_of_month'],
             'cron_hour' => $body['cron_hour'],
             'cron_minute' => $body['cron_minute'],
+            'timezone' => $timezone,
             'is_active' => $body['is_active'] ?? 1,
             'is_processing' => 0,
             'only_when_online' => $body['only_when_online'] ?? 0,
@@ -504,20 +518,28 @@ public function updateSchedule(Request $request, string $serverUuid, int $schedu
             return ApiResponse::error('Invalid request body', 'INVALID_REQUEST_BODY', 400);
         }
 
+        // If a timezone was supplied, validate it up-front (and recompute next_run_at below).
+        if (isset($body['timezone'])) {
+            if (!is_string($body['timezone']) || !ServerSchedule::isValidTimezone($body['timezone'])) {
+                return ApiResponse::error('Invalid timezone identifier', 'INVALID_TIMEZONE', 400);
+            }
+        }
+
         // Validate cron expression components if provided
-        if (isset($body['cron_day_of_week']) || isset($body['cron_month']) || isset($body['cron_day_of_month']) || isset($body['cron_hour']) || isset($body['cron_minute'])) {
+        if (isset($body['cron_day_of_week']) || isset($body['cron_month']) || isset($body['cron_day_of_month']) || isset($body['cron_hour']) || isset($body['cron_minute']) || isset($body['timezone'])) {
             $dayOfWeek = $body['cron_day_of_week'] ?? $schedule['cron_day_of_week'];
             $month = $body['cron_month'] ?? $schedule['cron_month'];
             $dayOfMonth = $body['cron_day_of_month'] ?? $schedule['cron_day_of_month'];
             $hour = $body['cron_hour'] ?? $schedule['cron_hour'];
             $minute = $body['cron_minute'] ?? $schedule['cron_minute'];
+            $timezone = $body['timezone'] ?? ($schedule['timezone'] ?? 'UTC');
 
             if (!ServerSchedule::validateCronExpression($dayOfWeek, $month, $dayOfMonth, $hour, $minute)) {
                 return ApiResponse::error('Invalid cron expression', 'INVALID_CRON_EXPRESSION', 400);
             }
 
-            // Calculate new next run time if cron expression changed
-            $body['next_run_at'] = ServerSchedule::calculateNextRunTime($dayOfWeek, $month, $dayOfMonth, $hour, $minute);
+            // Recompute next_run_at in the (possibly new) timezone, persist as UTC.
+            $body['next_run_at'] = ServerSchedule::calculateNextRunTime($dayOfWeek, $month, $dayOfMonth, $hour, $minute, null, $timezone);
         }
 
         // Update schedule
@@ -1092,6 +1114,7 @@ public function exportSchedule(Request $request, string $serverUuid, int $schedu
             'cron_day_of_month' => $schedule['cron_day_of_month'],
             'cron_month' => $schedule['cron_month'],
             'cron_day_of_week' => $schedule['cron_day_of_week'],
+            'timezone' => $schedule['timezone'] ?? 'UTC',
             'is_active' => (bool) $schedule['is_active'],
             'only_when_online' => (bool) $schedule['only_when_online'],
             'tasks' => $exportedTasks,
@@ -1206,12 +1229,21 @@ public function importSchedule(Request $request, string $serverUuid): Response
             }
         }
 
+        $timezone = isset($body['timezone']) && is_string($body['timezone']) && $body['timezone'] !== ''
+            ? $body['timezone']
+            : 'UTC';
+        if (!ServerSchedule::isValidTimezone($timezone)) {
+            return ApiResponse::error('Invalid timezone identifier', 'INVALID_TIMEZONE', 400);
+        }
+
         $nextRunAt = ServerSchedule::calculateNextRunTime(
             $body['cron_day_of_week'],
             $body['cron_month'],
             $body['cron_day_of_month'],
             $body['cron_hour'],
-            $body['cron_minute']
+            $body['cron_minute'],
+            null,
+            $timezone
         );
 
         $scheduleId = ServerSchedule::createSchedule([
@@ -1222,6 +1254,7 @@ public function importSchedule(Request $request, string $serverUuid): Response
             'cron_day_of_month' => $body['cron_day_of_month'],
             'cron_hour' => $body['cron_hour'],
             'cron_minute' => $body['cron_minute'],
+            'timezone' => $timezone,
             'is_active' => isset($body['is_active']) ? (int) $body['is_active'] : 1,
             'is_processing' => 0,
             'only_when_online' => isset($body['only_when_online']) ? (int) $body['only_when_online'] : 0,
diff --git a/backend/app/Controllers/User/Server/ServerUserController.php b/backend/app/Controllers/User/Server/ServerUserController.php
index 815db6802..73887d550 100755
--- a/backend/app/Controllers/User/Server/ServerUserController.php
+++ b/backend/app/Controllers/User/Server/ServerUserController.php
@@ -38,6 +38,7 @@
 use App\Chat\DatabaseInstance;
 use App\Config\ConfigInterface;
 use App\Helpers\PermissionHelper;
+use App\Chat\ServerCustomVariable;
 use App\CloudFlare\CloudFlareRealIP;
 use App\Mail\templates\ServerDeleted;
 use App\Plugins\Events\Events\ServerEvent;
@@ -754,6 +755,7 @@ public function getServer(Request $request, string $uuidShort): Response
         }
 
         $server['variables'] = $mergedVariables;
+        $server['custom_variables'] = ServerCustomVariable::getCustomVariablesByServerId((int) $server['id']);
 
         // Start flatten specific fields if they are valid JSON, else leave as is (do not json_decode, just keep string if not)
         $spell = &$server['spell'];
@@ -1470,6 +1472,136 @@ public function updateServer(Request $request, string $uuidShort): Response
         ], 'Server updated successfully', 200);
     }
 
+    public function createCustomVariable(Request $request, string $uuidShort): Response
+    {
+        $user = $request->attributes->get('user');
+        if (!$user) {
+            return ApiResponse::error('User not authenticated', 'UNAUTHORIZED', 401);
+        }
+
+        $server = Server::getServerByUuidShort($uuidShort);
+        if (!$server) {
+            return ApiResponse::error('Server not found', 'NOT_FOUND', 404);
+        }
+
+        $isOwner = (int) $server['owner_id'] === (int) $user['id'];
+        if (!$isOwner) {
+            $permissionCheck = $this->checkPermission($request, $server, SubuserPermissions::STARTUP_UPDATE);
+            if ($permissionCheck !== null) {
+                return $permissionCheck;
+            }
+        }
+
+        $data = json_decode($request->getContent(), true);
+        if (!is_array($data)) {
+            return ApiResponse::error('Invalid request data', 'INVALID_REQUEST', 400);
+        }
+
+        $name = trim((string) ($data['name'] ?? ''));
+        $envVariable = strtoupper(trim((string) ($data['env_variable'] ?? '')));
+        $value = (string) ($data['variable_value'] ?? '');
+        $isEncrypted = isset($data['is_encrypted']) && filter_var($data['is_encrypted'], FILTER_VALIDATE_BOOLEAN);
+
+        if ($name === '' || strlen($name) > 191) {
+            return ApiResponse::error('Variable name is required and must be less than 191 characters', 'INVALID_NAME', 400);
+        }
+
+        if (!ServerCustomVariable::isValidEnvVariable($envVariable) || strlen($envVariable) > 191) {
+            return ApiResponse::error('Environment variable must use only uppercase letters, numbers, and underscores, and cannot start with a number', 'INVALID_ENV_VARIABLE', 400);
+        }
+
+        $reservedVariables = [
+            'P_SERVER_LOCATION',
+            'P_SERVER_UUID',
+            'P_SERVER_ALLOCATION_LIMIT',
+            'SERVER_MEMORY',
+            'SERVER_IP',
+            'SERVER_PORT',
+        ];
+        if (in_array($envVariable, $reservedVariables, true) || str_starts_with($envVariable, 'P_SERVER_')) {
+            return ApiResponse::error('This environment variable name is reserved', 'RESERVED_ENV_VARIABLE', 400);
+        }
+
+        if (ServerCustomVariable::envVariableExists((int) $server['id'], $envVariable)) {
+            return ApiResponse::error('An environment variable with this name already exists', 'ENV_VARIABLE_EXISTS', 409);
+        }
+
+        $variableId = ServerCustomVariable::createCustomVariable([
+            'server_id' => (int) $server['id'],
+            'user_id' => (int) $user['id'],
+            'name' => $name,
+            'env_variable' => $envVariable,
+            'variable_value' => $value,
+            'is_encrypted' => $isEncrypted ? 1 : 0,
+        ]);
+
+        if (!$variableId) {
+            return ApiResponse::error('Failed to create custom variable', 'CUSTOM_VARIABLE_CREATE_FAILED', 500);
+        }
+
+        $syncError = $this->syncServerConfiguration($server);
+        if ($syncError !== null) {
+            return $syncError;
+        }
+
+        $node = Node::getNodeById($server['node_id']);
+        if ($node) {
+            $this->logActivity($server, $node, 'server_custom_variable_created', [
+                'server_uuid' => $server['uuid'],
+                'env_variable' => $envVariable,
+            ], $user);
+        }
+
+        return ApiResponse::success([
+            'custom_variable' => ServerCustomVariable::getCustomVariableById((int) $variableId),
+        ], 'Custom variable created successfully', 201);
+    }
+
+    public function deleteCustomVariable(Request $request, string $uuidShort, int $variableId): Response
+    {
+        $user = $request->attributes->get('user');
+        if (!$user) {
+            return ApiResponse::error('User not authenticated', 'UNAUTHORIZED', 401);
+        }
+
+        $server = Server::getServerByUuidShort($uuidShort);
+        if (!$server) {
+            return ApiResponse::error('Server not found', 'NOT_FOUND', 404);
+        }
+
+        $isOwner = (int) $server['owner_id'] === (int) $user['id'];
+        if (!$isOwner) {
+            $permissionCheck = $this->checkPermission($request, $server, SubuserPermissions::STARTUP_UPDATE);
+            if ($permissionCheck !== null) {
+                return $permissionCheck;
+            }
+        }
+
+        $customVariable = ServerCustomVariable::getCustomVariableById($variableId);
+        if (!$customVariable || (int) $customVariable['server_id'] !== (int) $server['id']) {
+            return ApiResponse::error('Custom variable not found', 'CUSTOM_VARIABLE_NOT_FOUND', 404);
+        }
+
+        if (!ServerCustomVariable::deleteCustomVariableForServer($variableId, (int) $server['id'])) {
+            return ApiResponse::error('Failed to delete custom variable', 'CUSTOM_VARIABLE_DELETE_FAILED', 500);
+        }
+
+        $syncError = $this->syncServerConfiguration($server);
+        if ($syncError !== null) {
+            return $syncError;
+        }
+
+        $node = Node::getNodeById($server['node_id']);
+        if ($node) {
+            $this->logActivity($server, $node, 'server_custom_variable_deleted', [
+                'server_uuid' => $server['uuid'],
+                'env_variable' => $customVariable['env_variable'],
+            ], $user);
+        }
+
+        return ApiResponse::success([], 'Custom variable deleted successfully', 200);
+    }
+
     #[OA\Post(
         path: '/api/user/servers/{uuidShort}/reinstall',
         summary: 'Reinstall server',
@@ -1963,7 +2095,7 @@ private function validateVariableValue(string $value, string $rules, string $fie
         $parts = explode('|', $rules);
         $required = in_array('required', $parts, true);
         $nullable = in_array('nullable', $parts, true);
-        $isNumeric = in_array('numeric', $parts, true) || in_array('integer', $parts, true);
+        $isNumeric = in_array('numeric', $parts, true) || in_array('integer', $parts, true) || in_array('int', $parts, true);
         // string rule is informational for our basic validator
 
         if ($value === '') {
@@ -2231,6 +2363,34 @@ private function wipeServerFiles(\App\Services\Wings\Wings $wings, string $serve
         }
     }
 
+    private function syncServerConfiguration(array $server): ?Response
+    {
+        $node = Node::getNodeById((int) $server['node_id']);
+        if (!$node) {
+            return ApiResponse::error('Node not found', 'NODE_NOT_FOUND', 404);
+        }
+
+        try {
+            $wings = new \App\Services\Wings\Wings(
+                $node['fqdn'],
+                $node['daemonListen'],
+                $node['scheme'],
+                $node['daemon_token'],
+                30
+            );
+            $response = $wings->getServer()->syncServer($server['uuid']);
+            if (!$response->isSuccessful()) {
+                return ApiResponse::error('Failed to sync server configuration: ' . $response->getError(), 'WINGS_ERROR', $response->getStatusCode());
+            }
+        } catch (\Exception $e) {
+            App::getInstance(true)->getLogger()->error('Failed to sync server configuration: ' . $e->getMessage());
+
+            return ApiResponse::error('Failed to sync server configuration: ' . $e->getMessage(), 'SERVER_SYNC_FAILED', 500);
+        }
+
+        return null;
+    }
+
     /**
      * Helper method to log server activity.
      */
diff --git a/backend/app/Controllers/User/User/SessionController.php b/backend/app/Controllers/User/User/SessionController.php
index d987defa3..ccd2da9af 100755
--- a/backend/app/Controllers/User/User/SessionController.php
+++ b/backend/app/Controllers/User/User/SessionController.php
@@ -20,18 +20,27 @@
 use App\App;
 use App\Chat\Role;
 use App\Chat\User;
+use App\Chat\Ticket;
 use App\Chat\Activity;
 use App\Chat\MailList;
 use App\Chat\ApiClient;
 use App\Chat\Permission;
+use App\Chat\TicketStatus;
+use App\Chat\TicketMessage;
+use App\Helpers\TimeHelper;
+use App\Chat\TicketCategory;
+use App\Chat\TicketPriority;
+use App\Chat\UserDataExport;
 use App\Chat\UserPreference;
 use App\Helpers\ApiResponse;
 use OpenApi\Attributes as OA;
+use App\Helpers\CaptchaHelper;
 use App\Config\ConfigInterface;
 use App\Middleware\AuthMiddleware;
 use App\CloudFlare\CloudFlareRealIP;
 use App\Helpers\EmailDomainValidator;
 use App\Plugins\Events\Events\UserEvent;
+use App\Plugins\Events\Events\TicketEvent;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -125,7 +134,7 @@ public function put(Request $request): Response
             if (!isset($data['turnstile_token']) || trim($data['turnstile_token']) === '') {
                 return ApiResponse::error('Captcha token is required', 'CAPTCHA_TOKEN_REQUIRED');
             }
-            if (!\App\Helpers\CaptchaHelper::validate($data['turnstile_token'], CloudFlareRealIP::getRealIP())) {
+            if (!CaptchaHelper::validate($data['turnstile_token'], CloudFlareRealIP::getRealIP())) {
                 return ApiResponse::error('Captcha validation failed', 'CAPTCHA_VALIDATION_FAILED');
             }
             // Remove turnstile_token from data after validation (it's not a user field)
@@ -346,6 +355,187 @@ public function get(Request $request): Response
         ], 'Session retrieved', 200);
     }
 
+    #[OA\Post(
+        path: '/api/user/data-request',
+        summary: 'Request account data export',
+        description: 'Create a support ticket requesting a personal data export for the authenticated user.',
+        tags: ['User - Session'],
+        responses: [
+            new OA\Response(response: 201, description: 'Data request ticket created successfully'),
+            new OA\Response(response: 400, description: 'Bad request - Missing ticket configuration'),
+            new OA\Response(response: 401, description: 'Unauthorized - User not authenticated'),
+            new OA\Response(response: 403, description: 'Forbidden - Ticket system disabled or open ticket limit reached'),
+            new OA\Response(response: 500, description: 'Internal server error - Failed to create request'),
+        ]
+    )]
+    public function requestDataExport(Request $request): Response
+    {
+        $app = App::getInstance(true);
+        $config = $app->getConfig();
+        $data = json_decode($request->getContent(), true);
+        if (!is_array($data)) {
+            $data = [];
+        }
+
+        if ($config->getSetting(ConfigInterface::TICKET_SYSTEM_ENABLED, 'true') !== 'true') {
+            return ApiResponse::error('Ticket system is disabled', 'TICKET_SYSTEM_DISABLED', 403);
+        }
+
+        if ($config->getSetting(ConfigInterface::TURNSTILE_ENABLED, 'false') === 'true') {
+            if (!isset($data['turnstile_token']) || trim((string) $data['turnstile_token']) === '') {
+                return ApiResponse::error('Captcha token is required', 'CAPTCHA_TOKEN_REQUIRED', 400);
+            }
+            if (!CaptchaHelper::validate((string) $data['turnstile_token'], CloudFlareRealIP::getRealIP())) {
+                return ApiResponse::error('Captcha validation failed', 'CAPTCHA_VALIDATION_FAILED', 400);
+            }
+        }
+
+        $user = AuthMiddleware::getCurrentUser($request);
+        if ($user == null) {
+            return ApiResponse::error('You are not allowed to access this resource!', 'INVALID_ACCOUNT_TOKEN', 400, []);
+        }
+
+        if (UserDataExport::hasRecentRequestForUser((string) $user['uuid'], 24)) {
+            return ApiResponse::error(
+                'You can request your personal data once every 24 hours. Please try again later.',
+                'DATA_EXPORT_RATE_LIMITED',
+                429
+            );
+        }
+
+        $maxOpenTickets = (int) $config->getSetting(ConfigInterface::TICKET_SYSTEM_MAX_OPEN_TICKETS, '10');
+        if ($maxOpenTickets > 0 && Ticket::getOpenTicketsCount($user['uuid']) >= $maxOpenTickets) {
+            return ApiResponse::error(
+                "You have reached the maximum number of open tickets ({$maxOpenTickets}). Please close or wait for resolution of existing tickets before creating a new one.",
+                'MAX_OPEN_TICKETS_REACHED',
+                403
+            );
+        }
+
+        $categories = TicketCategory::getAll('privacy', 1, 0);
+        if (empty($categories)) {
+            $categories = TicketCategory::getAll('data', 1, 0);
+        }
+        if (empty($categories)) {
+            $categories = TicketCategory::getAll(null, 1, 0);
+        }
+        if (empty($categories)) {
+            return ApiResponse::error('No ticket categories configured', 'NO_CATEGORIES', 500);
+        }
+
+        $priorities = TicketPriority::getAll('normal', 1, 0);
+        if (empty($priorities)) {
+            $priorities = TicketPriority::getAll('medium', 1, 0);
+        }
+        if (empty($priorities)) {
+            $priorities = TicketPriority::getAll('low', 1, 0);
+        }
+        if (empty($priorities)) {
+            $priorities = TicketPriority::getAll(null, 1, 0);
+        }
+        if (empty($priorities)) {
+            return ApiResponse::error('No ticket priorities configured', 'NO_PRIORITIES', 500);
+        }
+
+        $statuses = TicketStatus::getAll(null, 100, 0);
+        $openStatus = null;
+        foreach ($statuses as $status) {
+            if (strtolower($status['name']) === 'open') {
+                $openStatus = $status;
+                break;
+            }
+        }
+        if (!$openStatus && !empty($statuses)) {
+            $openStatus = $statuses[0];
+        }
+        if (!$openStatus) {
+            return ApiResponse::error('No ticket statuses configured', 'NO_STATUSES', 500);
+        }
+
+        $title = 'Personal data request';
+        $description = implode("\n", [
+            'I am requesting a copy of my personal data under UK GDPR.',
+            '',
+            'Account details:',
+            '- User UUID: ' . $user['uuid'],
+            '- Username: ' . $user['username'],
+            '- Email: ' . $user['email'],
+            '',
+            'Please provide the data export or advise on any identity verification and fulfilment timeline.',
+        ]);
+
+        $ticketData = [
+            'uuid' => Ticket::generateUuid(),
+            'user_uuid' => $user['uuid'],
+            'server_id' => null,
+            'category_id' => (int) $categories[0]['id'],
+            'priority_id' => (int) $priorities[0]['id'],
+            'status_id' => (int) $openStatus['id'],
+            'title' => $title,
+            'description' => $description,
+        ];
+
+        $ticketId = Ticket::create($ticketData);
+        if (!$ticketId) {
+            return ApiResponse::error('Failed to create data request', 'CREATE_FAILED', 500);
+        }
+
+        $messageId = TicketMessage::create([
+            'ticket_id' => $ticketId,
+            'user_uuid' => $user['uuid'],
+            'message' => $description,
+            'is_internal' => false,
+        ]);
+
+        if (!$messageId) {
+            $app->getLogger()->warning('Failed to create initial message for data request ticket: ' . $ticketId);
+        }
+
+        $exportUuid = UserDataExport::generateUuid();
+        $exportId = UserDataExport::create([
+            'uuid' => $exportUuid,
+            'user_uuid' => $user['uuid'],
+            'ticket_id' => $ticketId,
+        ]);
+
+        if (!$exportId) {
+            $app->getLogger()->error('Failed to queue data export for ticket: ' . $ticketId);
+
+            return ApiResponse::error('Data request ticket was created, but the export could not be queued. Please contact support.', 'EXPORT_QUEUE_FAILED', 500);
+        }
+
+        $ticket = Ticket::getById($ticketId);
+
+        Activity::createActivity([
+            'user_uuid' => $user['uuid'],
+            'name' => 'request_data_export',
+            'context' => 'Requested personal data export',
+            'ip_address' => CloudFlareRealIP::getRealIP(),
+        ]);
+
+        global $eventManager;
+        if (isset($eventManager) && $eventManager !== null) {
+            $eventManager->emit(
+                TicketEvent::onTicketCreated(),
+                [
+                    'ticket' => $ticket,
+                    'ticket_id' => $ticketId,
+                    'user_uuid' => $user['uuid'],
+                ]
+            );
+        }
+
+        return ApiResponse::success([
+            'ticket' => $ticket,
+            'message_id' => $messageId,
+            'export' => [
+                'id' => $exportId,
+                'uuid' => $exportUuid,
+                'status' => 'pending',
+            ],
+        ], 'Data request created successfully', 201);
+    }
+
     #[OA\Post(
         path: '/api/user/avatar',
         summary: 'Upload user avatar',
@@ -605,6 +795,15 @@ public function updatePreferences(Request $request): Response
             $data['favorite_server_uuids'] = $cleanFavorites;
         }
 
+        if (array_key_exists('timezone', $data)) {
+            if ($data['timezone'] === null || $data['timezone'] === '') {
+                // Treat empty value as "clear preference, fall back to browser/global default"
+                $data['timezone'] = null;
+            } elseif (!is_string($data['timezone']) || !TimeHelper::isValidTimezone($data['timezone'])) {
+                return ApiResponse::error('Invalid timezone identifier', 'INVALID_TIMEZONE', 400, []);
+            }
+        }
+
         // Update preferences (merges with existing)
         $success = UserPreference::updatePreferences($user['uuid'], $data);
 
@@ -715,7 +914,7 @@ public function getMails(Request $request): Response
                 'subject' => $mail['subject'] ?? '',
                 'body' => $mail['body'] ?? '',
                 'status' => $mail['status'] ?? 'pending',
-                'created_at' => $mail['created_at'] ?? '',
+                'created_at' => TimeHelper::toIso8601($mail['created_at'] ?? null),
             ];
             $mails[] = $mailData;
         }
@@ -849,8 +1048,8 @@ public function getActivities(Request $request): Response
                 'name' => $activity['name'] ?? '',
                 'context' => $activity['context'] ?? null,
                 'ip_address' => $ipAddress,
-                'created_at' => $activity['created_at'] ?? '',
-                'updated_at' => $activity['updated_at'] ?? '',
+                'created_at' => TimeHelper::toIso8601($activity['created_at'] ?? null),
+                'updated_at' => TimeHelper::toIso8601($activity['updated_at'] ?? null),
             ];
             $formattedActivities[] = $activityData;
         }
diff --git a/backend/app/Controllers/User/Vds/VmUserActivityController.php b/backend/app/Controllers/User/Vds/VmUserActivityController.php
index d355f1db5..ef19eca27 100644
--- a/backend/app/Controllers/User/Vds/VmUserActivityController.php
+++ b/backend/app/Controllers/User/Vds/VmUserActivityController.php
@@ -17,6 +17,7 @@
 
 namespace App\Controllers\User\Vds;
 
+use App\Helpers\TimeHelper;
 use App\Helpers\ApiResponse;
 use OpenApi\Attributes as OA;
 use App\Chat\VmInstanceActivity;
@@ -105,8 +106,12 @@ public function getVmInstanceActivities(Request $request, int $id): Response
             vmInstanceId: (int) $vmInstance['id'],
         );
 
+        $activities = is_array($result['data'] ?? null)
+            ? TimeHelper::normaliseRows($result['data'], ['timestamp'])
+            : [];
+
         return ApiResponse::success([
-            'activities' => $result['data'],
+            'activities' => $activities,
             'pagination' => $result['pagination'],
         ], 'Activities fetched', 200);
     }
diff --git a/backend/app/Controllers/User/VdsChatbotController.php b/backend/app/Controllers/User/VdsChatbotController.php
index 6825a0b00..33dc5808e 100644
--- a/backend/app/Controllers/User/VdsChatbotController.php
+++ b/backend/app/Controllers/User/VdsChatbotController.php
@@ -22,10 +22,12 @@
 use App\Helpers\ApiResponse;
 use OpenApi\Attributes as OA;
 use App\Chat\ChatConversation;
+use App\Services\Chatbot\TokenUsage;
 use App\Plugins\Events\Events\ChatbotEvent;
 use App\Services\Chatbot\VdsChatbotService;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 #[OA\Schema(
     schema: 'VdsChatbotRequest',
@@ -70,105 +72,28 @@ class VdsChatbotController
     )]
     public function chat(Request $request): Response
     {
-        $currentUser = $request->attributes->get('user');
-
-        if (!$currentUser || !isset($currentUser['id'])) {
-            return ApiResponse::error('User not authenticated', 'UNAUTHORIZED', 401);
-        }
-
-        // Check if chatbot is enabled
-        $app = App::getInstance(true);
-        $config = $app->getConfig();
-        $enabled = $config->getSetting(\App\Config\ConfigInterface::CHATBOT_ENABLED, 'true');
-        if ($enabled !== 'true') {
-            return ApiResponse::error('The AI chatbot is currently disabled by the administrator.', 'CHATBOT_DISABLED', 403);
-        }
-
-        $data = json_decode($request->getContent(), true);
-
-        if (!isset($data['message']) || empty(trim($data['message']))) {
-            return ApiResponse::error('Message is required', 'INVALID_REQUEST', 400);
-        }
-
-        $message        = trim($data['message']);
-        $history        = $data['history'] ?? [];
-        $pageContext     = $data['pageContext'] ?? [];
-        $conversationId = $data['conversation_id'] ?? null;
-
         try {
-            // Get or create conversation
-            $conversation = null;
-            if ($conversationId) {
-                $conversation = ChatConversation::getConversationById((int) $conversationId);
-                // Verify conversation belongs to user
-                if ($conversation && $conversation['user_uuid'] !== $currentUser['uuid']) {
-                    return ApiResponse::error('Conversation not found', 'NOT_FOUND', 404);
-                }
-            }
-
-            // Create new conversation if needed
-            if (!$conversation) {
-                $conversationId = ChatConversation::createConversation([
-                    'user_uuid' => $currentUser['uuid'],
-                    'title'     => substr($message, 0, 255),
-                ]);
-                if (!$conversationId) {
-                    return ApiResponse::error('Failed to create conversation', 'SERVER_ERROR', 500);
-                }
-                $conversation = ChatConversation::getConversationById($conversationId);
-            }
-
-            // Load conversation history from database if not provided
-            if (empty($history) && $conversation) {
-                $dbMessages = ChatMessage::getMessagesByConversation($conversation['id'], 50);
-                $history = array_map(function ($msg) {
-                    return [
-                        'role'    => $msg['role'],
-                        'content' => $msg['content'],
-                    ];
-                }, $dbMessages);
-            }
-
-            // Save user message to database
-            ChatMessage::createMessage([
-                'conversation_id' => $conversation['id'],
-                'role'            => 'user',
-                'content'         => $message,
-            ]);
-
-            // Get conversation memory
-            $conversationMemory = $conversation['memory'] ?? '';
-            $pageContext['conversation_memory'] = $conversationMemory;
-
-            // Process message through VDS AI
-            $chatbotService = new VdsChatbotService();
-            $result = $chatbotService->processMessage($message, $history, $currentUser, $pageContext);
-
-            // Update message count
-            $messageCount = ChatMessage::getMessageCount($conversation['id']);
-            ChatConversation::updateConversation($conversation['id'], [
-                'message_count' => $messageCount,
-            ]);
-
-            // Save AI response to database
-            ChatMessage::createMessage([
-                'conversation_id' => $conversation['id'],
-                'role'            => 'assistant',
-                'content'         => $result['response'],
-                'model'           => $result['model'] ?? null,
-            ]);
-
-            // Update conversation timestamp
-            ChatConversation::updateConversation($conversation['id'], [
-                'updated_at' => date('Y-m-d H:i:s'),
-            ]);
+            $payload = $this->processChatRequest($request);
 
             return ApiResponse::success([
-                'response'        => $result['response'],
-                'model'           => $result['model'] ?? 'FeatherPanel VDS AI',
-                'conversation_id' => $conversation['id'],
-                'tool_executions' => $result['tool_executions'] ?? [],
+                'response' => $payload['response'],
+                'model' => $payload['model'],
+                'conversation_id' => $payload['conversation_id'],
+                'message_id' => $payload['assistant_message_id'],
+                'user_message_id' => $payload['user_message_id'],
+                'usage' => $payload['usage'],
+                'user_usage' => $payload['user_usage'],
+                'tool_executions' => $payload['tool_executions'],
+                'tool_activity' => $payload['tool_activity'],
             ], 'Message processed successfully');
+        } catch (\InvalidArgumentException $e) {
+            return ApiResponse::error($e->getMessage(), 'INVALID_REQUEST', 400);
+        } catch (\RuntimeException $e) {
+            $message = $e->getMessage();
+            $code = $message === 'User not authenticated' ? 401 : ($message === 'Conversation not found' ? 404 : (str_contains($message, 'disabled') ? 403 : 500));
+            $errorCode = $code === 401 ? 'UNAUTHORIZED' : ($code === 404 ? 'NOT_FOUND' : ($code === 403 ? 'CHATBOT_DISABLED' : 'CHATBOT_ERROR'));
+
+            return ApiResponse::error($message, $errorCode, $code);
         } catch (\Exception $e) {
             App::getInstance(true)->getLogger()->error('VDS Chatbot error: ' . $e->getMessage());
 
@@ -180,6 +105,32 @@ public function chat(Request $request): Response
         }
     }
 
+    public function streamChat(Request $request): Response
+    {
+        return new StreamedResponse(function () use ($request): void {
+            $emit = function (string $type, array $payload = []): void {
+                echo "event: {$type}\n";
+                echo 'data: ' . json_encode($payload, JSON_UNESCAPED_SLASHES) . "\n\n";
+                @ob_flush();
+                flush();
+            };
+
+            try {
+                $payload = $this->processChatRequest($request, $emit);
+                $emit('final', $payload);
+            } catch (\Exception $e) {
+                App::getInstance(true)->getLogger()->error('VDS Chatbot stream error: ' . $e->getMessage());
+                $emit('error', [
+                    'message' => 'Failed to process message. Please try again.',
+                ]);
+            }
+        }, 200, [
+            'Content-Type' => 'text/event-stream',
+            'Cache-Control' => 'no-cache',
+            'X-Accel-Buffering' => 'no',
+        ]);
+    }
+
     #[OA\Get(
         path: '/api/user/vds-chatbot/conversations',
         summary: 'Get user VDS chatbot conversations',
@@ -414,6 +365,192 @@ public function updateMemory(Request $request, int $id): Response
         }
     }
 
+    private function processChatRequest(Request $request, ?callable $emit = null): array
+    {
+        $currentUser = $request->attributes->get('user');
+
+        if (!$currentUser || !isset($currentUser['id'])) {
+            throw new \RuntimeException('User not authenticated');
+        }
+
+        $app = App::getInstance(true);
+        $config = $app->getConfig();
+        $enabled = $config->getSetting(\App\Config\ConfigInterface::CHATBOT_ENABLED, 'true');
+        if ($enabled !== 'true') {
+            throw new \RuntimeException('The AI chatbot is currently disabled by the administrator.');
+        }
+
+        $data = json_decode($request->getContent(), true) ?: [];
+        if (!isset($data['message']) || empty(trim($data['message']))) {
+            throw new \InvalidArgumentException('Message is required');
+        }
+
+        $message = trim($data['message']);
+        $history = $data['history'] ?? [];
+        $pageContext = $data['pageContext'] ?? [];
+        $conversationId = $data['conversation_id'] ?? null;
+
+        $conversation = null;
+        if ($conversationId) {
+            $conversation = ChatConversation::getConversationById((int) $conversationId);
+            if ($conversation && $conversation['user_uuid'] !== $currentUser['uuid']) {
+                throw new \RuntimeException('Conversation not found');
+            }
+        }
+
+        if (!$conversation) {
+            $conversationId = ChatConversation::createConversation([
+                'user_uuid' => $currentUser['uuid'],
+                'title' => substr($message, 0, 255),
+            ]);
+            if (!$conversationId) {
+                throw new \RuntimeException('Failed to create conversation');
+            }
+            $conversation = ChatConversation::getConversationById($conversationId);
+        }
+
+        $dbMessages = ChatMessage::getMessagesByConversation($conversation['id'], 50);
+        if (empty($history) && $conversation) {
+            $history = $this->buildCompactHistory($dbMessages, $conversation);
+        } else {
+            $history = array_slice($history, -6);
+        }
+
+        $userUsage = TokenUsage::estimate($message);
+        $userMessageId = ChatMessage::createMessage([
+            'conversation_id' => $conversation['id'],
+            'role' => 'user',
+            'content' => $message,
+            'input_tokens' => $userUsage['input_tokens'],
+            'total_tokens' => $userUsage['total_tokens'],
+            'token_source' => $userUsage['source'],
+        ]);
+
+        if ($emit !== null) {
+            $emit('conversation', [
+                'conversation_id' => $conversation['id'],
+                'user_message_id' => $userMessageId,
+                'user_usage' => $userUsage,
+            ]);
+        }
+
+        $summary = $this->refreshContextSummary($conversation, $dbMessages, $message);
+        if ($emit !== null && $summary !== '') {
+            $emit('status', ['message' => 'Compacting conversation context']);
+        }
+        $pageContext['conversation_memory'] = trim(($conversation['memory'] ?? '') . "\n\n" . $summary);
+
+        $chatbotService = new VdsChatbotService();
+        $result = $chatbotService->processMessage($message, $history, $currentUser, $pageContext, $emit);
+        $usage = $result['usage'] ?? TokenUsage::estimate($message, $result['response'] ?? '');
+        $toolActivity = $result['tool_activity'] ?? [];
+
+        $assistantMessageId = ChatMessage::createMessage([
+            'conversation_id' => $conversation['id'],
+            'role' => 'assistant',
+            'content' => $result['response'],
+            'model' => $result['model'] ?? null,
+            'input_tokens' => $usage['input_tokens'] ?? null,
+            'output_tokens' => $usage['output_tokens'] ?? null,
+            'total_tokens' => $usage['total_tokens'] ?? null,
+            'token_source' => $usage['source'] ?? null,
+            'tool_activity' => $toolActivity,
+            'usage_json' => $usage,
+        ]);
+
+        $messageCount = ChatMessage::getMessageCount($conversation['id']);
+        ChatConversation::updateConversation($conversation['id'], [
+            'message_count' => $messageCount,
+            'updated_at' => date('Y-m-d H:i:s'),
+        ]);
+
+        return [
+            'response' => $result['response'],
+            'model' => $result['model'] ?? 'FeatherPanel VDS AI',
+            'conversation_id' => $conversation['id'],
+            'user_message_id' => $userMessageId,
+            'assistant_message_id' => $assistantMessageId,
+            'usage' => $usage,
+            'user_usage' => $userUsage,
+            'tool_executions' => $result['tool_executions'] ?? [],
+            'tool_activity' => $toolActivity,
+        ];
+    }
+
+    private function buildCompactHistory(array $dbMessages, array $conversation): array
+    {
+        $summary = $conversation['context_summary'] ?? '';
+        $recentMessages = array_slice($dbMessages, -6);
+        $history = [];
+
+        if ($summary !== '') {
+            $history[] = [
+                'role' => 'assistant',
+                'content' => "Conversation context summary:\n{$summary}",
+            ];
+        }
+
+        foreach ($recentMessages as $msg) {
+            $content = $msg['content'];
+            if (!empty($msg['tool_activity']) && is_array($msg['tool_activity'])) {
+                $content .= "\n\n[Tool/activity results from this assistant turn]\n" . $this->formatToolActivityForHistory($msg['tool_activity']);
+            }
+            $history[] = [
+                'role' => $msg['role'],
+                'content' => $content,
+            ];
+        }
+
+        return $history;
+    }
+
+    private function refreshContextSummary(array $conversation, array $dbMessages, string $latestMessage): string
+    {
+        $existing = trim((string) ($conversation['context_summary'] ?? ''));
+        if (count($dbMessages) < 10 || !ChatConversation::hasColumn('context_summary')) {
+            return $existing;
+        }
+
+        $olderMessages = array_slice($dbMessages, 0, -6);
+        $lines = [];
+        foreach ($olderMessages as $message) {
+            $content = trim(preg_replace('/\s+/', ' ', (string) $message['content']));
+            if (!empty($message['tool_activity']) && is_array($message['tool_activity'])) {
+                $content .= ' Tool/activity: ' . preg_replace('/\s+/', ' ', $this->formatToolActivityForHistory($message['tool_activity']));
+            }
+            if ($content === '') {
+                continue;
+            }
+            $lines[] = strtoupper((string) $message['role']) . ': ' . mb_substr($content, 0, 220);
+        }
+
+        $summary = trim($existing . "\n" . implode("\n", array_slice($lines, -12)));
+        $summary = mb_substr($summary, -3500);
+        $summary .= "\nLatest user message: " . mb_substr($latestMessage, 0, 300);
+
+        ChatConversation::updateConversation((int) $conversation['id'], [
+            'context_summary' => $summary,
+            'context_summary_updated_at' => date('Y-m-d H:i:s'),
+        ]);
+
+        return $summary;
+    }
+
+    private function formatToolActivityForHistory(array $toolActivity): string
+    {
+        $lines = [];
+        foreach ($toolActivity as $activity) {
+            if (!is_array($activity)) {
+                continue;
+            }
+            $status = ($activity['success'] ?? null) === false ? 'failed' : (($activity['success'] ?? null) ? 'completed' : 'planned');
+            $summary = isset($activity['summary']) ? ' - ' . $activity['summary'] : '';
+            $lines[] = ($activity['tool'] ?? 'unknown_tool') . ": {$status}{$summary}";
+        }
+
+        return implode("\n", $lines);
+    }
+
     private static function emitEvent(string $eventName, array $payload): void
     {
         global $eventManager;
diff --git a/backend/app/Controllers/Wings/Server/WingsServerInfoController.php b/backend/app/Controllers/Wings/Server/WingsServerInfoController.php
index 2dd8cbcf2..9adcb674f 100755
--- a/backend/app/Controllers/Wings/Server/WingsServerInfoController.php
+++ b/backend/app/Controllers/Wings/Server/WingsServerInfoController.php
@@ -26,6 +26,8 @@
 use App\Chat\ServerVariable;
 use App\Helpers\ApiResponse;
 use OpenApi\Attributes as OA;
+use App\Chat\ServerCustomVariable;
+use App\Helpers\WingsFileTrashConfig;
 use App\Plugins\Events\Events\WingsEvent;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -181,6 +183,10 @@ public function getServer(Request $request, string $uuid): Response
             $environment[$variable['env_variable']] = $variable['variable_value'];
         }
 
+        foreach (ServerCustomVariable::getEnvironmentVariablesByServerId((int) $server['id']) as $envVariable => $value) {
+            $environment[$envVariable] = $value;
+        }
+
         // Add default environment variables based on database fields
         $environment['P_SERVER_LOCATION'] = $node['location_id'] ?? '';
         $environment['P_SERVER_UUID'] = $server['uuid'];
@@ -476,6 +482,7 @@ public function getServer(Request $request, string $uuid): Response
                 'oom_disabled' => (bool) $server['oom_disabled'],
                 'requires_rebuild' => false,
             ],
+            'file_trash' => WingsFileTrashConfig::forWings(),
         ];
         $wingsMounts = Mount::getWingsMountsForServer((int) $server['id']);
         if ($wingsMounts !== []) {
diff --git a/backend/app/Controllers/Wings/Server/WingsServerListController.php b/backend/app/Controllers/Wings/Server/WingsServerListController.php
index 77b59dfe3..21166cdb1 100755
--- a/backend/app/Controllers/Wings/Server/WingsServerListController.php
+++ b/backend/app/Controllers/Wings/Server/WingsServerListController.php
@@ -26,6 +26,8 @@
 use App\Chat\ServerVariable;
 use App\Helpers\ApiResponse;
 use OpenApi\Attributes as OA;
+use App\Chat\ServerCustomVariable;
+use App\Helpers\WingsFileTrashConfig;
 use App\Plugins\Events\Events\WingsEvent;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -146,6 +148,10 @@ public function getRemoteServers(Request $request): Response
                 $environment[$variable['env_variable']] = $variable['variable_value'];
             }
 
+            foreach (ServerCustomVariable::getEnvironmentVariablesByServerId((int) $server['id']) as $envVariable => $value) {
+                $environment[$envVariable] = $value;
+            }
+
             // Add default environment variables
             $environment['P_SERVER_LOCATION'] = $node['location_id'] ?? '';
             $environment['P_SERVER_UUID'] = $server['uuid'];
@@ -371,6 +377,7 @@ public function getRemoteServers(Request $request): Response
                     'oom_disabled' => (bool) $server['oom_disabled'],
                     'requires_rebuild' => false,
                 ],
+                'file_trash' => WingsFileTrashConfig::forWings(),
             ];
             $listMounts = Mount::getWingsMountsForServer((int) $server['id']);
             if ($listMounts !== []) {
diff --git a/backend/app/Helpers/ModerationReasonHelper.php b/backend/app/Helpers/ModerationReasonHelper.php
new file mode 100644
index 000000000..e231dac71
--- /dev/null
+++ b/backend/app/Helpers/ModerationReasonHelper.php
@@ -0,0 +1,205 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Helpers;
+
+use App\Chat\User;
+
+class ModerationReasonHelper
+{
+    public const CATEGORY_LABELS = [
+        'payment_overdue' => 'Payment overdue',
+        'terms_violation' => 'Terms of service violation',
+        'abuse_harassment' => 'Abuse or harassment',
+        'resource_abuse' => 'Resource abuse',
+        'security_threat' => 'Security threat',
+        'spam' => 'Spam or advertising',
+        'chargeback' => 'Chargeback or fraud',
+        'manual_review' => 'Manual review required',
+        'featherzerotrust' => 'FeatherZeroTrust detection',
+        'other' => 'Other',
+    ];
+
+    public static function normalizeDetails(string $details): string
+    {
+        return trim(preg_replace('/\s+/u', ' ', $details) ?? '');
+    }
+
+    public static function formatReason(?string $category, string $details): string
+    {
+        $details = self::normalizeDetails($details);
+        $category = $category !== null ? trim($category) : '';
+
+        if ($category !== '' && isset(self::CATEGORY_LABELS[$category])) {
+            $label = self::CATEGORY_LABELS[$category];
+            if ($details === '') {
+                return $label;
+            }
+
+            return $label . ': ' . $details;
+        }
+
+        return $details;
+    }
+
+    public static function validateReason(string $reason): ?string
+    {
+        $reason = self::normalizeDetails($reason);
+        if ($reason === '') {
+            return 'A reason is required when suspending or banning.';
+        }
+        if (mb_strlen($reason) < 3) {
+            return 'Reason must be at least 3 characters.';
+        }
+        if (mb_strlen($reason) > 2000) {
+            return 'Reason must be 2000 characters or fewer.';
+        }
+
+        return null;
+    }
+
+    /**
+     * @return array{reason:string,category:?string,details:string}|null
+     */
+    public static function parseRequestBody(array $body): ?array
+    {
+        $category = isset($body['reason_category']) && is_string($body['reason_category'])
+            ? trim($body['reason_category'])
+            : null;
+        if ($category === '') {
+            $category = null;
+        }
+
+        $details = '';
+        if (isset($body['reason_details']) && is_string($body['reason_details'])) {
+            $details = $body['reason_details'];
+        } elseif (isset($body['reason']) && is_string($body['reason'])) {
+            $details = $body['reason'];
+        }
+
+        $reason = self::formatReason($category, $details);
+        if (self::validateReason($reason) !== null && isset($body['reason']) && is_string($body['reason'])) {
+            $reason = self::normalizeDetails($body['reason']);
+        }
+
+        return [
+            'reason' => $reason,
+            'category' => $category,
+            'details' => self::normalizeDetails($details),
+        ];
+    }
+
+    /**
+     * @param array<string, mixed> $row
+     *
+     * @return array<string, mixed>
+     */
+    public static function enrichUserBanMetadata(array $row): array
+    {
+        $staffUuid = isset($row['banned_by_uuid']) ? trim((string) $row['banned_by_uuid']) : '';
+        if ($staffUuid !== '') {
+            $staff = User::getUserByUuid($staffUuid);
+            $row['banned_by'] = $staff ? [
+                'uuid' => $staff['uuid'],
+                'username' => $staff['username'],
+            ] : [
+                'uuid' => $staffUuid,
+                'username' => null,
+            ];
+        } else {
+            $row['banned_by'] = null;
+        }
+
+        return $row;
+    }
+
+    /**
+     * @param array<string, mixed> $row
+     *
+     * @return array<string, mixed>
+     */
+    public static function enrichServerSuspensionMetadata(array $row): array
+    {
+        $staffUuid = isset($row['suspended_by_uuid']) ? trim((string) $row['suspended_by_uuid']) : '';
+        if ($staffUuid !== '') {
+            $staff = User::getUserByUuid($staffUuid);
+            $row['suspended_by'] = $staff ? [
+                'uuid' => $staff['uuid'],
+                'username' => $staff['username'],
+            ] : [
+                'uuid' => $staffUuid,
+                'username' => $staffUuid === 'system' ? 'System' : null,
+            ];
+        } else {
+            $row['suspended_by'] = null;
+        }
+
+        return $row;
+    }
+
+    /**
+     * @return array<string, string|null>
+     */
+    public static function banAppliedFields(string $reason, ?array $staffUser): array
+    {
+        return [
+            'banned' => 'true',
+            'ban_reason' => $reason,
+            'banned_at' => gmdate('Y-m-d H:i:s'),
+            'banned_by_uuid' => is_array($staffUser) ? ($staffUser['uuid'] ?? null) : null,
+        ];
+    }
+
+    /**
+     * @return array<string, null>
+     */
+    public static function banClearedFields(): array
+    {
+        return [
+            'banned' => 'false',
+            'ban_reason' => null,
+            'banned_at' => null,
+            'banned_by_uuid' => null,
+        ];
+    }
+
+    /**
+     * @return array<string, int|string|null>
+     */
+    public static function suspensionAppliedFields(string $reason, ?array $staffUser): array
+    {
+        return [
+            'suspended' => 1,
+            'suspension_reason' => $reason,
+            'suspended_at' => gmdate('Y-m-d H:i:s'),
+            'suspended_by_uuid' => is_array($staffUser) ? ($staffUser['uuid'] ?? null) : null,
+        ];
+    }
+
+    /**
+     * @return array<string, int|null>
+     */
+    public static function suspensionClearedFields(): array
+    {
+        return [
+            'suspended' => 0,
+            'suspension_reason' => null,
+            'suspended_at' => null,
+            'suspended_by_uuid' => null,
+        ];
+    }
+}
diff --git a/backend/app/Helpers/TimeHelper.php b/backend/app/Helpers/TimeHelper.php
new file mode 100644
index 000000000..06d611789
--- /dev/null
+++ b/backend/app/Helpers/TimeHelper.php
@@ -0,0 +1,132 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Helpers;
+
+/**
+ * Helpers for normalising datetime values that are exposed through the API.
+ *
+ * All datetime columns in the database are stored as UTC (the PDO connection
+ * forces `SET time_zone = '+00:00'`). API responses must therefore tag every
+ * datetime value with an explicit UTC offset (`Z`) so the frontend can render
+ * it in the user's preferred timezone unambiguously.
+ *
+ * Without this normalisation, MySQL returns naive datetime strings like
+ * `2026-05-17 19:00:00` which `new Date(...)` in JavaScript interprets as
+ * **local browser time**, causing a wall-clock offset bug equal to the user's
+ * timezone offset (the source of the historical "times are 2 hours behind"
+ * reports for Europe/Paris users).
+ */
+class TimeHelper
+{
+    /**
+     * Convert a MySQL-formatted datetime string (assumed UTC) to ISO-8601 with
+     * an explicit `Z` suffix so JavaScript parses it as UTC.
+     *
+     * Accepted inputs include:
+     *  - `Y-m-d H:i:s`        (e.g. `2026-05-17 19:00:00`)
+     *  - `Y-m-d\TH:i:s`       (e.g. `2026-05-17T19:00:00`)
+     *  - Anything else `DateTime` can parse (treated as UTC if no offset).
+     *
+     * Returns `null` for null/empty input and the original value (unchanged)
+     * if it cannot be parsed, so misformatted historical data does not blow
+     * up the request.
+     */
+    public static function toIso8601(mixed $value): ?string
+    {
+        if ($value === null) {
+            return null;
+        }
+
+        if (!is_string($value)) {
+            return null;
+        }
+
+        $trimmed = trim($value);
+        if ($trimmed === '' || $trimmed === '0000-00-00 00:00:00') {
+            return null;
+        }
+
+        try {
+            $dt = new \DateTimeImmutable($trimmed, new \DateTimeZone('UTC'));
+        } catch (\Exception $e) {
+            return $trimmed;
+        }
+
+        // setTimezone(UTC) is a no-op when input was naive (DateTimeImmutable
+        // honours the constructor TZ), but normalises any value that already
+        // carried an explicit offset.
+        return $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d\TH:i:s\Z');
+    }
+
+    /**
+     * Normalise the standard `created_at` / `updated_at` (and any caller-supplied
+     * additional keys) on an associative row in place, returning the new array.
+     *
+     * @param array<string, mixed> $row
+     * @param string[] $extraKeys additional datetime keys to normalise
+     *
+     * @return array<string, mixed>
+     */
+    public static function normaliseRow(array $row, array $extraKeys = []): array
+    {
+        $keys = array_unique(array_merge(['created_at', 'updated_at'], $extraKeys));
+        foreach ($keys as $key) {
+            if (array_key_exists($key, $row)) {
+                $row[$key] = self::toIso8601($row[$key]);
+            }
+        }
+
+        return $row;
+    }
+
+    /**
+     * Apply `normaliseRow` to a list of rows.
+     *
+     * @param array<int, array<string, mixed>> $rows
+     * @param string[] $extraKeys
+     *
+     * @return array<int, array<string, mixed>>
+     */
+    public static function normaliseRows(array $rows, array $extraKeys = []): array
+    {
+        return array_map(static fn (array $row) => self::normaliseRow($row, $extraKeys), $rows);
+    }
+
+    /**
+     * Check whether a string looks like a valid IANA timezone identifier
+     * (e.g. `Europe/Paris`, `America/Los_Angeles`, `UTC`).
+     *
+     * Uses PHP's built-in zone list rather than a custom regex so we accept
+     * exactly the same set of zones that PHP itself can render with.
+     */
+    public static function isValidTimezone(string $timezone): bool
+    {
+        $trimmed = trim($timezone);
+        if ($trimmed === '') {
+            return false;
+        }
+
+        try {
+            new \DateTimeZone($trimmed);
+
+            return true;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+}
diff --git a/backend/app/Helpers/WingsFileTrashConfig.php b/backend/app/Helpers/WingsFileTrashConfig.php
new file mode 100644
index 000000000..414802543
--- /dev/null
+++ b/backend/app/Helpers/WingsFileTrashConfig.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Helpers;
+
+use App\App;
+use App\Config\ConfigInterface;
+
+/**
+ * File trash settings pushed to FeatherWings in server configuration (SFTP, etc.).
+ */
+class WingsFileTrashConfig
+{
+    /**
+     * @return array{enabled: bool, max_size_bytes: int, retention_days: int}
+     */
+    public static function forWings(): array
+    {
+        $config = App::getInstance(true)->getConfig();
+        $maxMb = (int) $config->getSetting(ConfigInterface::FILE_TRASH_MAX_SIZE_MB, '512');
+        $retentionDays = (int) $config->getSetting(ConfigInterface::FILE_TRASH_RETENTION_DAYS, '30');
+
+        return [
+            'enabled' => $config->getSetting(ConfigInterface::FILE_TRASH_ENABLED, 'false') === 'true',
+            'max_size_bytes' => $maxMb > 0 ? $maxMb * 1024 * 1024 : 0,
+            'retention_days' => $retentionDays,
+        ];
+    }
+}
diff --git a/backend/app/KPI/Admin/SystemAnalytics.php b/backend/app/KPI/Admin/SystemAnalytics.php
index e603e082b..2c1b6a950 100755
--- a/backend/app/KPI/Admin/SystemAnalytics.php
+++ b/backend/app/KPI/Admin/SystemAnalytics.php
@@ -18,6 +18,7 @@
 namespace App\KPI\Admin;
 
 use App\Chat\Database;
+use App\Helpers\TimeHelper;
 
 /**
  * System Analytics and KPI service for mail, API keys, SSH keys, plugins, and system features.
@@ -90,6 +91,7 @@ public static function getMailQueueStats(): array
             LIMIT 10
         ");
         $recentQueued = $stmt->fetchAll(\PDO::FETCH_ASSOC) ?: [];
+        $recentQueued = TimeHelper::normaliseRows($recentQueued);
 
         return [
             'total_queued' => $pending,
diff --git a/backend/app/Mail/templates/AccountBanned.php b/backend/app/Mail/templates/AccountBanned.php
index b556d7e36..cb75b74fc 100755
--- a/backend/app/Mail/templates/AccountBanned.php
+++ b/backend/app/Mail/templates/AccountBanned.php
@@ -39,6 +39,7 @@ public static function getTemplate(array $data): string
                 'dashboard_url' => $data['app_url'] . '/dashboard',
                 'support_url' => $data['app_support_url'],
                 'suspension_time' => $data['suspension_time'],
+                'suspension_reason' => $data['suspension_reason'] ?? '',
             ]);
         }
 
@@ -59,6 +60,7 @@ public static function parseTemplate(string $template, array $data): string
         $template = str_replace('{dashboard_url}', $data['dashboard_url'], $template);
         $template = str_replace('{support_url}', $data['support_url'], $template);
         $template = str_replace('{suspension_time}', $data['suspension_time'], $template);
+        $template = str_replace('{suspension_reason}', $data['suspension_reason'] ?? '', $template);
 
         return $template;
     }
@@ -130,6 +132,7 @@ private static function getSubject(array $data): string
             'dashboard_url' => $data['app_url'] . '/dashboard',
             'support_url' => $data['app_support_url'],
             'suspension_time' => $data['suspension_time'],
+            'suspension_reason' => $data['suspension_reason'] ?? '',
         ]);
     }
 }
diff --git a/backend/app/Mail/templates/ServerBanned.php b/backend/app/Mail/templates/ServerBanned.php
index 4d477b559..57ba14cd0 100755
--- a/backend/app/Mail/templates/ServerBanned.php
+++ b/backend/app/Mail/templates/ServerBanned.php
@@ -39,6 +39,7 @@ public static function getTemplate(array $data): string
                 'dashboard_url' => $data['app_url'] . '/dashboard',
                 'support_url' => $data['app_support_url'],
                 'server_name' => $data['server_name'],
+                'suspension_reason' => $data['suspension_reason'] ?? '',
             ]);
         }
 
@@ -59,6 +60,7 @@ public static function parseTemplate(string $template, array $data): string
         $template = str_replace('{dashboard_url}', $data['dashboard_url'], $template);
         $template = str_replace('{support_url}', $data['support_url'], $template);
         $template = str_replace('{server_name}', $data['server_name'], $template);
+        $template = str_replace('{suspension_reason}', $data['suspension_reason'] ?? '', $template);
 
         return $template;
     }
@@ -134,6 +136,7 @@ private static function getSubject(array $data): string
             'dashboard_url' => $data['app_url'] . '/dashboard',
             'support_url' => $data['app_support_url'],
             'server_name' => $data['server_name'],
+            'suspension_reason' => $data['suspension_reason'] ?? '',
         ]);
     }
 }
diff --git a/backend/app/Mail/templates/VmSuspended.php b/backend/app/Mail/templates/VmSuspended.php
index fdc763e58..23d255efc 100644
--- a/backend/app/Mail/templates/VmSuspended.php
+++ b/backend/app/Mail/templates/VmSuspended.php
@@ -36,6 +36,7 @@ public static function getTemplate(array $data): string
                 'dashboard_url' => $data['app_url'] . '/dashboard',
                 'support_url' => $data['app_support_url'],
                 'vm_hostname' => $data['vm_hostname'],
+                'suspension_reason' => $data['suspension_reason'] ?? '',
             ]);
         }
 
@@ -53,6 +54,7 @@ public static function parseTemplate(string $template, array $data): string
         $template = str_replace('{dashboard_url}', $data['dashboard_url'], $template);
         $template = str_replace('{support_url}', $data['support_url'], $template);
         $template = str_replace('{vm_hostname}', $data['vm_hostname'], $template);
+        $template = str_replace('{suspension_reason}', $data['suspension_reason'] ?? '', $template);
 
         return $template;
     }
@@ -125,6 +127,7 @@ private static function getSubject(array $data): string
             'dashboard_url' => $data['app_url'] . '/dashboard',
             'support_url' => $data['app_support_url'],
             'vm_hostname' => $data['vm_hostname'],
+            'suspension_reason' => $data['suspension_reason'] ?? '',
         ]);
     }
 }
diff --git a/backend/app/Plugins/Events/Events/SpellsEvent.php b/backend/app/Plugins/Events/Events/SpellsEvent.php
index 8a55cf21e..fc3d3eee1 100755
--- a/backend/app/Plugins/Events/Events/SpellsEvent.php
+++ b/backend/app/Plugins/Events/Events/SpellsEvent.php
@@ -70,6 +70,14 @@ public static function onSpellsByRealmRetrieved(): string
         return 'featherpanel:admin:spells:by:realm:retrieved';
     }
 
+    /**
+     * Callback: int realm id, array spells, array reordered_by.
+     */
+    public static function onSpellsReordered(): string
+    {
+        return 'featherpanel:admin:spells:reordered';
+    }
+
     /**
      * Callback: array import data, array results.
      */
diff --git a/backend/app/Services/Backup/BackupFifoEviction.php b/backend/app/Services/Backup/BackupFifoEviction.php
index ef32836f2..44d5776f6 100644
--- a/backend/app/Services/Backup/BackupFifoEviction.php
+++ b/backend/app/Services/Backup/BackupFifoEviction.php
@@ -144,15 +144,33 @@ public static function evictOldestWingsBackup(int $serverId, string $serverUuid,
         }
 
         $response = $wings->getServer()->deleteBackup($serverUuid, (string) $victim['uuid']);
+        $missingOnNode = false;
         if (!$response->isSuccessful()) {
-            return [
-                'message' => 'Failed to remove oldest backup for rotation: ' . $response->getError(),
-                'code' => 'FIFO_EVICTION_FAILED',
-                'status' => $response->getStatusCode() >= 400 ? $response->getStatusCode() : 500,
-            ];
+            $status = $response->getStatusCode();
+            $error = $response->getError();
+            if ($status === 404 && self::isMissingBackupOnNodeError($error)) {
+                $missingOnNode = true;
+                $app->getLogger()->warning('FIFO eviction found stale backup record ' . $victim['uuid'] . ' for server ' . $serverUuid . ': ' . $error);
+            } else {
+                return [
+                    'message' => 'Failed to remove oldest backup for rotation: ' . $error,
+                    'code' => 'FIFO_EVICTION_FAILED',
+                    'status' => $status >= 400 ? $status : 500,
+                ];
+            }
         }
 
         if (!Backup::deleteBackup((int) $victim['id'])) {
+            if ($missingOnNode) {
+                $app->getLogger()->error('FIFO eviction: stale backup ' . $victim['uuid'] . ' was missing on Wings but DB soft-delete failed');
+
+                return [
+                    'message' => 'Backup was already missing on node but failed to update backup record',
+                    'code' => 'FIFO_EVICTION_DB_FAILED',
+                    'status' => 500,
+                ];
+            }
+
             $app->getLogger()->error('FIFO eviction: Wings deleted backup ' . $victim['uuid'] . ' but DB soft-delete failed');
 
             return [
@@ -162,6 +180,12 @@ public static function evictOldestWingsBackup(int $serverId, string $serverUuid,
             ];
         }
 
+        if ($missingOnNode) {
+            $app->getLogger()->info('FIFO backup rotation cleared stale Wings backup record ' . $victim['uuid'] . ' for server ' . $serverUuid);
+
+            return null;
+        }
+
         $app->getLogger()->info('FIFO backup rotation evicted Wings backup ' . $victim['uuid'] . ' for server ' . $serverUuid);
 
         return null;
@@ -232,4 +256,14 @@ public static function evictOldestVmBackup(array $instance, Proxmox $client): ?a
 
         return null;
     }
+
+    private static function isMissingBackupOnNodeError(string $error): bool
+    {
+        $normalized = strtolower($error);
+
+        return str_contains($normalized, 'requested backup was not found')
+            || str_contains($normalized, 'backup was not found')
+            || str_contains($normalized, 'backup not found')
+            || str_contains($normalized, 'no such backup');
+    }
 }
diff --git a/backend/app/Services/Chatbot/ChatbotRuntime.php b/backend/app/Services/Chatbot/ChatbotRuntime.php
new file mode 100644
index 000000000..89f17c471
--- /dev/null
+++ b/backend/app/Services/Chatbot/ChatbotRuntime.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Services\Chatbot;
+
+class ChatbotRuntime
+{
+    public static function emit(?callable $emit, string $type, array $payload = []): void
+    {
+        if ($emit === null) {
+            return;
+        }
+
+        $emit($type, $payload);
+    }
+
+    public static function toolActivity(array $toolCall, array $toolResult, int $iteration): array
+    {
+        return [
+            'tool'      => $toolCall['tool'] ?? 'unknown',
+            'params'    => self::sanitizeValue($toolCall['params'] ?? []),
+            'success'   => (bool) ($toolResult['success'] ?? false),
+            'error'     => $toolResult['error'] ?? null,
+            'summary'   => self::summarizeResult($toolResult),
+            'iteration' => $iteration,
+        ];
+    }
+
+    public static function summarizeResult(array $toolResult): string
+    {
+        if (!($toolResult['success'] ?? false)) {
+            return (string) ($toolResult['error'] ?? 'Tool failed.');
+        }
+
+        $data = $toolResult['data'] ?? null;
+        if (is_array($data)) {
+            if (isset($data['message'])) {
+                return self::truncate((string) $data['message'], 240);
+            }
+
+            if (isset($data['success'])) {
+                return ((bool) $data['success']) ? 'Tool completed successfully.' : 'Tool returned an unsuccessful result.';
+            }
+
+            return self::truncate(json_encode(self::sanitizeValue($data), JSON_UNESCAPED_SLASHES) ?: 'Tool completed.', 240);
+        }
+
+        return self::truncate((string) $data, 240);
+    }
+
+    public static function sanitizeValue(mixed $value): mixed
+    {
+        if (is_array($value)) {
+            $sanitized = [];
+            foreach ($value as $key => $item) {
+                $keyString = (string) $key;
+                if (preg_match('/password|token|secret|key|credential/i', $keyString)) {
+                    $sanitized[$key] = '[redacted]';
+                    continue;
+                }
+
+                $sanitized[$key] = self::sanitizeValue($item);
+            }
+
+            return $sanitized;
+        }
+
+        if (is_string($value)) {
+            return self::truncate($value, 500);
+        }
+
+        return $value;
+    }
+
+    public static function truncate(string $value, int $limit): string
+    {
+        if (strlen($value) <= $limit) {
+            return $value;
+        }
+
+        return rtrim(substr($value, 0, $limit - 3)) . '...';
+    }
+}
diff --git a/backend/app/Services/Chatbot/ChatbotService.php b/backend/app/Services/Chatbot/ChatbotService.php
index bb1c0609a..9bc071b67 100755
--- a/backend/app/Services/Chatbot/ChatbotService.php
+++ b/backend/app/Services/Chatbot/ChatbotService.php
@@ -53,7 +53,7 @@ public function __construct()
      *
      * @return array Response with 'response' and 'model' keys
      */
-    public function processMessage(string $message, array $history, array $user, array $pageContext = []): array
+    public function processMessage(string $message, array $history, array $user, array $pageContext = [], ?callable $emit = null): array
     {
         // Check if chatbot is enabled
         $enabled = $this->config->getSetting(ConfigInterface::CHATBOT_ENABLED, 'true');
@@ -69,22 +69,30 @@ public function processMessage(string $message, array $history, array $user, arr
         // Get chatbot configuration
         $temperature = (float) $this->config->getSetting(ConfigInterface::CHATBOT_TEMPERATURE, '0.7');
         $maxTokens = (int) $this->config->getSetting(ConfigInterface::CHATBOT_MAX_TOKENS, '2048');
-        $maxHistory = (int) $this->config->getSetting(ConfigInterface::CHATBOT_MAX_HISTORY, '10');
+        $maxHistory = min((int) $this->config->getSetting(ConfigInterface::CHATBOT_MAX_HISTORY, '4'), 6);
+
+        ChatbotRuntime::emit($emit, 'status', ['message' => 'Preparing chat context']);
 
         // Limit history to configured max
         $history = array_slice($history, -$maxHistory);
 
+        $isDashboardMode = $this->isDashboardMode($pageContext);
+
         // Build comprehensive system prompt
-        $contextBuilder = new ContextBuilder();
+        $contextBuilder = $isDashboardMode ? new DashboardContextBuilder() : new ContextBuilder();
 
         // Load base system prompt from file
-        $baseSystemPrompt = ContextBuilder::loadSystemPrompt();
+        $baseSystemPrompt = $isDashboardMode
+            ? DashboardContextBuilder::loadSystemPrompt()
+            : ContextBuilder::loadSystemPrompt();
 
         // Get admin-configured system prompt (optional override)
         $adminSystemPrompt = $this->config->getSetting(ConfigInterface::CHATBOT_SYSTEM_PROMPT, '');
 
-        // Build user context (servers, info, current page)
-        $userContext = $contextBuilder->buildContext($user, $pageContext);
+        // Build user context. Dashboard mode is compact and never injects logs by default.
+        $userContext = $isDashboardMode
+            ? $contextBuilder->buildContext($user, $pageContext)
+            : $contextBuilder->buildContext($user, $pageContext, $this->shouldIncludeLogs($message));
 
         // Get conversation memory if available
         $conversationMemory = $pageContext['conversation_memory'] ?? '';
@@ -98,7 +106,8 @@ public function processMessage(string $message, array $history, array $user, arr
 
         // Add conversation memory if available
         if (!empty($conversationMemory)) {
-            $systemPrompt .= "\n\n## Conversation Memory\n{$conversationMemory}";
+            $systemPrompt .= "\n\n## Compact Conversation Memory\n{$conversationMemory}";
+            $systemPrompt .= "\n\nUse this compact memory only as background. Never infer resource IDs, current state, or tool parameters from older summary text when the current dashboard/server context or tools disagree.";
         }
 
         // Get admin-configured user prompt (optional)
@@ -106,6 +115,9 @@ public function processMessage(string $message, array $history, array $user, arr
 
         // Prepend user prompt to message if configured
         $fullMessage = $message;
+        $fullMessage .= "\n\n[Current Turn Protocol: Treat this latest user message as the primary task. Use older conversation only as background. Do not bring up previous actions, previous questions, or unfinished older topics unless this latest message explicitly asks about them or clearly depends on them.]";
+        $fullMessage .= "\n\n[Response Language Protocol: Reply in the same natural language as this latest user message. If this message is English, reply in English only, regardless of older conversation history. If earlier replies used the wrong language, acknowledge that plainly instead of denying it.]";
+        $fullMessage .= "\n\n[Action Authorization Protocol: Only perform, claim, or emit ACTION/TOOL_CALL for destructive or state-changing actions when this latest user message explicitly requests that exact action. If the latest message asks to check, inspect, show status, diagnose, or look at a server, fetch/read status only. Do not restart, stop, kill, start, delete, write, or send console commands based on older conversation memory or summaries.]";
         if (!empty($userPrompt)) {
             $fullMessage = "{$fullMessage}\n\n[User Context: {$userPrompt}]";
         }
@@ -140,28 +152,80 @@ public function processMessage(string $message, array $history, array $user, arr
         }
 
         // Initialize tool handler
-        $toolHandler = new ToolHandler();
+        $toolHandler = new ToolHandler($isDashboardMode);
 
         // Add tool information to system prompt
         $toolsInfo = $this->formatToolsForPrompt($toolHandler);
         $systemPrompt .= "\n\n## Available Tools\n{$toolsInfo}";
 
-        // Process message with tool calling support (max 3 iterations to avoid loops)
-        $maxToolIterations = 3;
+        // Process message with tool calling support.
+        $maxToolIterations = 5;
         $toolIterations = 0;
         $currentMessage = $fullMessage;
         $currentHistory = $history;
         $finalResponse = '';
         $toolExecutions = []; // Store tool execution results for frontend
+        $toolActivity = [];
+        $usageItems = [];
+        $result = ['response' => '', 'model' => 'FeatherPanel AI'];
+        $requiredTool = $this->detectRequiredTool($message, $history);
+        $allowedSingleExecutionTools = $this->detectAllowedSingleExecutionTools($message, $history);
+        $lastToolResultsText = '';
+        $toolOutcomeFallbacks = [];
+        $completedSingleExecutionTools = [];
 
         while ($toolIterations < $maxToolIterations) {
             // Process message through provider
+            ChatbotRuntime::emit($emit, 'status', [
+                'message' => $toolIterations === 0 ? 'Calling AI model' : 'Calling AI model with tool results',
+                'iteration' => $toolIterations + 1,
+            ]);
             $result = $providerInstance->processMessage($currentMessage, $currentHistory, $systemPrompt);
             $response = $result['response'];
+            if (isset($result['usage']) && is_array($result['usage'])) {
+                $usageItems[] = $result['usage'];
+                ChatbotRuntime::emit($emit, 'usage', ['usage' => TokenUsage::aggregate($usageItems)]);
+            }
 
             // Check for tool calls
+            ChatbotRuntime::emit($emit, 'status', ['message' => 'Checking for tool calls']);
             $toolCalls = $toolHandler->parseToolCalls($response);
 
+            if (empty($toolCalls) && $toolHandler->hasMalformedToolCall($response)) {
+                $currentHistory[] = [
+                    'role' => 'assistant',
+                    'content' => $toolHandler->removeToolCalls($response),
+                ];
+                $currentMessage = $this->buildMalformedToolCorrection($toolHandler);
+                $currentHistory[] = [
+                    'role' => 'user',
+                    'content' => $currentMessage,
+                ];
+                ++$toolIterations;
+                $finalResponse = $toolHandler->removeToolCalls($response);
+                continue;
+            }
+
+            if (
+                empty($toolCalls)
+                && $requiredTool !== null
+                && $toolIterations < $maxToolIterations - 1
+                && !$this->responseClaimsRequiredToolCompleted($response, $requiredTool)
+            ) {
+                $currentHistory[] = [
+                    'role' => 'assistant',
+                    'content' => $toolHandler->removeToolCalls($response),
+                ];
+                $currentMessage = $this->buildRequiredToolCorrection($requiredTool, $history, $pageContext);
+                $currentHistory[] = [
+                    'role' => 'user',
+                    'content' => $currentMessage,
+                ];
+                ++$toolIterations;
+                $finalResponse = $toolHandler->removeToolCalls($response);
+                continue;
+            }
+
             if (empty($toolCalls)) {
                 // No tool calls, return final response
                 $finalResponse = $toolHandler->removeToolCalls($response);
@@ -171,6 +235,27 @@ public function processMessage(string $message, array $history, array $user, arr
             // Execute tool calls
             $toolResults = [];
             foreach ($toolCalls as $toolCall) {
+                if (!$this->isToolAllowedForLatestIntent($toolCall, $allowedSingleExecutionTools)) {
+                    $toolResults[] = [
+                        'tool' => $toolCall['tool'],
+                        'result' => "Skipped {$toolCall['tool']} because it does not match the latest user request. Do not use tools from older conversation context; answer using only the tools that were actually run for this message.",
+                    ];
+                    continue;
+                }
+
+                if ($this->shouldSkipDuplicateToolCall($toolCall, $completedSingleExecutionTools)) {
+                    $toolResults[] = [
+                        'tool' => $toolCall['tool'],
+                        'result' => "Skipped duplicate {$toolCall['tool']} call because that action already completed during this message. Do not call it again; summarize the completed result.",
+                    ];
+                    continue;
+                }
+
+                ChatbotRuntime::emit($emit, 'tool_call', [
+                    'tool' => $toolCall['tool'],
+                    'params' => ChatbotRuntime::sanitizeValue($toolCall['params']),
+                    'iteration' => $toolIterations + 1,
+                ]);
                 $toolResult = $toolHandler->executeTool(
                     $toolCall['tool'],
                     $toolCall['params'],
@@ -182,10 +267,24 @@ public function processMessage(string $message, array $history, array $user, arr
                 if (is_array($toolResult['data']) && isset($toolResult['data']['action_type'])) {
                     $toolExecutions[] = $toolResult['data'];
                 }
+                $activity = ChatbotRuntime::toolActivity($toolCall, $toolResult, $toolIterations + 1);
+                $toolActivity[] = $activity;
+                ChatbotRuntime::emit($emit, 'tool_result', $activity);
+
+                $formattedToolResult = $toolHandler->formatToolResult($toolCall['tool'], $toolResult);
+                if ($this->shouldGuaranteeToolOutcome($toolCall['tool'], $toolResult)) {
+                    $toolOutcomeFallbacks[] = [
+                        'tool' => $toolCall['tool'],
+                        'summary' => $formattedToolResult,
+                    ];
+                }
+                if (($toolResult['success'] ?? false) && $this->isSingleExecutionTool($toolCall['tool'])) {
+                    $completedSingleExecutionTools[$toolCall['tool']] = true;
+                }
 
                 $toolResults[] = [
                     'tool' => $toolCall['tool'],
-                    'result' => $toolHandler->formatToolResult($toolCall['tool'], $toolResult),
+                    'result' => $formattedToolResult,
                 ];
             }
 
@@ -197,10 +296,12 @@ public function processMessage(string $message, array $history, array $user, arr
             $toolResultsText .= "\nCRITICAL INSTRUCTIONS:\n";
             $toolResultsText .= "- You MUST provide clear, specific feedback to the user about what happened\n";
             $toolResultsText .= "- If an action succeeded, confirm what was done with specific details (e.g., 'I've created a backup named [backup_name] for server [server_name]')\n";
+            $toolResultsText .= "- If create_database succeeded, include the database name, username, password, host, port, and type in the final answer\n";
             $toolResultsText .= "- Include relevant information from the tool results (names, IDs, timestamps, etc.)\n";
             $toolResultsText .= "- If an action failed, explain the error clearly\n";
             $toolResultsText .= "- Never just say 'I'll do that' or 'done' without explaining what actually happened\n";
             $toolResultsText .= '- Be conversational and helpful - the user wants to know what you did for them';
+            $lastToolResultsText = $toolResultsText;
 
             // Remove tool calls from response and add to history
             $cleanResponse = $toolHandler->removeToolCalls($response);
@@ -220,18 +321,37 @@ public function processMessage(string $message, array $history, array $user, arr
             $finalResponse = $cleanResponse; // Store in case we hit max iterations
         }
 
-        // If we still have tool calls after max iterations, append a note
+        // If the last model turn still tried to call a tool, force one final synthesis pass
+        // so successful tool output is translated into a clean answer for the user.
         if ($toolIterations >= $maxToolIterations) {
-            $remainingCalls = $toolHandler->parseToolCalls($response);
+            $remainingCalls = $toolHandler->parseToolCalls($result['response'] ?? '');
             if (!empty($remainingCalls)) {
-                $finalResponse .= "\n\n[Note: Maximum tool call iterations reached. Some tools may not have been executed.]";
+                if ($lastToolResultsText !== '') {
+                    ChatbotRuntime::emit($emit, 'status', ['message' => 'Preparing final tool result summary']);
+                    $finalSystemPrompt = $systemPrompt . "\n\n## Final Tool Result Synthesis\n"
+                        . 'Do not call any tools in this pass. Use only the supplied tool results and write the final user-facing answer.';
+                    $finalMessage = $lastToolResultsText . "\n\nNo more tools may be called. Summarize the completed tool results for the user now.";
+                    $synthesisResult = $providerInstance->processMessage($finalMessage, $currentHistory, $finalSystemPrompt);
+                    if (isset($synthesisResult['usage']) && is_array($synthesisResult['usage'])) {
+                        $usageItems[] = $synthesisResult['usage'];
+                        ChatbotRuntime::emit($emit, 'usage', ['usage' => TokenUsage::aggregate($usageItems)]);
+                    }
+                    $finalResponse = $toolHandler->removeToolCalls($synthesisResult['response'] ?? $finalResponse);
+                    $result = $synthesisResult + $result;
+                } else {
+                    $finalResponse .= "\n\n[Note: Maximum tool call iterations reached. Some tools may not have been executed.]";
+                }
             }
         }
 
+        $finalResponse = $this->appendMissingToolOutcomes($finalResponse, $toolOutcomeFallbacks);
+
         return [
             'response' => trim($finalResponse),
             'model' => $result['model'] ?? 'FeatherPanel AI',
             'tool_executions' => $toolExecutions, // Include tool execution results for frontend
+            'tool_activity' => $toolActivity,
+            'usage' => TokenUsage::aggregate($usageItems),
         ];
     }
 
@@ -245,30 +365,317 @@ public function processMessage(string $message, array $history, array $user, arr
     private function formatToolsForPrompt(ToolHandler $toolHandler): string
     {
         $tools = $toolHandler->getAvailableTools();
-        $text = "You have access to the following tools to retrieve real-time data and perform actions:\n\n";
+        $text = "Use TOOL_CALL only when real-time data or an action is needed. Available tools:\n\n";
 
         foreach ($tools as $tool) {
-            $text .= "### {$tool['name']}\n";
-            $text .= "Description: {$tool['description']}\n";
-            $text .= "Parameters:\n";
-            foreach ($tool['parameters'] as $param => $desc) {
-                $text .= "  - {$param}: {$desc}\n";
+            $parameters = [];
+            foreach ($tool['parameters'] as $param => $description) {
+                $parameters[] = "{$param}: {$description}";
             }
-            $text .= "\n";
-            $text .= "To use this tool, include in your response:\n";
-            $text .= "TOOL_CALL: {$tool['name']} {\"param1\": \"value1\", \"param2\": \"value2\"}\n\n";
+            $text .= "- {$tool['name']}(" . implode('; ', $parameters) . ")\n";
         }
 
-        $text .= "IMPORTANT:\n";
-        $text .= "- Use tools when you need real-time data (e.g., server activities, database credentials)\n";
-        $text .= "- Do NOT include all data in your initial response - use tools to fetch what's needed\n";
-        $text .= "- You can call multiple tools in one response\n";
-        $text .= "- Tool results will be provided in your next context\n";
-        $text .= "- Always provide a natural language response along with tool calls\n";
+        $text .= "\nFormat: TOOL_CALL: tool_name {\"param\": \"value\"}\n";
+        $text .= "TOOL_CALL always requires a valid JSON object after the tool name. Never write TOOL_CALL for navigation.\n";
+        $text .= "For navigation, use ACTION: navigate server [uuid_or_name] to [page].\n";
+        $text .= "Tool selection protocol: if a tool exists for the user's latest request, use that tool instead of navigating or describing the page. Examples: create database -> create_database, create backup -> create_backup, create schedule -> create_schedule, list status -> get_server_status, list databases/credentials -> get_database_credentials.\n";
+        $text .= "You may call multiple tools. Always include a short natural language response with tool calls.\n";
 
         return $text;
     }
 
+    private function buildMalformedToolCorrection(ToolHandler $toolHandler): string
+    {
+        $toolNames = implode(', ', array_keys($toolHandler->getAvailableTools()));
+
+        return "Your previous response contained invalid TOOL_CALL syntax. Regenerate the answer now.\n"
+            . "Rules:\n"
+            . "- TOOL_CALL format is exactly: TOOL_CALL: tool_name {\"param\":\"value\"}\n"
+            . "- TOOL_CALL must use one of these tool names: {$toolNames}\n"
+            . "- Never use TOOL_CALL for navigation. Navigation uses ACTION: navigate server [uuid_or_name] to [page]\n"
+            . "- If a tool exists for the latest user request, call it with valid JSON parameters.\n"
+            . '- Do not expose TOOL_CALL text unless it is valid and intended for execution.';
+    }
+
+    private function detectRequiredTool(string $message, array $history): ?string
+    {
+        $message = mb_strtolower($message);
+        $hasRecentDatabaseContext = $this->hasRecentDatabaseContext($history);
+
+        if (
+            preg_match('/\b(delete|remove|drop)\b.*\b(database|db)\b/u', $message)
+            || (
+                $hasRecentDatabaseContext
+                && preg_match('/\b(delete|remove|drop)\s+(it|that|this|one)\b/u', $message)
+            )
+        ) {
+            return 'delete_database';
+        }
+
+        if (
+            preg_match('/\b(create|make|add|new|setup|set\s+up)\b.*\b(database|db)\b/u', $message)
+            || (
+                $hasRecentDatabaseContext
+                && preg_match('/\b(create|make|add|setup|set\s+up)\b.*\b(one|it|that|this)\b/u', $message)
+            )
+        ) {
+            return 'create_database';
+        }
+
+        if (
+            preg_match('/\b(update|change|modify)\b.*\b(database|db)\b/u', $message)
+            || (
+                $hasRecentDatabaseContext
+                && preg_match('/\b(update|change|modify)\s+(it|that|this|one)\b/u', $message)
+            )
+        ) {
+            return 'update_database';
+        }
+
+        return null;
+    }
+
+    private function hasRecentDatabaseContext(array $history): bool
+    {
+        $recentHistory = array_slice($history, -6);
+        $historyText = mb_strtolower(json_encode($recentHistory, JSON_UNESCAPED_SLASHES) ?: '');
+
+        return (bool) preg_match('/\b(databases?|db|database_credentials|create_database|delete_database|update_database)\b/u', $historyText);
+    }
+
+    private function responseClaimsRequiredToolCompleted(string $response, string $tool): bool
+    {
+        if (str_contains($response, "TOOL_CALL: {$tool}")) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function shouldGuaranteeToolOutcome(string $toolName, array $toolResult): bool
+    {
+        if (!($toolResult['success'] ?? false)) {
+            return true;
+        }
+
+        $data = $toolResult['data'] ?? null;
+        if (!is_array($data)) {
+            return false;
+        }
+
+        if ($toolName === 'create_database' && (($data['success'] ?? false) === true)) {
+            return true;
+        }
+
+        return isset($data['action_type']);
+    }
+
+    private function shouldSkipDuplicateToolCall(array $toolCall, array $completedSingleExecutionTools): bool
+    {
+        $toolName = (string) ($toolCall['tool'] ?? '');
+
+        return $this->isSingleExecutionTool($toolName) && isset($completedSingleExecutionTools[$toolName]);
+    }
+
+    private function isToolAllowedForLatestIntent(array $toolCall, array $allowedSingleExecutionTools): bool
+    {
+        $toolName = (string) ($toolCall['tool'] ?? '');
+
+        if (!$this->isSingleExecutionTool($toolName) || empty($allowedSingleExecutionTools)) {
+            return true;
+        }
+
+        return in_array($toolName, $allowedSingleExecutionTools, true);
+    }
+
+    private function detectAllowedSingleExecutionTools(string $message, array $history): array
+    {
+        $message = mb_strtolower($message);
+        $historyText = mb_strtolower(json_encode(array_slice($history, -6), JSON_UNESCAPED_SLASHES) ?: '');
+        $isCreate = (bool) preg_match('/\b(create|make|add|new|setup|set\s+up)\b/u', $message);
+        $isDelete = (bool) preg_match('/\b(delete|remove|drop|destroy)\b/u', $message);
+        $isUpdate = (bool) preg_match('/\b(update|change|modify|edit|rename)\b/u', $message);
+
+        if (!$isCreate && !$isDelete && !$isUpdate) {
+            return [];
+        }
+
+        $hasContext = static function (string $pattern) use ($message, $historyText): bool {
+            return (bool) preg_match($pattern, $message) || (bool) preg_match($pattern, $historyText);
+        };
+
+        if ($hasContext('/\b(databases?|db|database_credentials|create_database|delete_database|update_database)\b/u')) {
+            return $isDelete ? ['delete_database'] : ($isUpdate ? ['update_database'] : ['create_database']);
+        }
+
+        if ($hasContext('/\b(backups?|create_backup|delete_backup)\b/u')) {
+            return $isDelete ? ['delete_backup'] : ['create_backup'];
+        }
+
+        if ($hasContext('/\b(schedules?|tasks?|create_schedule|delete_schedule|update_schedule|create_task|delete_task|update_task)\b/u')) {
+            if ($isDelete) {
+                return ['delete_schedule', 'delete_task'];
+            }
+
+            return $isUpdate ? ['update_schedule', 'update_task'] : ['create_schedule', 'create_task'];
+        }
+
+        if ($hasContext('/\b(subdomains?|domains?|create_subdomain|delete_subdomain)\b/u')) {
+            return $isDelete ? ['delete_subdomain'] : ['create_subdomain'];
+        }
+
+        if ($hasContext('/\b(allocations?|ports?|delete_allocation|set_primary_allocation|auto_allocate)\b/u')) {
+            return $isDelete ? ['delete_allocation'] : ['set_primary_allocation', 'auto_allocate'];
+        }
+
+        if ($hasContext('/\b(files?|folders?|directories?|write_file|delete_files|rename_file|copy_files|compress_files|decompress_archive|pull_file)\b/u')) {
+            if ($isDelete) {
+                return ['delete_files'];
+            }
+
+            return ['write_file', 'create_directory', 'rename_file', 'copy_files', 'compress_files', 'decompress_archive', 'pull_file'];
+        }
+
+        return [];
+    }
+
+    private function isSingleExecutionTool(string $toolName): bool
+    {
+        return in_array($toolName, [
+            'create_database',
+            'delete_database',
+            'update_database',
+            'create_backup',
+            'delete_backup',
+            'server_power_action',
+            'create_schedule',
+            'delete_schedule',
+            'update_schedule',
+            'create_subdomain',
+            'delete_subdomain',
+            'delete_allocation',
+            'set_primary_allocation',
+            'auto_allocate',
+            'write_file',
+            'create_directory',
+            'delete_files',
+            'rename_file',
+            'copy_files',
+            'compress_files',
+            'decompress_archive',
+            'pull_file',
+        ], true);
+    }
+
+    private function appendMissingToolOutcomes(string $response, array $fallbacks): string
+    {
+        $response = trim($response);
+
+        foreach ($fallbacks as $fallback) {
+            $summary = trim((string) ($fallback['summary'] ?? ''));
+            if ($summary === '') {
+                continue;
+            }
+
+            if ($this->summaryContainsDatabaseCredentials($summary) && !$this->responseCoversToolOutcome($response, $summary)) {
+                $response = "The database was created successfully. Here are the actual credentials returned by the tool:\n\n" . $summary;
+                continue;
+            }
+
+            if ($this->responseCoversToolOutcome($response, $summary)) {
+                continue;
+            }
+
+            $summary = ChatbotRuntime::truncate($summary, 2500);
+            $response = $response === '' ? $summary : $response . "\n\n" . $summary;
+        }
+
+        return $response;
+    }
+
+    private function responseCoversToolOutcome(string $response, string $summary): bool
+    {
+        if ($response === '') {
+            return false;
+        }
+
+        $outcomeValues = $this->extractOutcomeValues($summary);
+        foreach ($outcomeValues as $value) {
+            if (mb_strlen($value) >= 3 && str_contains(mb_strtolower($response), mb_strtolower($value))) {
+                return true;
+            }
+        }
+
+        if (!empty($outcomeValues)) {
+            return false;
+        }
+
+        $normalizedResponse = mb_strtolower($response);
+        if (preg_match('/\b(successfully|completed|created|deleted|updated|started|stopped|restarted|renamed|copied|compressed|extracted|written|initiated)\b/u', $normalizedResponse)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function summaryContainsDatabaseCredentials(string $text): bool
+    {
+        return (bool) preg_match('/\bDatabase Name:\s*\S+.*\bUsername:\s*\S+.*\bPassword:\s*\S+/is', $text);
+    }
+
+    private function extractOutcomeValues(string $summary): array
+    {
+        preg_match_all('/^[A-Za-z][A-Za-z ]+:\s*(.+)$/m', $summary, $matches);
+
+        return array_values(array_filter(array_map(static function (string $value): string {
+            return trim($value);
+        }, $matches[1] ?? [])));
+    }
+
+    private function buildRequiredToolCorrection(string $tool, array $history, array $pageContext): string
+    {
+        $historyText = substr(json_encode(array_slice($history, -6), JSON_UNESCAPED_SLASHES) ?: '', -6000);
+        $contextText = substr(json_encode($pageContext, JSON_UNESCAPED_SLASHES) ?: '', -2000);
+
+        return "The latest user message requires the {$tool} tool, but your previous answer did not call it.\n"
+            . "Regenerate the answer now and call the required tool using valid JSON.\n"
+            . "Use recent history/tool results to resolve references like 'it', 'that database', or a friendly name such as 'hide and seek'.\n"
+            . "Recent history: {$historyText}\n"
+            . "Current page context: {$contextText}\n"
+            . "Required format: TOOL_CALL: {$tool} {\"server_uuid\":\"...\",\"database_name\":\"...\"}\n"
+            . 'If the exact database name is known from history, pass it. If only a friendly name is known, pass that as database_name so the tool can fuzzy-match it.';
+    }
+
+    /**
+     * Decide whether the latest user message needs server logs in context.
+     */
+    private function shouldIncludeLogs(string $message): bool
+    {
+        $message = mb_strtolower($message);
+
+        return (bool) preg_match(
+            '/\b(logs?|console|error|errors|crash(?:ed|es|ing)?|exception|stacktrace|traceback|failed?|failure|debug|diagnos(?:e|is)|troubleshoot|issue|problem|broken|boot|startup|start(?:ing)?|won[’\']?t\s+(?:start|boot)|not\s+(?:start(?:ing)?|boot(?:ing)?|working))\b/u',
+            $message
+        );
+    }
+
+    private function isDashboardMode(array $pageContext): bool
+    {
+        if (($pageContext['mode'] ?? '') !== 'dashboard') {
+            return false;
+        }
+
+        $route = (string) ($pageContext['route'] ?? $pageContext['page'] ?? '');
+        $allowedRoutes = [
+            '/dashboard',
+            '/dashboard/servers',
+            '/dashboard/vms',
+            '/dashboard/knowledgebase',
+        ];
+
+        return in_array($route, $allowedRoutes, true) || str_starts_with($route, '/dashboard/knowledgebase/');
+    }
+
     /**
      * Get the appropriate provider instance based on configuration.
      *
diff --git a/backend/app/Services/Chatbot/ContextBuilder.php b/backend/app/Services/Chatbot/ContextBuilder.php
index bbf8b63c8..8a6ea0fce 100755
--- a/backend/app/Services/Chatbot/ContextBuilder.php
+++ b/backend/app/Services/Chatbot/ContextBuilder.php
@@ -43,10 +43,11 @@ public function __construct()
      *
      * @param array $user Current user data
      * @param array $pageContext Current page context (route, server, etc.)
+     * @param bool $includeLogs Whether server logs should be included in context
      *
      * @return string Formatted context string
      */
-    public function buildContext(array $user, array $pageContext = []): string
+    public function buildContext(array $user, array $pageContext = [], bool $includeLogs = false): string
     {
         $context = [];
 
@@ -67,10 +68,6 @@ public function buildContext(array $user, array $pageContext = []): string
         $context[] = "User UUID: {$user['uuid']}";
         $context[] = "User ID: {$user['id']}";
 
-        if (isset($user['email'])) {
-            $context[] = "Email: {$user['email']}";
-        }
-
         if (isset($user['first_name']) || isset($user['last_name'])) {
             $name = trim(($user['first_name'] ?? '') . ' ' . ($user['last_name'] ?? ''));
             if (!empty($name)) {
@@ -78,18 +75,6 @@ public function buildContext(array $user, array $pageContext = []): string
             }
         }
 
-        if (isset($user['avatar']) && !empty($user['avatar'])) {
-            $context[] = "Avatar: {$user['avatar']}";
-        }
-
-        if (isset($user['two_fa_enabled'])) {
-            $context[] = '2FA Enabled: ' . ($user['two_fa_enabled'] === 'true' ? 'Yes' : 'No');
-        }
-
-        if (isset($user['last_seen'])) {
-            $context[] = "Last Seen: {$user['last_seen']}";
-        }
-
         // User Role/Permissions
         if ($isAdmin) {
             $context[] = 'Role: Administrator (Full Access)';
@@ -120,78 +105,12 @@ public function buildContext(array $user, array $pageContext = []): string
                 $context[] = "- UUID: {$server['uuidShort']}";
                 $context[] = '- Status: ' . ($server['status'] ?? 'unknown');
 
-                if (isset($server['description']) && !empty($server['description'])) {
-                    $context[] = "- Description: {$server['description']}";
-                }
-
-                // Only include node/realm/spell info if user is admin or has access
-                if ($isAdmin || isset($server['node']['name'])) {
-                    if (isset($server['node']['name'])) {
-                        $context[] = "- Node: {$server['node']['name']}";
-                    }
-                }
-
-                if (isset($server['realm']['name'])) {
-                    $context[] = "- Realm: {$server['realm']['name']}";
-                }
-
                 if (isset($server['spell']['name'])) {
                     $context[] = "- Spell/Type: {$server['spell']['name']}";
                 }
 
-                // Server Resource Limits
-                if (isset($server['memory'])) {
-                    $memoryMB = (int) $server['memory'];
-                    $memoryGB = round($memoryMB / 1024, 2);
-                    $context[] = "- Memory Limit: {$memoryMB} MB ({$memoryGB} GB)";
-                }
-
-                if (isset($server['swap'])) {
-                    $swapMB = (int) $server['swap'];
-                    $swapGB = round($swapMB / 1024, 2);
-                    $context[] = "- Swap Limit: {$swapMB} MB ({$swapGB} GB)";
-                }
-
-                if (isset($server['disk'])) {
-                    $diskMB = (int) $server['disk'];
-                    $diskGB = round($diskMB / 1024, 2);
-                    $context[] = "- Disk Limit: {$diskMB} MB ({$diskGB} GB)";
-                }
-
-                if (isset($server['cpu'])) {
-                    $context[] = "- CPU Limit: {$server['cpu']}%";
-                }
-
-                if (isset($server['io'])) {
-                    $context[] = "- IO Limit: {$server['io']}";
-                }
-
-                // Allocation Information (IP and Port)
-                if (isset($server['allocation'])) {
-                    $allocation = $server['allocation'];
-                    if (isset($allocation['ip'])) {
-                        $ipInfo = $allocation['ip'];
-                        if (isset($allocation['ip_alias']) && !empty($allocation['ip_alias'])) {
-                            $ipInfo .= " (Alias: {$allocation['ip_alias']})";
-                        }
-                        $context[] = "- IP Address: {$ipInfo}";
-                    }
-                    if (isset($allocation['port'])) {
-                        $context[] = "- Port: {$allocation['port']}";
-                        // Show connection info if both IP and port are available
-                        if (isset($allocation['ip'])) {
-                            $context[] = "- Connection: {$allocation['ip']}:{$allocation['port']}";
-                        }
-                    }
-                }
-
                 if (isset($server['is_subuser']) && $server['is_subuser']) {
                     $context[] = '- Access: Subuser (Limited Permissions)';
-                    // Only include specific permissions if user is admin
-                    if ($isAdmin && isset($server['subuser_permissions']) && !empty($server['subuser_permissions'])) {
-                        $perms = implode(', ', array_slice($server['subuser_permissions'], 0, 5)); // Limit to 5
-                        $context[] = "- Permissions: {$perms}";
-                    }
                 } else {
                     $context[] = '- Access: Owner (Full Control)';
                 }
@@ -323,24 +242,16 @@ public function buildContext(array $user, array $pageContext = []): string
                         $context[] = "Docker Image: {$serverData['image']}";
                     }
 
-                    // Fetch server logs if:
-                    // 1. Server is running or starting (to see current activity)
-                    // 2. User is on logs page (to see logs regardless of status)
-                    // 3. User is on console page (to see console output)
-                    $shouldFetchLogs = in_array(strtolower($serverStatus), ['running', 'starting', 'stopping', 'stopped']);
-                    $isOnLogsPage = isset($pageContext['page']) && in_array(strtolower($pageContext['page']), ['logs', 'console']);
-
-                    if ($shouldFetchLogs || $isOnLogsPage) {
+                    if ($includeLogs) {
                         $serverLogs = $this->getServerLogs($serverData);
                         if (!empty($serverLogs)) {
                             $context[] = '';
                             $context[] = '### Recent Server Logs';
-                            $context[] = 'The following are the most recent server logs (last 50 lines):';
+                            $context[] = 'The following are the most recent server logs (last 20 lines):';
                             $context[] = '';
                             $context[] = '```';
-                            // Limit to last 50 lines to avoid token limits
-                            $logLines = is_array($serverLogs) ? array_slice($serverLogs, -50) : explode("\n", $serverLogs);
-                            $logLines = array_slice($logLines, -50);
+                            $logLines = is_array($serverLogs) ? array_slice($serverLogs, -20) : explode("\n", $serverLogs);
+                            $logLines = array_slice($logLines, -20);
                             $context[] = implode("\n", $logLines);
                             $context[] = '```';
                         }
@@ -409,8 +320,8 @@ private function getUserServers(int $userId): array
             // Combine and enrich with related data
             $allServers = array_merge($ownedServers, $subuserServers);
 
-            // Limit to 20 most recent to avoid token limits
-            $allServers = array_slice($allServers, 0, 20);
+            // Keep context compact; tools can fetch deeper data on demand.
+            $allServers = array_slice($allServers, 0, 8);
 
             foreach ($allServers as &$server) {
                 // Check if subuser
diff --git a/backend/app/Services/Chatbot/DashboardContextBuilder.php b/backend/app/Services/Chatbot/DashboardContextBuilder.php
new file mode 100644
index 000000000..4a995c527
--- /dev/null
+++ b/backend/app/Services/Chatbot/DashboardContextBuilder.php
@@ -0,0 +1,176 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Services\Chatbot;
+
+use App\App;
+use App\Chat\Spell;
+use App\Chat\Server;
+use App\Permissions;
+use App\Chat\Subuser;
+use App\Chat\VmInstance;
+use App\Helpers\PermissionHelper;
+
+class DashboardContextBuilder
+{
+    private $app;
+
+    public function __construct()
+    {
+        $this->app = App::getInstance(true);
+    }
+
+    public function buildContext(array $user, array $pageContext = []): string
+    {
+        $context = [];
+        $userUuid = $user['uuid'] ?? '';
+        $isAdmin = PermissionHelper::hasPermission($userUuid, Permissions::ADMIN_ROOT);
+
+        $context[] = '## User Information';
+        $context[] = 'Username: ' . ($user['username'] ?? 'unknown');
+        $context[] = 'User UUID: ' . ($user['uuid'] ?? 'unknown');
+        $context[] = 'User ID: ' . ($user['id'] ?? 'unknown');
+        $context[] = $isAdmin ? 'Role: Administrator (Full Access)' : 'Role: User';
+
+        if (!empty($pageContext)) {
+            $context[] = '';
+            $context[] = '## Current Dashboard Page';
+            $context[] = 'Route: ' . ($pageContext['route'] ?? 'unknown');
+            $context[] = 'Page: ' . ($pageContext['page'] ?? $pageContext['routeName'] ?? 'unknown');
+        }
+
+        $servers = $this->getUserServers((int) ($user['id'] ?? 0));
+        $context[] = '';
+        $context[] = "## User's Servers";
+        if (empty($servers)) {
+            $context[] = 'No servers were found for this user.';
+        } else {
+            $context[] = 'Showing up to 8 accessible servers. Use tools for details.';
+            foreach ($servers as $index => $server) {
+                $context[] = sprintf(
+                    '%d. %s (%s) - status: %s, type: %s, access: %s',
+                    $index + 1,
+                    $server['name'] ?? 'Unnamed server',
+                    $server['uuidShort'] ?? $server['uuid'] ?? 'unknown',
+                    $server['status'] ?? 'unknown',
+                    $server['spell']['name'] ?? 'unknown',
+                    !empty($server['is_subuser']) ? 'subuser' : 'owner'
+                );
+            }
+        }
+
+        $instances = $this->getUserVdsInstances($userUuid);
+        $context[] = '';
+        $context[] = "## User's VDS Instances";
+        if (empty($instances)) {
+            $context[] = 'No VDS instances were found for this user.';
+        } else {
+            $context[] = 'Showing up to 5 accessible VDS instances. Use tools for details.';
+            foreach ($instances as $index => $instance) {
+                $context[] = sprintf(
+                    '%d. %s (ID: %s) - status: %s, type: %s',
+                    $index + 1,
+                    $instance['hostname'] ?? 'Unnamed VDS',
+                    $instance['id'] ?? 'unknown',
+                    $instance['status'] ?? 'unknown',
+                    $instance['vm_type'] ?? 'unknown'
+                );
+            }
+        }
+
+        $context[] = '';
+        $context[] = '## Context Limits';
+        $context[] = 'Logs, files, credentials, backups, allocations, full resource specs, and knowledgebase articles are not included by default.';
+        $context[] = 'Use tools only when the user asks for specific details or knowledgebase help.';
+
+        return implode("\n", $context);
+    }
+
+    public static function loadSystemPrompt(): string
+    {
+        $promptFile = __DIR__ . '/dashboard-system-prompt.txt';
+
+        if (file_exists($promptFile)) {
+            $content = file_get_contents($promptFile);
+
+            return trim($content);
+        }
+
+        return 'You are FeatherPanel Dashboard AI. Help users understand and navigate their dashboard, servers, VDS instances, and knowledgebase while keeping answers concise and using tools for specific details.';
+    }
+
+    private function getUserServers(int $userId): array
+    {
+        if ($userId <= 0) {
+            return [];
+        }
+
+        try {
+            $ownedServers = Server::searchServers(page: 1, limit: 8, search: '', ownerId: $userId);
+            $subusers = Subuser::getSubusersByUserId($userId);
+            $subuserMap = [];
+            $subuserServers = [];
+
+            foreach ($subusers as $subuser) {
+                $serverId = (int) ($subuser['server_id'] ?? 0);
+                if ($serverId <= 0 || isset($subuserMap[$serverId])) {
+                    continue;
+                }
+
+                $subuserMap[$serverId] = $subuser;
+                $server = Server::getServerById($serverId);
+                if ($server) {
+                    $subuserServers[] = $server;
+                }
+            }
+
+            $servers = array_slice(array_merge($ownedServers, $subuserServers), 0, 8);
+            foreach ($servers as &$server) {
+                $serverId = (int) ($server['id'] ?? 0);
+                $server['is_subuser'] = isset($subuserMap[$serverId]);
+                $spell = isset($server['spell_id']) ? Spell::getSpellById((int) $server['spell_id']) : null;
+                $server['spell'] = [
+                    'name' => $spell['name'] ?? null,
+                ];
+            }
+            unset($server);
+
+            return $servers;
+        } catch (\Exception $e) {
+            $this->app->getLogger()->error('DashboardContextBuilder: Failed to get servers: ' . $e->getMessage());
+
+            return [];
+        }
+    }
+
+    private function getUserVdsInstances(string $userUuid): array
+    {
+        if ($userUuid === '') {
+            return [];
+        }
+
+        try {
+            $instances = VmInstance::getByUserUuid($userUuid, 1, 5);
+
+            return is_array($instances) ? $instances : [];
+        } catch (\Exception $e) {
+            $this->app->getLogger()->error('DashboardContextBuilder: Failed to get VDS instances: ' . $e->getMessage());
+
+            return [];
+        }
+    }
+}
diff --git a/backend/app/Services/Chatbot/Providers/BasicProvider.php b/backend/app/Services/Chatbot/Providers/BasicProvider.php
index 8bae1a2ee..b2831372c 100755
--- a/backend/app/Services/Chatbot/Providers/BasicProvider.php
+++ b/backend/app/Services/Chatbot/Providers/BasicProvider.php
@@ -17,6 +17,8 @@
 
 namespace App\Services\Chatbot\Providers;
 
+use App\Services\Chatbot\TokenUsage;
+
 class BasicProvider implements ProviderInterface
 {
     /**
@@ -33,48 +35,42 @@ public function processMessage(string $message, array $history, string $systemPr
         $lowerMessage = strtolower($message);
 
         if (strpos($lowerMessage, 'hello') !== false || strpos($lowerMessage, 'hi') !== false) {
-            return [
-                'response' => "Hello! I'm your AI assistant for FeatherPanel. How can I help you today?",
-                'model' => 'FeatherPanel AI',
-            ];
+            return $this->response($message, "Hello! I'm your AI assistant for FeatherPanel. How can I help you today?");
         }
 
         if (strpos($lowerMessage, 'help') !== false) {
-            return [
-                'response' => "I can help you with various FeatherPanel tasks:\n\n" .
-                    "• Server management\n" .
-                    "• Configuration questions\n" .
-                    "• General panel information\n" .
-                    "• Troubleshooting\n\n" .
-                    'What would you like to know?',
-                'model' => 'FeatherPanel AI',
-            ];
+            return $this->response($message, "I can help you with various FeatherPanel tasks:\n\n" .
+                "• Server management\n" .
+                "• Configuration questions\n" .
+                "• General panel information\n" .
+                "• Troubleshooting\n\n" .
+                'What would you like to know?');
         }
 
         if (strpos($lowerMessage, 'server') !== false) {
-            return [
-                'response' => "I can help you with server-related tasks. You can:\n\n" .
-                    "• View server status\n" .
-                    "• Manage server files\n" .
-                    "• Control server power (start/stop/restart)\n" .
-                    "• View server console\n" .
-                    "• Manage databases\n\n" .
-                    'What specific server task do you need help with?',
-                'model' => 'FeatherPanel AI',
-            ];
+            return $this->response($message, "I can help you with server-related tasks. You can:\n\n" .
+                "• View server status\n" .
+                "• Manage server files\n" .
+                "• Control server power (start/stop/restart)\n" .
+                "• View server console\n" .
+                "• Manage databases\n\n" .
+                'What specific server task do you need help with?');
         }
 
         if (strpos($lowerMessage, 'thank') !== false) {
-            return [
-                'response' => "You're welcome! Is there anything else I can help you with?",
-                'model' => 'FeatherPanel AI',
-            ];
+            return $this->response($message, "You're welcome! Is there anything else I can help you with?");
         }
 
+        return $this->response($message, "I understand you're asking about: " . $message . "\n\n" .
+            "I'm a basic assistant. For more advanced responses, please configure Google Gemini, OpenRouter, or OpenAI in admin settings.");
+    }
+
+    private function response(string $input, string $output): array
+    {
         return [
-            'response' => "I understand you're asking about: " . $message . "\n\n" .
-                "I'm a basic assistant. For more advanced responses, please configure Google Gemini, OpenRouter, or OpenAI in admin settings.",
+            'response' => $output,
             'model' => 'FeatherPanel AI',
+            'usage' => TokenUsage::estimate($input, $output),
         ];
     }
 }
diff --git a/backend/app/Services/Chatbot/Providers/GoogleGeminiProvider.php b/backend/app/Services/Chatbot/Providers/GoogleGeminiProvider.php
index 89567e550..cccfd1b80 100755
--- a/backend/app/Services/Chatbot/Providers/GoogleGeminiProvider.php
+++ b/backend/app/Services/Chatbot/Providers/GoogleGeminiProvider.php
@@ -19,6 +19,7 @@
 
 use App\App;
 use GuzzleHttp\Client;
+use App\Services\Chatbot\TokenUsage;
 use GuzzleHttp\Exception\GuzzleException;
 
 class GoogleGeminiProvider implements ProviderInterface
@@ -155,6 +156,7 @@ public function processMessage(string $message, array $history, string $systemPr
             return [
                 'response' => $responseText,
                 'model' => "Google Gemini {$this->model}",
+                'usage' => TokenUsage::fromGeminiUsage($data['usageMetadata'] ?? null, $message, $responseText),
             ];
         } catch (GuzzleException $e) {
             $this->app->getLogger()->error('Google Gemini API exception: ' . $e->getMessage());
diff --git a/backend/app/Services/Chatbot/Providers/GrokProvider.php b/backend/app/Services/Chatbot/Providers/GrokProvider.php
index 5290cbe16..2cee266eb 100755
--- a/backend/app/Services/Chatbot/Providers/GrokProvider.php
+++ b/backend/app/Services/Chatbot/Providers/GrokProvider.php
@@ -19,6 +19,7 @@
 
 use App\App;
 use GuzzleHttp\Client;
+use App\Services\Chatbot\TokenUsage;
 use GuzzleHttp\Exception\GuzzleException;
 
 class GrokProvider implements ProviderInterface
@@ -132,6 +133,7 @@ public function processMessage(string $message, array $history, string $systemPr
             return [
                 'response' => $responseText,
                 'model' => "Grok {$this->model}",
+                'usage' => TokenUsage::fromOpenAiUsage($data['usage'] ?? null, $message, $responseText),
             ];
         } catch (GuzzleException $e) {
             $this->app->getLogger()->error('xAI (Grok) API exception: ' . $e->getMessage());
diff --git a/backend/app/Services/Chatbot/Providers/OllamaProvider.php b/backend/app/Services/Chatbot/Providers/OllamaProvider.php
index 7c8b2b656..0dde7503b 100755
--- a/backend/app/Services/Chatbot/Providers/OllamaProvider.php
+++ b/backend/app/Services/Chatbot/Providers/OllamaProvider.php
@@ -19,6 +19,7 @@
 
 use App\App;
 use GuzzleHttp\Client;
+use App\Services\Chatbot\TokenUsage;
 use GuzzleHttp\Exception\GuzzleException;
 
 class OllamaProvider implements ProviderInterface
@@ -134,10 +135,21 @@ public function processMessage(string $message, array $history, string $systemPr
             }
 
             $responseText = $data['response'];
+            $usage = [
+                'input_tokens' => isset($data['prompt_eval_count']) ? (int) $data['prompt_eval_count'] : TokenUsage::estimateTextTokens($prompt),
+                'output_tokens' => isset($data['eval_count']) ? (int) $data['eval_count'] : TokenUsage::estimateTextTokens($responseText),
+                'source' => isset($data['prompt_eval_count'], $data['eval_count']) ? 'provider' : 'estimated',
+                'raw' => [
+                    'prompt_eval_count' => $data['prompt_eval_count'] ?? null,
+                    'eval_count' => $data['eval_count'] ?? null,
+                ],
+            ];
+            $usage['total_tokens'] = $usage['input_tokens'] + $usage['output_tokens'];
 
             return [
                 'response' => $responseText,
                 'model' => "Ollama {$this->model}",
+                'usage' => $usage,
             ];
         } catch (GuzzleException $e) {
             $this->app->getLogger()->error('Ollama API exception: ' . $e->getMessage());
diff --git a/backend/app/Services/Chatbot/Providers/OpenAIProvider.php b/backend/app/Services/Chatbot/Providers/OpenAIProvider.php
index dc405ad1d..7f422293e 100755
--- a/backend/app/Services/Chatbot/Providers/OpenAIProvider.php
+++ b/backend/app/Services/Chatbot/Providers/OpenAIProvider.php
@@ -20,6 +20,7 @@
 use App\App;
 use GuzzleHttp\Client;
 use App\Config\ConfigInterface;
+use App\Services\Chatbot\TokenUsage;
 use GuzzleHttp\Exception\GuzzleException;
 
 class OpenAIProvider implements ProviderInterface
@@ -138,6 +139,7 @@ public function processMessage(string $message, array $history, string $systemPr
             return [
                 'response' => $responseText,
                 'model' => "OpenAI {$this->model}",
+                'usage' => TokenUsage::fromOpenAiUsage($data['usage'] ?? null, $message, $responseText),
             ];
         } catch (GuzzleException $e) {
             $this->app->getLogger()->error('OpenAI API exception: ' . $e->getMessage());
diff --git a/backend/app/Services/Chatbot/Providers/OpenRouterProvider.php b/backend/app/Services/Chatbot/Providers/OpenRouterProvider.php
index 1b646d987..c570612d8 100755
--- a/backend/app/Services/Chatbot/Providers/OpenRouterProvider.php
+++ b/backend/app/Services/Chatbot/Providers/OpenRouterProvider.php
@@ -19,6 +19,7 @@
 
 use App\App;
 use GuzzleHttp\Client;
+use App\Services\Chatbot\TokenUsage;
 use GuzzleHttp\Exception\GuzzleException;
 
 class OpenRouterProvider implements ProviderInterface
@@ -137,6 +138,7 @@ public function processMessage(string $message, array $history, string $systemPr
             return [
                 'response' => $responseText,
                 'model' => "OpenRouter {$modelName}",
+                'usage' => TokenUsage::fromOpenAiUsage($data['usage'] ?? null, $message, $responseText),
             ];
         } catch (GuzzleException $e) {
             $this->app->getLogger()->error('OpenRouter API exception: ' . $e->getMessage());
diff --git a/backend/app/Services/Chatbot/Providers/PerplexityProvider.php b/backend/app/Services/Chatbot/Providers/PerplexityProvider.php
index 0d0364c60..ff1ce9997 100755
--- a/backend/app/Services/Chatbot/Providers/PerplexityProvider.php
+++ b/backend/app/Services/Chatbot/Providers/PerplexityProvider.php
@@ -19,6 +19,7 @@
 
 use App\App;
 use GuzzleHttp\Client;
+use App\Services\Chatbot\TokenUsage;
 use GuzzleHttp\Exception\GuzzleException;
 
 class PerplexityProvider implements ProviderInterface
@@ -135,6 +136,7 @@ public function processMessage(string $message, array $history, string $systemPr
             return [
                 'response' => $responseText,
                 'model' => "Perplexity {$this->model}",
+                'usage' => TokenUsage::fromOpenAiUsage($data['usage'] ?? null, $message, $responseText),
             ];
         } catch (GuzzleException $e) {
             $this->app->getLogger()->error('Perplexity API exception: ' . $e->getMessage());
diff --git a/backend/app/Services/Chatbot/Providers/ProviderInterface.php b/backend/app/Services/Chatbot/Providers/ProviderInterface.php
index 0874e9896..cb8030b86 100755
--- a/backend/app/Services/Chatbot/Providers/ProviderInterface.php
+++ b/backend/app/Services/Chatbot/Providers/ProviderInterface.php
@@ -29,7 +29,7 @@ interface ProviderInterface
      * @param array $history Chat history (array of ['role' => 'user'|'assistant', 'content' => string])
      * @param string $systemPrompt Optional system prompt
      *
-     * @return array Response with 'response' and 'model' keys
+     * @return array Response with 'response', 'model', and optional 'usage' keys
      */
     public function processMessage(string $message, array $history, string $systemPrompt = ''): array;
 }
diff --git a/backend/app/Services/Chatbot/TokenUsage.php b/backend/app/Services/Chatbot/TokenUsage.php
new file mode 100644
index 000000000..2de5591df
--- /dev/null
+++ b/backend/app/Services/Chatbot/TokenUsage.php
@@ -0,0 +1,128 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Services\Chatbot;
+
+class TokenUsage
+{
+    public static function estimate(string $input = '', string $output = ''): array
+    {
+        $inputTokens = self::estimateTextTokens($input);
+        $outputTokens = self::estimateTextTokens($output);
+
+        return [
+            'input_tokens'  => $inputTokens,
+            'output_tokens' => $outputTokens,
+            'total_tokens'  => $inputTokens + $outputTokens,
+            'source'        => 'estimated',
+        ];
+    }
+
+    public static function estimateTextTokens(string $text): int
+    {
+        $text = trim($text);
+        if ($text === '') {
+            return 0;
+        }
+
+        // Roughly matches common tokenizer averages without adding a heavy tokenizer dependency.
+        return max(1, (int) ceil(mb_strlen($text) / 4));
+    }
+
+    public static function fromOpenAiUsage(?array $usage, string $input = '', string $output = ''): array
+    {
+        if (!$usage) {
+            return self::estimate($input, $output);
+        }
+
+        $inputTokens = (int) ($usage['prompt_tokens'] ?? $usage['input_tokens'] ?? 0);
+        $outputTokens = (int) ($usage['completion_tokens'] ?? $usage['output_tokens'] ?? 0);
+        $totalTokens = (int) ($usage['total_tokens'] ?? ($inputTokens + $outputTokens));
+
+        return [
+            'input_tokens'  => $inputTokens,
+            'output_tokens' => $outputTokens,
+            'total_tokens'  => $totalTokens,
+            'source'        => 'provider',
+            'raw'           => self::compactRaw($usage),
+        ];
+    }
+
+    public static function fromGeminiUsage(?array $usage, string $input = '', string $output = ''): array
+    {
+        if (!$usage) {
+            return self::estimate($input, $output);
+        }
+
+        $inputTokens = (int) ($usage['promptTokenCount'] ?? 0);
+        $outputTokens = (int) ($usage['candidatesTokenCount'] ?? 0);
+        $totalTokens = (int) ($usage['totalTokenCount'] ?? ($inputTokens + $outputTokens));
+
+        return [
+            'input_tokens'  => $inputTokens,
+            'output_tokens' => $outputTokens,
+            'total_tokens'  => $totalTokens,
+            'source'        => 'provider',
+            'raw'           => self::compactRaw($usage),
+        ];
+    }
+
+    public static function aggregate(array $items): array
+    {
+        $input = 0;
+        $output = 0;
+        $total = 0;
+        $source = 'unknown';
+        $raw = [];
+
+        foreach ($items as $usage) {
+            if (!is_array($usage)) {
+                continue;
+            }
+
+            $input += (int) ($usage['input_tokens'] ?? 0);
+            $output += (int) ($usage['output_tokens'] ?? 0);
+            $total += (int) ($usage['total_tokens'] ?? 0);
+            if (($usage['source'] ?? '') === 'provider') {
+                $source = 'provider';
+            } elseif ($source === 'unknown' && ($usage['source'] ?? '') === 'estimated') {
+                $source = 'estimated';
+            }
+            if (isset($usage['raw'])) {
+                $raw[] = $usage['raw'];
+            }
+        }
+
+        return [
+            'input_tokens'  => $input,
+            'output_tokens' => $output,
+            'total_tokens'  => $total > 0 ? $total : $input + $output,
+            'source'        => $source,
+            'raw'           => $raw,
+        ];
+    }
+
+    private static function compactRaw(array $raw): array
+    {
+        $encoded = json_encode($raw);
+        if ($encoded === false || strlen($encoded) <= 2000) {
+            return $raw;
+        }
+
+        return ['truncated' => true];
+    }
+}
diff --git a/backend/app/Services/Chatbot/Tools/CreateDatabaseTool.php b/backend/app/Services/Chatbot/Tools/CreateDatabaseTool.php
index e23fc3f4e..a73f59079 100755
--- a/backend/app/Services/Chatbot/Tools/CreateDatabaseTool.php
+++ b/backend/app/Services/Chatbot/Tools/CreateDatabaseTool.php
@@ -142,6 +142,7 @@ public function execute(array $params, array $user, array $pageContext = []): mi
         if (!$databaseName) {
             $databaseName = 'db_' . time();
         }
+        $databaseName = $this->normalizeDatabaseName((string) $databaseName, (int) $server['id']);
 
         // Generate full database name: s{server_id}_{database_name}
         $fullDatabaseName = 's' . $server['id'] . '_' . $databaseName;
@@ -244,6 +245,17 @@ private function generateRandomString(int $length = 16): string
         return $randomString;
     }
 
+    private function normalizeDatabaseName(string $databaseName, int $serverId): string
+    {
+        $databaseName = trim($databaseName);
+        $databaseName = preg_replace('/^s' . preg_quote((string) $serverId, '/') . '_/i', '', $databaseName) ?? $databaseName;
+        $databaseName = preg_replace('/\s+/', '_', $databaseName) ?? $databaseName;
+        $databaseName = preg_replace('/[^a-zA-Z0-9_]/', '_', $databaseName) ?? $databaseName;
+        $databaseName = trim($databaseName, '_');
+
+        return $databaseName !== '' ? $databaseName : 'db_' . time();
+    }
+
     /**
      * Create database and user on the database host.
      */
diff --git a/backend/app/Services/Chatbot/Tools/DeleteDatabaseTool.php b/backend/app/Services/Chatbot/Tools/DeleteDatabaseTool.php
index 7fd849c76..24ed4943d 100755
--- a/backend/app/Services/Chatbot/Tools/DeleteDatabaseTool.php
+++ b/backend/app/Services/Chatbot/Tools/DeleteDatabaseTool.php
@@ -102,8 +102,19 @@ public function execute(array $params, array $user, array $pageContext = []): mi
         } elseif ($databaseName) {
             // Get all databases for this server and find by name
             $databases = ServerDatabase::getServerDatabasesWithDetailsByServerId($server['id']);
+            $normalizedRequestedName = $this->normalizeDatabaseIdentifier((string) $databaseName);
             foreach ($databases as $db) {
-                if ($db['database'] === $databaseName || $db['username'] === $databaseName) {
+                $normalizedDatabaseName = $this->normalizeDatabaseIdentifier((string) $db['database']);
+                $normalizedUsername = $this->normalizeDatabaseIdentifier((string) $db['username']);
+
+                if (
+                    $db['database'] === $databaseName
+                    || $db['username'] === $databaseName
+                    || $normalizedDatabaseName === $normalizedRequestedName
+                    || $normalizedUsername === $normalizedRequestedName
+                    || str_ends_with($normalizedDatabaseName, $normalizedRequestedName)
+                    || str_contains($normalizedDatabaseName, $normalizedRequestedName)
+                ) {
                     $database = $db;
                     break;
                 }
@@ -212,4 +223,9 @@ public function getParameters(): array
             'database_name' => 'Database name or username (required if database_id not provided)',
         ];
     }
+
+    private function normalizeDatabaseIdentifier(string $value): string
+    {
+        return preg_replace('/[^a-z0-9]+/', '', strtolower($value)) ?? '';
+    }
 }
diff --git a/backend/app/Services/Chatbot/Tools/GetKnowledgebaseArticleTool.php b/backend/app/Services/Chatbot/Tools/GetKnowledgebaseArticleTool.php
new file mode 100644
index 000000000..9c57f602d
--- /dev/null
+++ b/backend/app/Services/Chatbot/Tools/GetKnowledgebaseArticleTool.php
@@ -0,0 +1,104 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Services\Chatbot\Tools;
+
+use App\App;
+use App\Config\ConfigInterface;
+use App\Chat\KnowledgebaseArticle;
+use App\Chat\KnowledgebaseCategory;
+
+class GetKnowledgebaseArticleTool implements ToolInterface
+{
+    public function execute(array $params, array $user, array $pageContext = []): mixed
+    {
+        if (!$this->isEnabled()) {
+            return [
+                'success' => false,
+                'error'   => 'Knowledgebase articles are disabled.',
+            ];
+        }
+
+        $articleId = isset($params['article_id']) ? (int) $params['article_id'] : 0;
+        if ($articleId <= 0) {
+            return [
+                'success' => false,
+                'error'   => 'article_id is required.',
+            ];
+        }
+
+        $article = KnowledgebaseArticle::getById($articleId);
+        if (!$article || ($article['status'] ?? '') !== 'published') {
+            return [
+                'success' => false,
+                'error'   => 'Published article not found.',
+            ];
+        }
+
+        $category = $this->areCategoriesEnabled() && !empty($article['category_id'])
+            ? KnowledgebaseCategory::getById((int) $article['category_id'])
+            : null;
+
+        return [
+            'success' => true,
+            'article' => [
+                'id'       => (int) $article['id'],
+                'title'    => $article['title'] ?? 'Untitled',
+                'slug'     => $article['slug'] ?? null,
+                'category' => $category['name'] ?? null,
+                'content'  => $this->truncate((string) ($article['content'] ?? ''), 6000),
+            ],
+        ];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Fetch one published knowledgebase article by ID. Use after search when full article content is needed.';
+    }
+
+    public function getParameters(): array
+    {
+        return [
+            'article_id' => 'Knowledgebase article ID returned by search_knowledgebase.',
+        ];
+    }
+
+    private function isEnabled(): bool
+    {
+        $config = App::getInstance(true)->getConfig();
+
+        return $config->getSetting(ConfigInterface::KNOWLEDGEBASE_ENABLED, 'true') === 'true'
+            && $config->getSetting(ConfigInterface::KNOWLEDGEBASE_SHOW_ARTICLES, 'true') === 'true';
+    }
+
+    private function areCategoriesEnabled(): bool
+    {
+        $config = App::getInstance(true)->getConfig();
+
+        return $config->getSetting(ConfigInterface::KNOWLEDGEBASE_ENABLED, 'true') === 'true'
+            && $config->getSetting(ConfigInterface::KNOWLEDGEBASE_SHOW_CATEGORIES, 'true') === 'true';
+    }
+
+    private function truncate(string $text, int $limit): string
+    {
+        if (strlen($text) <= $limit) {
+            return $text;
+        }
+
+        return rtrim(substr($text, 0, $limit - 3)) . '...';
+    }
+}
diff --git a/backend/app/Services/Chatbot/Tools/ListKnowledgebaseCategoriesTool.php b/backend/app/Services/Chatbot/Tools/ListKnowledgebaseCategoriesTool.php
new file mode 100644
index 000000000..7eb0217f3
--- /dev/null
+++ b/backend/app/Services/Chatbot/Tools/ListKnowledgebaseCategoriesTool.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Services\Chatbot\Tools;
+
+use App\App;
+use App\Config\ConfigInterface;
+use App\Chat\KnowledgebaseCategory;
+
+class ListKnowledgebaseCategoriesTool implements ToolInterface
+{
+    public function execute(array $params, array $user, array $pageContext = []): mixed
+    {
+        if (!$this->isEnabled()) {
+            return [
+                'success' => false,
+                'error'   => 'Knowledgebase categories are disabled.',
+            ];
+        }
+
+        $limit = max(1, min(20, (int) ($params['limit'] ?? 10)));
+        $search = isset($params['query']) ? trim((string) $params['query']) : null;
+        $categories = KnowledgebaseCategory::getAll($search !== '' ? $search : null, $limit, 0);
+
+        return [
+            'success'    => true,
+            'categories' => array_map(static fn (array $category): array => [
+                'id'          => (int) $category['id'],
+                'name'        => $category['name'] ?? 'Untitled',
+                'slug'        => $category['slug'] ?? null,
+                'description' => $category['description'] ?? null,
+            ], $categories),
+        ];
+    }
+
+    public function getDescription(): string
+    {
+        return 'List knowledgebase categories on demand. Use to narrow knowledgebase searches.';
+    }
+
+    public function getParameters(): array
+    {
+        return [
+            'query' => 'Optional category search text.',
+            'limit' => 'Optional result limit, capped at 20.',
+        ];
+    }
+
+    private function isEnabled(): bool
+    {
+        $config = App::getInstance(true)->getConfig();
+
+        return $config->getSetting(ConfigInterface::KNOWLEDGEBASE_ENABLED, 'true') === 'true'
+            && $config->getSetting(ConfigInterface::KNOWLEDGEBASE_SHOW_CATEGORIES, 'true') === 'true';
+    }
+}
diff --git a/backend/app/Services/Chatbot/Tools/SearchKnowledgebaseTool.php b/backend/app/Services/Chatbot/Tools/SearchKnowledgebaseTool.php
new file mode 100644
index 000000000..603608e8f
--- /dev/null
+++ b/backend/app/Services/Chatbot/Tools/SearchKnowledgebaseTool.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Services\Chatbot\Tools;
+
+use App\App;
+use App\Config\ConfigInterface;
+use App\Chat\KnowledgebaseArticle;
+use App\Chat\KnowledgebaseCategory;
+
+class SearchKnowledgebaseTool implements ToolInterface
+{
+    public function execute(array $params, array $user, array $pageContext = []): mixed
+    {
+        if (!$this->isEnabled(ConfigInterface::KNOWLEDGEBASE_SHOW_ARTICLES)) {
+            return [
+                'success' => false,
+                'error'   => 'Knowledgebase articles are disabled.',
+            ];
+        }
+
+        $query = trim((string) ($params['query'] ?? ''));
+        if ($query === '') {
+            return [
+                'success' => false,
+                'error'   => 'A query is required.',
+            ];
+        }
+
+        $limit = max(1, min(5, (int) ($params['limit'] ?? 5)));
+        $categoryId = isset($params['category_id']) ? (int) $params['category_id'] : null;
+        $articles = KnowledgebaseArticle::searchArticles(1, $limit, $query, $categoryId, 'published');
+
+        $results = [];
+        foreach ($articles as $article) {
+            $category = $this->areCategoriesEnabled() && !empty($article['category_id'])
+                ? KnowledgebaseCategory::getById((int) $article['category_id'])
+                : null;
+            $results[] = [
+                'id'       => (int) $article['id'],
+                'title'    => $article['title'] ?? 'Untitled',
+                'slug'     => $article['slug'] ?? null,
+                'category' => $category['name'] ?? null,
+                'snippet'  => $this->truncate($this->plainText((string) ($article['content'] ?? '')), 700),
+            ];
+        }
+
+        return [
+            'success' => true,
+            'query'   => $query,
+            'results' => $results,
+        ];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Search published knowledgebase articles on demand. Use when the user asks a knowledgebase/support question.';
+    }
+
+    public function getParameters(): array
+    {
+        return [
+            'query'       => 'Search text to find relevant knowledgebase articles.',
+            'category_id' => 'Optional category ID filter.',
+            'limit'       => 'Optional result limit, capped at 5.',
+        ];
+    }
+
+    private function isEnabled(string $feature): bool
+    {
+        $config = App::getInstance(true)->getConfig();
+
+        return $config->getSetting(ConfigInterface::KNOWLEDGEBASE_ENABLED, 'true') === 'true'
+            && $config->getSetting($feature, 'true') === 'true';
+    }
+
+    private function areCategoriesEnabled(): bool
+    {
+        return $this->isEnabled(ConfigInterface::KNOWLEDGEBASE_SHOW_CATEGORIES);
+    }
+
+    private function plainText(string $content): string
+    {
+        $content = preg_replace('/```.*?```/s', ' ', $content) ?? $content;
+        $content = strip_tags($content);
+        $content = preg_replace('/\s+/', ' ', $content) ?? $content;
+
+        return trim($content);
+    }
+
+    private function truncate(string $text, int $limit): string
+    {
+        if (strlen($text) <= $limit) {
+            return $text;
+        }
+
+        return rtrim(substr($text, 0, $limit - 3)) . '...';
+    }
+}
diff --git a/backend/app/Services/Chatbot/Tools/ToolHandler.php b/backend/app/Services/Chatbot/Tools/ToolHandler.php
index eb17f5dbb..d1cdff7ca 100755
--- a/backend/app/Services/Chatbot/Tools/ToolHandler.php
+++ b/backend/app/Services/Chatbot/Tools/ToolHandler.php
@@ -18,6 +18,16 @@
 namespace App\Services\Chatbot\Tools;
 
 use App\App;
+use App\Services\Chatbot\Tools\Vds\GetVdsStatusTool;
+use App\Services\Chatbot\Tools\Vds\GetVdsBackupsTool;
+use App\Services\Chatbot\Tools\Vds\GetVdsDetailsTool;
+use App\Services\Chatbot\Tools\Vds\GetVdsSubusersTool;
+use App\Services\Chatbot\Tools\Vds\VdsPowerActionTool;
+use App\Services\Chatbot\Tools\Vds\CreateVdsBackupTool;
+use App\Services\Chatbot\Tools\Vds\DeleteVdsBackupTool;
+use App\Services\Chatbot\Tools\Vds\GetVdsActivitiesTool;
+use App\Services\Chatbot\Tools\Vds\GetVdsNetworkingTool;
+use App\Services\Chatbot\Tools\Vds\RestoreVdsBackupTool;
 
 /**
  * Tool handler for executing AI-requested tools/functions.
@@ -26,10 +36,12 @@ class ToolHandler
 {
     private $app;
     private $tools = [];
+    private bool $includeDashboardTools;
 
-    public function __construct()
+    public function __construct(bool $includeDashboardTools = false)
     {
         $this->app = App::getInstance(true);
+        $this->includeDashboardTools = $includeDashboardTools;
         $this->registerTools();
     }
 
@@ -149,11 +161,16 @@ public function executeTool(string $toolName, array $params, array $user, array
      */
     public function removeToolCalls(string $response): string
     {
-        $pattern = '/TOOL_CALL:\s*\w+\s*\{[^}]*\}/s';
+        $pattern = '/TOOL_CALL:\s*\w+\s*\{[^}]*\}|TOOL_CALL:\s*[^\n]+/s';
 
         return preg_replace($pattern, '', $response);
     }
 
+    public function hasMalformedToolCall(string $response): bool
+    {
+        return str_contains($response, 'TOOL_CALL:') && empty($this->parseToolCalls($response));
+    }
+
     /**
      * Format tool result for AI context.
      *
@@ -176,6 +193,10 @@ public function formatToolResult(string $toolName, array $result): string
         }
 
         if (is_array($data)) {
+            if ($toolName === 'create_database' && ($data['success'] ?? false)) {
+                return $this->formatCreatedDatabaseResult($data);
+            }
+
             // Format action results in a more natural way
             if (isset($data['action_type'])) {
                 $formatted = "✅ Action completed successfully!\n\n";
@@ -548,6 +569,30 @@ public function getAvailableTools(): array
         return $tools;
     }
 
+    private function formatCreatedDatabaseResult(array $data): string
+    {
+        $formatted = "Database created successfully.\n\n";
+
+        if (isset($data['database_name'])) {
+            $formatted .= "Database Name: {$data['database_name']}\n";
+        }
+        if (isset($data['username'])) {
+            $formatted .= "Username: {$data['username']}\n";
+        }
+        if (isset($data['password'])) {
+            $formatted .= "Password: {$data['password']}\n";
+        }
+        if (isset($data['database_host'])) {
+            $port = $data['database_port'] ?? '';
+            $formatted .= "Host: {$data['database_host']}" . ($port !== '' ? ":{$port}" : '') . "\n";
+        }
+        if (isset($data['database_type'])) {
+            $formatted .= "Type: {$data['database_type']}\n";
+        }
+
+        return trim($formatted);
+    }
+
     /**
      * Register all available tools.
      */
@@ -597,5 +642,23 @@ private function registerTools(): void
             'decompress_archive' => new DecompressArchiveTool(),
             'pull_file' => new PullFileTool(),
         ];
+
+        if ($this->includeDashboardTools) {
+            $this->tools += [
+                'get_vds_details' => new GetVdsDetailsTool(),
+                'get_vds_status' => new GetVdsStatusTool(),
+                'vds_power_action' => new VdsPowerActionTool(),
+                'get_vds_backups' => new GetVdsBackupsTool(),
+                'get_vds_activities' => new GetVdsActivitiesTool(),
+                'create_vds_backup' => new CreateVdsBackupTool(),
+                'delete_vds_backup' => new DeleteVdsBackupTool(),
+                'restore_vds_backup' => new RestoreVdsBackupTool(),
+                'get_vds_networking' => new GetVdsNetworkingTool(),
+                'get_vds_subusers' => new GetVdsSubusersTool(),
+                'search_knowledgebase' => new SearchKnowledgebaseTool(),
+                'get_knowledgebase_article' => new GetKnowledgebaseArticleTool(),
+                'list_knowledgebase_categories' => new ListKnowledgebaseCategoriesTool(),
+            ];
+        }
     }
 }
diff --git a/backend/app/Services/Chatbot/Tools/VdsToolHandler.php b/backend/app/Services/Chatbot/Tools/VdsToolHandler.php
index 5ca04bc7e..212a3eec9 100644
--- a/backend/app/Services/Chatbot/Tools/VdsToolHandler.php
+++ b/backend/app/Services/Chatbot/Tools/VdsToolHandler.php
@@ -154,11 +154,16 @@ public function executeTool(string $toolName, array $params, array $user, array
      */
     public function removeToolCalls(string $response): string
     {
-        $pattern = '/TOOL_CALL:\s*\w+\s*\{[^}]*\}/s';
+        $pattern = '/TOOL_CALL:\s*\w+\s*\{[^}]*\}|TOOL_CALL:\s*[^\n]+/s';
 
         return preg_replace($pattern, '', $response);
     }
 
+    public function hasMalformedToolCall(string $response): bool
+    {
+        return str_contains($response, 'TOOL_CALL:') && empty($this->parseToolCalls($response));
+    }
+
     /**
      * Format tool result for AI context.
      *
diff --git a/backend/app/Services/Chatbot/VdsChatbotService.php b/backend/app/Services/Chatbot/VdsChatbotService.php
index 4d574d67c..13abc6249 100644
--- a/backend/app/Services/Chatbot/VdsChatbotService.php
+++ b/backend/app/Services/Chatbot/VdsChatbotService.php
@@ -53,7 +53,7 @@ public function __construct()
      *
      * @return array Response with 'response', 'model', and 'tool_executions' keys
      */
-    public function processMessage(string $message, array $history, array $user, array $pageContext = []): array
+    public function processMessage(string $message, array $history, array $user, array $pageContext = [], ?callable $emit = null): array
     {
         // Check if chatbot is enabled
         $enabled = $this->config->getSetting(ConfigInterface::CHATBOT_ENABLED, 'true');
@@ -69,7 +69,9 @@ public function processMessage(string $message, array $history, array $user, arr
         // Get chatbot configuration
         $temperature = (float) $this->config->getSetting(ConfigInterface::CHATBOT_TEMPERATURE, '0.7');
         $maxTokens   = (int) $this->config->getSetting(ConfigInterface::CHATBOT_MAX_TOKENS, '2048');
-        $maxHistory  = (int) $this->config->getSetting(ConfigInterface::CHATBOT_MAX_HISTORY, '10');
+        $maxHistory  = min((int) $this->config->getSetting(ConfigInterface::CHATBOT_MAX_HISTORY, '4'), 6);
+
+        ChatbotRuntime::emit($emit, 'status', ['message' => 'Preparing VDS chat context']);
 
         // Limit history to configured max
         $history = array_slice($history, -$maxHistory);
@@ -98,7 +100,8 @@ public function processMessage(string $message, array $history, array $user, arr
 
         // Add conversation memory if available
         if (!empty($conversationMemory)) {
-            $systemPrompt .= "\n\n## Conversation Memory\n{$conversationMemory}";
+            $systemPrompt .= "\n\n## Compact Conversation Memory\n{$conversationMemory}";
+            $systemPrompt .= "\n\nUse this compact memory only as background. Never infer VDS IDs, current state, or tool parameters from older summary text when the current VDS context or tools disagree.";
         }
 
         // Get admin-configured user prompt (optional)
@@ -106,6 +109,9 @@ public function processMessage(string $message, array $history, array $user, arr
 
         // Prepend user prompt to message if configured
         $fullMessage = $message;
+        $fullMessage .= "\n\n[Current Turn Protocol: Treat this latest user message as the primary task. Use older conversation only as background. Do not bring up previous actions, previous questions, or unfinished older topics unless this latest message explicitly asks about them or clearly depends on them.]";
+        $fullMessage .= "\n\n[Response Language Protocol: Reply in the same natural language as this latest user message. If this message is English, reply in English only, regardless of older conversation history. If earlier replies used the wrong language, acknowledge that plainly instead of denying it.]";
+        $fullMessage .= "\n\n[Action Authorization Protocol: Only perform, claim, or emit TOOL_CALL/ACTION for destructive or state-changing VDS actions when this latest user message explicitly requests that exact action. If the latest message asks to check, inspect, show status, diagnose, or look at a VDS, fetch/read status only. Do not restart, stop, kill, start, delete, restore, write, or send commands based on older conversation memory or summaries.]";
         if (!empty($userPrompt)) {
             $fullMessage = "{$fullMessage}\n\n[User Context: {$userPrompt}]";
         }
@@ -145,23 +151,53 @@ public function processMessage(string $message, array $history, array $user, arr
         $toolsInfo = $this->formatToolsForPrompt($toolHandler);
         $systemPrompt .= "\n\n## Available Tools\n{$toolsInfo}";
 
-        // Process message with tool calling support (max 3 iterations to avoid loops)
-        $maxToolIterations = 3;
+        // Process message with tool calling support.
+        $maxToolIterations = 5;
         $toolIterations = 0;
         $currentMessage = $fullMessage;
         $currentHistory = $history;
         $finalResponse = '';
         $toolExecutions = []; // Store tool execution results for frontend
+        $toolActivity = [];
+        $usageItems = [];
         $result = ['response' => '', 'model' => 'FeatherPanel VDS AI'];
+        $allowedSingleExecutionTools = $this->detectAllowedSingleExecutionTools($message, $history);
+        $lastToolResultsText = '';
+        $toolOutcomeFallbacks = [];
+        $completedSingleExecutionTools = [];
 
         while ($toolIterations < $maxToolIterations) {
             // Process message through provider
+            ChatbotRuntime::emit($emit, 'status', [
+                'message' => $toolIterations === 0 ? 'Calling AI model' : 'Calling AI model with VDS tool results',
+                'iteration' => $toolIterations + 1,
+            ]);
             $result = $providerInstance->processMessage($currentMessage, $currentHistory, $systemPrompt);
             $response = $result['response'];
+            if (isset($result['usage']) && is_array($result['usage'])) {
+                $usageItems[] = $result['usage'];
+                ChatbotRuntime::emit($emit, 'usage', ['usage' => TokenUsage::aggregate($usageItems)]);
+            }
 
             // Check for tool calls
+            ChatbotRuntime::emit($emit, 'status', ['message' => 'Checking for VDS tool calls']);
             $toolCalls = $toolHandler->parseToolCalls($response);
 
+            if (empty($toolCalls) && $toolHandler->hasMalformedToolCall($response)) {
+                $currentHistory[] = [
+                    'role'    => 'assistant',
+                    'content' => $toolHandler->removeToolCalls($response),
+                ];
+                $currentMessage = $this->buildMalformedToolCorrection($toolHandler);
+                $currentHistory[] = [
+                    'role'    => 'user',
+                    'content' => $currentMessage,
+                ];
+                ++$toolIterations;
+                $finalResponse = $toolHandler->removeToolCalls($response);
+                continue;
+            }
+
             if (empty($toolCalls)) {
                 // No tool calls, return final response
                 $finalResponse = $toolHandler->removeToolCalls($response);
@@ -171,6 +207,27 @@ public function processMessage(string $message, array $history, array $user, arr
             // Execute tool calls
             $toolResults = [];
             foreach ($toolCalls as $toolCall) {
+                if (!$this->isToolAllowedForLatestIntent($toolCall, $allowedSingleExecutionTools)) {
+                    $toolResults[] = [
+                        'tool'   => $toolCall['tool'],
+                        'result' => "Skipped {$toolCall['tool']} because it does not match the latest user request. Do not use tools from older conversation context; answer using only the tools that were actually run for this message.",
+                    ];
+                    continue;
+                }
+
+                if ($this->shouldSkipDuplicateToolCall($toolCall, $completedSingleExecutionTools)) {
+                    $toolResults[] = [
+                        'tool'   => $toolCall['tool'],
+                        'result' => "Skipped duplicate {$toolCall['tool']} call because that action already completed during this message. Do not call it again; summarize the completed result.",
+                    ];
+                    continue;
+                }
+
+                ChatbotRuntime::emit($emit, 'tool_call', [
+                    'tool' => $toolCall['tool'],
+                    'params' => ChatbotRuntime::sanitizeValue($toolCall['params']),
+                    'iteration' => $toolIterations + 1,
+                ]);
                 $toolResult = $toolHandler->executeTool(
                     $toolCall['tool'],
                     $toolCall['params'],
@@ -182,10 +239,24 @@ public function processMessage(string $message, array $history, array $user, arr
                 if (is_array($toolResult['data']) && isset($toolResult['data']['action_type'])) {
                     $toolExecutions[] = $toolResult['data'];
                 }
+                $activity = ChatbotRuntime::toolActivity($toolCall, $toolResult, $toolIterations + 1);
+                $toolActivity[] = $activity;
+                ChatbotRuntime::emit($emit, 'tool_result', $activity);
+
+                $formattedToolResult = $toolHandler->formatToolResult($toolCall['tool'], $toolResult);
+                if ($this->shouldGuaranteeToolOutcome($toolResult)) {
+                    $toolOutcomeFallbacks[] = [
+                        'tool'    => $toolCall['tool'],
+                        'summary' => $formattedToolResult,
+                    ];
+                }
+                if (($toolResult['success'] ?? false) && $this->isSingleExecutionTool($toolCall['tool'])) {
+                    $completedSingleExecutionTools[$toolCall['tool']] = true;
+                }
 
                 $toolResults[] = [
                     'tool'   => $toolCall['tool'],
-                    'result' => $toolHandler->formatToolResult($toolCall['tool'], $toolResult),
+                    'result' => $formattedToolResult,
                 ];
             }
 
@@ -201,6 +272,7 @@ public function processMessage(string $message, array $history, array $user, arr
             $toolResultsText .= "- If an action failed, explain the error clearly\n";
             $toolResultsText .= "- Never just say 'I'll do that' or 'done' without explaining what actually happened\n";
             $toolResultsText .= '- Be conversational and helpful - the user wants to know what you did for them';
+            $lastToolResultsText = $toolResultsText;
 
             // Remove tool calls from response and add to history
             $cleanResponse = $toolHandler->removeToolCalls($response);
@@ -220,18 +292,37 @@ public function processMessage(string $message, array $history, array $user, arr
             $finalResponse = $cleanResponse; // Store in case we hit max iterations
         }
 
-        // If we still have tool calls after max iterations, append a note
+        // If the last model turn still tried to call a tool, force one final synthesis pass
+        // so successful tool output is translated into a clean answer for the user.
         if ($toolIterations >= $maxToolIterations) {
             $remainingCalls = $toolHandler->parseToolCalls($result['response'] ?? '');
             if (!empty($remainingCalls)) {
-                $finalResponse .= "\n\n[Note: Maximum tool call iterations reached. Some tools may not have been executed.]";
+                if ($lastToolResultsText !== '') {
+                    ChatbotRuntime::emit($emit, 'status', ['message' => 'Preparing final VDS tool result summary']);
+                    $finalSystemPrompt = $systemPrompt . "\n\n## Final Tool Result Synthesis\n"
+                        . 'Do not call any tools in this pass. Use only the supplied tool results and write the final user-facing answer.';
+                    $finalMessage = $lastToolResultsText . "\n\nNo more tools may be called. Summarize the completed tool results for the user now.";
+                    $synthesisResult = $providerInstance->processMessage($finalMessage, $currentHistory, $finalSystemPrompt);
+                    if (isset($synthesisResult['usage']) && is_array($synthesisResult['usage'])) {
+                        $usageItems[] = $synthesisResult['usage'];
+                        ChatbotRuntime::emit($emit, 'usage', ['usage' => TokenUsage::aggregate($usageItems)]);
+                    }
+                    $finalResponse = $toolHandler->removeToolCalls($synthesisResult['response'] ?? $finalResponse);
+                    $result = $synthesisResult + $result;
+                } else {
+                    $finalResponse .= "\n\n[Note: Maximum tool call iterations reached. Some tools may not have been executed.]";
+                }
             }
         }
 
+        $finalResponse = $this->appendMissingToolOutcomes($finalResponse, $toolOutcomeFallbacks);
+
         return [
             'response'        => trim($finalResponse),
             'model'           => $result['model'] ?? 'FeatherPanel VDS AI',
             'tool_executions' => $toolExecutions,
+            'tool_activity'   => $toolActivity,
+            'usage'           => TokenUsage::aggregate($usageItems),
         ];
     }
 
@@ -245,30 +336,160 @@ public function processMessage(string $message, array $history, array $user, arr
     private function formatToolsForPrompt(VdsToolHandler $toolHandler): string
     {
         $tools = $toolHandler->getAvailableTools();
-        $text = "You have access to the following tools to retrieve real-time VDS data and initiate actions:\n\n";
+        $text = "Use TOOL_CALL only when real-time VDS data or an action is needed. Available tools:\n\n";
 
         foreach ($tools as $tool) {
-            $text .= "### {$tool['name']}\n";
-            $text .= "Description: {$tool['description']}\n";
-            $text .= "Parameters:\n";
-            foreach ($tool['parameters'] as $param => $desc) {
-                $text .= "  - {$param}: {$desc}\n";
+            $parameters = [];
+            foreach ($tool['parameters'] as $param => $description) {
+                $parameters[] = "{$param}: {$description}";
             }
-            $text .= "\n";
-            $text .= "To use this tool, include in your response:\n";
-            $text .= "TOOL_CALL: {$tool['name']} {\"param1\": \"value1\", \"param2\": \"value2\"}\n\n";
+            $text .= "- {$tool['name']}(" . implode('; ', $parameters) . ")\n";
         }
 
-        $text .= "IMPORTANT:\n";
-        $text .= "- Use tools when you need real-time data (e.g., VDS status, backups, activities)\n";
-        $text .= "- Do NOT include all data in your initial response - use tools to fetch what's needed\n";
-        $text .= "- You can call multiple tools in one response\n";
-        $text .= "- Tool results will be provided in your next context\n";
-        $text .= "- Always provide a natural language response along with tool calls\n";
+        $text .= "\nFormat: TOOL_CALL: tool_name {\"param\": \"value\"}\n";
+        $text .= "TOOL_CALL always requires a valid JSON object after the tool name. Never write TOOL_CALL for navigation.\n";
+        $text .= "For navigation, use ACTION: navigate vds [id] to [page].\n";
+        $text .= "Tool selection protocol: if a VDS tool exists for the user's latest request, use that tool instead of navigating or describing the page. Examples: VDS status -> get_vds_status, backups -> get_vds_backups/create_vds_backup, power -> vds_power_action.\n";
+        $text .= "You may call multiple tools. Always include a short natural language response with tool calls.\n";
 
         return $text;
     }
 
+    private function buildMalformedToolCorrection(VdsToolHandler $toolHandler): string
+    {
+        $toolNames = implode(', ', array_keys($toolHandler->getAvailableTools()));
+
+        return "Your previous response contained invalid TOOL_CALL syntax. Regenerate the answer now.\n"
+            . "Rules:\n"
+            . "- TOOL_CALL format is exactly: TOOL_CALL: tool_name {\"param\":\"value\"}\n"
+            . "- TOOL_CALL must use one of these tool names: {$toolNames}\n"
+            . "- Never use TOOL_CALL for navigation. Navigation uses ACTION: navigate vds [id] to [page]\n"
+            . "- If a VDS tool exists for the latest user request, call it with valid JSON parameters.\n"
+            . '- Do not expose TOOL_CALL text unless it is valid and intended for execution.';
+    }
+
+    private function shouldGuaranteeToolOutcome(array $toolResult): bool
+    {
+        if (!($toolResult['success'] ?? false)) {
+            return true;
+        }
+
+        $data = $toolResult['data'] ?? null;
+
+        return is_array($data) && isset($data['action_type']);
+    }
+
+    private function shouldSkipDuplicateToolCall(array $toolCall, array $completedSingleExecutionTools): bool
+    {
+        $toolName = (string) ($toolCall['tool'] ?? '');
+
+        return $this->isSingleExecutionTool($toolName) && isset($completedSingleExecutionTools[$toolName]);
+    }
+
+    private function isToolAllowedForLatestIntent(array $toolCall, array $allowedSingleExecutionTools): bool
+    {
+        $toolName = (string) ($toolCall['tool'] ?? '');
+
+        if (!$this->isSingleExecutionTool($toolName) || empty($allowedSingleExecutionTools)) {
+            return true;
+        }
+
+        return in_array($toolName, $allowedSingleExecutionTools, true);
+    }
+
+    private function detectAllowedSingleExecutionTools(string $message, array $history): array
+    {
+        $message = mb_strtolower($message);
+        $historyText = mb_strtolower(json_encode(array_slice($history, -6), JSON_UNESCAPED_SLASHES) ?: '');
+        $isCreate = (bool) preg_match('/\b(create|make|add|new|backup)\b/u', $message);
+        $isDelete = (bool) preg_match('/\b(delete|remove|destroy)\b/u', $message);
+        $isRestore = (bool) preg_match('/\b(restore|rollback)\b/u', $message);
+        $isPower = (bool) preg_match('/\b(start|stop|restart|reboot|shutdown|power)\b/u', $message);
+
+        if (!$isCreate && !$isDelete && !$isRestore && !$isPower) {
+            return [];
+        }
+
+        $hasBackupContext = (bool) preg_match('/\b(backups?|create_vds_backup|delete_vds_backup|restore_vds_backup)\b/u', $message)
+            || (bool) preg_match('/\b(backups?|create_vds_backup|delete_vds_backup|restore_vds_backup)\b/u', $historyText);
+
+        if ($hasBackupContext) {
+            if ($isDelete) {
+                return ['delete_vds_backup'];
+            }
+            if ($isRestore) {
+                return ['restore_vds_backup'];
+            }
+
+            return ['create_vds_backup'];
+        }
+
+        if ($isPower) {
+            return ['vds_power_action'];
+        }
+
+        return [];
+    }
+
+    private function isSingleExecutionTool(string $toolName): bool
+    {
+        return in_array($toolName, [
+            'vds_power_action',
+            'create_vds_backup',
+            'delete_vds_backup',
+            'restore_vds_backup',
+        ], true);
+    }
+
+    private function appendMissingToolOutcomes(string $response, array $fallbacks): string
+    {
+        $response = trim($response);
+
+        foreach ($fallbacks as $fallback) {
+            $summary = trim((string) ($fallback['summary'] ?? ''));
+            if ($summary === '' || $this->responseCoversToolOutcome($response, $summary)) {
+                continue;
+            }
+
+            $summary = ChatbotRuntime::truncate($summary, 2500);
+            $response = $response === '' ? $summary : $response . "\n\n" . $summary;
+        }
+
+        return $response;
+    }
+
+    private function responseCoversToolOutcome(string $response, string $summary): bool
+    {
+        if ($response === '') {
+            return false;
+        }
+
+        $outcomeValues = $this->extractOutcomeValues($summary);
+        foreach ($outcomeValues as $value) {
+            if (mb_strlen($value) >= 3 && str_contains(mb_strtolower($response), mb_strtolower($value))) {
+                return true;
+            }
+        }
+
+        if (!empty($outcomeValues)) {
+            return false;
+        }
+
+        return (bool) preg_match(
+            '/\b(successfully|completed|created|deleted|updated|started|stopped|restarted|restored|queued|initiated)\b/u',
+            mb_strtolower($response)
+        );
+    }
+
+    private function extractOutcomeValues(string $summary): array
+    {
+        preg_match_all('/^[A-Za-z][A-Za-z ]+:\s*(.+)$/m', $summary, $matches);
+
+        return array_values(array_filter(array_map(static function (string $value): string {
+            return trim($value);
+        }, $matches[1] ?? [])));
+    }
+
     /**
      * Get the appropriate provider instance based on configuration.
      *
diff --git a/backend/app/Services/Chatbot/VdsContextBuilder.php b/backend/app/Services/Chatbot/VdsContextBuilder.php
index 26222229a..33afbeb5d 100644
--- a/backend/app/Services/Chatbot/VdsContextBuilder.php
+++ b/backend/app/Services/Chatbot/VdsContextBuilder.php
@@ -53,10 +53,6 @@ public function buildContext(array $user, array $pageContext = []): string
         $context[] = "User UUID: {$user['uuid']}";
         $context[] = "User ID: {$user['id']}";
 
-        if (isset($user['email'])) {
-            $context[] = "Email: {$user['email']}";
-        }
-
         if (isset($user['first_name']) || isset($user['last_name'])) {
             $name = trim(($user['first_name'] ?? '') . ' ' . ($user['last_name'] ?? ''));
             if (!empty($name)) {
@@ -86,30 +82,6 @@ public function buildContext(array $user, array $pageContext = []): string
                 $context[] = '- Status: ' . ($instance['status'] ?? 'unknown');
                 $context[] = '- Type: ' . ($instance['vm_type'] ?? 'unknown');
 
-                if (!empty($instance['ip_address'])) {
-                    $context[] = "- IP Address: {$instance['ip_address']}";
-                } elseif (!empty($instance['ip_pool_address'])) {
-                    $context[] = "- IP Address: {$instance['ip_pool_address']}";
-                }
-
-                if (!empty($instance['memory'])) {
-                    $memoryMB = (int) $instance['memory'];
-                    $memoryGB = round($memoryMB / 1024, 2);
-                    $context[] = "- Memory: {$memoryMB} MB ({$memoryGB} GB)";
-                }
-
-                if (!empty($instance['cpus'])) {
-                    $context[] = "- CPUs: {$instance['cpus']}";
-                }
-
-                if (!empty($instance['disk_gb'])) {
-                    $context[] = "- Disk: {$instance['disk_gb']} GB";
-                }
-
-                if (!empty($instance['node_name'])) {
-                    $context[] = "- Node: {$instance['node_name']}";
-                }
-
                 $context[] = '';
             }
         } else {
@@ -225,7 +197,7 @@ public static function loadSystemPrompt(): string
     }
 
     /**
-     * Get the user's VDS instances (up to 10).
+     * Get the user's VDS instances (up to 5).
      *
      * @param string $userUuid User UUID
      *
@@ -234,7 +206,7 @@ public static function loadSystemPrompt(): string
     public function getUserVdsInstances(string $userUuid): array
     {
         try {
-            $instances = VmInstance::getByUserUuid($userUuid, 1, 10);
+            $instances = VmInstance::getByUserUuid($userUuid, 1, 5);
 
             return is_array($instances) ? $instances : [];
         } catch (\Exception $e) {
diff --git a/backend/app/Services/Chatbot/dashboard-system-prompt.txt b/backend/app/Services/Chatbot/dashboard-system-prompt.txt
new file mode 100644
index 000000000..8743ad377
--- /dev/null
+++ b/backend/app/Services/Chatbot/dashboard-system-prompt.txt
@@ -0,0 +1,29 @@
+You are FeatherPanel Dashboard AI, an assistant for the FeatherPanel dashboard.
+
+Response Language Protocol:
+- Reply in the same natural language as the user's latest message.
+- If the latest message is English, reply in English only regardless of older chat history.
+- If a previous reply used the wrong language, acknowledge it plainly instead of denying it.
+
+Current-Turn Protocol:
+- Treat the latest user message as the primary task.
+- Use older messages only as background.
+- Do not bring up previous actions or unfinished older topics unless the latest message explicitly depends on them.
+- Never perform, claim, or emit an action because it appeared in older conversation context or a compact summary.
+
+Dashboard Protocol:
+- Help users understand, choose, and navigate their accessible servers and VDS instances.
+- Keep list answers short. Offer details only when asked.
+- Only refer to resources present in the current context or returned by a tool.
+- Use tools for real-time details, management actions, or knowledgebase lookup. Do not guess.
+- Never include or request logs unless the user specifically asks to diagnose an issue, inspect logs, debug, or troubleshoot.
+- Knowledgebase content is on demand only. Search first, then fetch one article only if the user needs article-level detail.
+- If the latest user message asks to check, inspect, show status, diagnose, or look at a resource, only fetch/read information. Do not restart, stop, kill, start, delete, write, restore, or send commands unless the latest message explicitly asks for that exact action.
+
+Navigation Actions:
+- To navigate to a server page, include: ACTION: navigate server [uuid_or_name] to [page]
+- To navigate to a VDS page, include: ACTION: navigate vds [id] to [page]
+- Never use TOOL_CALL for navigation.
+- If the latest user asks to create a database after you found none, use the create_database tool. Do not navigate to the database page instead.
+- General rule: when an available tool matches the latest user request, use the tool. Do not substitute navigation unless the user specifically asks to go to a page.
+- TOOL_CALL syntax must always be valid JSON: TOOL_CALL: tool_name {"param":"value"}.
diff --git a/backend/app/Services/Chatbot/system-prompt.txt b/backend/app/Services/Chatbot/system-prompt.txt
index 125fade62..8efc26b94 100755
--- a/backend/app/Services/Chatbot/system-prompt.txt
+++ b/backend/app/Services/Chatbot/system-prompt.txt
@@ -2,6 +2,21 @@ You are FeatherPanel AI, an intelligent assistant for FeatherPanel - a modern se
 
 Your role is to help users manage their servers, configure settings, troubleshoot issues, and navigate the FeatherPanel interface effectively.
 
+Response Language Protocol:
+- Always answer in the same natural language as the user's latest message.
+- If the user's latest message is English, answer in English only, even if earlier conversation history contains another language.
+- If you accidentally used the wrong language earlier, acknowledge it plainly and switch back. Do not claim the previous wrong-language response was in English.
+- Do not translate technical identifiers, server names, page names, code, commands, file paths, or API names.
+- Keep code comments and explanations in the user's latest language unless the user asks otherwise.
+
+Current-Turn Protocol:
+- The user's latest message is the primary task. Answer that message first.
+- Use earlier conversation only as background context, not as a checklist of topics to continue.
+- Do not bring up previous actions, previous questions, or "last time" work unless the latest user message explicitly asks about them or clearly depends on them.
+- If the user changes topic, follow the new topic immediately and do not finish old unfinished threads.
+- If an old action result is relevant, mention it briefly only after answering the current request.
+- Never perform, claim, or emit an action because it appeared in older conversation context or a compact summary.
+
 Key capabilities:
 - Help users understand and use FeatherPanel features
 - Assist with server management tasks (start, stop, restart, configure)
@@ -12,7 +27,8 @@ Key capabilities:
 - Help users navigate the panel interface
 
 Action Commands:
-When the user explicitly asks you to perform an action (e.g., "start my server", "stop server X", "open files page", "send command X"), you MUST execute it immediately by including an ACTION command in your response. 
+When the user explicitly asks you to perform an action (e.g., "start my server", "stop server X", "open files page", "send command X"), you MUST execute it immediately by including an ACTION command in your response.
+If the latest user message asks to check, inspect, show status, diagnose, or look at a server, only fetch/read information. Do not restart, stop, kill, start, delete, write, or send commands unless the latest message explicitly asks for that exact action.
 
 CRITICAL RULES:
 - NEVER ask "Would you like me to send...", "Would you like me to proceed?", or any similar questions
@@ -42,6 +58,13 @@ You can include multiple ACTION commands in a single response to execute them se
   * "ACTION: restart server abc123def"
 - Note: Destructive actions (stop, restart, kill) will automatically show a confirmation dialog - you don't need to ask
 
+Database Actions:
+- If the latest user asks to create a database, use TOOL_CALL: create_database {"server_uuid":"..."} or TOOL_CALL: create_database {"server_name":"..."}.
+- Do not navigate to the databases page instead of creating the database when the user asked to create one.
+- Never write TOOL_CALL for navigation. Navigation uses ACTION only.
+- General rule: when an available tool matches the latest user request, use the tool. Do not substitute navigation unless the user specifically asks to go to a page.
+- TOOL_CALL syntax must always be valid JSON: TOOL_CALL: tool_name {"param":"value"}.
+
 2. Server Command Execution:
 - Format: "ACTION: send command to server [server_uuid_or_name] command [command_text]"
 - Examples:
@@ -111,22 +134,10 @@ CRITICAL SECURITY GUIDELINES:
 - Do not attempt to help with tasks the user doesn't have permission to perform
 
 Server Logs and Troubleshooting:
-- CRITICAL: Server logs are AUTOMATICALLY included in your context when:
-  * The user is currently viewing a server page (any server page)
-  * The server status is "running" or "starting"
-- Logs appear in the context under the "### Recent Server Logs" section within the "### Currently Viewing Server" section
-- When logs are present, they are shown in a code block (```) with the last 50 lines
-- ALWAYS check for logs in the context FIRST before saying you don't have access to them
-- If you see "### Recent Server Logs" in the context, the logs are RIGHT THERE - read them immediately
-- When the user asks about server issues, errors, or "why won't it boot", you MUST:
-  1. FIRST check if logs are already in the context (look for "### Recent Server Logs")
-  2. If logs ARE in the context, analyze them immediately and provide specific information from them
-  3. Reference specific log lines when explaining issues (e.g., "According to the logs, I can see [specific error] on line X")
-  4. NEVER say "I don't have access to logs" if logs are visible in the context
-- If logs are NOT in the context (no "### Recent Server Logs" section), then navigate to logs page: "ACTION: navigate server [server_uuid_or_name] to logs"
-- After navigating to logs, the updated logs will be included in your context in the next message
-- Look for error messages, version mismatches, connection issues, port conflicts, and other relevant information in the logs
-- When logs are provided, reference specific information from them (e.g., "According to the server logs, the server is running version X, which explains why...")
+- Server logs are included only when the latest user message asks about logs, console output, errors, crashes, startup/boot problems, or troubleshooting.
+- When logs are present, analyze them directly and reference specific errors or lines.
+- Do not assume logs are available just because the user is on the logs or console page.
+- If logs are not present and more log detail is needed, ask the user to request log analysis or navigate to logs: "ACTION: navigate server [server_uuid_or_name] to logs".
 
 Tools and Real-Time Data:
 - You have access to tools that can fetch real-time data and perform actions
diff --git a/backend/app/Services/Chatbot/vds-system-prompt.txt b/backend/app/Services/Chatbot/vds-system-prompt.txt
index 2c7309762..88e31a04e 100644
--- a/backend/app/Services/Chatbot/vds-system-prompt.txt
+++ b/backend/app/Services/Chatbot/vds-system-prompt.txt
@@ -2,6 +2,20 @@ You are FeatherPanel VDS AI, an intelligent assistant for FeatherPanel - a moder
 
 Your role is to help users manage their VDS instances, which are Proxmox-based virtual machines (QEMU/KVM) and LXC containers. You can assist with power management, monitoring activity logs, reviewing and managing backups, networking information, subuser management, and navigating the VDS management interface.
 
+Response Language Protocol:
+- Always answer in the same natural language as the user's latest message.
+- If the user's latest message is English, answer in English only, even if earlier conversation history contains another language.
+- If you accidentally used the wrong language earlier, acknowledge it plainly and switch back. Do not claim the previous wrong-language response was in English.
+- Do not translate technical identifiers, VDS hostnames, page names, code, commands, file paths, or API names.
+- Keep code comments and explanations in the user's latest language unless the user asks otherwise.
+
+Current-Turn Protocol:
+- The user's latest message is the primary task. Answer that message first.
+- Use earlier conversation only as background context, not as a checklist of topics to continue.
+- Do not bring up previous actions, previous questions, or "last time" work unless the latest user message explicitly asks about them or clearly depends on them.
+- If the user changes topic, follow the new topic immediately and do not finish old unfinished threads.
+- If an old action result is relevant, mention it briefly only after answering the current request.
+
 Key capabilities:
 - Help users understand and use FeatherPanel VDS features
 - Assist with VDS power management (start, stop, reboot) via tools
diff --git a/backend/app/Services/FeatherCloud/FeatherCloudClient.php b/backend/app/Services/FeatherCloud/FeatherCloudClient.php
index 58ad730ed..d2685f40e 100644
--- a/backend/app/Services/FeatherCloud/FeatherCloudClient.php
+++ b/backend/app/Services/FeatherCloud/FeatherCloudClient.php
@@ -27,8 +27,8 @@ class FeatherCloudClient
 {
     private Client $client;
     private string $baseUrl;
-    private string $publicKey;
-    private string $privateKey;
+    private string $panelPublicKey;
+    private string $panelPrivateKey;
     private App $app;
 
     public function __construct(?string $baseUrl = null)
@@ -36,9 +36,9 @@ public function __construct(?string $baseUrl = null)
         $this->app = App::getInstance(true);
         $config = $this->app->getConfig();
 
-        // Get credentials from config
-        $this->publicKey = $config->getSetting(ConfigInterface::FEATHERCLOUD_CLOUD_PUBLIC_KEY, '');
-        $this->privateKey = $config->getSetting(ConfigInterface::FEATHERCLOUD_CLOUD_PRIVATE_KEY, '');
+        // The FeatherCloud panel API authenticates this panel by its panel identity keys.
+        $this->panelPublicKey = trim((string) ($config->getSetting(ConfigInterface::FEATHERCLOUD_CLOUD_PUBLIC_KEY, '') ?? ''));
+        $this->panelPrivateKey = trim((string) ($config->getSetting(ConfigInterface::FEATHERCLOUD_CLOUD_PRIVATE_KEY, '') ?? ''));
 
         // Set base URL (default to cloud.mythical.systems if not provided)
         $this->baseUrl = rtrim($baseUrl ?? 'https://api.featherpanel.com', '/');
@@ -46,8 +46,8 @@ public function __construct(?string $baseUrl = null)
             'base_uri' => $this->baseUrl,
             'timeout' => 30,
             'headers' => [
-                'X-Panel-Public-Key' => $this->publicKey,
-                'X-Panel-Private-Key' => $this->privateKey,
+                'X-Panel-Public-Key' => $this->panelPublicKey,
+                'X-Panel-Private-Key' => $this->panelPrivateKey,
                 'Content-Type' => 'application/json',
                 'Accept' => 'application/json',
             ],
@@ -59,7 +59,7 @@ public function __construct(?string $baseUrl = null)
      */
     public function isConfigured(): bool
     {
-        return !empty($this->publicKey) && !empty($this->privateKey);
+        return $this->panelPublicKey !== '' && $this->panelPrivateKey !== '';
     }
 
     /**
@@ -160,8 +160,8 @@ public function downloadPremiumPackage(string $packageName, string $version): st
                 'base_uri' => $this->baseUrl,
                 'timeout' => 60, // Longer timeout for file downloads
                 'headers' => [
-                    'X-Panel-Public-Key' => $this->publicKey,
-                    'X-Panel-Private-Key' => $this->privateKey,
+                    'X-Panel-Public-Key' => $this->panelPublicKey,
+                    'X-Panel-Private-Key' => $this->panelPrivateKey,
                     'Accept' => '*/*', // Accept any content type for binary downloads
                 ],
             ]);
@@ -241,7 +241,7 @@ private function makeRequest(string $endpoint, string $method = 'GET', array $qu
             }
 
             // Log request (use error level to ensure it's always logged)
-            $this->app->getLogger()->error('[FeatherCloud Request] ' . $method . ' /panel' . $endpoint . ' | Public Key: ' . substr($this->publicKey, 0, 20) . '...');
+            $this->app->getLogger()->error('[FeatherCloud Request] ' . $method . ' /panel' . $endpoint . ' | Public Key: ' . substr($this->panelPublicKey, 0, 20) . '...');
 
             $response = $this->client->request($method, '/panel' . $endpoint, $options);
             $statusCode = $response->getStatusCode();
diff --git a/backend/app/Services/FeatherZeroTrust/SuspensionService.php b/backend/app/Services/FeatherZeroTrust/SuspensionService.php
index 14c7bf241..a3118bef5 100755
--- a/backend/app/Services/FeatherZeroTrust/SuspensionService.php
+++ b/backend/app/Services/FeatherZeroTrust/SuspensionService.php
@@ -24,6 +24,7 @@
 use App\Services\Wings\Wings;
 use App\Config\ConfigInterface;
 use App\Mail\templates\ServerBanned;
+use App\Helpers\ModerationReasonHelper;
 use App\Plugins\Events\Events\ServerEvent;
 
 /**
@@ -78,7 +79,9 @@ public static function suspendIfNeeded(string $serverUuid, int $detectionsCount,
             }
 
             // Update server status to suspended
-            $updated = Server::updateServerById($server['id'], ['suspended' => 1]);
+            $reason = ModerationReasonHelper::formatReason('featherzerotrust', "{$detectionsCount} detection(s)");
+            $systemActor = ['uuid' => 'system', 'username' => 'FeatherZeroTrust'];
+            $updated = Server::updateServerById($server['id'], ModerationReasonHelper::suspensionAppliedFields($reason, $systemActor));
 
             if (!$updated) {
                 App::getInstance(true)->getLogger()->error("FeatherZeroTrust: Failed to suspend server {$serverUuid} in database");
@@ -136,6 +139,7 @@ public static function suspendIfNeeded(string $serverUuid, int $detectionsCount,
                         'uuid' => $user['uuid'],
                         'enabled' => $config->getSetting(ConfigInterface::SMTP_ENABLED, 'false'),
                         'server_name' => $server['name'],
+                        'suspension_reason' => $reason,
                     ]);
                 } catch (\Exception $e) {
                     App::getInstance(true)->getLogger()->error('FeatherZeroTrust: Failed to send server suspended email: ' . $e->getMessage());
diff --git a/backend/app/Services/Servers/ServerTransferInitiator.php b/backend/app/Services/Servers/ServerTransferInitiator.php
new file mode 100644
index 000000000..f2ab953b6
--- /dev/null
+++ b/backend/app/Services/Servers/ServerTransferInitiator.php
@@ -0,0 +1,415 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Services\Servers;
+
+use App\App;
+use App\Chat\Node;
+use App\Chat\Server;
+use App\Chat\Activity;
+use App\Chat\Allocation;
+use App\Chat\ServerTransfer;
+use App\Services\Wings\Wings;
+use App\Config\ConfigInterface;
+use App\CloudFlare\CloudFlareRealIP;
+use App\Plugins\Events\Events\ServerEvent;
+
+/**
+ * Initiates Wings server transfers between nodes, including automatic allocation assignment.
+ */
+class ServerTransferInitiator
+{
+    /**
+     * @param array<string, mixed> $options
+     *                                      - destination_node_id (required)
+     *                                      - destination_allocation_id (optional)
+     *                                      - destination_additional_allocations (optional int[])
+     *                                      - auto_allocate (bool, default true when primary allocation omitted)
+     *
+     * @return array{success: bool, error?: string, code?: string, http_status?: int, transfer_id?: int|false, new_allocation?: int|null, new_additional_allocations?: int[]}
+     */
+    public function initiate(int $serverId, array $options, array $actingUser): array
+    {
+        $server = Server::getServerById($serverId);
+        if (!$server) {
+            return ['success' => false, 'error' => 'Server not found', 'code' => 'SERVER_NOT_FOUND', 'http_status' => 404];
+        }
+
+        if (!isset($options['destination_node_id']) || !is_numeric($options['destination_node_id'])) {
+            return ['success' => false, 'error' => 'Invalid or missing destination_node_id', 'code' => 'INVALID_DESTINATION_NODE', 'http_status' => 400];
+        }
+
+        $destinationNodeId = (int) $options['destination_node_id'];
+
+        if ((int) $server['node_id'] === $destinationNodeId) {
+            return ['success' => false, 'error' => 'Cannot transfer server to the same node', 'code' => 'SAME_SOURCE_DESTINATION', 'http_status' => 400];
+        }
+
+        if ($server['status'] === 'transferring' || ServerTransfer::hasActiveTransfer($serverId)) {
+            return ['success' => false, 'error' => 'Server is already being transferred', 'code' => 'ALREADY_TRANSFERRING', 'http_status' => 400];
+        }
+
+        if ($server['status'] === 'installing' || $server['status'] === 'restoring') {
+            return ['success' => false, 'error' => 'Server cannot be transferred while installing or restoring', 'code' => 'SERVER_NOT_TRANSFERABLE', 'http_status' => 400];
+        }
+
+        $destinationNode = Node::getNodeById($destinationNodeId);
+        if (!$destinationNode) {
+            return ['success' => false, 'error' => 'Destination node not found', 'code' => 'DESTINATION_NODE_NOT_FOUND', 'http_status' => 404];
+        }
+
+        $sourceNode = Node::getNodeById((int) $server['node_id']);
+        if (!$sourceNode) {
+            return ['success' => false, 'error' => 'Source node not found', 'code' => 'SOURCE_NODE_NOT_FOUND', 'http_status' => 404];
+        }
+
+        $originalNodeId = (int) $server['node_id'];
+        $originalAllocationId = $server['allocation_id'];
+
+        $currentAllocations = Allocation::getByServerId($serverId);
+        $oldAdditionalAllocations = array_values(array_filter(
+            array_map('intval', array_column($currentAllocations, 'id')),
+            fn (int $allocId) => $allocId !== (int) $originalAllocationId
+        ));
+
+        $allocationCountNeeded = max(1, 1 + count($oldAdditionalAllocations));
+
+        $newAllocationId = null;
+        $newAdditionalAllocations = [];
+
+        if (isset($options['destination_allocation_id'])) {
+            $destinationAllocation = Allocation::getAllocationById((int) $options['destination_allocation_id']);
+            if (!$destinationAllocation) {
+                return ['success' => false, 'error' => 'Destination allocation not found', 'code' => 'DESTINATION_ALLOCATION_NOT_FOUND', 'http_status' => 404];
+            }
+            if ((int) $destinationAllocation['node_id'] !== $destinationNodeId) {
+                return ['success' => false, 'error' => 'Destination allocation does not belong to destination node', 'code' => 'ALLOCATION_NODE_MISMATCH', 'http_status' => 400];
+            }
+            if ($destinationAllocation['server_id'] !== null) {
+                return ['success' => false, 'error' => 'Destination allocation is already assigned to another server', 'code' => 'ALLOCATION_IN_USE', 'http_status' => 400];
+            }
+            $newAllocationId = (int) $destinationAllocation['id'];
+        }
+
+        if (isset($options['destination_additional_allocations']) && is_array($options['destination_additional_allocations'])) {
+            foreach ($options['destination_additional_allocations'] as $allocId) {
+                $alloc = Allocation::getAllocationById((int) $allocId);
+                if ($alloc && (int) $alloc['node_id'] === $destinationNodeId && $alloc['server_id'] === null) {
+                    $newAdditionalAllocations[] = (int) $allocId;
+                }
+            }
+        }
+
+        $autoAllocate = !array_key_exists('auto_allocate', $options) || $options['auto_allocate'] !== false;
+        $excludeIds = array_merge(
+            $newAllocationId ? [$newAllocationId] : [],
+            $newAdditionalAllocations
+        );
+
+        if ($newAllocationId === null && $autoAllocate) {
+            $picked = Allocation::pickFreeAllocationIdsForNode($destinationNodeId, $allocationCountNeeded, $excludeIds);
+            if (count($picked) < $allocationCountNeeded) {
+                return [
+                    'success' => false,
+                    'error' => 'Not enough free allocations on the destination node (need ' . $allocationCountNeeded . ', found ' . count($picked) . ')',
+                    'code' => 'INSUFFICIENT_FREE_ALLOCATIONS',
+                    'http_status' => 400,
+                ];
+            }
+            $newAllocationId = array_shift($picked);
+            if (!empty($picked)) {
+                $newAdditionalAllocations = array_merge($newAdditionalAllocations, $picked);
+            }
+        } elseif ($newAllocationId === null) {
+            return [
+                'success' => false,
+                'error' => 'Destination allocation is required when auto_allocate is disabled',
+                'code' => 'DESTINATION_ALLOCATION_REQUIRED',
+                'http_status' => 400,
+            ];
+        } elseif ($autoAllocate && count($newAdditionalAllocations) < count($oldAdditionalAllocations)) {
+            $stillNeeded = count($oldAdditionalAllocations) - count($newAdditionalAllocations);
+            $picked = Allocation::pickFreeAllocationIdsForNode(
+                $destinationNodeId,
+                $stillNeeded,
+                array_merge($excludeIds, [$newAllocationId], $newAdditionalAllocations)
+            );
+            if (count($picked) < $stillNeeded) {
+                return [
+                    'success' => false,
+                    'error' => 'Not enough free allocations on the destination node for additional ports',
+                    'code' => 'INSUFFICIENT_FREE_ALLOCATIONS',
+                    'http_status' => 400,
+                ];
+            }
+            $newAdditionalAllocations = array_merge($newAdditionalAllocations, $picked);
+        }
+
+        $config = App::getInstance(true)->getConfig();
+        $panelUrl = $config->getSetting(ConfigInterface::APP_URL, 'https://featherpanel.mythical.systems');
+        $destinationUrl = $destinationNode['scheme'] . '://' . $destinationNode['fqdn'] . ':' . $destinationNode['daemonListen'];
+
+        try {
+            if ($newAllocationId) {
+                $allocationsToAssign = array_merge([$newAllocationId], $newAdditionalAllocations);
+                Allocation::assignMultipleToServer($serverId, $allocationsToAssign);
+            }
+
+            $updated = Server::updateServerById($serverId, [
+                'status' => 'transferring',
+                'node_id' => $destinationNodeId,
+            ]);
+            if (!$updated) {
+                if ($newAllocationId) {
+                    Allocation::unassignMultiple(array_merge([$newAllocationId], $newAdditionalAllocations));
+                }
+
+                return ['success' => false, 'error' => 'Failed to update server status', 'code' => 'UPDATE_FAILED', 'http_status' => 500];
+            }
+
+            $wings = new Wings(
+                $sourceNode['fqdn'],
+                $sourceNode['daemonListen'],
+                $sourceNode['scheme'],
+                $sourceNode['daemon_token'],
+                30
+            );
+
+            $jwtService = new \App\Services\Wings\Services\JwtService(
+                $destinationNode['daemon_token'],
+                $panelUrl,
+                $destinationUrl,
+                3600
+            );
+
+            $transferToken = $jwtService->generateTransferToken(
+                $server['uuid'],
+                $actingUser['uuid'],
+                ['*']
+            );
+
+            $transferData = [
+                'url' => $destinationUrl . '/api/transfers',
+                'token' => 'Bearer ' . $transferToken,
+            ];
+
+            $wings->getTransfer()->startTransfer($server['uuid'], $transferData);
+
+            $transferId = ServerTransfer::create([
+                'server_id' => $serverId,
+                'source_node_id' => $originalNodeId,
+                'destination_node_id' => $destinationNodeId,
+                'old_allocation' => $originalAllocationId,
+                'new_allocation' => $newAllocationId,
+                'old_additional_allocations' => $oldAdditionalAllocations,
+                'new_additional_allocations' => $newAdditionalAllocations,
+                'status' => 'in_progress',
+                'progress' => 0.0,
+                'started_at' => date('Y-m-d H:i:s'),
+            ]);
+
+            if (!$transferId) {
+                App::getInstance(true)->getLogger()->error('Failed to create server transfer record for server ' . $serverId);
+            }
+
+            Activity::createActivity([
+                'user_uuid' => $actingUser['uuid'],
+                'name' => 'initiate_server_transfer',
+                'context' => 'Initiated transfer of server ' . $server['name'] . ' from node ' . $sourceNode['name'] . ' to node ' . $destinationNode['name'],
+                'ip_address' => CloudFlareRealIP::getRealIP(),
+            ]);
+
+            global $eventManager;
+            if (isset($eventManager) && $eventManager !== null) {
+                $eventManager->emit(
+                    ServerEvent::onServerTransferInitiated(),
+                    [
+                        'server' => $server,
+                        'source_node' => $sourceNode,
+                        'destination_node' => $destinationNode,
+                        'initiated_by' => $actingUser,
+                    ]
+                );
+            }
+
+            return [
+                'success' => true,
+                'transfer_id' => $transferId,
+                'new_allocation' => $newAllocationId,
+                'new_additional_allocations' => $newAdditionalAllocations,
+            ];
+        } catch (\Exception $e) {
+            Server::updateServerById($serverId, [
+                'status' => $server['status'],
+                'node_id' => $originalNodeId,
+            ]);
+
+            if ($newAllocationId) {
+                Allocation::unassignMultiple(array_merge([$newAllocationId], $newAdditionalAllocations));
+            }
+
+            App::getInstance(true)->getLogger()->error('Failed to initiate server transfer: ' . $e->getMessage());
+
+            return [
+                'success' => false,
+                'error' => 'Failed to initiate server transfer: ' . $e->getMessage(),
+                'code' => 'TRANSFER_INITIATION_FAILED',
+                'http_status' => 500,
+            ];
+        }
+    }
+
+    /**
+     * @param array<int> $serverIds Empty means all transferable servers on the source node
+     *
+     * @return array{
+     *     initiated: array<int, array{server_id: int, name: string, transfer_id: int|false}>,
+     *     failed: array<int, array{server_id: int, name: string, error: string, code: string}>,
+     *     skipped: array<int, array{server_id: int, name: string, reason: string}>
+     * }
+     */
+    public function massTransfer(
+        int $sourceNodeId,
+        int $destinationNodeId,
+        array $serverIds,
+        bool $moveAll,
+        array $actingUser,
+        int $maxPerRequest = 100,
+    ): array {
+        $initiated = [];
+        $failed = [];
+        $skipped = [];
+
+        if ($sourceNodeId === $destinationNodeId) {
+            return [
+                'initiated' => [],
+                'failed' => [[
+                    'server_id' => 0,
+                    'name' => '',
+                    'error' => 'Cannot transfer to the same node',
+                    'code' => 'SAME_SOURCE_DESTINATION',
+                ]],
+                'skipped' => [],
+            ];
+        }
+
+        $serversOnNode = Server::getServersByNodeId($sourceNodeId);
+        $transferable = [];
+        foreach ($serversOnNode as $server) {
+            if ($server['status'] === 'transferring' || ServerTransfer::hasActiveTransfer((int) $server['id'])) {
+                $skipped[] = [
+                    'server_id' => (int) $server['id'],
+                    'name' => $server['name'],
+                    'reason' => 'already_transferring',
+                ];
+                continue;
+            }
+            if ($server['status'] === 'installing' || $server['status'] === 'restoring') {
+                $skipped[] = [
+                    'server_id' => (int) $server['id'],
+                    'name' => $server['name'],
+                    'reason' => 'not_transferable',
+                ];
+                continue;
+            }
+            $transferable[(int) $server['id']] = $server;
+        }
+
+        if ($moveAll) {
+            $targets = array_values($transferable);
+        } else {
+            $targets = [];
+            $onNodeIds = array_map(fn (array $s) => (int) $s['id'], $serversOnNode);
+            foreach ($serverIds as $serverId) {
+                $serverId = (int) $serverId;
+                if (!isset($transferable[$serverId])) {
+                    if (!in_array($serverId, $onNodeIds, true)) {
+                        $skipped[] = [
+                            'server_id' => $serverId,
+                            'name' => 'Server #' . $serverId,
+                            'reason' => 'not_on_source_node',
+                        ];
+                    }
+                    continue;
+                }
+                $targets[] = $transferable[$serverId];
+            }
+        }
+
+        if (count($targets) > $maxPerRequest) {
+            $targets = array_slice($targets, 0, $maxPerRequest);
+        }
+
+        $reservedAllocationIds = [];
+
+        foreach ($targets as $server) {
+            $serverId = (int) $server['id'];
+            $currentAllocations = Allocation::getByServerId($serverId);
+            $additionalCount = max(0, count($currentAllocations) - 1);
+            $needed = 1 + $additionalCount;
+
+            $picked = Allocation::pickFreeAllocationIdsForNode($destinationNodeId, $needed, $reservedAllocationIds);
+            if (count($picked) < $needed) {
+                $failed[] = [
+                    'server_id' => $serverId,
+                    'name' => $server['name'],
+                    'error' => 'Not enough free allocations on destination node',
+                    'code' => 'INSUFFICIENT_FREE_ALLOCATIONS',
+                ];
+                continue;
+            }
+
+            $primaryId = array_shift($picked);
+            $reservedAllocationIds[] = $primaryId;
+            $additionalIds = $picked;
+            $reservedAllocationIds = array_merge($reservedAllocationIds, $additionalIds);
+
+            $result = $this->initiate($serverId, [
+                'destination_node_id' => $destinationNodeId,
+                'destination_allocation_id' => $primaryId,
+                'destination_additional_allocations' => $additionalIds,
+                'auto_allocate' => false,
+            ], $actingUser);
+
+            if ($result['success']) {
+                $initiated[] = [
+                    'server_id' => $serverId,
+                    'name' => $server['name'],
+                    'transfer_id' => $result['transfer_id'] ?? false,
+                ];
+            } else {
+                $failed[] = [
+                    'server_id' => $serverId,
+                    'name' => $server['name'],
+                    'error' => $result['error'] ?? 'Transfer failed',
+                    'code' => $result['code'] ?? 'TRANSFER_FAILED',
+                ];
+                Allocation::unassignMultiple(array_merge([$primaryId], $additionalIds));
+                $reservedAllocationIds = array_values(array_diff(
+                    $reservedAllocationIds,
+                    array_merge([$primaryId], $additionalIds)
+                ));
+            }
+        }
+
+        return [
+            'initiated' => $initiated,
+            'failed' => $failed,
+            'skipped' => $skipped,
+        ];
+    }
+}
diff --git a/backend/app/Services/UserDataExport/UserDataExportService.php b/backend/app/Services/UserDataExport/UserDataExportService.php
new file mode 100644
index 000000000..9d5c2b619
--- /dev/null
+++ b/backend/app/Services/UserDataExport/UserDataExportService.php
@@ -0,0 +1,1368 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Services\UserDataExport;
+
+use App\App;
+use App\Chat\Node;
+use App\Chat\Backup;
+use App\Chat\Database;
+use GuzzleHttp\Client;
+use App\Services\Wings\Wings;
+use App\Config\ConfigInterface;
+use App\Services\Wings\Services\JwtService;
+
+/**
+ * Builds per-user database exports with secret values represented as metadata.
+ */
+class UserDataExportService
+{
+    private const EXPORT_SCHEMA_VERSION = 1;
+    private const BACKUP_WAIT_SECONDS = 60;
+    private const BACKUP_WAIT_INTERVAL_SECONDS = 5;
+
+    private array $secretColumns = [
+        'password',
+        'remember_token',
+        'two_fa_key',
+        'private_key',
+        'secret',
+        'token',
+        'access_token',
+        'refresh_token',
+        'id_token',
+        'api_key',
+        'key',
+        'credential_id',
+        'credential_public_key',
+        'root_password',
+        'database_encryption_key',
+    ];
+
+    private array $tableCache = [];
+    private array $columnCache = [];
+
+    /**
+     * Generate the export folder and return its path plus metadata.
+     */
+    public function buildExport(array $export): array
+    {
+        $pdo = Database::getPdoConnection();
+        $user = $this->fetchUser($pdo, (string) $export['user_uuid']);
+        if ($user === null) {
+            throw new \RuntimeException('User not found for data export');
+        }
+
+        $rootDir = $this->getStorageRoot();
+        $exportDir = $rootDir . '/' . $this->sanitizePathSegment((string) $export['uuid']);
+        $dataDir = $exportDir . '/featherpanel/database/tables';
+
+        $this->prepareDirectory($dataDir);
+
+        $context = $this->buildContext($pdo, $user, (int) $export['ticket_id']);
+        $tables = $this->collectTableData($pdo, $context);
+        $attachmentSummary = $this->exportAttachments($pdo, $context, $exportDir);
+        $serverSummary = $this->exportServers($pdo, $context, $exportDir, (string) $export['uuid']);
+
+        $summary = [];
+        foreach ($tables as $table => $rows) {
+            $summary[$table] = count($rows);
+            $this->writeJson($dataDir . '/' . $table . '.json', [
+                'table' => $table,
+                'row_count' => count($rows),
+                'rows' => $this->sanitizeRows($rows),
+            ]);
+        }
+
+        $manifest = [
+            'schema_version' => self::EXPORT_SCHEMA_VERSION,
+            'export_uuid' => $export['uuid'],
+            'requested_at' => $export['requested_at'] ?? null,
+            'generated_at' => gmdate('c'),
+            'user' => [
+                'id' => (int) $user['id'],
+                'uuid' => $user['uuid'],
+                'username' => $user['username'] ?? null,
+                'email' => $user['email'] ?? null,
+            ],
+            'ticket_id' => (int) $export['ticket_id'],
+            'secret_handling' => 'Sensitive columns are metadata-only. Raw values are not included.',
+            'tables' => $summary,
+            'folders' => [
+                'database' => 'featherpanel/database/tables',
+                'attachments' => 'featherpanel/attachments',
+                'servers' => 'featherpanel/servers',
+            ],
+            'attachments' => $attachmentSummary,
+            'servers' => $serverSummary,
+            'relation_ids' => [
+                'servers' => $context['server_ids'],
+                'database_dump_servers' => $context['database_dump_server_ids'],
+                'database_hosts' => $context['database_host_ids'],
+                'tickets' => $context['ticket_ids'],
+                'excluded_export_tickets' => $context['excluded_ticket_ids'],
+                'ticket_messages' => $context['message_ids'],
+                'vm_instances' => $context['vm_instance_ids'],
+                'subdomain_domains' => $context['domain_ids'],
+                'spells' => $context['spell_ids'],
+                'chatbot_conversations' => $context['conversation_ids'],
+                'server_schedules' => $context['schedule_ids'],
+            ],
+        ];
+
+        $this->prepareDirectory($exportDir . '/featherpanel/profile');
+        $this->writeJson($exportDir . '/manifest.json', $manifest);
+        $this->writeJson($exportDir . '/featherpanel/profile/user.json', [
+            'user' => $this->sanitizeRows([$user])[0],
+            'export_uuid' => $export['uuid'],
+            'generated_at' => $manifest['generated_at'],
+        ]);
+
+        return [
+            'export_dir' => $exportDir,
+            'manifest' => $manifest,
+        ];
+    }
+
+    /**
+     * Create a zip file from an export directory.
+     */
+    public function zipExportDirectory(string $exportDir, string $zipPath): void
+    {
+        if (!class_exists(\ZipArchive::class)) {
+            throw new \RuntimeException('PHP ZipArchive extension is not available');
+        }
+
+        $zipDir = dirname($zipPath);
+        if (!is_dir($zipDir) && !mkdir($zipDir, 0755, true) && !is_dir($zipDir)) {
+            throw new \RuntimeException('Failed to create zip output directory');
+        }
+
+        $zip = new \ZipArchive();
+        $opened = $zip->open($zipPath, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
+        if ($opened !== true) {
+            throw new \RuntimeException('Failed to open zip archive for writing. Code: ' . $opened);
+        }
+
+        $basePath = rtrim($exportDir, '/') . '/';
+        $iterator = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($exportDir, \FilesystemIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::SELF_FIRST
+        );
+
+        foreach ($iterator as $file) {
+            $fullPath = $file->getPathname();
+            $relativePath = substr($fullPath, strlen($basePath));
+
+            if ($file->isDir()) {
+                $zip->addEmptyDir($relativePath);
+                continue;
+            }
+
+            $zip->addFile($fullPath, $relativePath);
+        }
+
+        $zip->close();
+        @chmod($zipPath, 0644);
+    }
+
+    /**
+     * Remove an export working directory.
+     */
+    public function removeDirectory(string $path): void
+    {
+        if (!is_dir($path)) {
+            return;
+        }
+
+        $iterator = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
+
+        foreach ($iterator as $file) {
+            if ($file->isDir()) {
+                @rmdir($file->getPathname());
+            } else {
+                @unlink($file->getPathname());
+            }
+        }
+
+        @rmdir($path);
+    }
+
+    private function fetchUser(\PDO $pdo, string $userUuid): ?array
+    {
+        $stmt = $pdo->prepare('SELECT * FROM `featherpanel_users` WHERE `uuid` = :uuid LIMIT 1');
+        $stmt->execute(['uuid' => $userUuid]);
+
+        return $stmt->fetch(\PDO::FETCH_ASSOC) ?: null;
+    }
+
+    private function buildContext(\PDO $pdo, array $user, int $ticketId): array
+    {
+        $context = [
+            'user_id' => (int) $user['id'],
+            'user_uuid' => (string) $user['uuid'],
+            'email' => (string) ($user['email'] ?? ''),
+            'username' => (string) ($user['username'] ?? ''),
+            'ticket_ids' => [],
+            'excluded_ticket_ids' => [],
+            'message_ids' => [],
+            'server_ids' => [],
+            'database_dump_server_ids' => [],
+            'database_host_ids' => [],
+            'vm_instance_ids' => [],
+            'domain_ids' => [],
+            'spell_ids' => [],
+            'conversation_ids' => [],
+            'schedule_ids' => [],
+        ];
+
+        $context['excluded_ticket_ids'] = $this->selectIds($pdo, 'featherpanel_user_data_exports', ['user_uuid' => $context['user_uuid']], 'ticket_id');
+        $context['excluded_ticket_ids'][] = $ticketId;
+        $context['excluded_ticket_ids'] = $this->uniqueInts($context['excluded_ticket_ids']);
+
+        $context['ticket_ids'] = array_values(array_diff(
+            $this->selectIds($pdo, 'featherpanel_tickets', ['user_uuid' => $context['user_uuid']]),
+            $context['excluded_ticket_ids']
+        ));
+        $context['ticket_ids'] = $this->uniqueInts($context['ticket_ids']);
+
+        $ownedServerIds = $this->selectIds($pdo, 'featherpanel_servers', ['owner_id' => $context['user_id']]);
+        $subuserServerIds = $this->selectIds($pdo, 'featherpanel_server_subusers', ['user_id' => $context['user_id']], 'server_id');
+        $context['server_ids'] = $this->uniqueInts(array_merge($ownedServerIds, $subuserServerIds));
+        $context['database_dump_server_ids'] = $this->uniqueInts(array_merge(
+            $ownedServerIds,
+            $this->selectSubuserServerIdsWithPermission($pdo, $context['user_id'], 'database.view_password')
+        ));
+
+        $ownedVmInstanceIds = $this->selectIds($pdo, 'featherpanel_vm_instances', ['user_uuid' => $context['user_uuid']]);
+        $subuserVmInstanceIds = $this->selectIds($pdo, 'featherpanel_vm_subusers', ['user_id' => $context['user_id']], 'vm_instance_id');
+        $context['vm_instance_ids'] = $this->uniqueInts(array_merge($ownedVmInstanceIds, $subuserVmInstanceIds));
+        $context['conversation_ids'] = $this->selectIds($pdo, 'featherpanel_chatbot_conversations', ['user_uuid' => $context['user_uuid']]);
+
+        if (!empty($context['ticket_ids'])) {
+            $context['message_ids'] = $this->selectVisibleTicketMessageIds($pdo, $context['ticket_ids']);
+        }
+
+        if (!empty($context['server_ids'])) {
+            $context['schedule_ids'] = $this->selectIdsIn($pdo, 'featherpanel_server_schedules', 'server_id', $context['server_ids']);
+            $context['database_host_ids'] = $this->selectIdsIn($pdo, 'featherpanel_server_databases', 'server_id', $context['server_ids'], 'database_host_id');
+            $context['domain_ids'] = $this->selectIdsIn($pdo, 'featherpanel_subdomain_manager_subdomains', 'server_id', $context['server_ids'], 'domain_id');
+            $context['spell_ids'] = $this->uniqueInts(array_merge(
+                $this->selectIdsIn($pdo, 'featherpanel_servers', 'id', $context['server_ids'], 'spell_id'),
+                $this->selectIdsIn($pdo, 'featherpanel_subdomain_manager_subdomains', 'server_id', $context['server_ids'], 'spell_id')
+            ));
+        }
+
+        return $context;
+    }
+
+    private function collectTableData(\PDO $pdo, array $context): array
+    {
+        $tables = [];
+        foreach ($this->getTables($pdo) as $table) {
+            if (!str_starts_with($table, 'featherpanel_')) {
+                continue;
+            }
+
+            $columns = $this->getColumns($pdo, $table);
+            if (empty($columns)) {
+                continue;
+            }
+
+            $rows = $this->fetchRowsForContext($pdo, $table, $columns, $context);
+            if (!empty($rows)) {
+                $tables[$table] = $rows;
+            }
+        }
+
+        ksort($tables);
+
+        return $tables;
+    }
+
+    private function fetchRowsForContext(\PDO $pdo, string $table, array $columns, array $context): array
+    {
+        if ($table === 'featherpanel_ticket_attachments') {
+            return $this->fetchTicketAttachments($pdo, $context, false);
+        }
+        if ($table === 'featherpanel_user_data_exports') {
+            return [];
+        }
+
+        $clauses = [];
+        $params = [];
+
+        $this->addEqualsFilter($clauses, $params, $columns, 'user_uuid', $context['user_uuid']);
+        $this->addEqualsFilter($clauses, $params, $columns, 'uuid', $context['user_uuid'], $table === 'featherpanel_users');
+        $this->addEqualsFilter($clauses, $params, $columns, 'user_id', $context['user_id']);
+        $this->addEqualsFilter($clauses, $params, $columns, 'owner_id', $context['user_id']);
+        $this->addEqualsFilter($clauses, $params, $columns, 'created_by', $context['user_id']);
+        $this->addEqualsFilter($clauses, $params, $columns, 'updated_by', $context['user_id']);
+        $this->addEqualsFilter($clauses, $params, $columns, 'email', $context['email']);
+        $this->addEqualsFilter($clauses, $params, $columns, 'user_email', $context['email']);
+        $this->addEqualsFilter($clauses, $params, $columns, 'username', $context['username']);
+
+        $this->addInFilter($clauses, $params, $columns, 'ticket_id', $context['ticket_ids']);
+        $this->addInFilter($clauses, $params, $columns, 'message_id', $context['message_ids']);
+        $this->addInFilter($clauses, $params, $columns, 'server_id', $context['server_ids']);
+        $this->addInFilter($clauses, $params, $columns, 'vm_instance_id', $context['vm_instance_ids']);
+        $this->addInFilter($clauses, $params, $columns, 'instance_id', $context['vm_instance_ids']);
+        $this->addInFilter($clauses, $params, $columns, 'conversation_id', $context['conversation_ids']);
+        $this->addInFilter($clauses, $params, $columns, 'schedule_id', $context['schedule_ids']);
+        $this->addExactIdFilter($clauses, $params, $table, $columns, 'featherpanel_servers', $context['server_ids']);
+        $this->addExactIdFilter($clauses, $params, $table, $columns, 'featherpanel_vm_instances', $context['vm_instance_ids']);
+        $this->addExactIdFilter($clauses, $params, $table, $columns, 'featherpanel_databases', $context['database_host_ids']);
+        $this->addExactIdFilter($clauses, $params, $table, $columns, 'featherpanel_subdomain_manager_domains', $context['domain_ids']);
+        $this->addExactIdFilter($clauses, $params, $table, $columns, 'featherpanel_spells', $context['spell_ids']);
+        if ($table === 'featherpanel_subdomain_manager_domain_spells') {
+            $this->addInFilter($clauses, $params, $columns, 'domain_id', $context['domain_ids']);
+        }
+
+        if (empty($clauses)) {
+            return [];
+        }
+
+        $sql = 'SELECT * FROM `' . $table . '` WHERE (' . implode(' OR ', $clauses) . ')';
+        if ($table === 'featherpanel_ticket_messages' && in_array('is_internal', $columns, true)) {
+            $sql .= ' AND `is_internal` = 0';
+        }
+        $sql .= $this->buildOrderByClause($columns) . ' LIMIT 10000';
+        $stmt = $pdo->prepare($sql);
+        $stmt->execute($params);
+
+        return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+    }
+
+    private function fetchTicketAttachments(\PDO $pdo, array $context, bool $userDownloadableOnly = false): array
+    {
+        if (!$this->tableExists($pdo, 'featherpanel_ticket_attachments')) {
+            return [];
+        }
+
+        $clauses = [];
+        $params = [];
+        $columns = $this->getColumns($pdo, 'featherpanel_ticket_attachments');
+        $this->addInFilter($clauses, $params, $columns, 'message_id', $context['message_ids']);
+        if (in_array('ticket_id', $columns, true) && !empty($context['ticket_ids'])) {
+            $placeholders = [];
+            foreach ($context['ticket_ids'] as $ticketId) {
+                $param = 'p' . count($params);
+                $placeholders[] = ':' . $param;
+                $params[$param] = $ticketId;
+            }
+            $ticketClause = '`ticket_id` IN (' . implode(', ', $placeholders) . ')';
+            if ($userDownloadableOnly && in_array('user_downloadable', $columns, true)) {
+                $ticketClause = '(' . $ticketClause . ' AND `user_downloadable` = 1)';
+            }
+            $clauses[] = $ticketClause;
+        }
+
+        if (empty($clauses)) {
+            return [];
+        }
+
+        $stmt = $pdo->prepare('SELECT * FROM `featherpanel_ticket_attachments` WHERE ' . implode(' OR ', $clauses) . $this->buildOrderByClause($columns) . ' LIMIT 10000');
+        $stmt->execute($params);
+
+        return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+    }
+
+    private function exportAttachments(\PDO $pdo, array $context, string $exportDir): array
+    {
+        $attachmentsDir = $exportDir . '/featherpanel/attachments';
+        $this->prepareDirectory($attachmentsDir);
+
+        $attachments = $this->fetchTicketAttachments($pdo, $context, false);
+        $ticketMap = $this->fetchRowsByIds($pdo, 'featherpanel_tickets', $context['ticket_ids']);
+        $messageMap = $this->fetchRowsByIds($pdo, 'featherpanel_ticket_messages', $context['message_ids']);
+
+        $summary = [
+            'total_records' => count($attachments),
+            'copied_files' => 0,
+            'skipped_files' => [],
+            'files' => [],
+        ];
+
+        foreach ($attachments as $attachment) {
+            $ticketId = (int) ($attachment['ticket_id'] ?? 0);
+            $messageId = (int) ($attachment['message_id'] ?? 0);
+            if ($ticketId <= 0 && $messageId > 0 && isset($messageMap[$messageId])) {
+                $ticketId = (int) $messageMap[$messageId]['ticket_id'];
+            }
+
+            $ticketUuid = $ticketMap[$ticketId]['uuid'] ?? 'unknown-ticket';
+            $targetFolder = $attachmentsDir . '/tickets/' . $this->sanitizePathSegment((string) $ticketUuid);
+            $this->prepareDirectory($targetFolder);
+
+            $sourcePath = $this->resolvePublicFilePath((string) ($attachment['file_path'] ?? ''));
+            $targetName = $this->sanitizePathSegment((string) ($attachment['file_name'] ?? ('attachment-' . ($attachment['id'] ?? uniqid()))));
+            $targetPath = $targetFolder . '/' . $targetName;
+            $relativeTarget = 'featherpanel/attachments/tickets/' . $this->sanitizePathSegment((string) $ticketUuid) . '/' . $targetName;
+
+            $entry = [
+                'attachment' => $this->sanitizeRows([$attachment])[0],
+                'ticket_uuid' => $ticketUuid,
+                'message_id' => $messageId > 0 ? $messageId : null,
+                'export_path' => $relativeTarget,
+                'copied' => false,
+            ];
+
+            if ($sourcePath !== null && is_file($sourcePath) && @copy($sourcePath, $targetPath)) {
+                $entry['copied'] = true;
+                ++$summary['copied_files'];
+            } else {
+                $summary['skipped_files'][] = [
+                    'attachment_id' => (int) ($attachment['id'] ?? 0),
+                    'file_path' => $attachment['file_path'] ?? null,
+                    'reason' => 'File missing or not readable',
+                ];
+            }
+
+            $summary['files'][] = $entry;
+        }
+
+        $this->writeJson($attachmentsDir . '/index.json', $summary);
+
+        return [
+            'total_records' => $summary['total_records'],
+            'copied_files' => $summary['copied_files'],
+            'skipped_files' => count($summary['skipped_files']),
+        ];
+    }
+
+    private function exportServers(\PDO $pdo, array $context, string $exportDir, string $exportUuid): array
+    {
+        $serversDir = $exportDir . '/featherpanel/servers';
+        $this->prepareDirectory($serversDir);
+
+        $summary = [
+            'total_servers' => count($context['server_ids']),
+            'file_exports' => [],
+            'backup_requests' => [],
+            'database_dumps' => [],
+            'skipped' => [],
+        ];
+
+        foreach ($context['server_ids'] as $serverId) {
+            $server = $this->fetchRowById($pdo, 'featherpanel_servers', (int) $serverId);
+            if ($server === null) {
+                $summary['skipped'][] = ['server_id' => (int) $serverId, 'reason' => 'Server row not found'];
+                continue;
+            }
+
+            $serverFolderName = $this->sanitizePathSegment((string) ($server['uuid'] ?? $server['uuidShort'] ?? $server['id']));
+            $serverDir = $serversDir . '/' . $serverFolderName;
+            $this->prepareDirectory($serverDir);
+
+            $this->writeJson($serverDir . '/server.json', ['server' => $this->sanitizeRows([$server])[0]]);
+            $this->writeJson($serverDir . '/existing_backups.json', [
+                'backups' => $this->sanitizeRows($this->fetchRowsByColumn($pdo, 'featherpanel_server_backups', 'server_id', (int) $server['id'])),
+            ]);
+            $fileExport = $this->exportServerFilesFromBackup($server, $serverDir, $exportUuid);
+            $summary['file_exports'][] = $fileExport;
+            $this->writeJson($serverDir . '/files_index.json', $fileExport);
+
+            $databaseDump = $this->exportServerDatabases($pdo, $server, $serverDir, $context);
+            $summary['database_dumps'][] = $databaseDump;
+            $this->writeJson($serverDir . '/databases/index.json', $databaseDump);
+
+            $backupResult = $fileExport['backup'] ?? [
+                'status' => 'failed',
+                'message' => 'Backup export did not return backup metadata',
+            ];
+            $summary['backup_requests'][] = $backupResult;
+            $this->writeJson($serverDir . '/export_backup_request.json', $backupResult);
+        }
+
+        $this->writeJson($serversDir . '/index.json', $summary);
+
+        return [
+            'total_servers' => $summary['total_servers'],
+            'file_exports' => count($summary['file_exports']),
+            'backup_requests' => count($summary['backup_requests']),
+            'database_dumps' => array_sum(array_map(fn (array $entry): int => (int) ($entry['dumped_databases'] ?? 0), $summary['database_dumps'])),
+            'skipped' => count($summary['skipped']),
+        ];
+    }
+
+    private function exportServerFilesFromBackup(array $server, string $serverDir, string $exportUuid): array
+    {
+        $filesDir = $serverDir . '/files';
+        $archiveDir = $serverDir . '/backup_archive';
+        $this->prepareDirectory($filesDir);
+        $this->prepareDirectory($archiveDir);
+
+        $index = [
+            'server_id' => (int) $server['id'],
+            'server_uuid' => $server['uuid'] ?? null,
+            'method' => 'wings_backup_download_extract',
+            'export_path' => 'files',
+            'archive_path' => null,
+            'backup' => null,
+            'extracted' => false,
+            'skipped' => [],
+        ];
+
+        $backup = $this->requestServerBackup($server, $exportUuid);
+        $index['backup'] = $backup;
+
+        if (($backup['status'] ?? '') !== 'requested') {
+            $index['skipped'][] = ['path' => '/', 'reason' => $backup['message'] ?? 'Backup request failed'];
+
+            return $index;
+        }
+
+        $completedBackup = $this->waitForBackupCompletion((string) $backup['backup_uuid']);
+        if ($completedBackup === null) {
+            $index['skipped'][] = [
+                'path' => '/',
+                'reason' => 'Backup was requested but did not finish within ' . self::BACKUP_WAIT_SECONDS . ' seconds',
+            ];
+
+            return $index;
+        }
+
+        try {
+            $archivePath = $archiveDir . '/' . $this->sanitizePathSegment((string) $backup['backup_uuid']) . '.tar.gz';
+            $this->downloadBackupArchive($server, $completedBackup, $archivePath);
+            $index['archive_path'] = 'backup_archive/' . basename($archivePath);
+
+            $extractResult = $this->extractBackupArchive($archivePath, $filesDir);
+            $index['extracted'] = $extractResult['success'];
+            $index['extraction'] = $extractResult;
+            if (!$extractResult['success']) {
+                $index['skipped'][] = ['path' => '/', 'reason' => $extractResult['message']];
+            }
+        } catch (\Throwable $e) {
+            $index['skipped'][] = ['path' => '/', 'reason' => $e->getMessage()];
+        }
+
+        return $index;
+    }
+
+    private function exportServerDatabases(\PDO $appPdo, array $server, string $serverDir, array $context): array
+    {
+        $databasesDir = $serverDir . '/databases';
+        $this->prepareDirectory($databasesDir);
+
+        $summary = [
+            'server_id' => (int) $server['id'],
+            'server_uuid' => $server['uuid'] ?? null,
+            'dump_allowed' => in_array((int) $server['id'], $context['database_dump_server_ids'], true),
+            'total_databases' => 0,
+            'dumped_databases' => 0,
+            'skipped' => [],
+            'files' => [],
+        ];
+
+        $databases = $this->fetchServerDatabasesWithDetails($appPdo, (int) $server['id']);
+        $summary['total_databases'] = count($databases);
+
+        if (!$summary['dump_allowed']) {
+            foreach ($databases as $database) {
+                $summary['skipped'][] = [
+                    'database_id' => (int) ($database['id'] ?? 0),
+                    'database' => $database['database'] ?? null,
+                    'reason' => 'The user can access this server, but does not have database password/export access.',
+                ];
+            }
+
+            return $summary;
+        }
+
+        foreach ($databases as $database) {
+            $databaseName = (string) ($database['database'] ?? ('database_' . ($database['id'] ?? uniqid())));
+            $targetName = $this->sanitizePathSegment($databaseName) . '.sql';
+            $targetPath = $databasesDir . '/' . $targetName;
+
+            try {
+                $result = $this->buildMysqlDatabaseDump($database, $targetPath);
+                ++$summary['dumped_databases'];
+                $summary['files'][] = [
+                    'database_id' => (int) ($database['id'] ?? 0),
+                    'database' => $databaseName,
+                    'export_path' => 'databases/' . $targetName,
+                    'table_count' => $result['table_count'],
+                    'row_limit_per_table' => $result['row_limit_per_table'],
+                    'chunk_size' => $result['chunk_size'],
+                ];
+            } catch (\Throwable $e) {
+                $summary['skipped'][] = [
+                    'database_id' => (int) ($database['id'] ?? 0),
+                    'database' => $databaseName,
+                    'reason' => $e->getMessage(),
+                ];
+            }
+        }
+
+        return $summary;
+    }
+
+    private function fetchServerDatabasesWithDetails(\PDO $pdo, int $serverId): array
+    {
+        if (!$this->tableExists($pdo, 'featherpanel_server_databases') || !$this->tableExists($pdo, 'featherpanel_databases')) {
+            return [];
+        }
+
+        $stmt = $pdo->prepare(
+            'SELECT server_databases.*, database_hosts.database_type, database_hosts.database_host, database_hosts.database_port
+             FROM `featherpanel_server_databases` server_databases
+             INNER JOIN `featherpanel_databases` database_hosts ON database_hosts.id = server_databases.database_host_id
+             WHERE server_databases.server_id = :server_id
+             ORDER BY server_databases.id ASC'
+        );
+        $stmt->execute(['server_id' => $serverId]);
+
+        return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+    }
+
+    private function buildMysqlDatabaseDump(array $database, string $targetPath): array
+    {
+        $databaseType = strtolower((string) ($database['database_type'] ?? ''));
+        if (!in_array($databaseType, ['mysql', 'mariadb'], true)) {
+            throw new \RuntimeException('SQL dump export is only supported for MySQL/MariaDB databases');
+        }
+
+        $dbName = (string) ($database['database'] ?? '');
+        $host = (string) ($database['database_host'] ?? '');
+        $username = (string) ($database['username'] ?? '');
+        $password = (string) ($database['password'] ?? '');
+        $port = (int) ($database['database_port'] ?? 3306);
+
+        if ($dbName === '' || $host === '' || $username === '') {
+            throw new \RuntimeException('Database connection details are incomplete');
+        }
+
+        $pdo = new \PDO(
+            "mysql:host={$host};port={$port};dbname={$dbName};charset=utf8mb4",
+            $username,
+            $password,
+            [\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION, \PDO::ATTR_TIMEOUT => 30]
+        );
+
+        $tables = $pdo->query('SHOW TABLES')->fetchAll(\PDO::FETCH_COLUMN);
+        $chunkSize = 250;
+        $handle = fopen($targetPath, 'wb');
+        if ($handle === false) {
+            throw new \RuntimeException('Failed to open SQL dump for writing');
+        }
+
+        $write = static function (string $line = '') use ($handle): void {
+            if (fwrite($handle, $line . "\n") === false) {
+                throw new \RuntimeException('Failed to write SQL dump');
+            }
+        };
+
+        try {
+            $write('-- FeatherPanel SQL Dump');
+            $write('-- Database: ' . $dbName);
+            $write('-- Generated: ' . gmdate('Y-m-d H:i:s') . ' UTC');
+            $write('-- Host: ' . $host . ':' . $port);
+            $write();
+            $write('SET FOREIGN_KEY_CHECKS=0;');
+            $write("SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO';");
+            $write("SET time_zone='+00:00';");
+            $write();
+
+            foreach ($tables as $table) {
+                $safeTable = $this->quoteMysqlIdentifier((string) $table);
+                $write('-- Table: ' . $table);
+                $write('DROP TABLE IF EXISTS ' . $safeTable . ';');
+
+                $createRow = $pdo->query('SHOW CREATE TABLE ' . $safeTable)->fetch(\PDO::FETCH_NUM);
+                $write(((string) ($createRow[1] ?? '')) . ';');
+                $write();
+
+                $offset = 0;
+                while (true) {
+                    $rows = $pdo->query('SELECT * FROM ' . $safeTable . ' LIMIT ' . $chunkSize . ' OFFSET ' . $offset)->fetchAll(\PDO::FETCH_ASSOC);
+                    if (empty($rows)) {
+                        break;
+                    }
+
+                    $columns = '(' . implode(', ', array_map(fn ($column): string => $this->quoteMysqlIdentifier((string) $column), array_keys($rows[0]))) . ')';
+                    $valuesList = array_map(function (array $row) use ($pdo): string {
+                        $values = array_map(function ($value) use ($pdo): string {
+                            if ($value === null) {
+                                return 'NULL';
+                            }
+
+                            return $pdo->quote((string) $value);
+                        }, array_values($row));
+
+                        return '(' . implode(', ', $values) . ')';
+                    }, $rows);
+
+                    $write('INSERT INTO ' . $safeTable . ' ' . $columns . ' VALUES');
+                    $write(implode(",\n", $valuesList) . ';');
+                    $offset += $chunkSize;
+                }
+
+                if ($offset > 0) {
+                    $write();
+                }
+            }
+
+            $write('SET FOREIGN_KEY_CHECKS=1;');
+        } finally {
+            fclose($handle);
+        }
+
+        return [
+            'table_count' => count($tables),
+            'row_limit_per_table' => null,
+            'chunk_size' => $chunkSize,
+        ];
+    }
+
+    private function quoteMysqlIdentifier(string $identifier): string
+    {
+        return '`' . str_replace('`', '``', $identifier) . '`';
+    }
+
+    private function requestServerBackup(array $server, string $exportUuid): array
+    {
+        $backupUuid = $this->generateUuid();
+        $result = [
+            'server_id' => (int) $server['id'],
+            'server_uuid' => $server['uuid'] ?? null,
+            'backup_uuid' => $backupUuid,
+            'status' => 'skipped',
+            'message' => null,
+        ];
+
+        try {
+            $node = Node::getNodeById((int) $server['node_id']);
+            if (!$node) {
+                $result['message'] = 'Node not found';
+
+                return $result;
+            }
+
+            $backupId = Backup::createBackup([
+                'server_id' => (int) $server['id'],
+                'uuid' => $backupUuid,
+                'name' => 'Personal data export backup ' . $exportUuid,
+                'ignored_files' => '[]',
+                'disk' => 'wings',
+                'is_successful' => 0,
+                'is_locked' => 1,
+            ]);
+
+            if (!$backupId) {
+                $result['status'] = 'failed';
+                $result['message'] = 'Failed to create backup database record';
+
+                return $result;
+            }
+
+            $wings = new Wings(
+                $node['fqdn'],
+                (int) $node['daemonListen'],
+                $node['scheme'],
+                $node['daemon_token'],
+                30
+            );
+            $response = $wings->getServer()->createBackup((string) $server['uuid'], 'wings', $backupUuid, '[]');
+
+            if (!$response->isSuccessful()) {
+                Backup::deleteBackup((int) $backupId);
+                $result['status'] = 'failed';
+                $result['message'] = $response->getError();
+
+                return $result;
+            }
+
+            $result['status'] = 'requested';
+            $result['backup_id'] = (int) $backupId;
+            $result['message'] = 'Wings backup requested. The export worker will wait briefly for it, download it, and extract it into this export.';
+
+            return $result;
+        } catch (\Throwable $e) {
+            $result['status'] = 'failed';
+            $result['message'] = $e->getMessage();
+
+            return $result;
+        }
+    }
+
+    private function waitForBackupCompletion(string $backupUuid): ?array
+    {
+        $deadline = time() + self::BACKUP_WAIT_SECONDS;
+        while (true) {
+            $backup = Backup::getBackupByUuid($backupUuid);
+            if ($backup && (int) ($backup['is_successful'] ?? 0) === 1) {
+                return $backup;
+            }
+
+            if (time() >= $deadline) {
+                break;
+            }
+
+            sleep(self::BACKUP_WAIT_INTERVAL_SECONDS);
+        }
+
+        return null;
+    }
+
+    private function downloadBackupArchive(array $server, array $backup, string $archivePath): void
+    {
+        $node = Node::getNodeById((int) $server['node_id']);
+        if (!$node) {
+            throw new \RuntimeException('Node not found for backup download');
+        }
+
+        $owner = $this->fetchRowById(Database::getPdoConnection(), 'featherpanel_users', (int) $server['owner_id']);
+        $ownerUuid = (string) ($owner['uuid'] ?? '');
+        if ($ownerUuid === '') {
+            throw new \RuntimeException('Server owner not found for backup download token');
+        }
+
+        $baseWingsUrl = rtrim((string) $node['scheme'] . '://' . $node['fqdn'] . ':' . $node['daemonListen'], '/');
+        $jwtService = new JwtService(
+            (string) $node['daemon_token'],
+            App::getInstance(true)->getConfig()->getSetting(ConfigInterface::APP_URL, 'https://featherpanel.local'),
+            $baseWingsUrl
+        );
+
+        $jwtToken = $jwtService->generateBackupToken(
+            (string) $server['uuid'],
+            $ownerUuid,
+            ['backup.download'],
+            (string) $backup['uuid'],
+            'download'
+        );
+
+        $downloadUrl = $baseWingsUrl . '/download/backup?token=' . rawurlencode($jwtToken)
+            . '&server=' . rawurlencode((string) $server['uuid'])
+            . '&backup=' . rawurlencode((string) $backup['uuid']);
+
+        $client = new Client([
+            'timeout' => 300,
+            'verify' => false,
+            'http_errors' => false,
+        ]);
+        $response = $client->get($downloadUrl, ['sink' => $archivePath]);
+        $statusCode = $response->getStatusCode();
+        if ($statusCode < 200 || $statusCode >= 300) {
+            @unlink($archivePath);
+            throw new \RuntimeException('Backup archive download failed with HTTP status ' . $statusCode);
+        }
+        if (!is_file($archivePath) || filesize($archivePath) === 0) {
+            @unlink($archivePath);
+            throw new \RuntimeException('Backup archive download produced an empty file');
+        }
+    }
+
+    private function extractBackupArchive(string $archivePath, string $targetDir): array
+    {
+        $this->prepareDirectory($targetDir);
+
+        $zip = new \ZipArchive();
+        $opened = $zip->open($archivePath);
+        if ($opened === true) {
+            $extractedFiles = 0;
+            for ($i = 0; $i < $zip->numFiles; ++$i) {
+                $name = $zip->getNameIndex($i);
+                if (!is_string($name) || !$this->isSafeArchivePath($name)) {
+                    continue;
+                }
+                $zip->extractTo($targetDir, $name);
+                ++$extractedFiles;
+            }
+            $zip->close();
+
+            return [
+                'success' => true,
+                'format' => 'zip',
+                'message' => 'Backup archive extracted',
+                'entries' => $extractedFiles,
+            ];
+        }
+
+        try {
+            $tarPath = $archivePath;
+            if (str_ends_with($archivePath, '.gz')) {
+                $phar = new \PharData($archivePath);
+                $tarPath = substr($archivePath, 0, -3);
+                if (!is_file($tarPath)) {
+                    $phar->decompress();
+                }
+            }
+
+            $phar = new \PharData($tarPath);
+            $phar->extractTo($targetDir, null, true);
+
+            return [
+                'success' => true,
+                'format' => str_ends_with($archivePath, '.gz') ? 'tar.gz' : 'tar',
+                'message' => 'Backup archive extracted',
+            ];
+        } catch (\Throwable $e) {
+            return [
+                'success' => false,
+                'format' => 'unknown',
+                'message' => 'Failed to extract backup archive: ' . $e->getMessage(),
+            ];
+        }
+    }
+
+    private function isSafeArchivePath(string $path): bool
+    {
+        $normalized = str_replace('\\', '/', $path);
+
+        return !str_starts_with($normalized, '/')
+            && !str_contains($normalized, '../')
+            && !str_contains($normalized, '..\\')
+            && $normalized !== '..';
+    }
+
+    private function buildOrderByClause(array $columns): string
+    {
+        if (in_array('id', $columns, true)) {
+            return ' ORDER BY `id` ASC';
+        }
+
+        if (in_array('created_at', $columns, true)) {
+            return ' ORDER BY `created_at` ASC';
+        }
+
+        return '';
+    }
+
+    private function fetchRowById(\PDO $pdo, string $table, int $id): ?array
+    {
+        if ($id <= 0 || !$this->tableExists($pdo, $table)) {
+            return null;
+        }
+
+        $columns = $this->getColumns($pdo, $table);
+        if (!in_array('id', $columns, true)) {
+            return null;
+        }
+
+        $stmt = $pdo->prepare('SELECT * FROM `' . $table . '` WHERE `id` = :id LIMIT 1');
+        $stmt->execute(['id' => $id]);
+
+        return $stmt->fetch(\PDO::FETCH_ASSOC) ?: null;
+    }
+
+    private function fetchRowsByIds(\PDO $pdo, string $table, array $ids): array
+    {
+        $ids = $this->uniqueInts($ids);
+        if (empty($ids) || !$this->tableExists($pdo, $table)) {
+            return [];
+        }
+
+        $columns = $this->getColumns($pdo, $table);
+        if (!in_array('id', $columns, true)) {
+            return [];
+        }
+
+        $params = [];
+        $placeholders = [];
+        foreach ($ids as $id) {
+            $param = 'p' . count($params);
+            $placeholders[] = ':' . $param;
+            $params[$param] = $id;
+        }
+
+        $stmt = $pdo->prepare('SELECT * FROM `' . $table . '` WHERE `id` IN (' . implode(', ', $placeholders) . ')');
+        $stmt->execute($params);
+        $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+        $mapped = [];
+        foreach ($rows as $row) {
+            $mapped[(int) $row['id']] = $row;
+        }
+
+        return $mapped;
+    }
+
+    private function fetchRowsByColumn(\PDO $pdo, string $table, string $column, mixed $value): array
+    {
+        if (!$this->tableExists($pdo, $table)) {
+            return [];
+        }
+
+        $columns = $this->getColumns($pdo, $table);
+        if (!in_array($column, $columns, true)) {
+            return [];
+        }
+
+        $stmt = $pdo->prepare('SELECT * FROM `' . $table . '` WHERE `' . $column . '` = :value' . $this->buildOrderByClause($columns));
+        $stmt->execute(['value' => $value]);
+
+        return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+    }
+
+    private function resolvePublicFilePath(string $filePath): ?string
+    {
+        $normalizedPath = ltrim($filePath, '/');
+        if ($normalizedPath === '') {
+            return null;
+        }
+
+        $publicRoot = $this->getPublicRoot();
+        $fullPath = realpath($publicRoot . '/' . $normalizedPath);
+        $publicRealPath = realpath($publicRoot);
+
+        if ($fullPath === false || $publicRealPath === false || !str_starts_with($fullPath, $publicRealPath . DIRECTORY_SEPARATOR)) {
+            return null;
+        }
+
+        return $fullPath;
+    }
+
+    private function generateUuid(): string
+    {
+        $bytes = random_bytes(16);
+        $bytes[6] = chr(ord($bytes[6]) & 0x0F | 0x40);
+        $bytes[8] = chr(ord($bytes[8]) & 0x3F | 0x80);
+        $hex = bin2hex($bytes);
+
+        return sprintf(
+            '%s-%s-%s-%s-%s',
+            substr($hex, 0, 8),
+            substr($hex, 8, 4),
+            substr($hex, 12, 4),
+            substr($hex, 16, 4),
+            substr($hex, 20, 12)
+        );
+    }
+
+    private function addEqualsFilter(array &$clauses, array &$params, array $columns, string $column, mixed $value, bool $enabled = true): void
+    {
+        if (!$enabled || !in_array($column, $columns, true) || $value === null || $value === '') {
+            return;
+        }
+
+        $param = 'p' . count($params);
+        $clauses[] = '`' . $column . '` = :' . $param;
+        $params[$param] = $value;
+    }
+
+    private function addInFilter(array &$clauses, array &$params, array $columns, string $column, array $values): void
+    {
+        if (!in_array($column, $columns, true) || empty($values)) {
+            return;
+        }
+
+        $placeholders = [];
+        foreach ($values as $value) {
+            $param = 'p' . count($params);
+            $placeholders[] = ':' . $param;
+            $params[$param] = $value;
+        }
+
+        $clauses[] = '`' . $column . '` IN (' . implode(', ', $placeholders) . ')';
+    }
+
+    private function addExactIdFilter(array &$clauses, array &$params, string $table, array $columns, string $targetTable, array $ids): void
+    {
+        if ($table !== $targetTable || !in_array('id', $columns, true) || empty($ids)) {
+            return;
+        }
+
+        $this->addInFilter($clauses, $params, $columns, 'id', $ids);
+    }
+
+    private function selectIds(\PDO $pdo, string $table, array $conditions, string $idColumn = 'id'): array
+    {
+        if (!$this->tableExists($pdo, $table)) {
+            return [];
+        }
+
+        $columns = $this->getColumns($pdo, $table);
+        if (!in_array($idColumn, $columns, true)) {
+            return [];
+        }
+
+        $where = [];
+        $params = [];
+        foreach ($conditions as $column => $value) {
+            if (!in_array($column, $columns, true) || $value === null || $value === '') {
+                return [];
+            }
+            $where[] = '`' . $column . '` = :' . $column;
+            $params[$column] = $value;
+        }
+
+        $stmt = $pdo->prepare('SELECT `' . $idColumn . '` FROM `' . $table . '` WHERE ' . implode(' AND ', $where));
+        $stmt->execute($params);
+
+        return $this->uniqueInts($stmt->fetchAll(\PDO::FETCH_COLUMN));
+    }
+
+    private function selectIdsIn(\PDO $pdo, string $table, string $column, array $values, string $idColumn = 'id'): array
+    {
+        if (!$this->tableExists($pdo, $table) || empty($values)) {
+            return [];
+        }
+
+        $columns = $this->getColumns($pdo, $table);
+        if (!in_array($idColumn, $columns, true) || !in_array($column, $columns, true)) {
+            return [];
+        }
+
+        $params = [];
+        $placeholders = [];
+        foreach ($values as $value) {
+            $param = 'p' . count($params);
+            $placeholders[] = ':' . $param;
+            $params[$param] = $value;
+        }
+
+        $stmt = $pdo->prepare('SELECT `' . $idColumn . '` FROM `' . $table . '` WHERE `' . $column . '` IN (' . implode(', ', $placeholders) . ')');
+        $stmt->execute($params);
+
+        return $this->uniqueInts($stmt->fetchAll(\PDO::FETCH_COLUMN));
+    }
+
+    private function selectSubuserServerIdsWithPermission(\PDO $pdo, int $userId, string $permission): array
+    {
+        if (!$this->tableExists($pdo, 'featherpanel_server_subusers') || $userId <= 0 || $permission === '') {
+            return [];
+        }
+
+        $stmt = $pdo->prepare('SELECT `server_id`, `permissions` FROM `featherpanel_server_subusers` WHERE `user_id` = :user_id');
+        $stmt->execute(['user_id' => $userId]);
+
+        $serverIds = [];
+        foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+            $permissions = json_decode((string) ($row['permissions'] ?? '[]'), true);
+            if (!is_array($permissions)) {
+                continue;
+            }
+            if (in_array('*', $permissions, true) || in_array($permission, $permissions, true)) {
+                $serverIds[] = (int) $row['server_id'];
+            }
+        }
+
+        return $this->uniqueInts($serverIds);
+    }
+
+    private function selectVisibleTicketMessageIds(\PDO $pdo, array $ticketIds): array
+    {
+        if (!$this->tableExists($pdo, 'featherpanel_ticket_messages') || empty($ticketIds)) {
+            return [];
+        }
+
+        $params = [];
+        $placeholders = [];
+        foreach ($ticketIds as $ticketId) {
+            $param = 'p' . count($params);
+            $placeholders[] = ':' . $param;
+            $params[$param] = $ticketId;
+        }
+
+        $stmt = $pdo->prepare(
+            'SELECT `id` FROM `featherpanel_ticket_messages`
+             WHERE `ticket_id` IN (' . implode(', ', $placeholders) . ')
+               AND `is_internal` = 0'
+        );
+        $stmt->execute($params);
+
+        return $this->uniqueInts($stmt->fetchAll(\PDO::FETCH_COLUMN));
+    }
+
+    private function sanitizeRows(array $rows): array
+    {
+        return array_map(function (array $row): array {
+            foreach ($row as $column => $value) {
+                if ($this->isSecretColumn((string) $column)) {
+                    $row[$column] = $this->secretMetadata($value);
+                }
+            }
+
+            return $row;
+        }, $rows);
+    }
+
+    private function isSecretColumn(string $column): bool
+    {
+        $normalized = strtolower($column);
+
+        foreach ($this->secretColumns as $secretColumn) {
+            if ($normalized === $secretColumn || str_contains($normalized, $secretColumn)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function secretMetadata(mixed $value): array
+    {
+        if ($value === null || $value === '') {
+            return [
+                'present' => false,
+                'length' => 0,
+            ];
+        }
+
+        return [
+            'present' => true,
+            'length' => strlen((string) $value),
+            'sha256' => hash('sha256', (string) $value),
+            'redacted' => true,
+        ];
+    }
+
+    private function writeJson(string $path, array $data): void
+    {
+        $encoded = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+        if ($encoded === false) {
+            throw new \RuntimeException('Failed to encode export JSON');
+        }
+
+        if (file_put_contents($path, $encoded . PHP_EOL) === false) {
+            throw new \RuntimeException('Failed to write export JSON: ' . $path);
+        }
+    }
+
+    private function getTables(\PDO $pdo): array
+    {
+        if (!empty($this->tableCache)) {
+            return $this->tableCache;
+        }
+
+        $stmt = $pdo->query('SHOW TABLES');
+        $this->tableCache = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+
+        return $this->tableCache;
+    }
+
+    private function tableExists(\PDO $pdo, string $table): bool
+    {
+        return in_array($table, $this->getTables($pdo), true);
+    }
+
+    private function getColumns(\PDO $pdo, string $table): array
+    {
+        if (isset($this->columnCache[$table])) {
+            return $this->columnCache[$table];
+        }
+
+        if (!$this->tableExists($pdo, $table)) {
+            return [];
+        }
+
+        $stmt = $pdo->query('DESCRIBE `' . $table . '`');
+        $this->columnCache[$table] = array_map(
+            fn (array $column): string => $column['Field'],
+            $stmt->fetchAll(\PDO::FETCH_ASSOC)
+        );
+
+        return $this->columnCache[$table];
+    }
+
+    private function uniqueInts(array $values): array
+    {
+        $ints = array_map('intval', $values);
+        $ints = array_filter($ints, fn (int $value): bool => $value > 0);
+
+        return array_values(array_unique($ints));
+    }
+
+    private function getStorageRoot(): string
+    {
+        if (defined('APP_STORAGE_DIR')) {
+            $base = realpath((string) APP_STORAGE_DIR);
+            if ($base === false) {
+                $base = $this->normalizePath((string) APP_STORAGE_DIR);
+            }
+        } else {
+            $base = dirname(__DIR__, 4) . '/storage';
+        }
+
+        return rtrim($base, '/\\') . '/user-data-exports';
+    }
+
+    private function getPublicRoot(): string
+    {
+        if (defined('APP_DIR')) {
+            $publicRoot = realpath(rtrim((string) APP_DIR, '/\\') . '/public');
+            if ($publicRoot !== false) {
+                return $publicRoot;
+            }
+
+            return $this->normalizePath(rtrim((string) APP_DIR, '/\\') . '/public');
+        }
+
+        return dirname(__DIR__, 4) . '/public';
+    }
+
+    private function normalizePath(string $path): string
+    {
+        $path = str_replace('\\', '/', $path);
+        $isAbsolute = str_starts_with($path, '/');
+        $parts = [];
+
+        foreach (explode('/', $path) as $part) {
+            if ($part === '' || $part === '.') {
+                continue;
+            }
+            if ($part === '..') {
+                array_pop($parts);
+                continue;
+            }
+            $parts[] = $part;
+        }
+
+        return ($isAbsolute ? '/' : '') . implode('/', $parts);
+    }
+
+    private function prepareDirectory(string $path): void
+    {
+        if (is_dir($path)) {
+            if (!is_writable($path)) {
+                throw new \RuntimeException('Export directory is not writable: ' . $path);
+            }
+
+            return;
+        }
+
+        $parent = dirname($path);
+        if (is_dir($parent) && !is_writable($parent)) {
+            throw new \RuntimeException('Export directory parent is not writable: ' . $parent);
+        }
+
+        $previousError = error_get_last();
+        if (!@mkdir($path, 0770, true) && !is_dir($path)) {
+            $error = error_get_last();
+            $message = is_array($error) && $error !== $previousError && isset($error['message'])
+                ? ' (' . $error['message'] . ')'
+                : '';
+
+            throw new \RuntimeException('Failed to create export directory: ' . $path . $message);
+        }
+
+        @chmod($path, 0770);
+        clearstatcache(true, $path);
+        if (!is_writable($path)) {
+            throw new \RuntimeException('Created export directory is not writable: ' . $path);
+        }
+    }
+
+    private function sanitizePathSegment(string $segment): string
+    {
+        return preg_replace('/[^a-zA-Z0-9._-]/', '_', $segment) ?: 'export';
+    }
+}
diff --git a/backend/app/Services/Wings/Services/ServerService.php b/backend/app/Services/Wings/Services/ServerService.php
index 81bb6bf8c..c53755441 100755
--- a/backend/app/Services/Wings/Services/ServerService.php
+++ b/backend/app/Services/Wings/Services/ServerService.php
@@ -228,12 +228,18 @@ public function reinstallServer(string $serverUuid): WingsResponse
 
     /**
      * List items in a directory.
+     *
+     * @param bool $includeDirectorySizes when true, requests Wings recursive per-folder sizes (cached on the daemon)
      */
-    public function listDirectory(string $serverUuid, string $directory = '/'): WingsResponse
+    public function listDirectory(string $serverUuid, string $directory = '/', bool $includeDirectorySizes = false): WingsResponse
     {
         try {
             $encodedDirectory = urlencode($directory);
-            $response = $this->connection->get("/api/servers/{$serverUuid}/files/list-directory?directory={$encodedDirectory}");
+            $query = "directory={$encodedDirectory}";
+            if ($includeDirectorySizes) {
+                $query .= '&directory_sizes=true';
+            }
+            $response = $this->connection->get("/api/servers/{$serverUuid}/files/list-directory?{$query}");
 
             return new WingsResponse($response, 200);
         } catch (\Exception $e) {
@@ -259,6 +265,27 @@ public function searchFiles(string $serverUuid, array $filters = []): WingsRespo
         }
     }
 
+    /**
+     * List one directory inside an on-disk archive without extracting (supported formats only).
+     *
+     * @param string $innerPath Path inside the archive (empty string = root)
+     */
+    public function listArchiveDirectory(string $serverUuid, string $directory, string $file, string $innerPath = ''): WingsResponse
+    {
+        try {
+            $query = http_build_query([
+                'directory' => $directory,
+                'file' => $file,
+                'path' => $innerPath,
+            ]);
+            $response = $this->connection->get("/api/servers/{$serverUuid}/files/archive/list?{$query}");
+
+            return new WingsResponse($response, 200);
+        } catch (\Exception $e) {
+            return new WingsResponse(['error' => $e->getMessage()], 500);
+        }
+    }
+
     /**
      * Get file contents.
      */
@@ -363,14 +390,25 @@ public function copyFiles(string $serverUuid, string $location, array $files): W
 
     /**
      * Delete files/directories.
+     *
+     * @param array<string, mixed> $options Optional keys: use_trash (bool), permanent (bool), trash (array{max_size_bytes?: int, retention_days?: int})
      */
-    public function deleteFiles(string $serverUuid, string $root, array $files): WingsResponse
+    public function deleteFiles(string $serverUuid, string $root, array $files, array $options = []): WingsResponse
     {
         try {
             $data = [
                 'root' => $root,
                 'files' => $files,
             ];
+            if (isset($options['use_trash'])) {
+                $data['use_trash'] = (bool) $options['use_trash'];
+            }
+            if (isset($options['permanent'])) {
+                $data['permanent'] = (bool) $options['permanent'];
+            }
+            if (!empty($options['trash']) && is_array($options['trash'])) {
+                $data['trash'] = $options['trash'];
+            }
             $response = $this->connection->post("/api/servers/{$serverUuid}/files/delete", $data);
 
             return new WingsResponse($response, 204);
@@ -379,6 +417,73 @@ public function deleteFiles(string $serverUuid, string $root, array $files): Win
         }
     }
 
+    /**
+     * List trashed files for a server.
+     */
+    public function listTrash(string $serverUuid, int $maxSizeBytes = 0, int $retentionDays = 0): WingsResponse
+    {
+        try {
+            $query = http_build_query([
+                'max_size_bytes' => $maxSizeBytes,
+                'retention_days' => $retentionDays,
+            ]);
+            $response = $this->connection->get("/api/servers/{$serverUuid}/files/trash?{$query}");
+
+            return new WingsResponse($response, 200);
+        } catch (\Exception $e) {
+            return new WingsResponse(['error' => $e->getMessage()], 500);
+        }
+    }
+
+    /**
+     * Restore files from trash.
+     */
+    public function restoreTrash(string $serverUuid, array $ids, bool $overwrite = false): WingsResponse
+    {
+        try {
+            $this->connection->post("/api/servers/{$serverUuid}/files/trash/restore", [
+                'ids' => $ids,
+                'overwrite' => $overwrite,
+            ]);
+
+            return new WingsResponse([], 204);
+        } catch (WingsRequestException $e) {
+            return new WingsResponse(['error' => $e->getMessage()], $e->getCode());
+        } catch (\Exception $e) {
+            return new WingsResponse(['error' => $e->getMessage()], 500);
+        }
+    }
+
+    /**
+     * Permanently delete selected trash entries.
+     */
+    public function deleteTrashEntries(string $serverUuid, array $ids): WingsResponse
+    {
+        try {
+            $response = $this->connection->post("/api/servers/{$serverUuid}/files/trash/delete", [
+                'ids' => $ids,
+            ]);
+
+            return new WingsResponse($response, 204);
+        } catch (\Exception $e) {
+            return new WingsResponse(['error' => $e->getMessage()], 500);
+        }
+    }
+
+    /**
+     * Empty the entire trash bin for a server.
+     */
+    public function emptyTrash(string $serverUuid): WingsResponse
+    {
+        try {
+            $response = $this->connection->delete("/api/servers/{$serverUuid}/files/trash");
+
+            return new WingsResponse($response, 204);
+        } catch (\Exception $e) {
+            return new WingsResponse(['error' => $e->getMessage()], 500);
+        }
+    }
+
     /**
      * Create directory.
      */
@@ -489,6 +594,36 @@ public function decompressArchive(string $serverUuid, string $file, string $root
         }
     }
 
+    /**
+     * Extract selected paths from an on-disk archive without unpacking the whole archive (Wings 204).
+     *
+     * @param array<int, string> $entries Paths inside the archive (files and/or directories)
+     */
+    public function extractArchiveSelection(
+        string $serverUuid,
+        string $root,
+        string $file,
+        string $destination,
+        array $entries,
+        ?int $timeout = null,
+    ): WingsResponse {
+        try {
+            $data = [
+                'root' => $root,
+                'file' => $file,
+                'destination' => $destination,
+                'entries' => array_values($entries),
+            ];
+
+            $requestTimeout = $timeout ?? (60 * 15);
+            $response = $this->connection->post("/api/servers/{$serverUuid}/files/archive/extract", $data, [], 3, $requestTimeout);
+
+            return new WingsResponse($response, 204);
+        } catch (\Exception $e) {
+            return new WingsResponse(['error' => $e->getMessage()], 500);
+        }
+    }
+
     /**
      * Change file permissions (chmod).
      */
@@ -619,6 +754,8 @@ public function deleteBackup(string $serverUuid, string $backupId): WingsRespons
             $response = $this->connection->delete("/api/servers/{$serverUuid}/backup/{$backupId}");
 
             return new WingsResponse($response, 204);
+        } catch (WingsAuthenticationException | WingsRequestException $e) {
+            return new WingsResponse(['error' => $e->getMessage()], $e->getCode() > 0 ? $e->getCode() : 500);
         } catch (\Exception $e) {
             return new WingsResponse(['error' => $e->getMessage()], 500);
         }
diff --git a/backend/app/Services/Wings/WingsConnection.php b/backend/app/Services/Wings/WingsConnection.php
index 4ebf814cf..478f46074 100755
--- a/backend/app/Services/Wings/WingsConnection.php
+++ b/backend/app/Services/Wings/WingsConnection.php
@@ -632,7 +632,7 @@ private function handleHttpError(int $httpCode, ?array $responseData, string $en
             case 403:
                 throw new WingsAuthenticationException("Access forbidden: {$errorDetails}", 403);
             case 404:
-                throw new WingsRequestException("Endpoint not found: {$endpoint}", 404);
+                throw new WingsRequestException("Wings request failed (404) for {$endpoint}: {$errorDetails}", 404);
             case 429:
                 throw new WingsRequestException("Rate limit exceeded: {$errorDetails}", 429);
             case 500:
diff --git a/backend/app/routes/admin/allocations.php b/backend/app/routes/admin/allocations.php
index e1b7f7fc5..61ed0a4b0 100755
--- a/backend/app/routes/admin/allocations.php
+++ b/backend/app/routes/admin/allocations.php
@@ -82,6 +82,18 @@ function (Request $request) {
         ['DELETE']
     );
 
+    // Bulk update address - PATCH /api/admin/allocations/bulk-address
+    App::getInstance(true)->registerAdminRoute(
+        $routes,
+        'admin-allocations-bulk-address',
+        '/api/admin/allocations/bulk-address',
+        function (Request $request) {
+            return (new AllocationsController())->bulkUpdateAddress($request);
+        },
+        Permissions::ADMIN_ALLOCATIONS_EDIT,
+        ['PATCH']
+    );
+
     // PARAMETERIZED ROUTES (must come AFTER specific routes)
     // Show single - GET /api/admin/allocations/{id}
     App::getInstance(true)->registerAdminRoute(
diff --git a/backend/app/routes/admin/nodes.php b/backend/app/routes/admin/nodes.php
index 4ce266858..0648dd84c 100755
--- a/backend/app/routes/admin/nodes.php
+++ b/backend/app/routes/admin/nodes.php
@@ -290,4 +290,36 @@ function (Request $request, array $args) {
         Permissions::ADMIN_NODES_EDIT,
         ['PUT', 'POST']
     );
+
+    App::getInstance(true)->registerAdminRoute(
+        $routes,
+        'admin-nodes-mass-transfer-preview',
+        '/api/admin/nodes/{id}/mass-transfer/preview',
+        function (Request $request, array $args) {
+            $id = $args['id'] ?? null;
+            if (!$id || !is_numeric($id)) {
+                return ApiResponse::error('Missing or invalid ID', 'INVALID_ID', 400);
+            }
+
+            return (new NodesController())->previewMassTransfer($request, (int) $id);
+        },
+        Permissions::ADMIN_SERVERS_EDIT,
+        ['GET']
+    );
+
+    App::getInstance(true)->registerAdminRoute(
+        $routes,
+        'admin-nodes-mass-transfer',
+        '/api/admin/nodes/{id}/mass-transfer',
+        function (Request $request, array $args) {
+            $id = $args['id'] ?? null;
+            if (!$id || !is_numeric($id)) {
+                return ApiResponse::error('Missing or invalid ID', 'INVALID_ID', 400);
+            }
+
+            return (new NodesController())->massTransfer($request, (int) $id);
+        },
+        Permissions::ADMIN_SERVERS_EDIT,
+        ['POST']
+    );
 };
diff --git a/backend/app/routes/admin/servers.php b/backend/app/routes/admin/servers.php
index 390b1662d..b91ac8304 100755
--- a/backend/app/routes/admin/servers.php
+++ b/backend/app/routes/admin/servers.php
@@ -227,6 +227,42 @@ function (Request $request, array $args) {
         Permissions::ADMIN_SERVERS_VIEW,
     );
 
+    App::getInstance(true)->registerAdminRoute(
+        $routes,
+        'admin-servers-custom-variable-create',
+        '/api/admin/servers/{id}/custom-variables',
+        function (Request $request, array $args) {
+            $id = $args['id'] ?? null;
+            if (!$id || !is_numeric($id)) {
+                return ApiResponse::error('Missing or invalid server ID', 'INVALID_SERVER_ID', 400);
+            }
+
+            return (new ServersController())->createCustomVariable($request, (int) $id);
+        },
+        Permissions::ADMIN_SERVERS_EDIT,
+        ['POST']
+    );
+
+    App::getInstance(true)->registerAdminRoute(
+        $routes,
+        'admin-servers-custom-variable-delete',
+        '/api/admin/servers/{id}/custom-variables/{variableId}',
+        function (Request $request, array $args) {
+            $id = $args['id'] ?? null;
+            $variableId = $args['variableId'] ?? null;
+            if (!$id || !is_numeric($id)) {
+                return ApiResponse::error('Missing or invalid server ID', 'INVALID_SERVER_ID', 400);
+            }
+            if (!$variableId || !is_numeric($variableId)) {
+                return ApiResponse::error('Missing or invalid variable ID', 'INVALID_VARIABLE_ID', 400);
+            }
+
+            return (new ServersController())->deleteCustomVariable($request, (int) $id, (int) $variableId);
+        },
+        Permissions::ADMIN_SERVERS_EDIT,
+        ['DELETE']
+    );
+
     // Suspend a server
     App::getInstance(true)->registerAdminRoute(
         $routes,
diff --git a/backend/app/routes/admin/spells.php b/backend/app/routes/admin/spells.php
index 5a8b162f2..53668dfff 100755
--- a/backend/app/routes/admin/spells.php
+++ b/backend/app/routes/admin/spells.php
@@ -86,6 +86,16 @@ function (Request $request) {
         Permissions::ADMIN_SPELLS_CREATE,
         ['PUT']
     );
+    App::getInstance(true)->registerAdminRoute(
+        $routes,
+        'admin-spells-reorder',
+        '/api/admin/spells/reorder',
+        function (Request $request) {
+            return (new SpellsController())->reorder($request);
+        },
+        Permissions::ADMIN_SPELLS_EDIT,
+        ['POST']
+    );
     App::getInstance(true)->registerAdminRoute(
         $routes,
         'admin-spells-by-realm',
diff --git a/backend/app/routes/admin/users.php b/backend/app/routes/admin/users.php
index 1374f3452..5929b2a54 100755
--- a/backend/app/routes/admin/users.php
+++ b/backend/app/routes/admin/users.php
@@ -175,6 +175,21 @@ function (Request $request, array $args) {
         Permissions::ADMIN_USERS_EDIT,
         ['POST']
     );
+    App::getInstance(true)->registerAdminRoute(
+        $routes,
+        'admin-users-verify-email',
+        '/api/admin/users/{uuid}/verify-email',
+        function (Request $request, array $args) {
+            $uuid = $args['uuid'] ?? null;
+            if (!$uuid || !is_string($uuid)) {
+                return ApiResponse::error('Missing or invalid UUID', 'INVALID_UUID', 400);
+            }
+
+            return (new UsersController())->forceVerifyEmail($request, $uuid);
+        },
+        Permissions::ADMIN_USERS_EDIT,
+        ['POST']
+    );
     App::getInstance(true)->registerAdminRoute(
         $routes,
         'admin-users-ban',
diff --git a/backend/app/routes/user/auth.php b/backend/app/routes/user/auth.php
index 9269ab621..c199bfce3 100755
--- a/backend/app/routes/user/auth.php
+++ b/backend/app/routes/user/auth.php
@@ -96,6 +96,19 @@ function (Request $request) {
         'user-auth'
     );
 
+    // POST (resend verification email)
+    App::getInstance(true)->registerApiRoute(
+        $routes,
+        'verify-email-resend',
+        '/api/user/auth/verify-email/resend',
+        function (Request $request) {
+            return (new VerifyEmailController())->resend($request);
+        },
+        ['POST'],
+        Rate::perMinute(3),
+        'user-auth-verify-email'
+    );
+
     // PUT (reset password)
     App::getInstance(true)->registerApiRoute(
         $routes,
@@ -241,6 +254,30 @@ function (Request $request) {
         'user-auth-oidc'
     );
 
+    App::getInstance(true)->registerAuthRoute(
+        $routes,
+        'oidc-link',
+        '/api/user/auth/oidc/link',
+        function (Request $request) {
+            return (new OidcController())->link($request);
+        },
+        ['GET'],
+        Rate::perMinute(5),
+        'user-auth-oidc'
+    );
+
+    App::getInstance(true)->registerAuthRoute(
+        $routes,
+        'oidc-unlink',
+        '/api/user/auth/oidc/unlink',
+        function (Request $request) {
+            return (new OidcController())->unlink($request);
+        },
+        ['DELETE'],
+        Rate::perMinute(5),
+        'user-auth-oidc'
+    );
+
     // Email Login (OTP) routes
     App::getInstance(true)->registerApiRoute(
         $routes,
diff --git a/backend/app/routes/user/chatbot.php b/backend/app/routes/user/chatbot.php
index 9f2fc9242..34880d549 100755
--- a/backend/app/routes/user/chatbot.php
+++ b/backend/app/routes/user/chatbot.php
@@ -35,6 +35,18 @@ function (Request $request) {
         'user-chatbot'
     );
 
+    App::getInstance(true)->registerAuthRoute(
+        $routes,
+        'user-chatbot-chat-stream',
+        '/api/user/chatbot/chat/stream',
+        function (Request $request) {
+            return (new ChatbotController())->streamChat($request);
+        },
+        ['POST'],
+        Rate::perMinute(30),
+        'user-chatbot'
+    );
+
     App::getInstance(true)->registerAuthRoute(
         $routes,
         'chatbot-conversations',
diff --git a/backend/app/routes/user/ldap.php b/backend/app/routes/user/ldap.php
index 313677123..96c566647 100644
--- a/backend/app/routes/user/ldap.php
+++ b/backend/app/routes/user/ldap.php
@@ -31,4 +31,24 @@ function (Request $request) {
         },
         ['PUT']
     );
+
+    App::getInstance(true)->registerAuthRoute(
+        $routes,
+        'user-ldap-link',
+        '/api/user/auth/ldap/link',
+        function (Request $request) {
+            return (new LdapController())->link($request);
+        },
+        ['PUT']
+    );
+
+    App::getInstance(true)->registerAuthRoute(
+        $routes,
+        'user-ldap-unlink',
+        '/api/user/auth/ldap/unlink',
+        function (Request $request) {
+            return (new LdapController())->unlink($request);
+        },
+        ['DELETE']
+    );
 };
diff --git a/backend/app/routes/user/server/core.php b/backend/app/routes/user/server/core.php
index d79592db2..dc78a4a04 100755
--- a/backend/app/routes/user/server/core.php
+++ b/backend/app/routes/user/server/core.php
@@ -104,6 +104,46 @@ function (Request $request, array $args) {
         'user-server-update'
     );
 
+    App::getInstance(true)->registerServerRoute(
+        $routes,
+        'session-server-custom-variable-create',
+        '/api/user/servers/{uuidShort}/custom-variables',
+        function (Request $request, array $args) {
+            $uuidShort = $args['uuidShort'] ?? null;
+            if (!$uuidShort) {
+                return ApiResponse::error('Missing or invalid UUID short', 'INVALID_UUID_SHORT', 400);
+            }
+
+            return (new ServerUserController())->createCustomVariable($request, $uuidShort);
+        },
+        'uuidShort',
+        ['POST'],
+        Rate::perMinute(10),
+        'user-server-custom-variable-create'
+    );
+
+    App::getInstance(true)->registerServerRoute(
+        $routes,
+        'session-server-custom-variable-delete',
+        '/api/user/servers/{uuidShort}/custom-variables/{variableId}',
+        function (Request $request, array $args) {
+            $uuidShort = $args['uuidShort'] ?? null;
+            $variableId = $args['variableId'] ?? null;
+            if (!$uuidShort) {
+                return ApiResponse::error('Missing or invalid UUID short', 'INVALID_UUID_SHORT', 400);
+            }
+            if (!$variableId || !is_numeric($variableId)) {
+                return ApiResponse::error('Missing or invalid variable ID', 'INVALID_VARIABLE_ID', 400);
+            }
+
+            return (new ServerUserController())->deleteCustomVariable($request, $uuidShort, (int) $variableId);
+        },
+        'uuidShort',
+        ['DELETE'],
+        Rate::perMinute(10),
+        'user-server-custom-variable-delete'
+    );
+
     // Rate limit: Admin can override in ratelimit.json, default is 1 per hour (very restrictive for deletion)
     App::getInstance(true)->registerServerRoute(
         $routes,
diff --git a/backend/app/routes/user/server/files.php b/backend/app/routes/user/server/files.php
index c4f592281..7a06a75e0 100755
--- a/backend/app/routes/user/server/files.php
+++ b/backend/app/routes/user/server/files.php
@@ -42,6 +42,24 @@ function (Request $request, array $args) {
         'user-server-files'
     );
 
+    App::getInstance(true)->registerServerRoute(
+        $routes,
+        'session-server-archive-list',
+        '/api/user/servers/{uuidShort}/archive-list',
+        function (Request $request, array $args) {
+            $uuidShort = $args['uuidShort'] ?? null;
+            if (!$uuidShort) {
+                return ApiResponse::error('Missing or invalid UUID short', 'INVALID_UUID_SHORT', 400);
+            }
+
+            return (new ServerFilesController())->listArchiveDirectory($request, $uuidShort);
+        },
+        'uuidShort',
+        ['GET'],
+        Rate::perMinute(60),
+        'user-server-files'
+    );
+
     App::getInstance(true)->registerServerRoute(
         $routes,
         'session-server-search-files',
@@ -139,6 +157,66 @@ function (Request $request, array $args) {
         'user-server-files'
     );
 
+    App::getInstance(true)->registerServerRoute(
+        $routes,
+        'session-server-trash-list',
+        '/api/user/servers/{uuidShort}/trash',
+        function (Request $request, array $args) {
+            $uuidShort = $args['uuidShort'] ?? null;
+
+            return (new ServerFilesController())->listTrash($request, $uuidShort);
+        },
+        'uuidShort',
+        ['GET'],
+        Rate::perMinute(60),
+        'user-server-files'
+    );
+
+    App::getInstance(true)->registerServerRoute(
+        $routes,
+        'session-server-trash-restore',
+        '/api/user/servers/{uuidShort}/trash/restore',
+        function (Request $request, array $args) {
+            $uuidShort = $args['uuidShort'] ?? null;
+
+            return (new ServerFilesController())->restoreTrash($request, $uuidShort);
+        },
+        'uuidShort',
+        ['POST'],
+        Rate::perMinute(20),
+        'user-server-files'
+    );
+
+    App::getInstance(true)->registerServerRoute(
+        $routes,
+        'session-server-trash-delete',
+        '/api/user/servers/{uuidShort}/trash/delete',
+        function (Request $request, array $args) {
+            $uuidShort = $args['uuidShort'] ?? null;
+
+            return (new ServerFilesController())->deleteTrashEntries($request, $uuidShort);
+        },
+        'uuidShort',
+        ['POST'],
+        Rate::perMinute(10),
+        'user-server-files'
+    );
+
+    App::getInstance(true)->registerServerRoute(
+        $routes,
+        'session-server-trash-empty',
+        '/api/user/servers/{uuidShort}/trash/empty',
+        function (Request $request, array $args) {
+            $uuidShort = $args['uuidShort'] ?? null;
+
+            return (new ServerFilesController())->emptyTrash($request, $uuidShort);
+        },
+        'uuidShort',
+        ['POST'],
+        Rate::perMinute(5),
+        'user-server-files'
+    );
+
     App::getInstance(true)->registerServerRoute(
         $routes,
         'session-server-wipe-all-files',
@@ -212,6 +290,21 @@ function (Request $request, array $args) {
         'user-server-files'
     );
 
+    App::getInstance(true)->registerServerRoute(
+        $routes,
+        'session-server-extract-archive-selection',
+        '/api/user/servers/{uuidShort}/extract-archive-selection',
+        function (Request $request, array $args) {
+            $uuidShort = $args['uuidShort'] ?? null;
+
+            return (new ServerFilesController())->extractArchiveSelection($request, $uuidShort);
+        },
+        'uuidShort',
+        ['POST'],
+        Rate::perMinute(20),
+        'user-server-files'
+    );
+
     App::getInstance(true)->registerServerRoute(
         $routes,
         'session-server-change-permissions',
diff --git a/backend/app/routes/user/session.php b/backend/app/routes/user/session.php
index 0fef95101..6846e0cb0 100755
--- a/backend/app/routes/user/session.php
+++ b/backend/app/routes/user/session.php
@@ -75,6 +75,17 @@ function (Request $request) {
         Rate::perMinute(30), // Default: Admin can override in ratelimit.json
         'user-session'
     );
+    App::getInstance(true)->registerAuthRoute(
+        $routes,
+        'data-request-create',
+        '/api/user/data-request',
+        function (Request $request) {
+            return (new SessionController())->requestDataExport($request);
+        },
+        ['POST'],
+        Rate::perMinute(2), // Default: Admin can override in ratelimit.json
+        'user-session'
+    );
     App::getInstance(true)->registerAuthRoute(
         $routes,
         'mails-get',
diff --git a/backend/app/routes/user/spells.php b/backend/app/routes/user/spells.php
index 603294c23..f1b4a1c12 100755
--- a/backend/app/routes/user/spells.php
+++ b/backend/app/routes/user/spells.php
@@ -69,7 +69,17 @@ function (Request $request) {
                 });
             }
 
-            return ApiResponse::success(['spells' => array_values($spells)], 'Spells fetched successfully', 200);
+            $spells = array_values($spells);
+            usort($spells, static function (array $a, array $b): int {
+                $order = ($a['sort_order'] ?? 0) <=> ($b['sort_order'] ?? 0);
+                if ($order !== 0) {
+                    return $order;
+                }
+
+                return strcasecmp($a['name'] ?? '', $b['name'] ?? '');
+            });
+
+            return ApiResponse::success(['spells' => $spells], 'Spells fetched successfully', 200);
         },
         ['GET'],
         Rate::perMinute(60), // Default: Admin can override in ratelimit.json
diff --git a/backend/app/routes/user/vds/chatbot.php b/backend/app/routes/user/vds/chatbot.php
index afe6da3b0..dace50110 100644
--- a/backend/app/routes/user/vds/chatbot.php
+++ b/backend/app/routes/user/vds/chatbot.php
@@ -35,6 +35,18 @@ function (Request $request) {
         'user-vds-chatbot'
     );
 
+    App::getInstance(true)->registerAuthRoute(
+        $routes,
+        'vds-chatbot-chat-stream',
+        '/api/user/vds-chatbot/chat/stream',
+        function (Request $request) {
+            return (new VdsChatbotController())->streamChat($request);
+        },
+        ['POST'],
+        Rate::perMinute(30),
+        'user-vds-chatbot'
+    );
+
     App::getInstance(true)->registerAuthRoute(
         $routes,
         'vds-chatbot-conversations',
diff --git a/backend/cli b/backend/cli
index 1947eb206..994acd67b 100755
--- a/backend/cli
+++ b/backend/cli
@@ -42,7 +42,7 @@ define('APP_START', microtime(true));
 define('APP_DIR', APP_PUBLIC . '/');
 define('APP_CRON_DIR', APP_PUBLIC . '/storage/cron/');
 define('SYSTEM_KERNEL_NAME', php_uname('s'));
-define('APP_VERSION', 'v1.3.7.2');
+define('APP_VERSION', 'v1.3.7.3');
 define('APP_UPSTREAM', 'stable');
 define('REQUEST_ID', uniqid());
 define('TELEMETRY', true);
diff --git a/backend/composer.lock b/backend/composer.lock
index 15e18f21e..01aa2392c 100755
--- a/backend/composer.lock
+++ b/backend/composer.lock
@@ -232,16 +232,16 @@
         },
         {
             "name": "dg/mysql-dump",
-            "version": "v1.6.0",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dg/MySQL-dump.git",
-                "reference": "b83859026dc3651c6aa39376705fbfa57c0486c5"
+                "reference": "257d0c2c0ed4415330912456d252f2f4253496cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dg/MySQL-dump/zipball/b83859026dc3651c6aa39376705fbfa57c0486c5",
-                "reference": "b83859026dc3651c6aa39376705fbfa57c0486c5",
+                "url": "https://api.github.com/repos/dg/MySQL-dump/zipball/257d0c2c0ed4415330912456d252f2f4253496cc",
+                "reference": "257d0c2c0ed4415330912456d252f2f4253496cc",
                 "shasum": ""
             },
             "require": {
@@ -269,9 +269,9 @@
                 "mysql"
             ],
             "support": {
-                "source": "https://github.com/dg/MySQL-dump/tree/v1.6.0"
+                "source": "https://github.com/dg/MySQL-dump/tree/v1.7.0"
             },
-            "time": "2024-09-16T04:30:48+00:00"
+            "time": "2026-05-18T00:49:32+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -507,16 +507,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.10.0",
+            "version": "7.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
+                "reference": "aed36fd5fb4844f284252a999d9abf35d3a9a1ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
-                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aed36fd5fb4844f284252a999d9abf35d3a9a1ae",
+                "reference": "aed36fd5fb4844f284252a999d9abf35d3a9a1ae",
                 "shasum": ""
             },
             "require": {
@@ -534,8 +534,9 @@
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
                 "guzzle/client-integration-tests": "3.0.2",
+                "guzzlehttp/test-server": "^0.3.2",
                 "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -613,7 +614,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.10.0"
+                "source": "https://github.com/guzzle/guzzle/tree/7.10.2"
             },
             "funding": [
                 {
@@ -629,20 +630,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-23T22:36:01+00:00"
+            "time": "2026-05-20T11:58:52+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.3.0",
+            "version": "2.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "481557b130ef3790cf82b713667b43030dc9c957"
+                "reference": "d2d8dfae4757f384d630fdffc2d8d6618d8f4c5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
-                "reference": "481557b130ef3790cf82b713667b43030dc9c957",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/d2d8dfae4757f384d630fdffc2d8d6618d8f4c5e",
+                "reference": "d2d8dfae4757f384d630fdffc2d8d6618d8f4c5e",
                 "shasum": ""
             },
             "require": {
@@ -650,7 +651,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34"
             },
             "type": "library",
             "extra": {
@@ -696,7 +697,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.3.0"
+                "source": "https://github.com/guzzle/promises/tree/2.3.1"
             },
             "funding": [
                 {
@@ -712,20 +713,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-22T14:34:08+00:00"
+            "time": "2026-05-19T18:30:48+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.9.0",
+            "version": "2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884"
+                "reference": "73ab136360b5dfd858006eae9795e8fe43c80361"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/7d0ed42f28e42d61352a7a79de682e5e67fec884",
-                "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/73ab136360b5dfd858006eae9795e8fe43c80361",
+                "reference": "73ab136360b5dfd858006eae9795e8fe43c80361",
                 "shasum": ""
             },
             "require": {
@@ -740,9 +741,9 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "http-interop/http-factory-tests": "0.9.0",
+                "http-interop/http-factory-tests": "1.1.0",
                 "jshttp/mime-db": "1.54.0.1",
-                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -813,7 +814,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.9.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.10.1"
             },
             "funding": [
                 {
@@ -829,7 +830,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-03-10T16:41:02+00:00"
+            "time": "2026-05-20T09:27:36+00:00"
         },
         {
             "name": "ifsnop/mysqldump-php",
@@ -2564,16 +2565,16 @@
         },
         {
             "name": "symfony/mime",
-            "version": "v7.4.9",
+            "version": "v7.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "2d550c4758ba4c47519a6667c36553d535705b0c"
+                "reference": "b198dd66c211c97119bcaaff7c13431dbbb5e470"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/2d550c4758ba4c47519a6667c36553d535705b0c",
-                "reference": "2d550c4758ba4c47519a6667c36553d535705b0c",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/b198dd66c211c97119bcaaff7c13431dbbb5e470",
+                "reference": "b198dd66c211c97119bcaaff7c13431dbbb5e470",
                 "shasum": ""
             },
             "require": {
@@ -2629,7 +2630,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.4.9"
+                "source": "https://github.com/symfony/mime/tree/v7.4.12"
             },
             "funding": [
                 {
@@ -2649,7 +2650,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-04-29T13:21:53+00:00"
+            "time": "2026-05-20T07:20:23+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -3474,16 +3475,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v7.4.9",
+            "version": "v7.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "287771d8bc86eacb30678dd10eda6c64a859951f"
+                "reference": "3b04a5ec4887a8135a12ebf0f4cbc5b8fc8ee204"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/287771d8bc86eacb30678dd10eda6c64a859951f",
-                "reference": "287771d8bc86eacb30678dd10eda6c64a859951f",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/3b04a5ec4887a8135a12ebf0f4cbc5b8fc8ee204",
+                "reference": "3b04a5ec4887a8135a12ebf0f4cbc5b8fc8ee204",
                 "shasum": ""
             },
             "require": {
@@ -3535,7 +3536,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v7.4.9"
+                "source": "https://github.com/symfony/routing/tree/v7.4.12"
             },
             "funding": [
                 {
@@ -3555,7 +3556,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-04-22T15:21:55+00:00"
+            "time": "2026-05-20T07:20:23+00:00"
         },
         {
             "name": "symfony/serializer",
@@ -3907,16 +3908,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v7.4.11",
+            "version": "v7.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "e2eb64a57763815ccae07ac1c7653d6cc1c326fd"
+                "reference": "8b6952b56ca6417f25f7a65758cadd0ce02edc51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/e2eb64a57763815ccae07ac1c7653d6cc1c326fd",
-                "reference": "e2eb64a57763815ccae07ac1c7653d6cc1c326fd",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/8b6952b56ca6417f25f7a65758cadd0ce02edc51",
+                "reference": "8b6952b56ca6417f25f7a65758cadd0ce02edc51",
                 "shasum": ""
             },
             "require": {
@@ -3959,7 +3960,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v7.4.11"
+                "source": "https://github.com/symfony/yaml/tree/v7.4.12"
             },
             "funding": [
                 {
@@ -3979,7 +3980,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-13T12:04:42+00:00"
+            "time": "2026-05-20T07:20:23+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -4138,16 +4139,16 @@
         },
         {
             "name": "web-auth/webauthn-lib",
-            "version": "5.3.2",
+            "version": "5.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-auth/webauthn-lib.git",
-                "reference": "a272f254c056fb3d6c80a4801d3c7c5fedc6a08d"
+                "reference": "e6f656d6c6b29fa305382fe6a0a3be8177d177df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/a272f254c056fb3d6c80a4801d3c7c5fedc6a08d",
-                "reference": "a272f254c056fb3d6c80a4801d3c7c5fedc6a08d",
+                "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/e6f656d6c6b29fa305382fe6a0a3be8177d177df",
+                "reference": "e6f656d6c6b29fa305382fe6a0a3be8177d177df",
                 "shasum": ""
             },
             "require": {
@@ -4208,7 +4209,7 @@
                 "webauthn"
             ],
             "support": {
-                "source": "https://github.com/web-auth/webauthn-lib/tree/5.3.2"
+                "source": "https://github.com/web-auth/webauthn-lib/tree/5.3.3"
             },
             "funding": [
                 {
@@ -4220,20 +4221,20 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2026-05-01T12:14:37+00:00"
+            "time": "2026-05-17T19:04:30+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "2.3.0",
+            "version": "2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4"
+                "reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/eb0d790f735ba6cff25c683a85a1da0eadeff9e4",
-                "reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/9007ea6f45ecf352a9422b36644e4bfc039b9155",
+                "reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155",
                 "shasum": ""
             },
             "require": {
@@ -4249,7 +4250,11 @@
             },
             "type": "library",
             "extra": {
+                "psalm": {
+                    "pluginClass": "Webmozart\\Assert\\PsalmPlugin"
+                },
                 "branch-alias": {
+                    "dev-master": "2.0-dev",
                     "dev-feature/2-0": "2.0-dev"
                 }
             },
@@ -4280,9 +4285,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/2.3.0"
+                "source": "https://github.com/webmozarts/assert/tree/2.4.0"
             },
-            "time": "2026-04-11T10:33:05+00:00"
+            "time": "2026-05-20T13:07:01+00:00"
         },
         {
             "name": "zircote/swagger-php",
@@ -4845,16 +4850,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.95.1",
+            "version": "v3.95.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "a9727678fbd12997f1d9de8f4a37824ed9df1065"
+                "reference": "a28d88a5e172b27e78d0816992b15a9df3da20f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a9727678fbd12997f1d9de8f4a37824ed9df1065",
-                "reference": "a9727678fbd12997f1d9de8f4a37824ed9df1065",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a28d88a5e172b27e78d0816992b15a9df3da20f1",
+                "reference": "a28d88a5e172b27e78d0816992b15a9df3da20f1",
                 "shasum": ""
             },
             "require": {
@@ -4886,8 +4891,8 @@
                 "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "facile-it/paraunit": "^1.3.1 || ^2.8.0",
-                "infection/infection": "^0.32.6",
+                "facile-it/paraunit": "^1.3.1 || ^2.11.0",
+                "infection/infection": "^0.32.7",
                 "justinrainbow/json-schema": "^6.8.0",
                 "keradus/cli-executor": "^2.3",
                 "mikey179/vfsstream": "^1.6.12",
@@ -4938,7 +4943,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.95.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.95.2"
             },
             "funding": [
                 {
@@ -4946,7 +4951,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-04-12T17:00:09+00:00"
+            "time": "2026-05-15T09:20:44+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -5128,11 +5133,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.54",
+            "version": "2.1.55",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8be50c3992107dc837b17da4d140fbbdf9a5c5bd",
-                "reference": "8be50c3992107dc837b17da4d140fbbdf9a5c5bd",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9eaac3826ed5e9b8427350a43cac825eeca3f566",
+                "reference": "9eaac3826ed5e9b8427350a43cac825eeca3f566",
                 "shasum": ""
             },
             "require": {
@@ -5177,7 +5182,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-04-29T13:31:09+00:00"
+            "time": "2026-05-18T11:57:34+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
diff --git a/backend/public/index.php b/backend/public/index.php
index b52abbbc4..a7fdbe31b 100755
--- a/backend/public/index.php
+++ b/backend/public/index.php
@@ -34,7 +34,7 @@
 define('SYSTEM_OS_NAME', gethostname() . '/' . PHP_OS_FAMILY);
 define('SYSTEM_KERNEL_NAME', php_uname('s'));
 define('TELEMETRY', true);
-define('APP_VERSION', 'v1.3.7.2');
+define('APP_VERSION', 'v1.3.7.3');
 define('APP_UPSTREAM', 'stable');
 define('REQUEST_ID', uniqid());
 
diff --git a/backend/storage/cron/php/AServerScheduleProcessor.php b/backend/storage/cron/php/AServerScheduleProcessor.php
index 3eb60709c..0ed400f7c 100755
--- a/backend/storage/cron/php/AServerScheduleProcessor.php
+++ b/backend/storage/cron/php/AServerScheduleProcessor.php
@@ -133,14 +133,17 @@ private function processSchedule(array $schedule)
             if (!$this->isServerOnline($server)) {
                 MinecraftColorCodeSupport::sendOutputWithNewLine('&eServer is offline, skipping schedule: ' . $schedule['name']);
 
-                // Calculate next run time and update schedule
+                // Calculate next run time and update schedule, honouring the
+                // schedule's authoring timezone so e.g. "0 3 * * *" still means
+                // 03:00 local even after PHP's default zone was pinned to UTC.
                 $nextRunAt = ServerSchedule::calculateNextRunTime(
                     $schedule['cron_day_of_week'],
                     $schedule['cron_month'],
                     $schedule['cron_day_of_month'],
                     $schedule['cron_hour'],
                     $schedule['cron_minute'],
-                    $schedule['next_run_at'] ?? null
+                    $schedule['next_run_at'] ?? null,
+                    $schedule['timezone'] ?? 'UTC'
                 );
 
                 ServerSchedule::updateSchedule($schedule['id'], [
@@ -168,21 +171,24 @@ private function processSchedule(array $schedule)
         // Execute the schedule
         $this->executeSchedule($schedule, $server);
 
-        // Calculate next run time
+        // Calculate next run time in the schedule's authoring timezone.
         $nextRunAt = ServerSchedule::calculateNextRunTime(
             $schedule['cron_day_of_week'],
             $schedule['cron_month'],
             $schedule['cron_day_of_month'],
             $schedule['cron_hour'],
             $schedule['cron_minute'],
-            $schedule['next_run_at'] ?? null
+            $schedule['next_run_at'] ?? null,
+            $schedule['timezone'] ?? 'UTC'
         );
 
-        // Update schedule with next run time and mark as not processing
+        // Update schedule with next run time and mark as not processing.
+        // `last_run_at` is a TIMESTAMP and PHP runs in UTC, so gmdate is
+        // explicit about intent.
         ServerSchedule::updateSchedule($schedule['id'], [
             'is_processing' => 0,
             'next_run_at' => $nextRunAt,
-            'last_run_at' => date('Y-m-d H:i:s'),
+            'last_run_at' => gmdate('Y-m-d H:i:s'),
         ]);
 
         MinecraftColorCodeSupport::sendOutputWithNewLine('&aSchedule processed successfully: ' . $schedule['name'] . ' (Next run: ' . $nextRunAt . ')');
diff --git a/backend/storage/cron/php/UserDataExportProcessor.php b/backend/storage/cron/php/UserDataExportProcessor.php
new file mode 100644
index 000000000..1f301fe76
--- /dev/null
+++ b/backend/storage/cron/php/UserDataExportProcessor.php
@@ -0,0 +1,319 @@
+<?php
+
+/*
+ * This file is part of FeatherPanel.
+ *
+ * Copyright (C) 2025 MythicalSystems Studios
+ * Copyright (C) 2025 FeatherPanel Contributors
+ * Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * See the LICENSE file or <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Cron;
+
+use App\App;
+use App\Chat\Node;
+use App\Chat\Backup;
+use App\Chat\Ticket;
+use App\Chat\Database;
+use App\Chat\TimedTask;
+use App\Chat\TicketMessage;
+use App\Chat\UserDataExport;
+use App\Services\Wings\Wings;
+use App\Chat\TicketAttachment;
+use App\Config\ConfigInterface;
+use App\Cli\Utils\MinecraftColorCodeSupport;
+use App\Services\UserDataExport\UserDataExportService;
+
+/**
+ * Processes queued user data export requests.
+ */
+class UserDataExportProcessor implements TimeTask
+{
+    private const TASK_NAME = 'user-data-export-processor';
+    private const MAX_EXPORTS_PER_RUN = 3;
+    private const MAX_ATTEMPTS = 3;
+    private const EXPORT_RETENTION_HOURS = 24;
+    private const CLEANUP_LIMIT = 25;
+
+    /**
+     * Entry point for the cron job.
+     */
+    public function run()
+    {
+        $cron = new Cron(self::TASK_NAME, '1M');
+        $force = true;
+
+        try {
+            $ran = $cron->runIfDue(function () {
+                $cleaned = $this->cleanupExpiredExports();
+                $processed = $this->processExports();
+                TimedTask::markRun(
+                    self::TASK_NAME,
+                    true,
+                    'Processed ' . $processed . ' user data export(s), cleaned ' . $cleaned . ' expired export(s)'
+                );
+            }, $force);
+
+            if (!$ran) {
+                return;
+            }
+        } catch (\Exception $e) {
+            App::getInstance(false, true)->getLogger()->error('Failed to process user data exports: ' . $e->getMessage());
+            TimedTask::markRun(self::TASK_NAME, false, $e->getMessage());
+        }
+    }
+
+    private function processExports(): int
+    {
+        $processed = 0;
+        $service = new UserDataExportService();
+
+        MinecraftColorCodeSupport::sendOutputWithNewLine('&aProcessing user data exports...');
+
+        for ($i = 0; $i < self::MAX_EXPORTS_PER_RUN; ++$i) {
+            $export = UserDataExport::claimNextPending(self::MAX_ATTEMPTS);
+            if ($export === null) {
+                break;
+            }
+
+            try {
+                $this->processExport($service, $export);
+                ++$processed;
+                MinecraftColorCodeSupport::sendOutputWithNewLine('&aProcessed user data export: ' . $export['uuid']);
+            } catch (\Throwable $e) {
+                UserDataExport::markFailed((int) $export['id'], $e->getMessage());
+                App::getInstance(false, true)->getLogger()->error('User data export failed (' . $export['uuid'] . '): ' . $e->getMessage());
+                MinecraftColorCodeSupport::sendOutputWithNewLine('&cFailed user data export: ' . $e->getMessage());
+            }
+        }
+
+        return $processed;
+    }
+
+    private function cleanupExpiredExports(): int
+    {
+        $cleaned = 0;
+        $exports = UserDataExport::getExpiredForCleanup(self::EXPORT_RETENTION_HOURS, self::CLEANUP_LIMIT);
+        if (empty($exports)) {
+            return 0;
+        }
+
+        MinecraftColorCodeSupport::sendOutputWithNewLine('&aCleaning expired user data exports...');
+
+        foreach ($exports as $export) {
+            try {
+                $this->cleanupExport($export);
+                ++$cleaned;
+            } catch (\Throwable $e) {
+                App::getInstance(false, true)->getLogger()->warning(
+                    'Failed to clean expired user data export ' . ($export['uuid'] ?? 'unknown') . ': ' . $e->getMessage()
+                );
+            }
+        }
+
+        return $cleaned;
+    }
+
+    private function cleanupExport(array $export): void
+    {
+        $ticketId = (int) ($export['ticket_id'] ?? 0);
+        if ($ticketId > 0) {
+            $this->deleteTicketAttachmentFiles($ticketId);
+        }
+
+        if (!empty($export['file_path']) && is_string($export['file_path'])) {
+            $this->deleteAttachmentPath($export['file_path']);
+        }
+
+        $this->cleanupWingsExportBackups((string) ($export['uuid'] ?? ''));
+
+        if ($ticketId > 0 && Ticket::getById($ticketId) !== null) {
+            Ticket::delete($ticketId);
+        } else {
+            UserDataExport::deleteById((int) $export['id']);
+        }
+    }
+
+    private function deleteTicketAttachmentFiles(int $ticketId): void
+    {
+        foreach (TicketAttachment::getAll($ticketId, null, 1000, 0) as $attachment) {
+            if (isset($attachment['file_path']) && is_string($attachment['file_path'])) {
+                $this->deleteAttachmentPath($attachment['file_path']);
+            }
+        }
+    }
+
+    private function deleteAttachmentPath(string $filePath): void
+    {
+        $resolvedPath = $this->resolveAttachmentPath($filePath);
+        if ($resolvedPath !== null && is_file($resolvedPath) && !@unlink($resolvedPath)) {
+            App::getInstance(false, true)->getLogger()->warning('Failed to delete user data export attachment: ' . $resolvedPath);
+        }
+    }
+
+    private function resolveAttachmentPath(string $filePath): ?string
+    {
+        $normalized = ltrim($filePath, '/\\');
+        if (strpos($normalized, 'attachments/') !== 0 || strpos($normalized, '..') !== false) {
+            return null;
+        }
+
+        $relative = substr($normalized, strlen('attachments/'));
+        if ($relative === '') {
+            return null;
+        }
+
+        $attachmentsDir = $this->getAttachmentsDirectory();
+        $realAttachmentsDir = realpath($attachmentsDir);
+        if ($realAttachmentsDir === false) {
+            return null;
+        }
+
+        $realPath = realpath($attachmentsDir . '/' . $relative);
+        if ($realPath === false) {
+            return null;
+        }
+
+        $realAttachmentsDir = rtrim($realAttachmentsDir, '/\\') . DIRECTORY_SEPARATOR;
+        if (strpos($realPath, $realAttachmentsDir) !== 0) {
+            return null;
+        }
+
+        return $realPath;
+    }
+
+    private function cleanupWingsExportBackups(string $exportUuid): void
+    {
+        if (!preg_match('/^[a-f0-9\-]{36}$/i', $exportUuid)) {
+            return;
+        }
+
+        foreach ($this->getExportBackups($exportUuid) as $backup) {
+            try {
+                $node = Node::getNodeById((int) $backup['node_id']);
+                if ($node !== null && !empty($backup['server_uuid']) && !empty($backup['uuid'])) {
+                    $wings = new Wings(
+                        $node['fqdn'],
+                        (int) $node['daemonListen'],
+                        $node['scheme'],
+                        $node['daemon_token'],
+                        30
+                    );
+                    $response = $wings->getServer()->deleteBackup((string) $backup['server_uuid'], (string) $backup['uuid']);
+                    if (!$response->isSuccessful()) {
+                        App::getInstance(false, true)->getLogger()->warning(
+                            'Failed to delete user data export Wings backup ' . $backup['uuid'] . ': ' . $response->getError()
+                        );
+                    }
+                }
+            } catch (\Throwable $e) {
+                App::getInstance(false, true)->getLogger()->warning(
+                    'Failed to delete user data export Wings backup ' . ($backup['uuid'] ?? 'unknown') . ': ' . $e->getMessage()
+                );
+            }
+
+            Backup::deleteBackup((int) $backup['id']);
+        }
+    }
+
+    private function getExportBackups(string $exportUuid): array
+    {
+        $pdo = Database::getPdoConnection();
+        $stmt = $pdo->prepare(
+            'SELECT backups.*, servers.uuid AS server_uuid, servers.node_id
+             FROM featherpanel_server_backups backups
+             INNER JOIN featherpanel_servers servers ON servers.id = backups.server_id
+             WHERE backups.name = :name
+               AND backups.deleted_at IS NULL'
+        );
+        $stmt->execute(['name' => 'Personal data export backup ' . $exportUuid]);
+
+        return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+    }
+
+    private function processExport(UserDataExportService $service, array $export): void
+    {
+        $ticket = Ticket::getById((int) $export['ticket_id']);
+        if ($ticket === null) {
+            throw new \RuntimeException('Ticket not found for export');
+        }
+
+        $result = $service->buildExport($export);
+        $exportDir = $result['export_dir'];
+
+        try {
+            $filename = $this->buildAttachmentFilename((string) $ticket['uuid'], (string) $export['uuid']);
+            $attachmentDir = $this->getAttachmentsDirectory();
+            if (!is_dir($attachmentDir) && !mkdir($attachmentDir, 0755, true) && !is_dir($attachmentDir)) {
+                throw new \RuntimeException('Failed to create attachments directory');
+            }
+
+            $zipPath = $attachmentDir . '/' . $filename;
+            $service->zipExportDirectory($exportDir, $zipPath);
+
+            $messageId = TicketMessage::create([
+                'ticket_id' => (int) $ticket['id'],
+                'user_uuid' => null,
+                'message' => $this->buildSystemReplyMessage($filename),
+                'is_internal' => false,
+            ]);
+
+            if (!$messageId) {
+                throw new \RuntimeException('Failed to create system reply for export ticket');
+            }
+
+            $attachmentId = TicketAttachment::create([
+                'ticket_id' => (int) $ticket['id'],
+                'message_id' => $messageId,
+                'file_name' => $filename,
+                'file_path' => '/attachments/' . $filename,
+                'file_size' => filesize($zipPath) ?: 0,
+                'file_type' => 'application/zip',
+                'user_downloadable' => 1,
+            ]);
+
+            if (!$attachmentId) {
+                @unlink($zipPath);
+                throw new \RuntimeException('Failed to create ticket attachment for export');
+            }
+
+            UserDataExport::markCompleted((int) $export['id'], '/attachments/' . $filename);
+        } finally {
+            $service->removeDirectory($exportDir);
+        }
+    }
+
+    private function buildSystemReplyMessage(string $filename): string
+    {
+        $appName = App::getInstance(false, true)->getConfig()->getSetting(ConfigInterface::APP_NAME, 'FeatherPanel');
+
+        return implode("\n", [
+            'Your personal data export has been generated automatically by ' . $appName . '.',
+            '',
+            'The export is attached to this ticket as `' . $filename . '`.',
+            'Sensitive credentials and tokens are represented as metadata only and raw secret values are not included.',
+        ]);
+    }
+
+    private function buildAttachmentFilename(string $ticketUuid, string $exportUuid): string
+    {
+        $safeTicketUuid = preg_replace('/[^a-zA-Z0-9._-]/', '_', $ticketUuid) ?: 'ticket';
+        $safeExportUuid = preg_replace('/[^a-zA-Z0-9._-]/', '_', $exportUuid) ?: bin2hex(random_bytes(8));
+
+        return $safeTicketUuid . '_data_export_' . $safeExportUuid . '.zip';
+    }
+
+    private function getAttachmentsDirectory(): string
+    {
+        $appDir = defined('APP_DIR') ? rtrim((string) APP_DIR, '/') : dirname(__DIR__, 3);
+
+        return $appDir . '/public/attachments';
+    }
+}
diff --git a/backend/storage/cron/php/ZCheckExpiredServers.php b/backend/storage/cron/php/ZCheckExpiredServers.php
index 2da50329e..46a286843 100644
--- a/backend/storage/cron/php/ZCheckExpiredServers.php
+++ b/backend/storage/cron/php/ZCheckExpiredServers.php
@@ -29,6 +29,7 @@
 use App\Chat\Server;
 use App\Chat\Database;
 use App\Chat\VmInstance;
+use App\Helpers\ModerationReasonHelper;
 use App\Cli\Utils\MinecraftColorCodeSupport;
 
 class ZCheckExpiredServers implements TimeTask
@@ -161,7 +162,11 @@ private function checkExpiredVmInstances(): int
         foreach ($expiredVms as $vm) {
             try {
                 // Suspend the VM instance
-                $success = VmInstance::update((int) $vm['id'], ['suspended' => 1]);
+                $reason = ModerationReasonHelper::formatReason('payment_overdue', 'Service expired on ' . ($vm['expires_at'] ?? ''));
+                $success = VmInstance::update((int) $vm['id'], ModerationReasonHelper::suspensionAppliedFields($reason, [
+                    'uuid' => 'system',
+                    'username' => 'System',
+                ]));
 
                 if ($success) {
                     ++$suspendedCount;
diff --git a/backend/storage/cron/runner.php b/backend/storage/cron/runner.php
index 53c136f82..9a046341a 100755
--- a/backend/storage/cron/runner.php
+++ b/backend/storage/cron/runner.php
@@ -16,7 +16,6 @@
  */
 
 use App\Plugins\PluginManager;
-use App\Config\ConfigInterface;
 
 define('APP_STARTUP', microtime(true));
 define('APP_START', microtime(true));
@@ -58,13 +57,15 @@
 App::sendOutputWithNewLine('&7Starting App cron runner.');
 
 /**
- * Ensure the correct timezone is set for the cron runner.
+ * Force PHP's default timezone to UTC for the cron runner.
+ *
+ * Cron jobs use `date('Y-m-d H:i:s')` (and friends) to generate timestamps
+ * that are stored in DATETIME columns — those columns are interpreted as
+ * UTC by the frontend, so the cron context must also be UTC, regardless of
+ * the admin-configured `app_timezone` panel setting (which is a display
+ * preference, not a storage policy).
  */
-$timezone = $app->getConfig()->getSetting(ConfigInterface::APP_TIMEZONE, 'UTC');
-if (!@date_default_timezone_set($timezone)) {
-    $app->getLogger()->warning("Invalid timezone '$timezone', falling back to UTC.");
-    date_default_timezone_set('UTC');
-}
+date_default_timezone_set('UTC');
 
 // Run main cronjobs
 foreach (glob(__DIR__ . '/php/*.php') as $file) {
diff --git a/backend/storage/migrations/2026-05-17.16.22-add-chatbot-message-usage-metadata.sql b/backend/storage/migrations/2026-05-17.16.22-add-chatbot-message-usage-metadata.sql
new file mode 100644
index 000000000..d8576665c
--- /dev/null
+++ b/backend/storage/migrations/2026-05-17.16.22-add-chatbot-message-usage-metadata.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `featherpanel_chatbot_messages`
+ADD COLUMN `input_tokens` INT UNSIGNED DEFAULT NULL AFTER `model`,
+ADD COLUMN `output_tokens` INT UNSIGNED DEFAULT NULL AFTER `input_tokens`,
+ADD COLUMN `total_tokens` INT UNSIGNED DEFAULT NULL AFTER `output_tokens`,
+ADD COLUMN `token_source` VARCHAR(32) DEFAULT NULL AFTER `total_tokens`,
+ADD COLUMN `tool_activity` JSON DEFAULT NULL AFTER `token_source`,
+ADD COLUMN `usage_json` JSON DEFAULT NULL AFTER `tool_activity`;
diff --git a/backend/storage/migrations/2026-05-17.16.30-add-chatbot-context-summary.sql b/backend/storage/migrations/2026-05-17.16.30-add-chatbot-context-summary.sql
new file mode 100644
index 000000000..8ac596e33
--- /dev/null
+++ b/backend/storage/migrations/2026-05-17.16.30-add-chatbot-context-summary.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `featherpanel_chatbot_conversations`
+ADD COLUMN `context_summary` TEXT DEFAULT NULL AFTER `memory`,
+ADD COLUMN `context_summary_updated_at` TIMESTAMP NULL DEFAULT NULL AFTER `context_summary`;
diff --git a/backend/storage/migrations/2026-05-17.19.12-create-server-custom-variables.sql b/backend/storage/migrations/2026-05-17.19.12-create-server-custom-variables.sql
new file mode 100644
index 000000000..c0952a253
--- /dev/null
+++ b/backend/storage/migrations/2026-05-17.19.12-create-server-custom-variables.sql
@@ -0,0 +1,18 @@
+CREATE TABLE
+	IF NOT EXISTS `featherpanel_server_custom_variables` (
+		`id` int (11) NOT NULL AUTO_INCREMENT,
+		`server_id` int (11) NOT NULL,
+		`user_id` int (11) NOT NULL,
+		`name` varchar(191) NOT NULL,
+		`env_variable` varchar(191) NOT NULL,
+		`variable_value` text NOT NULL,
+		`is_encrypted` tinyint (1) NOT NULL DEFAULT 0,
+		`created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+		`updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+		PRIMARY KEY (`id`),
+		UNIQUE KEY `server_custom_variables_server_env_unique` (`server_id`, `env_variable`),
+		KEY `server_custom_variables_server_id_foreign` (`server_id`),
+		KEY `server_custom_variables_user_id_foreign` (`user_id`),
+		CONSTRAINT `server_custom_variables_server_id_foreign` FOREIGN KEY (`server_id`) REFERENCES `featherpanel_servers` (`id`) ON DELETE CASCADE,
+		CONSTRAINT `server_custom_variables_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `featherpanel_users` (`id`) ON DELETE CASCADE
+	) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
diff --git a/backend/storage/migrations/2026-05-17.20.41-add-encryption-flag-to-server-custom-variables.sql b/backend/storage/migrations/2026-05-17.20.41-add-encryption-flag-to-server-custom-variables.sql
new file mode 100644
index 000000000..c2cd7524d
--- /dev/null
+++ b/backend/storage/migrations/2026-05-17.20.41-add-encryption-flag-to-server-custom-variables.sql
@@ -0,0 +1,17 @@
+SET @column_exists = (
+	SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE TABLE_SCHEMA = DATABASE()
+		AND TABLE_NAME = 'featherpanel_server_custom_variables'
+		AND COLUMN_NAME = 'is_encrypted'
+);
+
+SET @sql = IF(
+	@column_exists = 0,
+	'ALTER TABLE `featherpanel_server_custom_variables` ADD COLUMN `is_encrypted` tinyint (1) NOT NULL DEFAULT 0 AFTER `variable_value`',
+	'SELECT 1'
+);
+
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
diff --git a/backend/storage/migrations/2026-05-17.21.13-create-user-data-exports.sql b/backend/storage/migrations/2026-05-17.21.13-create-user-data-exports.sql
new file mode 100644
index 000000000..fc927d560
--- /dev/null
+++ b/backend/storage/migrations/2026-05-17.21.13-create-user-data-exports.sql
@@ -0,0 +1,29 @@
+CREATE TABLE IF NOT EXISTS `featherpanel_user_data_exports` (
+    `id` INT(11) NOT NULL AUTO_INCREMENT,
+    `uuid` CHAR(36) NOT NULL,
+    `user_uuid` CHAR(36) NOT NULL,
+    `ticket_id` INT(11) NOT NULL,
+    `status` ENUM('pending', 'processing', 'completed', 'failed') NOT NULL DEFAULT 'pending',
+    `attempts` INT(11) NOT NULL DEFAULT 0,
+    `file_path` VARCHAR(255) DEFAULT NULL,
+    `error_message` TEXT DEFAULT NULL,
+    `requested_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `processing_started_at` TIMESTAMP NULL DEFAULT NULL,
+    `processed_at` TIMESTAMP NULL DEFAULT NULL,
+    `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `updated_at` TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `user_data_exports_uuid_unique` (`uuid`),
+    KEY `user_data_exports_user_uuid_index` (`user_uuid`),
+    KEY `user_data_exports_ticket_id_index` (`ticket_id`),
+    KEY `user_data_exports_status_index` (`status`),
+    KEY `user_data_exports_requested_at_index` (`requested_at`),
+    CONSTRAINT `user_data_exports_user_uuid_foreign`
+        FOREIGN KEY (`user_uuid`)
+        REFERENCES `featherpanel_users` (`uuid`)
+        ON DELETE CASCADE,
+    CONSTRAINT `user_data_exports_ticket_id_foreign`
+        FOREIGN KEY (`ticket_id`)
+        REFERENCES `featherpanel_tickets` (`id`)
+        ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
diff --git a/backend/storage/migrations/2026-05-17.23.30-shift-legacy-paris-datetimes-to-utc.sql b/backend/storage/migrations/2026-05-17.23.30-shift-legacy-paris-datetimes-to-utc.sql
new file mode 100644
index 000000000..edc44c81e
--- /dev/null
+++ b/backend/storage/migrations/2026-05-17.23.30-shift-legacy-paris-datetimes-to-utc.sql
@@ -0,0 +1,286 @@
+
+-- Pin the session to UTC so any incidental `CURRENT_TIMESTAMP` (e.g. the
+-- featherpanel_migrations bookkeeping row) is at least in UTC.
+SET time_zone = '+00:00';
+
+SET @migration_cutoff_utc = '2026-05-17 12:00:00';
+
+-- -----------------------------------------------------------------------------
+-- featherpanel_users — first_seen + last_seen
+-- -----------------------------------------------------------------------------
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_users'
+      AND COLUMN_NAME IN ('first_seen', 'last_seen')
+);
+SET @sql := IF(@cnt = 2,
+    "UPDATE `featherpanel_users`
+        SET `first_seen` = CONVERT_TZ(`first_seen`, 'SYSTEM', '+00:00'),
+            `last_seen`  = CONVERT_TZ(`last_seen`,  'SYSTEM', '+00:00')
+        WHERE (`first_seen` IS NOT NULL AND `first_seen` < @migration_cutoff_utc)
+           OR (`last_seen`  IS NOT NULL AND `last_seen`  < @migration_cutoff_utc)",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- featherpanel_activity — created_at + updated_at
+-- -----------------------------------------------------------------------------
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_activity'
+      AND COLUMN_NAME IN ('created_at', 'updated_at')
+);
+SET @sql := IF(@cnt = 2,
+    "UPDATE `featherpanel_activity`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00'),
+            `updated_at` = CONVERT_TZ(`updated_at`, 'SYSTEM', '+00:00')
+        WHERE (`created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc)
+           OR (`updated_at` IS NOT NULL AND `updated_at` < @migration_cutoff_utc)",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- featherpanel_locations — created_at + updated_at
+-- -----------------------------------------------------------------------------
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_locations'
+      AND COLUMN_NAME IN ('created_at', 'updated_at')
+);
+SET @sql := IF(@cnt = 2,
+    "UPDATE `featherpanel_locations`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00'),
+            `updated_at` = CONVERT_TZ(`updated_at`, 'SYSTEM', '+00:00')
+        WHERE (`created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc)
+           OR (`updated_at` IS NOT NULL AND `updated_at` < @migration_cutoff_utc)",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- featherpanel_installed_plugins.installed_at (single column)
+-- -----------------------------------------------------------------------------
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_installed_plugins'
+      AND COLUMN_NAME = 'installed_at'
+);
+SET @sql := IF(@cnt = 1,
+    "UPDATE `featherpanel_installed_plugins`
+        SET `installed_at` = CONVERT_TZ(`installed_at`, 'SYSTEM', '+00:00')
+        WHERE `installed_at` IS NOT NULL AND `installed_at` < @migration_cutoff_utc",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- featherpanel_addons.date
+-- -----------------------------------------------------------------------------
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_addons'
+      AND COLUMN_NAME = 'date'
+);
+SET @sql := IF(@cnt = 1,
+    "UPDATE `featherpanel_addons`
+        SET `date` = CONVERT_TZ(`date`, 'SYSTEM', '+00:00')
+        WHERE `date` IS NOT NULL AND `date` < @migration_cutoff_utc",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- featherpanel_addons_settings.date
+-- -----------------------------------------------------------------------------
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_addons_settings'
+      AND COLUMN_NAME = 'date'
+);
+SET @sql := IF(@cnt = 1,
+    "UPDATE `featherpanel_addons_settings`
+        SET `date` = CONVERT_TZ(`date`, 'SYSTEM', '+00:00')
+        WHERE `date` IS NOT NULL AND `date` < @migration_cutoff_utc",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- featherpanel_settings.date
+-- -----------------------------------------------------------------------------
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_settings'
+      AND COLUMN_NAME = 'date'
+);
+SET @sql := IF(@cnt = 1,
+    "UPDATE `featherpanel_settings`
+        SET `date` = CONVERT_TZ(`date`, 'SYSTEM', '+00:00')
+        WHERE `date` IS NOT NULL AND `date` < @migration_cutoff_utc",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- Optional plugin: featherpanel_billingoxapay_logs.created_at
+-- -----------------------------------------------------------------------------
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_billingoxapay_logs'
+      AND COLUMN_NAME = 'created_at'
+);
+SET @sql := IF(@cnt = 1,
+    "UPDATE `featherpanel_billingoxapay_logs`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00')
+        WHERE `created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- Optional plugin: featherpanel_billingrazorpay_logs.created_at
+-- -----------------------------------------------------------------------------
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_billingrazorpay_logs'
+      AND COLUMN_NAME = 'created_at'
+);
+SET @sql := IF(@cnt = 1,
+    "UPDATE `featherpanel_billingrazorpay_logs`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00')
+        WHERE `created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- Optional plugin: pterodactyl-panel-api API key timestamps
+-- -----------------------------------------------------------------------------
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_pterodactylpanelapi_pterodactyl_api_key'
+      AND COLUMN_NAME IN ('created_at', 'updated_at')
+);
+SET @sql := IF(@cnt = 2,
+    "UPDATE `featherpanel_pterodactylpanelapi_pterodactyl_api_key`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00'),
+            `updated_at` = CONVERT_TZ(`updated_at`, 'SYSTEM', '+00:00')
+        WHERE (`created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc)
+           OR (`updated_at` IS NOT NULL AND `updated_at` < @migration_cutoff_utc)",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- Optional plugin: minecraftplayermanager_logs.created_at
+-- -----------------------------------------------------------------------------
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_minecraftplayermanager_logs'
+      AND COLUMN_NAME = 'created_at'
+);
+SET @sql := IF(@cnt = 1,
+    "UPDATE `featherpanel_minecraftplayermanager_logs`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00')
+        WHERE `created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- Optional plugin suite: VM / VDS DATETIME defaults
+-- -----------------------------------------------------------------------------
+
+-- vm_creation_pending.created_at
+SET @cnt := (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'featherpanel_vm_creation_pending' AND COLUMN_NAME = 'created_at');
+SET @sql := IF(@cnt = 1,
+    "UPDATE `featherpanel_vm_creation_pending`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00')
+        WHERE `created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- vm_instances.created_at + updated_at
+SET @cnt := (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'featherpanel_vm_instances' AND COLUMN_NAME IN ('created_at','updated_at'));
+SET @sql := IF(@cnt = 2,
+    "UPDATE `featherpanel_vm_instances`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00'),
+            `updated_at` = CONVERT_TZ(`updated_at`, 'SYSTEM', '+00:00')
+        WHERE (`created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc)
+           OR (`updated_at` IS NOT NULL AND `updated_at` < @migration_cutoff_utc)",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- vm_instance_ips.created_at + updated_at
+SET @cnt := (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'featherpanel_vm_instance_ips' AND COLUMN_NAME IN ('created_at','updated_at'));
+SET @sql := IF(@cnt = 2,
+    "UPDATE `featherpanel_vm_instance_ips`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00'),
+            `updated_at` = CONVERT_TZ(`updated_at`, 'SYSTEM', '+00:00')
+        WHERE (`created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc)
+           OR (`updated_at` IS NOT NULL AND `updated_at` < @migration_cutoff_utc)",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- vm_logs.created_at
+SET @cnt := (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'featherpanel_vm_logs' AND COLUMN_NAME = 'created_at');
+SET @sql := IF(@cnt = 1,
+    "UPDATE `featherpanel_vm_logs`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00')
+        WHERE `created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- vm_nodes.created_at + updated_at
+SET @cnt := (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'featherpanel_vm_nodes' AND COLUMN_NAME IN ('created_at','updated_at'));
+SET @sql := IF(@cnt = 2,
+    "UPDATE `featherpanel_vm_nodes`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00'),
+            `updated_at` = CONVERT_TZ(`updated_at`, 'SYSTEM', '+00:00')
+        WHERE (`created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc)
+           OR (`updated_at` IS NOT NULL AND `updated_at` < @migration_cutoff_utc)",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- vm_ssh_keys.created_at + updated_at
+SET @cnt := (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'featherpanel_vm_ssh_keys' AND COLUMN_NAME IN ('created_at','updated_at'));
+SET @sql := IF(@cnt = 2,
+    "UPDATE `featherpanel_vm_ssh_keys`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00'),
+            `updated_at` = CONVERT_TZ(`updated_at`, 'SYSTEM', '+00:00')
+        WHERE (`created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc)
+           OR (`updated_at` IS NOT NULL AND `updated_at` < @migration_cutoff_utc)",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- vm_tasks.created_at + updated_at
+SET @cnt := (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'featherpanel_vm_tasks' AND COLUMN_NAME IN ('created_at','updated_at'));
+SET @sql := IF(@cnt = 2,
+    "UPDATE `featherpanel_vm_tasks`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00'),
+            `updated_at` = CONVERT_TZ(`updated_at`, 'SYSTEM', '+00:00')
+        WHERE (`created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc)
+           OR (`updated_at` IS NOT NULL AND `updated_at` < @migration_cutoff_utc)",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- vm_templates.created_at + updated_at
+SET @cnt := (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'featherpanel_vm_templates' AND COLUMN_NAME IN ('created_at','updated_at'));
+SET @sql := IF(@cnt = 2,
+    "UPDATE `featherpanel_vm_templates`
+        SET `created_at` = CONVERT_TZ(`created_at`, 'SYSTEM', '+00:00'),
+            `updated_at` = CONVERT_TZ(`updated_at`, 'SYSTEM', '+00:00')
+        WHERE (`created_at` IS NOT NULL AND `created_at` < @migration_cutoff_utc)
+           OR (`updated_at` IS NOT NULL AND `updated_at` < @migration_cutoff_utc)",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
diff --git a/backend/storage/migrations/2026-05-17.23.45-add-server-schedule-timezone.sql b/backend/storage/migrations/2026-05-17.23.45-add-server-schedule-timezone.sql
new file mode 100644
index 000000000..129dc6b12
--- /dev/null
+++ b/backend/storage/migrations/2026-05-17.23.45-add-server-schedule-timezone.sql
@@ -0,0 +1,15 @@
+-- Add a per-schedule timezone column so each server cron schedule can be
+-- evaluated in whichever zone the user actually authored it for (e.g. a
+-- nightly backup at 03:00 should mean 03:00 local for that user, not 03:00
+-- UTC). Defaults to 'UTC' so existing schedules keep their current
+-- behaviour without any surprise time shift.
+SET @cnt := (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'featherpanel_server_schedules'
+      AND COLUMN_NAME = 'timezone'
+);
+SET @sql := IF(@cnt = 0,
+    "ALTER TABLE `featherpanel_server_schedules` ADD COLUMN `timezone` VARCHAR(64) NOT NULL DEFAULT 'UTC' AFTER `cron_minute`",
+    'DO 0');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
diff --git a/backend/storage/migrations/2026-05-19.20.00-add-moderation-reasons.sql b/backend/storage/migrations/2026-05-19.20.00-add-moderation-reasons.sql
new file mode 100644
index 000000000..1a7723c0f
--- /dev/null
+++ b/backend/storage/migrations/2026-05-19.20.00-add-moderation-reasons.sql
@@ -0,0 +1,10 @@
+-- Ban / suspension metadata for staff visibility
+ALTER TABLE `featherpanel_users`
+ADD COLUMN `ban_reason` TEXT NULL DEFAULT NULL AFTER `banned`,
+ADD COLUMN `banned_at` DATETIME NULL DEFAULT NULL AFTER `ban_reason`,
+ADD COLUMN `banned_by_uuid` CHAR(36) NULL DEFAULT NULL AFTER `banned_at`;
+
+ALTER TABLE `featherpanel_servers`
+ADD COLUMN `suspension_reason` TEXT NULL DEFAULT NULL AFTER `suspended`,
+ADD COLUMN `suspended_at` DATETIME NULL DEFAULT NULL AFTER `suspension_reason`,
+ADD COLUMN `suspended_by_uuid` CHAR(36) NULL DEFAULT NULL AFTER `suspended_at`;
diff --git a/backend/storage/migrations/2026-05-19.20.30-add-vm-moderation-reasons.sql b/backend/storage/migrations/2026-05-19.20.30-add-vm-moderation-reasons.sql
new file mode 100644
index 000000000..ffbcbf57a
--- /dev/null
+++ b/backend/storage/migrations/2026-05-19.20.30-add-vm-moderation-reasons.sql
@@ -0,0 +1,5 @@
+-- Suspension metadata for VDS/VM instances (staff visibility)
+ALTER TABLE `featherpanel_vm_instances`
+ADD COLUMN `suspension_reason` TEXT NULL DEFAULT NULL AFTER `suspended`,
+ADD COLUMN `suspended_at` DATETIME NULL DEFAULT NULL AFTER `suspension_reason`,
+ADD COLUMN `suspended_by_uuid` CHAR(36) NULL DEFAULT NULL AFTER `suspended_at`;
diff --git a/backend/storage/migrations/2026-05-20.12.00-add-spell-sort-order.sql b/backend/storage/migrations/2026-05-20.12.00-add-spell-sort-order.sql
new file mode 100644
index 000000000..2faf340b6
--- /dev/null
+++ b/backend/storage/migrations/2026-05-20.12.00-add-spell-sort-order.sql
@@ -0,0 +1,5 @@
+-- Custom display order for spells within each realm
+ALTER TABLE `featherpanel_spells`
+ADD COLUMN `sort_order` INT NOT NULL DEFAULT 0 AFTER `realm_id`;
+
+CREATE INDEX `spells_realm_sort_order_index` ON `featherpanel_spells` (`realm_id`, `sort_order`);
diff --git a/frontendv2/package.json b/frontendv2/package.json
index 4d052007f..3ce7f0980 100644
--- a/frontendv2/package.json
+++ b/frontendv2/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "frontendv2",
-	"version": "1.3.7+2",
+	"version": "1.3.7+3",
 	"license": "AGPL-3.0-or-later",
 	"type": "module",
 	"scripts": {
@@ -47,7 +47,8 @@
 		"axios": "^1.16.1",
 		"class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
-		"date-fns": "^4.1.0",
+		"date-fns": "^4.2.1",
+		"date-fns-tz": "^3.2.0",
 		"js-yaml": "^4.1.1",
 		"lucide-react": "^1.16.0",
 		"next": "16.2.6",
diff --git a/frontendv2/pnpm-lock.yaml b/frontendv2/pnpm-lock.yaml
index ec976bddb..285f6d79f 100644
--- a/frontendv2/pnpm-lock.yaml
+++ b/frontendv2/pnpm-lock.yaml
@@ -81,8 +81,11 @@ importers:
         specifier: ^2.1.1
         version: 2.1.1
       date-fns:
-        specifier: ^4.1.0
-        version: 4.1.0
+        specifier: ^4.2.1
+        version: 4.2.1
+      date-fns-tz:
+        specifier: ^3.2.0
+        version: 3.2.0(date-fns@4.2.1)
       js-yaml:
         specifier: ^4.1.1
         version: 4.1.1
@@ -1690,8 +1693,13 @@ packages:
     resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
     engines: {node: '>= 0.4'}
 
-  date-fns@4.1.0:
-    resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==}
+  date-fns-tz@3.2.0:
+    resolution: {integrity: sha512-sg8HqoTEulcbbbVXeg84u5UnlsQa8GS5QXMqjjYIhS4abEVVKIUwe0/l/UhrZdKaL/W5eWZNlbTeEIiOXTcsBQ==}
+    peerDependencies:
+      date-fns: ^3.0.0 || ^4.0.0
+
+  date-fns@4.2.1:
+    resolution: {integrity: sha512-37RhSdxaG1suen6VDCza6rNrQfooyQh57HFVPwQGEq2QWliVLzPQZ8Oa017weOu+HZCnzI7N3Pf/wyoBKfEqrA==}
 
   debug@3.2.7:
     resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
@@ -5084,7 +5092,11 @@ snapshots:
       es-errors: 1.3.0
       is-data-view: 1.0.2
 
-  date-fns@4.1.0: {}
+  date-fns-tz@3.2.0(date-fns@4.2.1):
+    dependencies:
+      date-fns: 4.2.1
+
+  date-fns@4.2.1: {}
 
   debug@3.2.7:
     dependencies:
diff --git a/frontendv2/public/icanhasfeatherpanel/events/allocations.html b/frontendv2/public/icanhasfeatherpanel/events/allocations.html
index e5c9b2f84..71c6ef8b3 100644
--- a/frontendv2/public/icanhasfeatherpanel/events/allocations.html
+++ b/frontendv2/public/icanhasfeatherpanel/events/allocations.html
@@ -189,7 +189,7 @@ <h2><code>featherpanel:admin:allocations:allocation:updated</code></h2>
   <p class="muted"><strong>Callback parameters:</strong> int allocation id, array old data, array new data.</p>
 
   <h3>Event Data</h3>
-  <p class="muted"><strong>Data keys:</strong> allocation, updated_by, updated_data</p>
+  <p class="muted"><strong>Data keys:</strong> allocation, deleted_source_conflicts, deleted_target_conflicts, from_ip, ip_alias, matched_count, node_id, to_ip, updated_by, updated_count, updated_data</p>
 
   <h3>Emitted From</h3>
   <ul>
@@ -202,9 +202,9 @@ <h3>Usage Example</h3>
 
 public static function processEvents(PluginEvents $evt): void
 {
-    $evt->on(AllocationsEvent::onAllocationUpdated(), function ($allocation, $updatedBy, $updatedData) {
+    $evt->on(AllocationsEvent::onAllocationUpdated(), function ($allocation, $deletedSourceConflicts, $deletedTargetConflicts, $fromIp, $ipAlias, $matchedCount, $nodeId, $toIp, $updatedBy, $updatedCount, $updatedData) {
         // Handle featherpanel:admin:allocations:allocation:updated
-        // Data keys: allocation, updated_by, updated_data
+        // Data keys: allocation, deleted_source_conflicts, deleted_target_conflicts, from_ip, ip_alias, matched_count, node_id, to_ip, updated_by, updated_count, updated_data
     });
 }</code></pre>
 </article>
diff --git a/frontendv2/public/icanhasfeatherpanel/events/index.html b/frontendv2/public/icanhasfeatherpanel/events/index.html
index 4cebee736..cde6db998 100644
--- a/frontendv2/public/icanhasfeatherpanel/events/index.html
+++ b/frontendv2/public/icanhasfeatherpanel/events/index.html
@@ -29,7 +29,7 @@ <h1>Plugin Events &amp; Hooks</h1>
       </p>
       <div style="margin-top: 0.75rem;">
         <span class="badge">49 event categories</span>
-        <span class="badge">390 total events</span>
+        <span class="badge">391 total events</span>
       </div>
     </header>
 
diff --git a/frontendv2/public/icanhasfeatherpanel/events/server.html b/frontendv2/public/icanhasfeatherpanel/events/server.html
index b53b98bed..abbb24c9d 100644
--- a/frontendv2/public/icanhasfeatherpanel/events/server.html
+++ b/frontendv2/public/icanhasfeatherpanel/events/server.html
@@ -1258,11 +1258,11 @@ <h2><code>featherpanel:server:transfer:initiated</code></h2>
   <p class="muted"><strong>Callback parameters:</strong> array server data, array source_node, array destination_node, array initiated_by.</p>
 
   <h3>Event Data</h3>
-  <p class="muted"><strong>Data keys:</strong> destination_node, initiated_by, server, source_node</p>
+  <p class="muted"><strong>Data keys:</strong> N/A</p>
 
   <h3>Emitted From</h3>
   <ul>
-<li><code>backend/app/Controllers/Admin/ServersController.php</code></li>
+<li class="muted">No known emission locations.</li>
   </ul>
 
   <h3>Usage Example</h3>
@@ -1271,9 +1271,9 @@ <h3>Usage Example</h3>
 
 public static function processEvents(PluginEvents $evt): void
 {
-    $evt->on(ServerEvent::onServerTransferInitiated(), function ($destinationNode, $initiatedBy, $server, $sourceNode) {
+    $evt->on(ServerEvent::onServerTransferInitiated(), function ($data, $source_node, $destination_node, $initiated_by) {
         // Handle featherpanel:server:transfer:initiated
-        // Data keys: destination_node, initiated_by, server, source_node
+        // Parameters: array server data, array source_node, array destination_node, array initiated_by.
     });
 }</code></pre>
 </article>
diff --git a/frontendv2/public/icanhasfeatherpanel/events/spells.html b/frontendv2/public/icanhasfeatherpanel/events/spells.html
index 69cf052e0..2581e03ac 100644
--- a/frontendv2/public/icanhasfeatherpanel/events/spells.html
+++ b/frontendv2/public/icanhasfeatherpanel/events/spells.html
@@ -24,7 +24,7 @@
     <a href="/icanhasfeatherpanel/events/index.html" class="back-link">&larr; Back to all event categories</a>
     <header>
       <h1>Spells</h1>
-      <p class="muted">14 events in this category.</p>
+      <p class="muted">15 events in this category.</p>
     </header>
 
 <article class="card">
@@ -235,6 +235,32 @@ <h3>Usage Example</h3>
 }</code></pre>
 </article>
 
+<article class="card">
+  <h2><code>featherpanel:admin:spells:reordered</code></h2>
+  <p class="muted"><strong>Method:</strong> <code>onSpellsReordered</code></p>
+  <p class="muted"><strong>Callback parameters:</strong> int realm id, array spells, array reordered_by.</p>
+
+  <h3>Event Data</h3>
+  <p class="muted"><strong>Data keys:</strong> realm_id, reordered_by, spells</p>
+
+  <h3>Emitted From</h3>
+  <ul>
+<li><code>backend/app/Controllers/Admin/SpellsController.php</code></li>
+  </ul>
+
+  <h3>Usage Example</h3>
+  <pre><code>use App\Plugins\PluginEvents;
+use App\Plugins\Events\Events\SpellsEvent;
+
+public static function processEvents(PluginEvents $evt): void
+{
+    $evt->on(SpellsEvent::onSpellsReordered(), function ($realmId, $reorderedBy, $spells) {
+        // Handle featherpanel:admin:spells:reordered
+        // Data keys: realm_id, reordered_by, spells
+    });
+}</code></pre>
+</article>
+
 <article class="card">
   <h2><code>featherpanel:admin:spells:retrieved</code></h2>
   <p class="muted"><strong>Method:</strong> <code>onSpellsRetrieved</code></p>
diff --git a/frontendv2/public/icanhasfeatherpanel/events/ticket.html b/frontendv2/public/icanhasfeatherpanel/events/ticket.html
index 72b663372..6c8190553 100644
--- a/frontendv2/public/icanhasfeatherpanel/events/ticket.html
+++ b/frontendv2/public/icanhasfeatherpanel/events/ticket.html
@@ -221,6 +221,7 @@ <h3>Emitted From</h3>
   <ul>
 <li><code>backend/app/Controllers/Admin/TicketsController.php</code></li>
 <li><code>backend/app/Controllers/User/TicketsController.php</code></li>
+<li><code>backend/app/Controllers/User/User/SessionController.php</code></li>
   </ul>
 
   <h3>Usage Example</h3>
diff --git a/frontendv2/public/icanhasfeatherpanel/events/user.html b/frontendv2/public/icanhasfeatherpanel/events/user.html
index b75041c34..5cbf6fbb8 100644
--- a/frontendv2/public/icanhasfeatherpanel/events/user.html
+++ b/frontendv2/public/icanhasfeatherpanel/events/user.html
@@ -268,7 +268,7 @@ <h2><code>featherpanel:user:updated</code></h2>
   <p class="muted"><strong>Callback parameters:</strong> array user data, array updated data, array updated by.</p>
 
   <h3>Event Data</h3>
-  <p class="muted"><strong>Data keys:</strong> banned, updated_by, updated_data, user</p>
+  <p class="muted"><strong>Data keys:</strong> ban_reason, mail_verify, updated_by, updated_data, user</p>
 
   <h3>Emitted From</h3>
   <ul>
@@ -281,9 +281,9 @@ <h3>Usage Example</h3>
 
 public static function processEvents(PluginEvents $evt): void
 {
-    $evt->on(UserEvent::onUserUpdated(), function ($banned, $updatedBy, $updatedData, $user) {
+    $evt->on(UserEvent::onUserUpdated(), function ($banReason, $mailVerify, $updatedBy, $updatedData, $user) {
         // Handle featherpanel:user:updated
-        // Data keys: banned, updated_by, updated_data, user
+        // Data keys: ban_reason, mail_verify, updated_by, updated_data, user
     });
 }</code></pre>
 </article>
diff --git a/frontendv2/public/locales/en.json b/frontendv2/public/locales/en.json
index b913068e1..f4940d0eb 100644
--- a/frontendv2/public/locales/en.json
+++ b/frontendv2/public/locales/en.json
@@ -30,7 +30,16 @@
 			"continue_with_password": "Enter your password to continue",
 			"request_login_code": "Request Login Code",
 			"use_password_instead": "Use Password Instead",
-			"use_different_account": "Use a different account"
+			"use_different_account": "Use a different account",
+			"ldapProvider": "LDAP Provider",
+			"ldapUsername": "LDAP Username",
+			"ldapUsernamePlaceholder": "Enter your LDAP username",
+			"selectLdapProvider": "Please select an LDAP provider",
+			"ldapLogin": "LDAP Login",
+			"ldapLoginDescription": "Use your directory account",
+			"ldapLoginTitle": "Directory sign in",
+			"ldapLoginSubtitle": "Choose your provider and sign in with your LDAP credentials.",
+			"loginWithLdap": "Login with LDAP"
 		},
 		"emailLogin": {
 			"title": "Email Login",
@@ -146,7 +155,9 @@
 			"failed": "Failed to verify email.",
 			"success_title": "Email verified",
 			"failed_title": "Verification failed",
-			"continue_to_login": "Continue to login"
+			"continue_to_login": "Continue to login",
+			"resend": "Resend verification email",
+			"resend_sent": "If this account still needs verification, a new email is on its way."
 		},
 		"loginSuccess": "Login successful",
 		"ssoLoggingIn": "Logging in via SSO...",
@@ -227,6 +238,7 @@
 		"enable": "Enable",
 		"copiedToClipboard": "Copied to clipboard",
 		"copied_to_clipboard": "Copied to clipboard",
+		"copy_to_clipboard": "Copy to clipboard",
 		"reload": "Reload",
 		"retry": "Retry",
 		"actionsCannotBeUndone": "Actions cannot be undone",
@@ -259,7 +271,10 @@
 		"users": "users",
 		"confirm": "Confirm",
 		"search": "Search",
+		"select": "Select",
 		"copy": "Copy",
+		"format": "Format",
+		"format_document": "Format Document",
 		"time": {
 			"just_now": "Just now",
 			"hours_ago": "{count} hour{s} ago",
@@ -272,7 +287,10 @@
 		"copied": "Copied to clipboard",
 		"failed": "Failed",
 		"importing": "Importing...",
+		"not_available": "—",
 		"nA": "N/A",
+		"no_data": "No data",
+		"no_content": "No content",
 		"noPermission": "You do not have permission to perform this action.",
 		"pending": "Pending",
 		"pleaseFixErrors": "Please fix the errors below.",
@@ -297,11 +315,20 @@
 		"inactive": "Inactive",
 		"enabled": "Enabled",
 		"disabled": "Disabled",
-		"save_changes": "Save Changes"
+		"dismiss": "Dismiss",
+		"closePanel": "Close panel",
+		"loadingApp": "Loading {appName}",
+		"initializingApplication": "Initializing application...",
+		"save_changes": "Save Changes",
+		"hacker_easter_egg": {
+			"title": "Look what you have done script kiddy.",
+			"description": "Hahahah how funny you are you think you're a hacker or something? Okay then, let's see how you get rid of me."
+		}
 	},
 	"branding": {
 		"running_on": "Running on {name} {version}",
-		"copyright": "{company}"
+		"copyright": "{company}",
+		"powered_by": "Powered by FeatherPanel"
 	},
 	"maintenance": {
 		"title": "System Maintenance",
@@ -322,7 +349,9 @@
 		"username_length": "Username must be between {min} and {max} characters",
 		"email_length": "Email must be between {min} and {max} characters",
 		"password_length": "Password must be between {min} and {max} characters",
-		"captcha_required": "Please complete the CAPTCHA verification"
+				"captcha_required": "Please complete the CAPTCHA verification",
+				"verification_code_6_digits": "Verification code must be 6 digits",
+				"email_required": "Email is required"
 	},
 	"dashboard": {
 		"title": "Dashboard",
@@ -490,14 +519,72 @@
 		"analyticsEnabled": "Allow analytics and external scripts",
 		"securitySettings": "Security Settings",
 		"securitySettingsDescription": "Manage your account security and authentication methods",
+		"preferences": {
+			"title": "Display Preferences",
+			"description": "Choose how dates and times are displayed across the panel."
+		},
+		"timezone": {
+			"title": "Timezone",
+			"description": "All dates and times shown in the panel will be converted to the timezone you select here. Leave on the default to follow your current device.",
+			"useBrowser": "Auto-detect from this device ({timezone})",
+			"current": "Currently using",
+			"saved": "Timezone updated",
+			"saveFailed": "Failed to update timezone"
+		},
 		"sessionManagement": "Session Management",
 		"sessionManagementDescription": "Log out of your account on this device",
 		"logout": "Logout",
+		"logoutFailed": "Logout failed",
 		"discordAccount": "Discord Account",
 		"discordAccountDescription": "Link or unlink your Discord account",
 		"linkDiscord": "Link Discord",
 		"unlinkDiscord": "Unlink Discord",
 		"linkedAs": "Linked as",
+		"discordUnlinkedSuccessfully": "Discord account unlinked successfully",
+		"discordUnlinkFailed": "Failed to unlink Discord account",
+		"oidcAccount": "OIDC Account",
+		"oidcAccountDescription": "Link an external single sign-on account to this FeatherPanel account.",
+		"linkOidc": "Link OIDC",
+		"unlinkOidc": "Unlink OIDC",
+		"selectOidcProvider": "Please select an OIDC provider",
+		"oidcLinkedSuccessfully": "OIDC account linked successfully",
+		"oidcUnlinkedSuccessfully": "OIDC account unlinked successfully",
+		"oidcLinkFailed": "Failed to link OIDC account",
+		"oidcAccessDenied": "OIDC access was denied by the provider.",
+		"oidcDiscoveryFailed": "OIDC discovery failed. Please check the provider issuer URL.",
+		"oidcEmailNotVerified": "Your OIDC email address is not verified. Verify your email with the identity provider, then try again.",
+		"oidcInvalidAudience": "The OIDC token audience does not match this FeatherPanel client.",
+		"oidcInvalidIdToken": "The identity provider returned an invalid OIDC ID token.",
+		"oidcInvalidIssuer": "The OIDC token issuer does not match the configured provider.",
+		"oidcInvalidState": "The OIDC login session expired or is invalid. Please try again.",
+		"oidcMissingCode": "The identity provider did not return an authorization code.",
+		"oidcMissingSubject": "The identity provider did not return a user subject identifier.",
+		"oidcNotConfigured": "This OIDC provider is not fully configured.",
+		"oidcProviderMissing": "Please select an OIDC provider.",
+		"oidcProviderNotFound": "The selected OIDC provider is unavailable.",
+		"oidcTokenFailed": "The identity provider rejected the token request. Please check the OIDC client configuration.",
+		"oidcUserNotFound": "No FeatherPanel account matches this OIDC identity.",
+		"oidcUnlinkFailed": "Failed to unlink OIDC account",
+		"ldapAccount": "LDAP Account",
+		"ldapAccountDescription": "Link your directory credentials so this account can sign in with LDAP.",
+		"linkLdap": "Link LDAP",
+		"unlinkLdap": "Unlink LDAP",
+		"ldapUsernamePlaceholder": "LDAP username",
+		"ldapPasswordPlaceholder": "LDAP password",
+		"ldapMissingFields": "Please select a provider and enter your LDAP username and password",
+		"ldapLinkedSuccessfully": "LDAP account linked successfully",
+		"ldapUnlinkedSuccessfully": "LDAP account unlinked successfully",
+		"ldapLinkFailed": "Failed to link LDAP account",
+		"ldapUnlinkFailed": "Failed to unlink LDAP account",
+		"dataRequest": {
+			"title": "Request Your Data",
+			"description": "Create a support ticket asking the host for a copy of the personal data associated with your account.",
+			"ticketSystemDisabledDescription": "Data requests use support tickets, but the ticket system is currently disabled.",
+			"button": "Request Data",
+			"success": "Data request created successfully",
+			"failed": "Failed to create data request",
+			"ticketSystemDisabled": "The ticket system is currently disabled"
+		},
 		"sshKeys": {
 			"title": "SSH Keys",
 			"description": "Manage your SSH keys for secure server access",
@@ -629,15 +716,25 @@
 			"statuses": {
 				"active": "Active"
 			},
-			"deleteFailed": "Failed to delete API key"
+			"deleteFailed": "Failed to delete API key",
+			"loadClientsFailed": "Failed to load API clients",
+			"loadClientFailed": "Failed to load API client",
+			"updateClientFailed": "Failed to update API client",
+			"regenerateFailed": "Failed to regenerate API keys"
 		},
 		"activity": {
 			"title": "Activity Log",
 			"description": "View your recent account activity",
 			"noActivities": "No activities yet",
+			"emptyDescription": "Your recent activity will appear here",
 			"loading": "Loading activity...",
+			"loadFailed": "Failed to load activity log",
 			"refresh": "Refresh",
-			"searchPlaceholder": "Search activity..."
+			"searchPlaceholder": "Search activity...",
+			"showingActivities": "Showing {from} to {to} of {total} activities",
+			"totalActivities": "{count} activities",
+			"noSearchResults": "No search results",
+			"tryDifferentSearch": "Try a different search term"
 		},
 		"mail": {
 			"title": "Mail List",
@@ -671,7 +768,9 @@
 			"enabled": "Enabled",
 			"enable": "Enable 2FA",
 			"disable": "Disable 2FA",
-			"description": "Add an extra layer of security to your account"
+			"description": "Add an extra layer of security to your account",
+			"disabledSuccessfully": "2FA disabled successfully",
+			"disableFailed": "Failed to disable 2FA"
 		}
 	},
 	"servers": {
@@ -1238,6 +1337,7 @@
 			"ticketPriorities": "Ticket Priorities",
 			"ticketStatuses": "Ticket Statuses",
 			"files": "Files",
+			"trash": "Trash",
 			"databases": "Databases",
 			"schedules": "Schedules",
 			"lifecycleHooks": "Lifecycle Hooks",
@@ -1318,10 +1418,42 @@
 		"messages": {
 			"update_started": "Update process started successfully.",
 			"update_failed": "Failed to start update.",
-			"checking_updates": "Checking for updates..."
+			"checking_updates": "Checking for updates...",
+			"bulk_starting": "Starting bulk updates...",
+			"bulk_started": "Bulk update process initiated!",
+			"bulk_failed": "Some updates failed to start."
+		}
+	},
+	"sidebar": {
+		"close": "Close sidebar",
+		"server_switcher": {
+			"title": "Switch server",
+			"switch": "Switch server",
+			"current": "Current server",
+			"loading": "Loading servers…",
+			"view_all": "View all servers"
 		}
 	},
 	"navbar": {
+		"server_switcher": {
+			"title": "Switch server",
+			"switch": "Switch server",
+			"current": "Current server",
+			"loading": "Loading servers…",
+			"empty": "No servers found",
+			"empty_favorites": "No favorite servers yet. Star a server in the list to pin it here.",
+			"empty_recent": "No recently viewed servers yet.",
+			"empty_search": "No servers match your search.",
+			"search_placeholder": "Search servers…",
+			"clear_search": "Clear search",
+			"tabs_label": "Server list filters",
+			"tabs": {
+				"all": "All",
+				"favorites": "Favorites",
+				"recent": "Recent"
+			},
+			"view_all": "View all servers"
+		},
 		"profile": "Your Profile",
 		"adminArea": "Admin Area",
 		"adminPanelTooltip": "Admin Panel",
@@ -1566,6 +1698,13 @@
 		"createSuccess": "Backup created successfully",
 		"restoreFailed": "Failed to restore backup",
 		"restoreSuccess": "Backup restoration initiated successfully",
+		"startSuccess": "Backup started. This may take a few minutes.",
+		"startFailed": "Failed to start backup",
+		"deleteSuccessShort": "Backup deleted",
+		"restoreStarted": "Restore started. This may take several minutes.",
+		"restoreStartFailed": "Failed to start restore",
+		"restoreTakingLong": "Restore is taking longer than expected. Please check manually.",
+		"restoreCompleted": "Restore completed successfully!",
 		"downloadFailed": "Failed to get download URL",
 		"downloadSuccess": "Download URL generated successfully",
 		"deleteFailed": "Failed to delete backup",
@@ -1801,7 +1940,9 @@
 		"loadFailed": "Failed to load subdomains.",
 		"configuration": "Configuration",
 		"helpfulTips": "Helpful Tips",
-		"guide": "Guide"
+		"guide": "Guide",
+		"guide_custom_address": "Subdomains allow you to give your server a custom address, like",
+		"guide_multiple": "You can create multiple subdomains for different purposes."
 	},
 	"serverSchedules": {
 		"title": "Schedules",
@@ -1823,6 +1964,8 @@
 		"dayOfMonth": "Day (Month)",
 		"month": "Month",
 		"dayOfWeek": "Day (Week)",
+		"timezone": "Timezone",
+		"timezoneHelp": "The timezone the cron expression above is interpreted in. For example, '0 3 * * *' with 'Europe/Paris' means 3 AM Paris time, not 3 AM UTC.",
 		"onlyWhenOnline": "Only When Online",
 		"onlyWhenOnlineHelp": "Should this schedule only run when the server is online?",
 		"scheduleEnabled": "Schedule Enabled",
@@ -1837,6 +1980,8 @@
 		"createFailed": "Failed to create schedule.",
 		"updateSuccess": "Schedule updated successfully.",
 		"updateFailed": "Failed to update schedule.",
+		"loadFailed": "Failed to load schedule.",
+		"nameRequired": "Schedule name is required.",
 		"deleteSuccess": "Schedule deleted successfully.",
 		"deleteFailed": "Failed to delete schedule.",
 		"toggleSuccess": "Schedule status updated.",
@@ -1865,7 +2010,11 @@
 		"clickToUploadJson": "Click to upload a .json file",
 		"orPasteJson": "or paste JSON",
 		"nextRun": "Next:",
-		"showing": "Showing {from}–{to} of {total}"
+		"showing": "Showing {from}–{to} of {total}",
+		"options": "Options",
+		"configuration": "Configuration",
+		"runRegardless": "No - Run regardless of server status",
+		"runOnlyOnline": "Yes - Only run when server is online"
 	},
 	"serverTasks": {
 		"title": "Schedule Tasks",
@@ -2528,16 +2677,81 @@
 			"upload_files": "Upload files",
 			"upload_folders": "Upload folder(s)",
 			"ignored_content": "Ignored Content",
-			"wipe_all": "Wipe All"
+			"wipe_all": "Wipe All",
+			"trash": "Trash"
 		},
 		"list": {
 			"header_name": "Name",
 			"header_size": "Size",
 			"header_modified": "Last Modified",
+			"header_actions": "Actions",
 			"empty": {},
 			"empty_description": "This directory is empty.",
 			"empty_title": "No Files Found"
 		},
+		"trash": {
+			"title": "Trash",
+			"subtitle": "Restore or permanently remove deleted files from your server.",
+			"description": "{count} item(s) using {size} in trash",
+			"disabled": "The file trash bin is disabled by your administrator.",
+			"back_to_files": "Back to file manager",
+			"loading": "Loading trash...",
+			"empty_title": "Trash is empty",
+			"empty": "Deleted files from the file manager will appear here until restored or purged.",
+			"restore": "Restore",
+			"delete_permanent": "Delete permanently",
+			"empty_all": "Empty trash",
+			"stats": {
+				"items": "Items",
+				"size": "Total size",
+				"selected": "Selected"
+			},
+			"list": {
+				"header_name": "Name",
+				"header_size": "Size",
+				"header_deleted": "Deleted"
+			},
+			"empty_dialog": {
+				"title": "Empty trash",
+				"description": "Permanently delete every item in trash. This cannot be undone.",
+				"cancel": "Cancel",
+				"confirm": "Empty trash",
+				"confirming": "Emptying..."
+			},
+			"restore_dialog": {
+				"title": "Restore from trash",
+				"description": "Restore {count} selected item(s) to their original location.",
+				"overwrite_label": "Replace existing files",
+				"overwrite_hint": "If the server recreated a file with the same name (for example banned-players.json), enable this to replace it with the trashed copy.",
+				"cancel": "Cancel",
+				"confirm": "Restore",
+				"confirming": "Restoring..."
+			},
+			"messages": {
+				"load_error": "Failed to load trash",
+				"restored": "Restored from trash",
+				"restore_error": "Failed to restore files",
+				"deleted": "Permanently deleted from trash",
+				"delete_error": "Failed to delete trash items",
+				"emptied": "Trash emptied",
+				"empty_error": "Failed to empty trash"
+			}
+		},
+		"archive_browser": {
+			"title": "Browse archive",
+			"loading": "Loading...",
+			"empty": "This folder is empty.",
+			"error": "Could not read this archive. It may be unsupported, corrupted, or too large.",
+			"truncated": "Listing was truncated. Extract the archive to see everything.",
+			"up": "Up",
+			"close": "Close",
+			"drag_hint": "Drag files or folders onto a directory in the file manager to extract them there, or onto a breadcrumb to choose a parent path. Folders use the grip on the right.",
+			"drag_handle": "Drag to extract this item",
+			"extract_here": "Extract here",
+			"extract_root": "Extract to root",
+			"extract_full": "Extract entire archive here",
+			"extract_full_loading": "Extracting archive..."
+		},
 		"messages": {
 			"active_pull": "Active Pull",
 			"task_id": "Task ID: {id}",
@@ -2545,9 +2759,19 @@
 			"wings_connection_unavailable": "Wings Connection Unavailable. Please contact the support team.",
 			"contact_support": "If this problem persists, please contact the support team.",
 			"failed_download": "Failed to initiate download",
+			"request_timed_out": "Request timed out",
+			"load_timeout_retry": "File loading timed out. Please try again.",
+			"download_cancelled": "Download cancelled",
+			"cancel_download_failed": "Failed to cancel download",
+			"moved_to_trash": "Moved to trash",
+			"deleted": "Deleted successfully",
+			"delete_failed": "Failed to delete files",
 			"extracting": "Extracting archive...",
 			"extracted": "Archive extracted",
 			"extract_failed": "Failed to extract archive",
+			"archive_members_extracting": "Extracting from archive...",
+			"archive_members_extracted": "Extracted into folder",
+			"archive_members_extract_failed": "Could not extract from archive",
 			"uploading": "Uploading {file}...",
 			"upload_complete": "Upload complete",
 			"upload_failed": "Upload failed",
@@ -2587,6 +2811,7 @@
 			"contents_placeholder": "Search text in files...",
 			"search": "Search",
 			"stop": "Stop",
+			"search_failed": "Failed to search files",
 			"no_results": "No matches found in this folder",
 			"results_title": "Search results",
 			"result_item": "{count} matches in {file}",
@@ -2787,6 +3012,154 @@
 					"maxWorldSize": {
 						"label": "Max World Size",
 						"description": "Maximum world size in blocks"
+					},
+					"serverName": {
+						"label": "Server Name",
+						"description": "Internal server name used for logging"
+					},
+					"serverIp": {
+						"label": "Server IP",
+						"description": "Bind address (leave empty for all interfaces)"
+					},
+					"serverPort": {
+						"label": "Server Port",
+						"description": "Port the Minecraft server listens on"
+					},
+					"networkCompressionThreshold": {
+						"label": "Network Compression Threshold",
+						"description": "Packet size threshold for compression (-1 to disable)"
+					},
+					"rateLimit": {
+						"label": "Rate Limit",
+						"description": "Maximum packets per second (0 to disable)"
+					},
+					"playerIdleTimeout": {
+						"label": "Player Idle Timeout",
+						"description": "Minutes before idle players are kicked (0 to disable)"
+					},
+					"pauseWhenEmptySeconds": {
+						"label": "Pause When Empty (seconds)",
+						"description": "Seconds after last player leaves before pausing (-1 to disable)"
+					},
+					"enableStatus": {
+						"label": "Enable Status",
+						"description": "Respond to server list ping requests"
+					},
+					"preventProxyConnections": {
+						"label": "Prevent Proxy Connections",
+						"description": "Block players if ISP differs from the one used to join"
+					},
+					"logIps": {
+						"label": "Log IPs",
+						"description": "Log player IP addresses in the server log"
+					},
+					"acceptsTransfers": {
+						"label": "Accepts Transfers",
+						"description": "Allow players to transfer to this server from another server"
+					},
+					"enableRcon": {
+						"label": "Enable RCON",
+						"description": "Enable remote console access"
+					},
+					"rconPort": {
+						"label": "RCON Port",
+						"description": "Port used for RCON connections"
+					},
+					"rconPassword": {
+						"label": "RCON Password",
+						"description": "Password required for RCON access"
+					},
+					"broadcastRconToOps": {
+						"label": "Broadcast RCON to OPs",
+						"description": "Send RCON command output to online operators"
+					},
+					"enableQuery": {
+						"label": "Enable Query",
+						"description": "Enable GameSpy4 query protocol"
+					},
+					"queryPort": {
+						"label": "Query Port",
+						"description": "Port used for query protocol responses"
+					},
+					"managementServerEnabled": {
+						"label": "Enable Management Server",
+						"description": "Enable the built-in management server API"
+					},
+					"managementServerHost": {
+						"label": "Management Server Host",
+						"description": "Host address for the management server"
+					},
+					"managementServerPort": {
+						"label": "Management Server Port",
+						"description": "Port for the management server (0 for automatic)"
+					},
+					"managementServerSecret": {
+						"label": "Management Server Secret",
+						"description": "Shared secret for management server authentication"
+					},
+					"managementServerAllowedOrigins": {
+						"label": "Allowed Origins",
+						"description": "Comma-separated list of allowed CORS origins"
+					},
+					"managementServerTlsEnabled": {
+						"label": "Management TLS Enabled",
+						"description": "Use TLS for management server connections"
+					},
+					"managementServerTlsKeystore": {
+						"label": "TLS Keystore Path",
+						"description": "Path to the TLS keystore file"
+					},
+					"managementServerTlsKeystorePassword": {
+						"label": "TLS Keystore Password",
+						"description": "Password for the TLS keystore"
+					},
+					"initialEnabledPacks": {
+						"label": "Initial Enabled Packs",
+						"description": "Comma-separated list of data packs enabled on world creation"
+					},
+					"initialDisabledPacks": {
+						"label": "Initial Disabled Packs",
+						"description": "Comma-separated list of data packs disabled on world creation"
+					},
+					"maxTickTime": {
+						"label": "Max Tick Time",
+						"description": "Maximum milliseconds per tick before watchdog stops the server"
+					},
+					"statusHeartbeatInterval": {
+						"label": "Status Heartbeat Interval",
+						"description": "Interval in seconds for status heartbeats (0 to disable)"
+					},
+					"regionFileCompression": {
+						"label": "Region File Compression",
+						"description": "Compression algorithm used for region files"
+					},
+					"syncChunkWrites": {
+						"label": "Sync Chunk Writes",
+						"description": "Synchronously write chunk data to disk"
+					},
+					"debug": {
+						"label": "Debug Mode",
+						"description": "Enable debug logging"
+					},
+					"enableJmxMonitoring": {
+						"label": "Enable JMX Monitoring",
+						"description": "Expose JMX monitoring beans"
+					},
+					"enableCodeOfConduct": {
+						"label": "Enable Code of Conduct",
+						"description": "Enable the Minecraft code of conduct system"
+					},
+					"bugReportLink": {
+						"label": "Bug Report Link",
+						"description": "URL shown to players for reporting bugs"
+					},
+					"textFilteringConfig": {
+						"label": "Text Filtering Config",
+						"description": "Path or configuration for chat text filtering"
+					},
+					"textFilteringVersion": {
+						"label": "Text Filtering Version",
+						"description": "Text filtering configuration version"
 					}
 				},
 				"sections": {
@@ -2796,7 +3169,10 @@
 					"network": "Network & Security",
 					"performance": "Performance Settings",
 					"resourcePack": "Resource Pack",
-					"advanced": "Advanced Settings"
+					"advanced": "Advanced Settings",
+					"dataPacks": "Data Packs",
+					"rconQuery": "RCON & Query",
+					"managementServer": "Management Server"
 				},
 				"sectionsDescriptions": {
 					"serverInfo": "Basic server configuration",
@@ -2805,7 +3181,10 @@
 					"network": "Network and security settings",
 					"performance": "Server performance and rendering settings",
 					"resourcePack": "Resource pack configuration",
-					"advanced": "Advanced server configuration"
+					"advanced": "Advanced server configuration",
+					"dataPacks": "Initial data pack configuration",
+					"rconQuery": "Remote console and query protocol settings",
+					"managementServer": "Built-in management API settings"
 				},
 				"options": {
 					"gamemode": {
@@ -2826,6 +3205,11 @@
 						"amplified": "Amplified",
 						"largeBiomes": "Large Biomes",
 						"singleBiome": "Single Biome"
+					},
+					"regionFileCompression": {
+						"deflate": "Deflate",
+						"none": "None",
+						"lz4": "LZ4"
 					}
 				}
 			},
@@ -3205,6 +3589,8 @@
 			"preview": "Preview",
 			"cant_preview": "Cannot preview this file",
 			"folder_label": "Folder",
+			"trash_open": "Open trash",
+			"trash_empty": "Empty trash",
 			"edit": "Edit",
 			"rename": "Rename",
 			"download": "Download",
@@ -3212,11 +3598,21 @@
 			"move": "Move",
 			"hash": "File Hash",
 			"extract": "Extract",
+			"browse_archive": "Browse archive",
 			"compress": "Compress",
 			"permissions": "Permissions",
 			"delete": "Delete"
 		},
 		"dialogs": {
+			"archive_browse": {
+				"title": "Browse archive",
+				"loading": "Loading…",
+				"empty": "This folder is empty.",
+				"error": "Could not read this archive. It may be unsupported, corrupted, or too large.",
+				"truncated": "Listing was truncated. Extract the archive to see everything.",
+				"up": "Up",
+				"close": "Close"
+			},
 			"create_file": {
 				"title": "Create New File",
 				"description": "Create a new file in {root}",
@@ -3240,7 +3636,12 @@
 			},
 			"delete": {
 				"title": "Delete Files",
+				"title_trash": "Delete files",
 				"description": "Are you sure you want to delete {count} item(s)? This action cannot be undone.",
+				"description_trash": "Move {count} selected item(s) to trash. You can restore them from the Trash page.",
+				"move_to_trash": "Move to trash",
+				"moving_to_trash": "Moving to trash…",
+				"delete_permanent_short": "Delete permanently",
 				"cancel": "Cancel",
 				"delete": "Delete",
 				"deleting": "Deleting..."
@@ -3358,6 +3759,37 @@
 	},
 	"admin": {
 		"navbar": {},
+		"moderation": {
+			"reason_category_label": "Reason category",
+			"reason_category_placeholder": "Select a category (optional)",
+			"reason_details_label": "Details for staff",
+			"reason_details_placeholder": "Describe why this action was taken. Visible to staff only.",
+			"reason_details_help": "Provide a category, at least 3 characters of detail, or both. This helps other staff understand the decision.",
+			"reason_required": "A reason is required when suspending or banning.",
+			"status_reason": "Reason",
+			"status_by": "Actioned by",
+			"status_at": "Actioned at",
+			"no_reason_recorded": "No reason recorded",
+			"unknown_staff": "Unknown staff member",
+			"unknown_time": "Unknown time",
+			"user_banned_title": "Account ban active",
+			"user_not_banned": "This account is not banned.",
+			"server_suspended_title": "Server suspension active",
+			"server_not_suspended": "This server is not suspended.",
+			"vds_suspended_title": "VDS suspension active",
+			"vds_not_suspended": "This VDS instance is not suspended.",
+			"categories": {
+				"payment_overdue": "Payment overdue",
+				"terms_violation": "Terms of service violation",
+				"abuse_harassment": "Abuse or harassment",
+				"resource_abuse": "Resource abuse",
+				"security_threat": "Security threat",
+				"spam": "Spam or advertising",
+				"chargeback": "Chargeback or fraud",
+				"manual_review": "Manual review required",
+				"other": "Other"
+			}
+		},
 		"affiliates": {
 			"title": "Recommended Partners",
 			"description": "Affiliate hosting partners for game and VDS infrastructure.",
@@ -3853,6 +4285,8 @@
 				"field_lxc_root_password": "Default LXC root password",
 				"field_lxc_root_password_placeholder": "e.g. P@ssw0rd (shown to users after deploy)",
 				"field_lxc_root_password_help": "Informational only. FeatherPanel does not change the root password on the container; this value is just displayed to users as the default root password for LXC instances created from this template.",
+				"security_recommendation": "Security Recommendation",
+				"lxc_security_warning": "LXC is not recommended for public hosting due to security risks.",
 				"create_success": "Template added successfully.",
 				"create_failed": "Failed to add template.",
 				"delete_success": "Template deleted.",
@@ -4095,6 +4529,12 @@
 				"fetch_failed": "Failed to load IP pool.",
 				"add_success": "IP added successfully.",
 				"add_failed": "Failed to add IP.",
+				"single": "Single",
+				"bulk": "Bulk",
+				"bulk_list": "IP list",
+				"bulk_help": "One IP per line, or comma/space separated. CIDR/gateway/notes apply to all.",
+				"bulk_empty": "Add at least one IP (one per line, comma, or space separated).",
+				"bulk_invalid_ip": "Invalid IP in list: {ip}",
 				"update_success": "IP updated successfully.",
 				"update_failed": "Failed to update IP.",
 				"delete_success": "IP deleted successfully.",
@@ -4268,6 +4708,15 @@
 			"resize_disk": "Expand disk",
 			"disk_size_placeholder": "e.g. +5G or 20G",
 			"resize_success": "Disk resized successfully.",
+			"resize_input_required": "Select a disk and enter size (e.g. +5G)",
+			"infrastructure_required_to_continue": "Add at least one VPS location and one VDS node before continuing.",
+			"infrastructure_required": "Infrastructure required",
+			"create_vps_location_first": "Create at least one VPS location first.",
+			"create_vds_node_first": "Create at least one VDS node and link it to a location.",
+			"infrastructure_counts": "{locations} VPS location(s) · {nodes} VDS node(s)",
+			"recheck_infrastructure": "Recheck infrastructure",
+			"create_ip_and_assign": "Create IP and assign",
+			"initiating_creation": "Initiating VM creation…",
 			"network_multi_hint": "Add or remove IPs (Proxmox net0, net1, …). Select IP from pool for each interface.",
 			"network_multi_qemu_hint": "Add or remove IPs for this VM. FeatherPanel will keep virtual NICs and cloud-init ipconfig entries aligned automatically.",
 			"add_ip": "Add IP",
@@ -4275,6 +4724,8 @@
 			"secondary_ip": "Secondary",
 			"disks_list": "Disks",
 			"disk_storage": "Storage",
+			"resize_disk_label": "Disk",
+			"resize_size_label": "Size",
 			"disk_size_gb": "Size (GB)",
 			"disk_path": "Mount path (optional)",
 			"add_disk": "Add disk",
@@ -4497,6 +4948,8 @@
 			},
 			"suspend": "Suspend",
 			"unsuspend": "Unsuspend",
+			"suspend_confirm_title": "Suspend VDS instance?",
+			"suspend_confirm_description": "Provide a reason for staff before suspending {hostname}. The owner will be notified by email.",
 			"suspend_success": "VDS instance suspended successfully",
 			"unsuspend_success": "VDS instance unsuspended successfully"
 		},
@@ -4610,6 +5063,33 @@
 				"confirm_delete": "Confirm Delete",
 				"cancel_delete": "Cancel"
 			},
+			"mass_transfer": {
+				"button": "Mass move servers",
+				"title": "Mass move servers",
+				"description": "Move servers from {node} to another node. Free allocations on the destination are assigned automatically — no need to pick an IP for each server.",
+				"destination_node": "Destination node",
+				"select_destination": "Select destination node...",
+				"transferable": "Can move",
+				"allocations_needed": "Allocations needed",
+				"free_on_destination": "Free on destination",
+				"batch_limit": "Max per run",
+				"insufficient_allocations": "The destination node does not have enough free allocations for your selection.",
+				"auto_allocate_note": "Primary and extra ports are filled from unused allocations on the destination node, in IP/port order.",
+				"move_all": "Move all ({count})",
+				"select_all": "Select all",
+				"deselect_all": "Deselect all",
+				"no_transferable": "No servers on this node can be moved right now.",
+				"allocations_per_server": "{count} allocation(s)",
+				"skipped_count": "{count} server(s) skipped (installing, restoring, or already transferring).",
+				"start": "Move {count} server(s)",
+				"confirm_title": "Start mass move?",
+				"confirm_description": "Move {count} server(s) from {source} to {destination}. Servers will be stopped during transfer. Backups on the old node are removed from the panel.",
+				"confirm_submit": "Start transfers",
+				"complete_summary": "Mass move: {initiated} started, {failed} failed, {skipped} skipped.",
+				"failed": "Mass move failed",
+				"preview_failed": "Could not load move preview",
+				"fetch_nodes_failed": "Failed to load nodes"
+			},
 			"help": {
 				"what": {
 					"title": "What are Nodes?",
@@ -4639,6 +5119,7 @@
 				"create_allocation": "Create Allocation",
 				"delete_unused": "Delete Unused",
 				"delete_selected": "Delete Selected",
+				"change_address": "Change IP/Alias",
 				"ip_address": "IP Address",
 				"port": "Port",
 				"ip_alias": "IP Alias",
@@ -4685,6 +5166,16 @@
 					"title": "Edit Allocation",
 					"description": "Edit details for allocation: {ip}:{port}"
 				},
+				"bulk_address": {
+					"title": "Change Allocation IP/Alias",
+					"description": "Update every allocation on this node that currently uses a specific IP address. Assigned allocations are updated in place.",
+					"from_ip": "Current IP Address",
+					"to_ip": "New IP Address",
+					"to_ip_help": "Leave blank if you only want to update the alias.",
+					"update_alias": "Update IP alias",
+					"alias_help": "When enabled, leave the alias blank to clear it for the matching allocations.",
+					"submit": "Update Allocations"
+				},
 				"no_results": "No allocations found matching your search.",
 				"messages": {
 					"fetch_failed": "Failed to fetch allocations",
@@ -4692,6 +5183,9 @@
 					"create_failed": "Failed to create allocations",
 					"update_success": "Allocation updated successfully",
 					"update_failed": "Failed to update allocation",
+					"bulk_address_success": "Allocation IP/Alias updated successfully",
+					"bulk_address_failed": "Failed to update allocation IP/Alias",
+					"bulk_address_missing": "Enter a current IP and either a new IP or alias update.",
 					"delete_success": "Allocation deleted successfully",
 					"delete_failed": "Failed to delete allocation",
 					"bulk_delete_success": "Selected allocations deleted successfully",
@@ -4721,7 +5215,8 @@
 					"restart_checkbox": "Restart Wings after saving",
 					"restart_help": "If enabled, Wings will be restarted to apply the new configuration immediately.",
 					"restart_notice": "Wings is being restarted to apply the new configuration.",
-					"save_success": "Configuration saved successfully."
+					"save_success": "Configuration saved successfully.",
+					"load_failed_title": "Failed to Load Configuration"
 				},
 				"diagnostics": {
 					"title": "Diagnostics",
@@ -4783,6 +5278,8 @@
 					"configure_disabled_notice": "You must disable this module before you can change its configuration.",
 					"config_save_success": "Configuration for {name} saved successfully.",
 					"config_save_failed": "Failed to save configuration for {name}.",
+					"config_fetch_failed": "Failed to fetch module configuration",
+					"invalid_json_config": "Invalid JSON configuration",
 					"enabled_badge": "Enabled",
 					"disabled_badge": "Disabled",
 					"no_modules": "No Modules Found",
@@ -4955,6 +5452,7 @@
 			"description": "Manage all servers in your system.",
 			"search_placeholder": "Search by name, description, or status...",
 			"no_results": "No servers found",
+			"owner_last_seen": "Owner last seen",
 			"create": "Create Server",
 			"filters": {
 				"advanced": "Advanced filters",
@@ -5082,6 +5580,11 @@
 				"destination_allocation": "Destination Primary Allocation",
 				"select_node": "Select destination node...",
 				"select_allocation": "Select destination allocation...",
+				"auto_allocate": "Assign allocation automatically",
+				"auto_allocate_help": "Uses the next free allocation(s) on the destination node for the primary port and any extra ports.",
+				"search_nodes": "Search nodes...",
+				"search_allocations": "Search allocations...",
+				"no_free_allocations": "No free allocations found",
 				"current_node": "Current Node",
 				"server": "Server",
 				"warning_banner": "⚠️ USE AT YOUR OWN RISK ⚠️",
@@ -5255,6 +5758,11 @@
 						"docker_image_required": "Docker image is required",
 						"startup_required": "Startup command is required"
 					}
+				},
+				"messages": {
+					"spell_details_failed": "Failed to fetch spell details",
+					"created": "Server created successfully!",
+					"create_failed": "Failed to create server"
 				}
 			},
 			"edit": {
@@ -5344,6 +5852,8 @@
 					"active": "Active",
 					"suspend": "Suspend",
 					"unsuspend": "Unsuspend",
+					"suspend_confirm_title": "Suspend Server?",
+					"suspend_confirm_description": "Provide a reason for staff before suspending {name}. The owner will be notified by email.",
 					"suspend_success": "Server suspended successfully",
 					"suspend_failed": "Failed to suspend server",
 					"unsuspend_success": "Server unsuspended successfully",
@@ -5386,6 +5896,7 @@
 			},
 			"sidebar": {
 				"ticket_info": "Ticket Information",
+					"user_info_unavailable": "User info unavailable",
 				"tabs": {},
 				"labels": {
 					"id": "ID",
@@ -5543,6 +6054,8 @@
 			},
 			"view": {
 				"original_request": "Original Request",
+				"mail_preview_title": "Email Preview",
+				"email_body": "Email Body",
 				"edit": "Edit Ticket",
 				"close": "Close Ticket",
 				"reopen": "Reopen Ticket",
@@ -5727,6 +6240,10 @@
 				"last_7_days": "Last 7 days",
 				"last_30_days": "Last 30 days",
 				"most_active_time": "Most active time",
+				"total_activities": "Total activities",
+				"all_time_activity_events": "All-time platform activity events",
+				"top_activity_type": "Top activity type",
+				"no_activity_data": "No activity data",
 				"trend_title": "Activity Trend (7 Days)",
 				"trend_desc": "Daily activity volume over the last week",
 				"breakdown_title": "Activity Breakdown",
@@ -5760,7 +6277,12 @@
 				"assigned": "Assigned",
 				"available": "Available",
 				"disk_usage": "Disk Usage",
-				"memory_usage": "Memory Usage"
+				"memory_usage": "Memory Usage",
+				"top_used_port": "Top used port",
+				"assigned_allocations": "Assigned: {count} allocations",
+				"top_ip_total_ports": "Top IP total ports",
+				"ip_usage": "{ip} ({percentage}% used)",
+				"no_allocation_usage_data": "No allocation usage data"
 			},
 			"languages": {
 				"title": "Language Analytics",
@@ -5789,6 +6311,10 @@
 				"in_use": "{percentage}% in use",
 				"library": "In library",
 				"active_links": "Active links",
+				"spells_with_variables": "Spells with variables",
+				"privileged_scripts": "Privileged scripts: {count}",
+				"mail_templates": "Mail templates",
+				"notification_templates": "Templates available for notifications",
 				"spells_by_realm": "Spells by Realm",
 				"spells_by_realm_desc": "Spell distribution across realms",
 				"variable_types": "Variable Types",
@@ -5833,6 +6359,14 @@
 				"disk_dist_desc": "Disk allocation ranges",
 				"age_dist": "Server Age Distribution",
 				"age_dist_desc": "How old are your servers",
+				"avg_db_limit": "Avg DB limit",
+				"avg_backup_limit": "Avg backup limit: {count}",
+				"skip_scripts_enabled": "Skip scripts enabled",
+				"oom_disabled": "OOM disabled: {count}",
+				"server_variables": "Server variables",
+				"custom_runtime_variables": "Custom runtime variable values",
+				"server_activity_events": "Server activity events",
+				"operational_events": "Operational events across all servers",
 				"unknown": "Unknown"
 			},
 			"system": {
@@ -5849,6 +6383,14 @@
 				"delivery_rate": "Delivery rate",
 				"queue_status": "Mail Queue Status",
 				"queue_status_desc": "Email queue distribution",
+				"chat_conversations": "Chat conversations",
+				"messages_count": "Messages: {count}",
+				"chat_users_30d": "Chat users (30d)",
+				"avg_messages_per_conversation": "Avg msgs/conversation: {count}",
+				"api_clients": "API clients",
+				"oauth2_authorizations": "OAuth2 authorizations: {count}",
+				"enabled_oidc_providers": "Enabled OIDC providers",
+				"identity_providers_configured": "Identity providers configured",
 				"recent_activity": "Recent Mail Queue Activity",
 				"recent_activity_desc": "Latest email processing status",
 				"no_activity": "No recent mail queue activity",
@@ -5870,6 +6412,10 @@
 				"banned_pct": "{percentage}% of total",
 				"verified_pct": "{percentage}% verified",
 				"two_fa_pct": "{percentage}% with 2FA",
+				"unverified": "Unverified",
+				"pending_email_verification": "Users pending email verification",
+				"not_secured": "Not secured",
+				"fully_secured": "Fully secured: {count}",
 				"reg_trend": "Registration Trend (30 Days)",
 				"reg_trend_desc": "Daily user registrations over the last 30 days",
 				"role_dist": "User Distribution by Role",
@@ -5893,6 +6439,77 @@
 				"growth_30d": "Growth Rate (30 days)",
 				"growth_comparison": "{new} new vs {previous} previous"
 			},
+			"vds": {
+				"title": "VDS Analytics",
+				"subtitle": "VDS-only KPIs for nodes, templates, instances, backups, and operations.",
+				"error": "Failed to fetch VDS analytics data.",
+				"instances": "Instances",
+				"nodes": "Nodes",
+				"templates": "Templates",
+				"backups": "Backups",
+				"tasks": "Tasks",
+				"subusers": "Subusers",
+				"instance_ips": "Instance IPs",
+				"activities": "Activities",
+				"vds_instances": "VDS Instances",
+				"vds_nodes": "VDS Nodes",
+				"instance_backups": "Instance Backups",
+				"instance_activities": "Instance Activities",
+				"nodes_templates": "Nodes: {nodes}, Templates: {templates}",
+				"templates_tasks": "Templates: {templates}, Tasks: {tasks}",
+				"ips_subusers": "IPs: {ips}, Subusers: {subusers}",
+				"total_vds_objects": "Total VDS objects: {count}",
+				"breakdown": "VDS Breakdown",
+				"breakdown_desc": "VDS-related object totals",
+				"totals": "VDS Totals",
+				"totals_desc": "Total VDS object count",
+				"vds_objects": "VDS Objects",
+				"runtime_breakdown": "VDS Runtime Breakdown",
+				"runtime_breakdown_desc": "Operational VDS entities and usage"
+			},
+			"knowledgebase": {
+				"title": "Knowledgebase Analytics",
+				"subtitle": "Knowledgebase content KPIs.",
+				"categories": "Categories",
+				"articles": "Articles",
+				"attachments": "Attachments",
+				"tags": "Tags",
+				"category_entries": "Knowledgebase category entries",
+				"published_articles": "Published/support articles",
+				"uploaded_attachments": "Uploaded article attachments",
+				"total_kb_objects": "Total KB Objects",
+				"all_entities": "All knowledgebase entities",
+				"breakdown": "Knowledgebase Breakdown",
+				"breakdown_desc": "Distribution by KB object type",
+				"objects": "Knowledgebase Objects",
+				"objects_desc": "Counts across KB entities"
+			},
+			"tickets": {
+				"title": "Tickets Analytics",
+				"subtitle": "Ticketing KPIs and usage metrics.",
+				"tickets": "Tickets",
+				"messages": "Messages",
+				"attachments": "Attachments",
+				"categories": "Categories",
+				"priorities": "Priorities",
+				"statuses": "Statuses",
+				"today": "Today",
+				"this_week": "This Week",
+				"last_week": "Last Week",
+				"total_tickets": "Total tickets",
+				"ticket_messages": "Ticket Messages",
+				"conversation_volume": "Conversation volume",
+				"ticket_attachments": "Ticket Attachments",
+				"uploaded_files": "Uploaded files",
+				"weekly_growth": "Weekly Growth",
+				"weekly_comparison": "{thisWeek} this week vs {lastWeek} last week",
+				"breakdown": "Ticket Breakdown",
+				"breakdown_desc": "Distribution by entity type",
+				"creation_velocity": "Ticket Creation Velocity",
+				"creation_velocity_desc": "Today and week-over-week ticket volume",
+				"recent_trend": "Recent Ticket Trend (14d)",
+				"recent_trend_desc": "Tickets created per day over the most recent 14 days"
+			},
 			"nav": {
 				"users_desc": "Comprehensive user statistics including registrations, roles, security, and growth metrics",
 				"activity_desc": "Track user activities, trends, peak hours, and activity type distribution across your panel",
@@ -6156,7 +6773,8 @@
 		"feathercloud": {
 			"translations": {
 				"download_coming_soon": "Download functionality will be available when the API is ready",
-				"download_failed": "Failed to download translation"
+				"download_failed": "Failed to download translation",
+				"fetch_failed": "Failed to fetch community translations"
 			}
 		},
 		"cloud_management": {
@@ -6244,17 +6862,27 @@
 				"warning1": "New keys will be generated immediately",
 				"warning2": "You must update your FeatherCloud account with the new keys",
 				"warning3": "Old keys will no longer work after rotation",
-				"warning4": "Cloud credentials are currently empty - premium plugins cannot be downloaded until FeatherCloud credentials are configured",
+				"warning4": "After rotation you must use Link with FeatherCloud again so FeatherCloud can issue new API keys; premium and cloud features stay offline until OAuth completes",
 				"cancel": "Cancel",
 				"confirm": "Rotate Keys",
 				"rotating": "Rotating..."
 			},
+			"messages": {
+				"credentials_load_failed": "Failed to load cloud credentials",
+				"credentials_rotated": "Keys rotated. Link with FeatherCloud again (OAuth) to restore cloud API access.",
+				"credentials_rotate_failed": "Failed to rotate cloud credentials",
+				"cloud_credentials_empty": "Cloud credentials are empty. Premium plugins cannot be downloaded until FeatherCloud credentials are configured.",
+				"oauth_link_failed": "Failed to generate OAuth2 link"
+			},
 			"finish": {
 				"processing": "Processing OAuth2 Callback...",
 				"success": "Successfully Connected!",
 				"failed": "Connection Failed",
 				"processing_desc": "Please wait while we save your cloud credentials...",
 				"success_desc": "Your panel is now linked with FeatherCloud. You can now access premium plugins, FeatherAI, and cloud intelligence services.",
+				"linked_toast": "Your panel has been successfully linked with FeatherCloud!",
+				"save_failed": "Failed to save cloud credentials",
+				"missing_params": "Missing required parameters: cloud_api_key and cloud_api_secret",
 				"whats_next": "What's Next?",
 				"next_step1": "Access premium plugins from the FeatherCloud marketplace",
 				"next_step2": "Use FeatherAI for intelligent automation and analysis",
@@ -6271,7 +6899,9 @@
 			"search_placeholder": "Search by username, email, or role...",
 			"last_seen": "Last seen",
 			"table": {},
-			"actions": {},
+			"actions": {
+				"force_verify_email": "Force verify email"
+			},
 			"create": {
 				"title": "Create User",
 				"description": "Fill in the details to create a new user",
@@ -6321,6 +6951,7 @@
 				"2fa": "2FA",
 				"no_2fa": "No 2FA",
 				"discord_linked": "Discord Linked",
+				"email_unverified": "Email Unverified",
 				"ldap": "LDAP",
 				"oidc": "OIDC/SSO",
 				"local": "Local"
@@ -6347,6 +6978,8 @@
 				"description": "Edit user details and permissions.",
 				"ban_user": "Ban User",
 				"unban_user": "Unban User",
+				"ban_confirm_title": "Ban User?",
+				"ban_confirm_description": "Provide a reason for staff before banning {username}. The user will be notified by email.",
 				"disable_2fa": "Disable 2FA",
 				"unlink_discord": "Unlink Discord",
 				"loading": "Loading user...",
@@ -6475,6 +7108,10 @@
 				"sending_email": "Sending...",
 				"discord_confirm": "Are you sure you want to unlink Discord from this user?",
 				"ban_confirm": "Are you sure you want to ban/unban this user?",
+				"unban_confirm": "Are you sure you want to unban this user?",
+				"force_verify_email_confirm": "Force verify {username}'s email address? This lets the user log in without using their verification link.",
+				"force_verify_email_success": "User email verified successfully",
+				"force_verify_email_failed": "Failed to verify user email",
 				"fetch_failed": "Failed to fetch users",
 				"delete_confirm": "Are you sure you want to delete user {username}?",
 				"updating": "Updating user..."
@@ -6717,6 +7354,7 @@
 				"button": "Send Test Email",
 				"sending": "Sending test email...",
 				"success": "Test email sent successfully! Please check your inbox.",
+				"failed_short": "Failed to send test email",
 				"failed": "Failed to send test email. Please check your SMTP settings.",
 				"troubleshooting": "If emails aren't being sent, check the async_runner logs on your server: cd /var/www/featherpanel && docker compose logs async-runner -f"
 			},
@@ -7000,7 +7638,8 @@
 				"failed_load_key": "Failed to load API key details",
 				"failed_fetch_keys": "Failed to fetch API keys",
 				"key_created": "API key created successfully!",
-				"key_create_failed": "Failed to create API key"
+				"key_create_failed": "Failed to create API key",
+				"cheat_code_activated": "Cheat code activated: Prerequisites bypassed!"
 			},
 			"prerequisites": {
 				"title": "System Requirements",
@@ -7071,13 +7710,7 @@
 			"info": {
 				"title": "Excluded Data",
 				"description": "The following items are excluded from migration to ensure a clean import.",
-				"items": [
-					null,
-					null,
-					null,
-					null,
-					null
-				],
+				"items": [null, null, null, null, null],
 				"footer": "Excluding this data significantly reduces migration time."
 			},
 			"create_key": {
@@ -7093,12 +7726,7 @@
 				"creating": "Creating..."
 			},
 			"warning_dialog": {
-				"items": [
-					null,
-					null,
-					null,
-					null
-				]
+				"items": [null, null, null, null]
 			}
 		},
 		"database_management": {
@@ -7460,6 +8088,7 @@
 				"close": "Close",
 				"cancel": "Cancel",
 				"install": "Install",
+				"update_all": "Update All ({count})",
 				"select_all": "Select All",
 				"deselect_all": "Deselect All",
 				"dismiss": "Dismiss"
@@ -7572,6 +8201,9 @@
 				"install_failed": "Failed to install plugin",
 				"update_success": "Plugin updated successfully",
 				"update_failed": "Failed to update plugin",
+				"bulk_update_success": "{count} plugin(s) updated successfully",
+				"bulk_update_partial": "{success} plugin(s) updated, {failed} failed",
+				"bulk_update_failed": "Failed to update plugins",
 				"uninstall_success": "Plugin uninstalled",
 				"uninstall_failed": "Failed to uninstall plugin",
 				"save_success": "Settings saved successfully",
@@ -7630,7 +8262,10 @@
 				"import_failed": "Failed to import default English translations.",
 				"invalid_json": "Invalid JSON format. Please check your syntax.",
 				"uploaded": "Uploaded successfully.",
-				"upload_failed": "Failed to upload translation file."
+				"upload_failed": "Failed to upload translation file.",
+				"invalid_language_code": "Invalid language code. Use ISO 639-1 format (e.g., en, de, fr)",
+				"file_exists_opening": "Translation file \"{lang}.json\" already exists. Opening it for editing.",
+				"download_failed": "Failed to download translation file"
 			},
 			"help": {
 				"what_is": {
@@ -7732,10 +8367,20 @@
 			"subtitle_realm": "Managing spells for realm: {realm}",
 			"create": "Create Spell",
 			"import": "Import Spell",
+			"import_dialog_description": "Select the realm where you want to import this spell.",
 			"browse_marketplace": "Browse Marketplace",
 			"viewall": "View All Spells",
 			"search_placeholder": "Search by name, description, or author...",
 			"no_results": "No spells found",
+			"order": {
+				"title": "Reorder spells",
+				"subtitle": "Use the arrows to set display order in this realm (shown when creating servers and picking a spell).",
+				"unsaved_changes": "You have unsaved changes",
+				"messages": {
+					"saved": "Spell order saved successfully",
+					"save_failed": "Failed to save spell order"
+				}
+			},
 			"table": {},
 			"tabs": {
 				"general": "General",
@@ -7758,6 +8403,12 @@
 				"update_url": "Update URL",
 				"banner_url": "Banner URL",
 				"banner_preview": "Preview:",
+				"loading_spell": "Loading spell...",
+				"basic_information": "Basic Information",
+				"docker_configuration": "Docker Configuration",
+				"server_features": "Server Features",
+				"server_configuration": "Server Configuration",
+				"installation_startup_scripts": "Installation & Startup Scripts",
 				"docker_images": "Docker Images",
 				"add_docker_image": "Add Docker Image",
 				"script_container": "Script Container",
@@ -7820,6 +8471,9 @@
 				"delete_confirm": "Are you sure you want to delete this spell?",
 				"imported": "Spell imported successfully",
 				"import_failed": "Failed to import spell",
+				"select_realm": "Please select a realm",
+				"no_file_selected": "No file selected",
+				"name_realm_required": "Name and Realm are required",
 				"export_failed": "Failed to export spell",
 				"variable_created": "Variable created successfully",
 				"variable_updated": "Variable updated successfully",
@@ -7876,6 +8530,8 @@
 				"subject": "Subject",
 				"body": "Body (HTML)",
 				"html_help": "You can use HTML tags like <h1>, <p>, <strong>, <em>, <a>, etc.",
+				"editor": "Editor",
+				"live_preview": "Live Preview",
 				"submit_create": "Create Template",
 				"submit_update": "Update Template",
 				"send": "Send to All Users",
@@ -7929,6 +8585,21 @@
 				"max_tokens_description": "Maximum tokens in responses (1-8192)",
 				"max_history": "Max History",
 				"max_history_description": "Previous messages in context (1-50)",
+				"api_key": "API Key",
+				"api_key_placeholder": "Enter API key to change",
+				"model": "Model",
+				"base_url": "Base URL",
+				"grok_api_key": "xAI (Grok) API Key",
+				"grok_model": "xAI (Grok) Model",
+				"providers": {
+					"basic": "Basic (No AI)",
+					"google_gemini": "Google Gemini",
+					"openai": "OpenAI",
+					"openrouter": "OpenRouter",
+					"ollama": "Ollama (Self-hosted)",
+					"grok": "Grok (xAI)",
+					"perplexity": "Perplexity"
+				},
 				"system_prompt_core": "AI Core System Prompt",
 				"system_prompt_core_readonly": "Core System Prompt (Read-Only)",
 				"system_prompt_core_description": "The core system prompt that defines the AI assistant's behavior and capabilities. This is read-only and loaded from the system configuration.",
@@ -8018,7 +8689,22 @@
 			"save": "Save Changes",
 			"domainDetailsTitle": "Subdomain Entries: {domain}",
 			"domainDetailsDescription": "Active subdomains currently assigned to servers under this domain.",
-			"noSubdomains": "No active subdomains found under this domain."
+			"viewEntries": "View entries",
+			"noSubdomains": "No active subdomains found under this domain.",
+			"messages": {
+				"fetch_domains_failed": "Failed to fetch domains.",
+				"load_settings_failed": "Failed to load global settings.",
+				"cloudflare_settings_saved": "Cloudflare settings updated successfully.",
+				"save_settings_failed": "Failed to save settings.",
+				"domain_created": "Domain created successfully.",
+				"domain_updated": "Domain updated successfully.",
+				"domain_save_failed": "Failed to save domain configuration.",
+				"domain_deleted": "Domain deleted successfully.",
+				"domain_delete_failed": "Failed to delete domain.",
+				"domain_details_failed": "Failed to load domain details.",
+				"subdomain_list_failed": "Failed to load subdomain list.",
+				"create_spell_first": "Please create a spell first in the Spells section."
+			}
 		},
 		"featherzerotrust": {
 			"title": "FeatherZeroTrust",
@@ -8154,9 +8840,13 @@
 				"noLogs": "No execution logs found",
 				"emptyDescription": "Cron job execution history will appear here once scans are performed.",
 				"execution": "Execution",
+				"executionDetails": "Execution Details",
+				"executionDetailsDescription": "Detailed scan results for execution ID: {id}",
 				"startedAt": "Started at",
 				"servers": "Servers",
+				"totalServers": "Total Servers",
 				"detections": "Detections",
+				"totalDetections": "Total Detections",
 				"completed": "Completed",
 				"inProgress": "In Progress",
 				"viewDetails": "View Details",
@@ -8265,6 +8955,9 @@
 	"vds": {
 		"activities": {
 			"description": "All power, subuser and console actions for this VDS instance.",
+			"fetch_failed": "Failed to fetch activity log",
+			"permission_denied": "You do not have permission to view this activity log",
+			"payload_copied": "Payload copied",
 			"filter": {
 				"reinstall": "Reinstall events"
 			}
@@ -8346,6 +9039,18 @@
 			"description": "Manage user access and permissions for this VDS instance.",
 			"add": "Add Subuser",
 			"email_placeholder": "User email address",
+			"no_subusers": "No Subusers",
+			"remove": "Remove Subuser",
+			"edit_permissions": "Edit Permissions",
+			"owner_only": "Only the VM owner can manage subusers.",
+			"fetch_failed": "Failed to fetch subusers",
+			"select_permission": "Select at least one permission.",
+			"added": "Subuser added successfully.",
+			"add_failed": "Failed to add subuser.",
+			"removed": "Subuser removed.",
+			"remove_failed": "Failed to remove subuser.",
+			"permissions_updated": "Permissions updated.",
+			"permissions_update_failed": "Failed to update permissions.",
 			"permissions": {
 				"power": {
 					"label": "Power Control",
@@ -8407,6 +9112,16 @@
 		},
 		"settings": {
 			"title": "VDS Settings",
+			"description": "Manage your VDS instance settings and reinstall options.",
+			"loading": "Loading VDS settings…",
+			"access_denied": "You do not have permission to access VDS settings.",
+			"instance_info": {
+				"title": "Instance Info",
+				"hostname": "Hostname",
+				"vmid": "VMID",
+				"type": "Type",
+				"node": "Node"
+			},
 			"reinstall": {
 				"title": "Reinstall Operating System",
 				"description": "This will permanently wipe the current OS and reinstall from a chosen template. All data on the VDS will be lost.",
@@ -8429,7 +9144,15 @@
 					"ssh_keys_placeholder": "Paste SSH public key(s) here..."
 				},
 				"cancel_button": "Cancel",
-				"confirm_button": "Confirm Reinstall"
+				"confirm_button": "Confirm Reinstall",
+				"select_template_first": "Please select a template first.",
+				"initiating": "Initiating reinstall…",
+				"start_failed": "Failed to start reinstall.",
+				"missing_id": "Reinstall did not return a reinstall_id",
+				"started": "Reinstall initiated. This may take several minutes.",
+				"timeout": "Reinstall timed out waiting for completion",
+				"success": "VDS reinstalled successfully.",
+				"failed": "Reinstall failed"
 			},
 			"hardware": {
 				"title": "QEMU Hardware (EFI / TPM)",
@@ -8472,6 +9195,9 @@
 				"toast_unmounted": "ISO unmounted successfully.",
 				"toast_unmount_failed": "Failed to unmount ISO.",
 				"toast_fetch_failed": "Failed to fetch ISO.",
+				"toast_queue_failed": "Failed to queue ISO task.",
+				"toast_fetch_queued": "ISO fetch queued.",
+				"fetch_timeout": "ISO fetch timed out",
 				"errors": {
 					"iso_file_required": "Select an ISO file",
 					"storage_required": "Select an ISO storage",
@@ -8575,6 +9301,50 @@
 		"you": "You",
 		"toolActionSuccess": "Action '{action}' completed successfully",
 		"toolActionFailed": "Action '{action}' failed",
-		"toggleSidebar": "Toggle sidebar"
+		"toggleSidebar": "Toggle sidebar",
+		"welcomeDashboard": "Hi {name}! I'm your FeatherPanel Dashboard AI. I can help you find servers, manage VDS instances, navigate the dashboard, and look up knowledgebase articles when you ask.",
+		"commandsHint": "Type /help for commands.",
+		"availableCommands": "Available commands:\n\n- `/help` or `/commands` - show chatbot commands\n- `/context` - show current chat mode, route, and context limits\n- `/compact` - compact the visible conversation locally\n- `/clear` - start a fresh chat",
+		"contextCommand": "Current context:\n\n- Mode: {mode}\n- Route: {route}\n- History sent to AI: compacted server-side, recent turns only\n- Server/VDS/KB details: fetched with tools only when needed\n- Logs: not included unless troubleshooting is requested",
+		"compactCommand": "Compacted the visible conversation. Future requests already use server-side compact memory and recent turns.",
+		"unknownCommand": "Unknown command: `{command}`.\n\nType `/help` to see available commands.",
+		"tokenUsageAssistant": "{total} tokens",
+		"tokenUsageAssistantDetails": "Input {input} / Output {output} / Total {total} tokens",
+		"tokenUsageUser": "{count} tokens",
+		"tokenUsageUserDetails": "{count} input tokens",
+		"callingTool": "Calling {tool}",
+		"toolFinished": "{tool} finished",
+		"toolFailed": "{tool} failed",
+		"toolRunning": "Running",
+		"toolDone": "Done",
+		"toolFailedShort": "Failed",
+		"toolRunningSummary": "Running...",
+		"online": "Online",
+		"readyToHelp": "Ready to help",
+		"assistant": "Assistant",
+		"slashCommands": "Commands",
+		"commandHelpTitle": "Help",
+		"commandHelpDescription": "Show every available chatbot command.",
+		"commandContextTitle": "Context",
+		"commandContextDescription": "Show the current chat mode, route, and context limits.",
+		"commandCompactTitle": "Compact",
+		"commandCompactDescription": "Compact the visible conversation into a short local summary.",
+		"commandClearTitle": "Clear",
+		"commandClearDescription": "Start a fresh chat locally.",
+		"commandNoMatches": "No matching commands",
+		"plannedAction": "Planned action",
+		"actionRestartServer": "Restart server",
+		"actionStartServer": "Start server",
+		"actionStopServer": "Stop server",
+		"actionKillServer": "Kill server",
+		"actionSendCommand": "Send command",
+		"actionNavigate": "Navigate",
+		"waitingForConfirmation": "Waiting for confirmation",
+		"typing": "Writing response",
+		"checkingActions": "Checking planned actions",
+		"moreInfo": "More info",
+		"toolsUsed": "Tools and actions used",
+		"showDetails": "Show details",
+		"hideDetails": "Hide details"
 	}
 }
diff --git a/frontendv2/scripts/scan-translations.js b/frontendv2/scripts/scan-translations.js
index 9192148a7..a38e5eef9 100644
--- a/frontendv2/scripts/scan-translations.js
+++ b/frontendv2/scripts/scan-translations.js
@@ -77,8 +77,8 @@ function scanTranslations() {
     const files = getAllFiles(SRC_DIR);
     console.log(`${colors.green}✓ Found ${files.length} source files to scan.${colors.reset}\n`);
 
-    // Regex to find t('key')
-    const SIMPLE_REGEX = /[^a-zA-Z]t\s*\(\s*['"]([^'"]+)['"]/g;
+    // Regex to find t('key') and tr('key')
+    const SIMPLE_REGEX = /[^a-zA-Z]t(?:r)?\s*\(\s*['"]([^'"]+)['"]/g;
     // Regex to find t(cond ? 'key1' : 'key2')
     // Supports multiline matching because we scan file content, not just lines
     const TERNARY_REGEX = /[^a-zA-Z]t\s*\(\s*[^,)]+\s*\?\s*['"]([^'"]+)['"]\s*:\s*['"]([^'"]+)['"]/g;
diff --git a/frontendv2/src/app/(app)/admin/analytics/activity/page.tsx b/frontendv2/src/app/(app)/admin/analytics/activity/page.tsx
index b2031be73..493767141 100644
--- a/frontendv2/src/app/(app)/admin/analytics/activity/page.tsx
+++ b/frontendv2/src/app/(app)/admin/analytics/activity/page.tsx
@@ -163,15 +163,15 @@ export default function ActivityAnalyticsPage() {
                         />
                         <ResourceCard
                             title={stats.total.toString()}
-                            subtitle='Total activities'
-                            description='All-time platform activity events'
+                            subtitle={t('admin.analytics.activity.total_activities')}
+                            description={t('admin.analytics.activity.all_time_activity_events')}
                             icon={TrendingUp}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
                         />
                         <ResourceCard
                             title={(topActivities[0]?.count ?? 0).toString()}
-                            subtitle='Top activity type'
-                            description={topActivities[0]?.name ?? 'No activity data'}
+                            subtitle={t('admin.analytics.activity.top_activity_type')}
+                            description={topActivities[0]?.name ?? t('admin.analytics.activity.no_activity_data')}
                             icon={List}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
                         />
diff --git a/frontendv2/src/app/(app)/admin/analytics/content/page.tsx b/frontendv2/src/app/(app)/admin/analytics/content/page.tsx
index 5e5ab594f..5024de486 100644
--- a/frontendv2/src/app/(app)/admin/analytics/content/page.tsx
+++ b/frontendv2/src/app/(app)/admin/analytics/content/page.tsx
@@ -208,15 +208,17 @@ export default function ContentAnalyticsPage() {
                         />
                         <ResourceCard
                             title={(spellOverview?.with_variables ?? 0).toString()}
-                            subtitle='Spells with variables'
-                            description={`Privileged scripts: ${spellOverview?.privileged_scripts ?? 0}`}
+                            subtitle={t('admin.analytics.content.spells_with_variables')}
+                            description={t('admin.analytics.content.privileged_scripts', {
+                                count: String(spellOverview?.privileged_scripts ?? 0),
+                            })}
                             icon={ShieldAlert}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
                         />
                         <ResourceCard
                             title={mailTemplatesTotal.toString()}
-                            subtitle='Mail templates'
-                            description='Templates available for notifications'
+                            subtitle={t('admin.analytics.content.mail_templates')}
+                            description={t('admin.analytics.content.notification_templates')}
                             icon={Mail}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
                         />
diff --git a/frontendv2/src/app/(app)/admin/analytics/infrastructure/page.tsx b/frontendv2/src/app/(app)/admin/analytics/infrastructure/page.tsx
index 03efee3ad..ae2f13f17 100644
--- a/frontendv2/src/app/(app)/admin/analytics/infrastructure/page.tsx
+++ b/frontendv2/src/app/(app)/admin/analytics/infrastructure/page.tsx
@@ -246,16 +246,23 @@ export default function InfrastructureAnalyticsPage() {
                         />
                         <ResourceCard
                             title={topPort ? String(topPort.port) : '0'}
-                            subtitle='Top used port'
-                            description={`Assigned: ${topPort?.assigned ?? 0} allocations`}
+                            subtitle={t('admin.analytics.infrastructure.top_used_port')}
+                            description={t('admin.analytics.infrastructure.assigned_allocations', {
+                                count: String(topPort?.assigned ?? 0),
+                            })}
                             icon={EthernetPort}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
                         />
                         <ResourceCard
                             title={topIp ? String(topIp.total_ports) : '0'}
-                            subtitle='Top IP total ports'
+                            subtitle={t('admin.analytics.infrastructure.top_ip_total_ports')}
                             description={
-                                topIp ? `${topIp.ip} (${topIp.usage_percentage}% used)` : 'No allocation usage data'
+                                topIp
+                                    ? t('admin.analytics.infrastructure.ip_usage', {
+                                          ip: topIp.ip,
+                                          percentage: String(topIp.usage_percentage),
+                                      })
+                                    : t('admin.analytics.infrastructure.no_allocation_usage_data')
                             }
                             icon={Globe}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
diff --git a/frontendv2/src/app/(app)/admin/analytics/knowledgebase/page.tsx b/frontendv2/src/app/(app)/admin/analytics/knowledgebase/page.tsx
index 3deff2830..81d0f46e2 100644
--- a/frontendv2/src/app/(app)/admin/analytics/knowledgebase/page.tsx
+++ b/frontendv2/src/app/(app)/admin/analytics/knowledgebase/page.tsx
@@ -21,6 +21,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 import React, { useEffect, useState } from 'react';
 import api from '@/lib/api';
+import { useTranslation } from '@/contexts/TranslationContext';
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { PageHeader } from '@/components/featherui/PageHeader';
 import { WidgetRenderer } from '@/components/server/WidgetRenderer';
@@ -34,6 +35,7 @@ interface Data {
 }
 
 export default function KnowledgebaseAnalyticsPage() {
+    const { t } = useTranslation();
     const [data, setData] = useState<Data | null>(null);
     const { getWidgets } = usePluginWidgets('admin-analytics-knowledgebase');
     const [loading, setLoading] = useState(true);
@@ -44,56 +46,60 @@ export default function KnowledgebaseAnalyticsPage() {
             .finally(() => setLoading(false));
     }, []);
 
-    if (loading) return <div className='flex min-h-[300px] items-center justify-center'>Loading...</div>;
-    if (!data) return <div className='flex min-h-[300px] items-center justify-center'>No data</div>;
+    if (loading) return <div className='flex min-h-[300px] items-center justify-center'>{t('common.loading')}</div>;
+    if (!data) return <div className='flex min-h-[300px] items-center justify-center'>{t('common.no_data')}</div>;
 
     const breakdown = [
-        { name: 'Categories', value: data.knowledgebase.categories ?? 0 },
-        { name: 'Articles', value: data.knowledgebase.articles ?? 0 },
-        { name: 'Attachments', value: data.knowledgebase.attachments ?? 0 },
-        { name: 'Tags', value: data.knowledgebase.tags ?? 0 },
+        { name: t('admin.analytics.knowledgebase.categories'), value: data.knowledgebase.categories ?? 0 },
+        { name: t('admin.analytics.knowledgebase.articles'), value: data.knowledgebase.articles ?? 0 },
+        { name: t('admin.analytics.knowledgebase.attachments'), value: data.knowledgebase.attachments ?? 0 },
+        { name: t('admin.analytics.knowledgebase.tags'), value: data.knowledgebase.tags ?? 0 },
     ];
 
     return (
         <>
             <WidgetRenderer widgets={getWidgets('admin-analytics-knowledgebase', 'top-of-page')} />
             <div className='space-y-6'>
-                <PageHeader title='Knowledgebase Analytics' description='Knowledgebase content KPIs.' icon={BookOpen} />
+                <PageHeader
+                    title={t('admin.analytics.knowledgebase.title')}
+                    description={t('admin.analytics.knowledgebase.subtitle')}
+                    icon={BookOpen}
+                />
                 <div className='grid gap-6 md:grid-cols-2 lg:grid-cols-4'>
                     <ResourceCard
                         title={String(data.knowledgebase.categories ?? 0)}
-                        subtitle='Categories'
-                        description='Knowledgebase category entries'
+                        subtitle={t('admin.analytics.knowledgebase.categories')}
+                        description={t('admin.analytics.knowledgebase.category_entries')}
                         icon={FolderTree}
                     />
                     <ResourceCard
                         title={String(data.knowledgebase.articles ?? 0)}
-                        subtitle='Articles'
-                        description='Published/support articles'
+                        subtitle={t('admin.analytics.knowledgebase.articles')}
+                        description={t('admin.analytics.knowledgebase.published_articles')}
                         icon={BookOpen}
                     />
                     <ResourceCard
                         title={String(data.knowledgebase.attachments ?? 0)}
-                        subtitle='Attachments'
-                        description='Uploaded article attachments'
+                        subtitle={t('admin.analytics.knowledgebase.attachments')}
+                        description={t('admin.analytics.knowledgebase.uploaded_attachments')}
                         icon={Paperclip}
                     />
                     <ResourceCard
                         title={String(data.totals.knowledgebase_objects ?? 0)}
-                        subtitle='Total KB Objects'
-                        description='All knowledgebase entities'
+                        subtitle={t('admin.analytics.knowledgebase.total_kb_objects')}
+                        description={t('admin.analytics.knowledgebase.all_entities')}
                         icon={Tags}
                     />
                 </div>
                 <div className='grid gap-4 md:grid-cols-2'>
                     <SimplePieChart
-                        title='Knowledgebase Breakdown'
-                        description='Distribution by KB object type'
+                        title={t('admin.analytics.knowledgebase.breakdown')}
+                        description={t('admin.analytics.knowledgebase.breakdown_desc')}
                         data={breakdown}
                     />
                     <SimpleBarChart
-                        title='Knowledgebase Objects'
-                        description='Counts across KB entities'
+                        title={t('admin.analytics.knowledgebase.objects')}
+                        description={t('admin.analytics.knowledgebase.objects_desc')}
                         data={breakdown}
                     />
                 </div>
diff --git a/frontendv2/src/app/(app)/admin/analytics/servers/page.tsx b/frontendv2/src/app/(app)/admin/analytics/servers/page.tsx
index 1561f4528..5c4ea68f8 100644
--- a/frontendv2/src/app/(app)/admin/analytics/servers/page.tsx
+++ b/frontendv2/src/app/(app)/admin/analytics/servers/page.tsx
@@ -368,8 +368,10 @@ export default function ServerAnalyticsPage() {
                         {limitStats && (
                             <ResourceCard
                                 title={String(limitStats.avg_database_limit)}
-                                subtitle='Avg DB limit'
-                                description={`Avg backup limit: ${limitStats.avg_backup_limit}`}
+                                subtitle={t('admin.analytics.servers.avg_db_limit')}
+                                description={t('admin.analytics.servers.avg_backup_limit', {
+                                    count: String(limitStats.avg_backup_limit),
+                                })}
                                 icon={HardDrive}
                                 className='bg-card/50 shadow-none! backdrop-blur-sm'
                             />
@@ -377,8 +379,10 @@ export default function ServerAnalyticsPage() {
                         {configurationStats && (
                             <ResourceCard
                                 title={String(configurationStats.skip_scripts_enabled)}
-                                subtitle='Skip scripts enabled'
-                                description={`OOM disabled: ${configurationStats.oom_disabled}`}
+                                subtitle={t('admin.analytics.servers.skip_scripts_enabled')}
+                                description={t('admin.analytics.servers.oom_disabled', {
+                                    count: String(configurationStats.oom_disabled),
+                                })}
                                 icon={Settings}
                                 className='bg-card/50 shadow-none! backdrop-blur-sm'
                             />
@@ -386,8 +390,8 @@ export default function ServerAnalyticsPage() {
                         {variableStats && (
                             <ResourceCard
                                 title={String(variableStats.total_variables)}
-                                subtitle='Server variables'
-                                description='Custom runtime variable values'
+                                subtitle={t('admin.analytics.servers.server_variables')}
+                                description={t('admin.analytics.servers.custom_runtime_variables')}
                                 icon={ShieldAlert}
                                 className='bg-card/50 shadow-none! backdrop-blur-sm'
                             />
@@ -395,8 +399,8 @@ export default function ServerAnalyticsPage() {
                         {serverActivityStats && (
                             <ResourceCard
                                 title={String(serverActivityStats.total_activities)}
-                                subtitle='Server activity events'
-                                description='Operational events across all servers'
+                                subtitle={t('admin.analytics.servers.server_activity_events')}
+                                description={t('admin.analytics.servers.operational_events')}
                                 icon={Activity}
                                 className='bg-card/50 shadow-none! backdrop-blur-sm'
                             />
diff --git a/frontendv2/src/app/(app)/admin/analytics/system/page.tsx b/frontendv2/src/app/(app)/admin/analytics/system/page.tsx
index a39bc22c7..7f40fb16f 100644
--- a/frontendv2/src/app/(app)/admin/analytics/system/page.tsx
+++ b/frontendv2/src/app/(app)/admin/analytics/system/page.tsx
@@ -156,29 +156,35 @@ export default function SystemAnalyticsPage() {
                             <div className='grid gap-6 md:grid-cols-2 lg:grid-cols-4'>
                                 <ResourceCard
                                     title={featureStats.chatbot_conversations.toString()}
-                                    subtitle='Chat conversations'
-                                    description={`Messages: ${featureStats.chatbot_messages}`}
+                                    subtitle={t('admin.analytics.system.chat_conversations')}
+                                    description={t('admin.analytics.system.messages_count', {
+                                        count: featureStats.chatbot_messages.toString(),
+                                    })}
                                     icon={Bot}
                                     className='bg-card/50 shadow-none! backdrop-blur-sm'
                                 />
                                 <ResourceCard
                                     title={featureStats.chatbot_active_users_30d.toString()}
-                                    subtitle='Chat users (30d)'
-                                    description={`Avg msgs/conversation: ${featureStats.avg_messages_per_conversation}`}
+                                    subtitle={t('admin.analytics.system.chat_users_30d')}
+                                    description={t('admin.analytics.system.avg_messages_per_conversation', {
+                                        count: featureStats.avg_messages_per_conversation.toString(),
+                                    })}
                                     icon={UserCircle}
                                     className='bg-card/50 shadow-none! backdrop-blur-sm'
                                 />
                                 <ResourceCard
                                     title={featureStats.api_clients.toString()}
-                                    subtitle='API clients'
-                                    description={`OAuth2 authorizations: ${featureStats.oauth2_authorizations}`}
+                                    subtitle={t('admin.analytics.system.api_clients')}
+                                    description={t('admin.analytics.system.oauth2_authorizations', {
+                                        count: featureStats.oauth2_authorizations.toString(),
+                                    })}
                                     icon={KeyRound}
                                     className='bg-card/50 shadow-none! backdrop-blur-sm'
                                 />
                                 <ResourceCard
                                     title={featureStats.oidc_enabled_providers.toString()}
-                                    subtitle='Enabled OIDC providers'
-                                    description='Identity providers configured'
+                                    subtitle={t('admin.analytics.system.enabled_oidc_providers')}
+                                    description={t('admin.analytics.system.identity_providers_configured')}
                                     icon={ShieldCheck}
                                     className='bg-card/50 shadow-none! backdrop-blur-sm'
                                 />
diff --git a/frontendv2/src/app/(app)/admin/analytics/tickets/page.tsx b/frontendv2/src/app/(app)/admin/analytics/tickets/page.tsx
index b0146bb30..42a45e236 100644
--- a/frontendv2/src/app/(app)/admin/analytics/tickets/page.tsx
+++ b/frontendv2/src/app/(app)/admin/analytics/tickets/page.tsx
@@ -21,6 +21,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 import React, { useEffect, useState } from 'react';
 import api from '@/lib/api';
+import { useTranslation } from '@/contexts/TranslationContext';
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { PageHeader } from '@/components/featherui/PageHeader';
 import { WidgetRenderer } from '@/components/server/WidgetRenderer';
@@ -41,6 +42,7 @@ interface Data {
 }
 
 export default function TicketsAnalyticsPage() {
+    const { t } = useTranslation();
     const [data, setData] = useState<Data | null>(null);
     const { getWidgets } = usePluginWidgets('admin-analytics-tickets');
     const [loading, setLoading] = useState(true);
@@ -51,21 +53,21 @@ export default function TicketsAnalyticsPage() {
             .finally(() => setLoading(false));
     }, []);
 
-    if (loading) return <div className='flex min-h-[300px] items-center justify-center'>Loading...</div>;
-    if (!data) return <div className='flex min-h-[300px] items-center justify-center'>No data</div>;
+    if (loading) return <div className='flex min-h-[300px] items-center justify-center'>{t('common.loading')}</div>;
+    if (!data) return <div className='flex min-h-[300px] items-center justify-center'>{t('common.no_data')}</div>;
 
     const breakdown = [
-        { name: 'Tickets', value: data.tickets.tickets ?? 0 },
-        { name: 'Messages', value: data.tickets.messages ?? 0 },
-        { name: 'Attachments', value: data.tickets.attachments ?? 0 },
-        { name: 'Categories', value: data.tickets.categories ?? 0 },
-        { name: 'Priorities', value: data.tickets.priorities ?? 0 },
-        { name: 'Statuses', value: data.tickets.statuses ?? 0 },
+        { name: t('admin.analytics.tickets.tickets'), value: data.tickets.tickets ?? 0 },
+        { name: t('admin.analytics.tickets.messages'), value: data.tickets.messages ?? 0 },
+        { name: t('admin.analytics.tickets.attachments'), value: data.tickets.attachments ?? 0 },
+        { name: t('admin.analytics.tickets.categories'), value: data.tickets.categories ?? 0 },
+        { name: t('admin.analytics.tickets.priorities'), value: data.tickets.priorities ?? 0 },
+        { name: t('admin.analytics.tickets.statuses'), value: data.tickets.statuses ?? 0 },
     ];
     const weeklyBars = [
-        { name: 'Today', value: data.velocity.today ?? 0 },
-        { name: 'This Week', value: data.velocity.this_week ?? 0 },
-        { name: 'Last Week', value: data.velocity.last_week ?? 0 },
+        { name: t('admin.analytics.tickets.today'), value: data.velocity.today ?? 0 },
+        { name: t('admin.analytics.tickets.this_week'), value: data.velocity.this_week ?? 0 },
+        { name: t('admin.analytics.tickets.last_week'), value: data.velocity.last_week ?? 0 },
     ];
     const trendBars = (data.trend_42d || []).slice(-14).map((p) => ({ name: p.date.slice(5), value: p.count }));
 
@@ -73,49 +75,56 @@ export default function TicketsAnalyticsPage() {
         <>
             <WidgetRenderer widgets={getWidgets('admin-analytics-tickets', 'top-of-page')} />
             <div className='space-y-6'>
-                <PageHeader title='Tickets Analytics' description='Ticketing KPIs and usage metrics.' icon={Ticket} />
+                <PageHeader
+                    title={t('admin.analytics.tickets.title')}
+                    description={t('admin.analytics.tickets.subtitle')}
+                    icon={Ticket}
+                />
                 <div className='grid gap-6 md:grid-cols-2 lg:grid-cols-4'>
                     <ResourceCard
                         title={String(data.tickets.tickets ?? 0)}
-                        subtitle='Tickets'
-                        description='Total tickets'
+                        subtitle={t('admin.analytics.tickets.tickets')}
+                        description={t('admin.analytics.tickets.total_tickets')}
                         icon={Ticket}
                     />
                     <ResourceCard
                         title={String(data.tickets.messages ?? 0)}
-                        subtitle='Ticket Messages'
-                        description='Conversation volume'
+                        subtitle={t('admin.analytics.tickets.ticket_messages')}
+                        description={t('admin.analytics.tickets.conversation_volume')}
                         icon={MessageSquare}
                     />
                     <ResourceCard
                         title={String(data.tickets.attachments ?? 0)}
-                        subtitle='Ticket Attachments'
-                        description='Uploaded files'
+                        subtitle={t('admin.analytics.tickets.ticket_attachments')}
+                        description={t('admin.analytics.tickets.uploaded_files')}
                         icon={Paperclip}
                     />
                     <ResourceCard
                         title={`${data.velocity.weekly_growth_percent > 0 ? '+' : ''}${data.velocity.weekly_growth_percent}%`}
-                        subtitle='Weekly Growth'
-                        description={`${data.velocity.this_week} this week vs ${data.velocity.last_week} last week`}
+                        subtitle={t('admin.analytics.tickets.weekly_growth')}
+                        description={t('admin.analytics.tickets.weekly_comparison', {
+                            thisWeek: String(data.velocity.this_week),
+                            lastWeek: String(data.velocity.last_week),
+                        })}
                         icon={TrendingUp}
                     />
                 </div>
                 <div className='grid gap-4 md:grid-cols-2'>
                     <SimplePieChart
-                        title='Ticket Breakdown'
-                        description='Distribution by entity type'
+                        title={t('admin.analytics.tickets.breakdown')}
+                        description={t('admin.analytics.tickets.breakdown_desc')}
                         data={breakdown}
                     />
                     <SimpleBarChart
-                        title='Ticket Creation Velocity'
-                        description='Today and week-over-week ticket volume'
+                        title={t('admin.analytics.tickets.creation_velocity')}
+                        description={t('admin.analytics.tickets.creation_velocity_desc')}
                         data={weeklyBars}
                     />
                 </div>
                 <div className='grid gap-4 md:grid-cols-1'>
                     <SimpleBarChart
-                        title='Recent Ticket Trend (14d)'
-                        description='Tickets created per day over the most recent 14 days'
+                        title={t('admin.analytics.tickets.recent_trend')}
+                        description={t('admin.analytics.tickets.recent_trend_desc')}
                         data={trendBars}
                     />
                 </div>
diff --git a/frontendv2/src/app/(app)/admin/analytics/users/page.tsx b/frontendv2/src/app/(app)/admin/analytics/users/page.tsx
index d2cc8386c..aa24ec723 100644
--- a/frontendv2/src/app/(app)/admin/analytics/users/page.tsx
+++ b/frontendv2/src/app/(app)/admin/analytics/users/page.tsx
@@ -219,15 +219,17 @@ export default function UserAnalyticsPage() {
                         />
                         <ResourceCard
                             title={overview.unverified.toString()}
-                            subtitle='Unverified'
-                            description='Users pending email verification'
+                            subtitle={t('admin.analytics.users.unverified')}
+                            description={t('admin.analytics.users.pending_email_verification')}
                             icon={UserMinus}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
                         />
                         <ResourceCard
                             title={(securityOverview?.not_secured ?? 0).toString()}
-                            subtitle='Not secured'
-                            description={`Fully secured: ${securityOverview?.fully_secured ?? 0}`}
+                            subtitle={t('admin.analytics.users.not_secured')}
+                            description={t('admin.analytics.users.fully_secured', {
+                                count: String(securityOverview?.fully_secured ?? 0),
+                            })}
                             icon={ShieldAlert}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
                         />
diff --git a/frontendv2/src/app/(app)/admin/analytics/vds/page.tsx b/frontendv2/src/app/(app)/admin/analytics/vds/page.tsx
index ef7bef363..58fba45ee 100644
--- a/frontendv2/src/app/(app)/admin/analytics/vds/page.tsx
+++ b/frontendv2/src/app/(app)/admin/analytics/vds/page.tsx
@@ -17,6 +17,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 import React, { useEffect, useState } from 'react';
 import api from '@/lib/api';
+import { useTranslation } from '@/contexts/TranslationContext';
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { ResourceCard } from '@/components/featherui/ResourceCard';
 import { PageHeader } from '@/components/featherui/PageHeader';
@@ -32,6 +33,7 @@ interface DashboardData {
 }
 
 export default function VdsAnalyticsPage() {
+    const { t } = useTranslation();
     const { fetchWidgets, getWidgets } = usePluginWidgets('admin-analytics-vds');
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState<string | null>(null);
@@ -45,11 +47,11 @@ export default function VdsAnalyticsPage() {
             setDashboard(res.data.data);
         } catch (err) {
             console.error('Failed to fetch VDS analytics:', err);
-            setError('Failed to fetch VDS analytics data.');
+            setError(t('admin.analytics.vds.error'));
         } finally {
             setLoading(false);
         }
-    }, []);
+    }, [t]);
 
     useEffect(() => {
         fetchData();
@@ -75,25 +77,25 @@ export default function VdsAnalyticsPage() {
                     onClick={fetchData}
                     className='bg-primary text-primary-foreground rounded-md px-4 py-2 transition-opacity hover:opacity-90'
                 >
-                    Retry
+                    {t('admin.analytics.activity.retry')}
                 </button>
             </div>
         );
     }
 
     const vdsBreakdown = [
-        { name: 'Instances', value: dashboard?.vds.instances ?? 0 },
-        { name: 'Nodes', value: dashboard?.vds.nodes ?? 0 },
-        { name: 'Templates', value: dashboard?.vds.templates ?? 0 },
-        { name: 'Backups', value: dashboard?.vds.instance_backups ?? 0 },
-        { name: 'Tasks', value: dashboard?.vds.tasks ?? 0 },
+        { name: t('admin.analytics.vds.instances'), value: dashboard?.vds.instances ?? 0 },
+        { name: t('admin.analytics.vds.nodes'), value: dashboard?.vds.nodes ?? 0 },
+        { name: t('admin.analytics.vds.templates'), value: dashboard?.vds.templates ?? 0 },
+        { name: t('admin.analytics.vds.backups'), value: dashboard?.vds.instance_backups ?? 0 },
+        { name: t('admin.analytics.vds.tasks'), value: dashboard?.vds.tasks ?? 0 },
     ];
 
     const vdsRuntimeBreakdown = [
-        { name: 'Subusers', value: dashboard?.vds.subusers ?? 0 },
-        { name: 'Instance IPs', value: dashboard?.vds.instance_ips ?? 0 },
-        { name: 'Activities', value: dashboard?.vds.instance_activities ?? 0 },
-        { name: 'Backups', value: dashboard?.vds.instance_backups ?? 0 },
+        { name: t('admin.analytics.vds.subusers'), value: dashboard?.vds.subusers ?? 0 },
+        { name: t('admin.analytics.vds.instance_ips'), value: dashboard?.vds.instance_ips ?? 0 },
+        { name: t('admin.analytics.vds.activities'), value: dashboard?.vds.instance_activities ?? 0 },
+        { name: t('admin.analytics.vds.backups'), value: dashboard?.vds.instance_backups ?? 0 },
     ];
 
     return (
@@ -101,8 +103,8 @@ export default function VdsAnalyticsPage() {
             <WidgetRenderer widgets={getWidgets('admin-analytics-vds', 'top-of-page')} />
             <div className='space-y-6'>
                 <PageHeader
-                    title='VDS Analytics'
-                    description='VDS-only KPIs for nodes, templates, instances, backups, and operations.'
+                    title={t('admin.analytics.vds.title')}
+                    description={t('admin.analytics.vds.subtitle')}
                     icon={Boxes}
                 />
 
@@ -110,29 +112,40 @@ export default function VdsAnalyticsPage() {
                     <div className='grid gap-6 md:grid-cols-2 lg:grid-cols-4'>
                         <ResourceCard
                             title={String(dashboard.vds.instances)}
-                            subtitle='VDS Instances'
-                            description={`Nodes: ${dashboard.vds.nodes}, Templates: ${dashboard.vds.templates}`}
+                            subtitle={t('admin.analytics.vds.vds_instances')}
+                            description={t('admin.analytics.vds.nodes_templates', {
+                                nodes: String(dashboard.vds.nodes),
+                                templates: String(dashboard.vds.templates),
+                            })}
                             icon={Boxes}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
                         />
                         <ResourceCard
                             title={String(dashboard.vds.nodes)}
-                            subtitle='VDS Nodes'
-                            description={`Templates: ${dashboard.vds.templates}, Tasks: ${dashboard.vds.tasks}`}
+                            subtitle={t('admin.analytics.vds.vds_nodes')}
+                            description={t('admin.analytics.vds.templates_tasks', {
+                                templates: String(dashboard.vds.templates),
+                                tasks: String(dashboard.vds.tasks),
+                            })}
                             icon={Server}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
                         />
                         <ResourceCard
                             title={String(dashboard.vds.instance_backups)}
-                            subtitle='Instance Backups'
-                            description={`IPs: ${dashboard.vds.instance_ips}, Subusers: ${dashboard.vds.subusers}`}
+                            subtitle={t('admin.analytics.vds.instance_backups')}
+                            description={t('admin.analytics.vds.ips_subusers', {
+                                ips: String(dashboard.vds.instance_ips),
+                                subusers: String(dashboard.vds.subusers),
+                            })}
                             icon={Archive}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
                         />
                         <ResourceCard
                             title={String(dashboard.vds.instance_activities)}
-                            subtitle='Instance Activities'
-                            description={`Total VDS objects: ${dashboard.totals.vds_objects}`}
+                            subtitle={t('admin.analytics.vds.instance_activities')}
+                            description={t('admin.analytics.vds.total_vds_objects', {
+                                count: String(dashboard.totals.vds_objects),
+                            })}
                             icon={Activity}
                             className='bg-card/50 shadow-none! backdrop-blur-sm'
                         />
@@ -140,19 +153,25 @@ export default function VdsAnalyticsPage() {
                 )}
 
                 <div className='grid gap-4 md:grid-cols-2'>
-                    <SimplePieChart title='VDS Breakdown' description='VDS-related object totals' data={vdsBreakdown} />
+                    <SimplePieChart
+                        title={t('admin.analytics.vds.breakdown')}
+                        description={t('admin.analytics.vds.breakdown_desc')}
+                        data={vdsBreakdown}
+                    />
                     <SimpleBarChart
-                        title='VDS Totals'
-                        description='Total VDS object count'
-                        data={[{ name: 'VDS Objects', value: dashboard?.totals.vds_objects ?? 0 }]}
+                        title={t('admin.analytics.vds.totals')}
+                        description={t('admin.analytics.vds.totals_desc')}
+                        data={[
+                            { name: t('admin.analytics.vds.vds_objects'), value: dashboard?.totals.vds_objects ?? 0 },
+                        ]}
                         color='#6366f1'
                     />
                 </div>
 
                 <div className='grid gap-4 md:grid-cols-1'>
                     <SimpleBarChart
-                        title='VDS Runtime Breakdown'
-                        description='Operational VDS entities and usage'
+                        title={t('admin.analytics.vds.runtime_breakdown')}
+                        description={t('admin.analytics.vds.runtime_breakdown_desc')}
                         data={vdsRuntimeBreakdown}
                         color='#22c55e'
                     />
diff --git a/frontendv2/src/app/(app)/admin/cloud-management/finish/page.tsx b/frontendv2/src/app/(app)/admin/cloud-management/finish/page.tsx
index 9bbbb15b5..b3c3ac0ff 100644
--- a/frontendv2/src/app/(app)/admin/cloud-management/finish/page.tsx
+++ b/frontendv2/src/app/(app)/admin/cloud-management/finish/page.tsx
@@ -41,7 +41,7 @@ export default function CloudManagementFinishPage() {
         const cloudApiSecret = searchParams.get('cloud_api_secret');
 
         if (!cloudApiKey || !cloudApiSecret) {
-            setError('Missing required parameters: cloud_api_key and cloud_api_secret');
+            setError(t('admin.cloud_management.finish.missing_params'));
             setIsLoading(false);
             return;
         }
@@ -55,27 +55,27 @@ export default function CloudManagementFinishPage() {
 
             if (response.data && response.data.success) {
                 setIsSuccess(true);
-                toast.success('Your panel has been successfully linked with FeatherCloud!');
+                toast.success(t('admin.cloud_management.finish.linked_toast'));
 
                 setTimeout(() => {
                     router.push('/admin/cloud-management');
                 }, 3000);
             } else {
-                throw new Error(response.data.message || 'Failed to save credentials');
+                throw new Error(response.data.message || t('admin.cloud_management.finish.save_failed'));
             }
         } catch (err) {
             console.error('Failed to save cloud credentials:', err);
             const errorMessage =
                 axios.isAxiosError(err) && err.response?.data?.message
                     ? err.response.data.message
-                    : 'Failed to save cloud credentials';
+                    : t('admin.cloud_management.finish.save_failed');
             setError(errorMessage);
-            toast.error('Failed to save cloud credentials');
+            toast.error(t('admin.cloud_management.finish.save_failed'));
         } finally {
             setIsSaving(false);
             setIsLoading(false);
         }
-    }, [searchParams, router]);
+    }, [searchParams, router, t]);
 
     useEffect(() => {
         saveCloudCredentials();
diff --git a/frontendv2/src/app/(app)/admin/cloud-management/page.tsx b/frontendv2/src/app/(app)/admin/cloud-management/page.tsx
index a28a0d4f6..7a29e606c 100644
--- a/frontendv2/src/app/(app)/admin/cloud-management/page.tsx
+++ b/frontendv2/src/app/(app)/admin/cloud-management/page.tsx
@@ -123,12 +123,12 @@ export default function CloudManagementPage() {
                 },
             });
         } catch (error) {
-            toast.error('Failed to load cloud credentials');
+            toast.error(t('admin.cloud_management.messages.credentials_load_failed'));
             console.error(error);
         } finally {
             setIsLoading(false);
         }
-    }, []);
+    }, [t]);
 
     const regenerateKeys = async () => {
         setIsRegenerating(true);
@@ -150,14 +150,12 @@ export default function CloudManagementPage() {
 
             const cloudCredsEmpty = !data?.cloud_credentials?.public_key || !data?.cloud_credentials?.private_key;
             if (cloudCredsEmpty) {
-                toast.warning(
-                    'Cloud credentials are empty. Premium plugins cannot be downloaded until FeatherCloud credentials are configured.',
-                );
+                toast.warning(t('admin.cloud_management.messages.cloud_credentials_empty'));
             } else {
-                toast.success('Cloud credentials rotated');
+                toast.success(t('admin.cloud_management.messages.credentials_rotated'));
             }
         } catch (error) {
-            toast.error('Failed to rotate cloud credentials');
+            toast.error(t('admin.cloud_management.messages.credentials_rotate_failed'));
             console.error(error);
         } finally {
             setIsRegenerating(false);
@@ -172,10 +170,10 @@ export default function CloudManagementPage() {
             if (oauth2Url) {
                 window.location.href = oauth2Url;
             } else {
-                toast.error('Failed to generate OAuth2 link');
+                toast.error(t('admin.cloud_management.messages.oauth_link_failed'));
             }
         } catch (error) {
-            toast.error('Failed to generate OAuth2 link');
+            toast.error(t('admin.cloud_management.messages.oauth_link_failed'));
             console.error(error);
         } finally {
             setIsLinking(false);
diff --git a/frontendv2/src/app/(app)/admin/feathercloud/plugins/page.tsx b/frontendv2/src/app/(app)/admin/feathercloud/plugins/page.tsx
index 05ecdf927..96074bc57 100644
--- a/frontendv2/src/app/(app)/admin/feathercloud/plugins/page.tsx
+++ b/frontendv2/src/app/(app)/admin/feathercloud/plugins/page.tsx
@@ -60,6 +60,7 @@ import { PageCard } from '@/components/featherui/PageCard';
 import { Badge } from '@/components/ui/badge';
 import { Select } from '@/components/ui/select-native';
 import { cn } from '@/lib/utils';
+import { collectOwnedCloudPackageIds, isCloudPackageOwned } from '@/lib/cloudPackageMatch';
 import { Sheet, SheetHeader, SheetTitle, SheetDescription, SheetFooter } from '@/components/ui/sheet';
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
 
@@ -76,6 +77,7 @@ interface OnlineAddon {
     premium: number;
     premium_price?: string;
     premium_link?: string;
+    store_slug?: string | null;
     latest_version?: {
         version: string;
         download_url: string;
@@ -129,6 +131,12 @@ interface RequirementsCheckResult {
     };
 }
 
+const addonOwnershipOptions = (addon: Pick<OnlineAddon, 'identifier' | 'premium_link' | 'store_slug' | 'name'>) => ({
+    premiumLink: addon.premium_link,
+    storeSlug: addon.store_slug,
+    displayName: addon.name,
+});
+
 /** Any of these in the search box + Enter toggles UI preview mode. */
 const PLUGIN_UI_PREVIEW_SECRETS = ['testpluginuinow', 'testingpluginui'] as const;
 
@@ -326,10 +334,7 @@ export default function PluginsPage() {
                 const data = res.data?.data;
                 const purchases = Array.isArray(data?.purchases) ? data.purchases : [];
                 for (const p of purchases) {
-                    const raw = p?.product?.identifier;
-                    if (typeof raw === 'string' && raw.trim() !== '') {
-                        ids.add(raw.trim().toLowerCase());
-                    }
+                    collectOwnedCloudPackageIds(p).forEach((id) => ids.add(id));
                 }
                 if (purchases.length < limit) {
                     break;
@@ -796,11 +801,10 @@ export default function PluginsPage() {
             if (!row || row.premium !== 1) {
                 return true;
             }
-            const id = identifier.toLowerCase();
-            if (uiPreviewMode && id === 'premiumstorepreview') {
+            if (uiPreviewMode && identifier.toLowerCase() === 'premiumstorepreview') {
                 return true;
             }
-            return ownedCloudPackageIdsRef.current.some((x) => x.toLowerCase() === id);
+            return isCloudPackageOwned(ownedCloudPackageIdsRef.current, identifier, addonOwnershipOptions(row));
         });
         if (toInstall.length < pluginsReady.length) {
             toast.message(t('admin.marketplace.plugins.queue.premium_skipped_not_owned'));
@@ -859,12 +863,12 @@ export default function PluginsPage() {
     };
 
     const isPremiumOwnedForQueue = useCallback(
-        (identifier: string) => {
-            const id = identifier.toLowerCase();
+        (addon: Pick<OnlineAddon, 'identifier' | 'premium_link' | 'store_slug' | 'name'>) => {
+            const id = addon.identifier.toLowerCase();
             if (uiPreviewMode && id === 'premiumstorepreview') {
                 return true;
             }
-            return ownedCloudPackageIdsRef.current.some((x) => x.toLowerCase() === id);
+            return isCloudPackageOwned(ownedCloudPackageIdsRef.current, addon.identifier, addonOwnershipOptions(addon));
         },
         [uiPreviewMode],
     );
@@ -881,7 +885,6 @@ export default function PluginsPage() {
         if (uiPreviewMode) {
             return;
         }
-        const ownedSet = new Set(ownedCloudPackageIds.map((x) => x.toLowerCase()));
         const oa = onlineAddonsRef.current;
         const pa = popularAddonsRef.current;
         setSelectedPluginIds((prev) => {
@@ -890,7 +893,7 @@ export default function PluginsPage() {
                 if (!row || row.premium !== 1) {
                     return true;
                 }
-                return ownedSet.has(id.toLowerCase());
+                return isCloudPackageOwned(ownedCloudPackageIds, id, addonOwnershipOptions(row));
             });
             return next.length === prev.length ? prev : next;
         });
@@ -926,7 +929,7 @@ export default function PluginsPage() {
             }
 
             const row = lookupAddonRow(identifier);
-            if (row?.premium === 1 && !isPremiumOwnedForQueue(identifier)) {
+            if (row?.premium === 1 && !isPremiumOwnedForQueue(row)) {
                 toast.error(t('admin.marketplace.plugins.queue.premium_not_owned'));
                 return prev;
             }
@@ -1304,7 +1307,7 @@ export default function PluginsPage() {
                             const isPremium = addon.premium === 1;
                             const storeUrl = addon.premium_link?.trim() ?? '';
                             const hasStore = Boolean(storeUrl);
-                            const premiumOwned = !isPremium || isPremiumOwnedForQueue(addon.identifier);
+                            const premiumOwned = !isPremium || isPremiumOwnedForQueue(addon);
                             const requiresCloudBlock = isPremium && !hasStore && !cloudAccountConfigured;
                             const premiumNotLicensed = isPremium && cloudAccountConfigured && !premiumOwned;
                             const storePrimary =
@@ -1674,7 +1677,7 @@ export default function PluginsPage() {
                                 const store = sp.premium_link?.trim();
                                 const isPrem = sp.premium === 1;
                                 const installed = installedPluginIds.includes(sp.identifier);
-                                const premiumOwned = !isPrem || isPremiumOwnedForQueue(sp.identifier);
+                                const premiumOwned = !isPrem || isPremiumOwnedForQueue(sp);
                                 const premiumNotLicensed = isPrem && cloudAccountConfigured && !premiumOwned;
                                 const storePrimary =
                                     (isPrem && Boolean(store) && !cloudAccountConfigured) ||
diff --git a/frontendv2/src/app/(app)/admin/feathercloud/translations/page.tsx b/frontendv2/src/app/(app)/admin/feathercloud/translations/page.tsx
index 765bd559d..c8e0ae401 100644
--- a/frontendv2/src/app/(app)/admin/feathercloud/translations/page.tsx
+++ b/frontendv2/src/app/(app)/admin/feathercloud/translations/page.tsx
@@ -74,14 +74,14 @@ export default function CommunityTranslationsPage() {
                 setFilteredTranslations(mockTranslations);
             } catch (error) {
                 console.error('Error fetching community translations:', error);
-                toast.error('Failed to fetch community translations');
+                toast.error(t('admin.feathercloud.translations.fetch_failed'));
             } finally {
                 setLoading(false);
             }
         };
 
         fetchTranslations();
-    }, []);
+    }, [t]);
 
     useEffect(() => {
         if (!debouncedSearchQuery) {
diff --git a/frontendv2/src/app/(app)/admin/featherpanel-ai-agent/page.tsx b/frontendv2/src/app/(app)/admin/featherpanel-ai-agent/page.tsx
index 245907395..2e7d84ea4 100644
--- a/frontendv2/src/app/(app)/admin/featherpanel-ai-agent/page.tsx
+++ b/frontendv2/src/app/(app)/admin/featherpanel-ai-agent/page.tsx
@@ -246,13 +246,25 @@ export default function FeatherAiAgentPage() {
                                         value={providerValue || 'basic'}
                                         onChange={(e) => updateSettingValue('chatbot_ai_provider', e.target.value)}
                                     >
-                                        <option value='basic'>Basic (No AI)</option>
-                                        <option value='google_gemini'>Google Gemini</option>
-                                        <option value='openai'>OpenAI</option>
-                                        <option value='openrouter'>OpenRouter</option>
-                                        <option value='ollama'>Ollama (Self-hosted)</option>
-                                        <option value='grok'>Grok (xAI)</option>
-                                        <option value='perplexity'>Perplexity</option>
+                                        <option value='basic'>
+                                            {t('admin.featherai_agent.config.providers.basic')}
+                                        </option>
+                                        <option value='google_gemini'>
+                                            {t('admin.featherai_agent.config.providers.google_gemini')}
+                                        </option>
+                                        <option value='openai'>
+                                            {t('admin.featherai_agent.config.providers.openai')}
+                                        </option>
+                                        <option value='openrouter'>
+                                            {t('admin.featherai_agent.config.providers.openrouter')}
+                                        </option>
+                                        <option value='ollama'>
+                                            {t('admin.featherai_agent.config.providers.ollama')}
+                                        </option>
+                                        <option value='grok'>{t('admin.featherai_agent.config.providers.grok')}</option>
+                                        <option value='perplexity'>
+                                            {t('admin.featherai_agent.config.providers.perplexity')}
+                                        </option>
                                     </Select>
                                 </div>
 
@@ -334,10 +346,12 @@ export default function FeatherAiAgentPage() {
                                     {providerValue === 'google_gemini' && (
                                         <>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>API Key</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.api_key')}
+                                                </Label>
                                                 <Input
                                                     type='password'
-                                                    placeholder='Enter API key to change'
+                                                    placeholder={t('admin.featherai_agent.config.api_key_placeholder')}
                                                     className='h-12'
                                                     value={String(getSettingValue('chatbot_google_ai_api_key') || '')}
                                                     onChange={(e) =>
@@ -346,7 +360,9 @@ export default function FeatherAiAgentPage() {
                                                 />
                                             </div>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>Model</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.model')}
+                                                </Label>
                                                 <Input
                                                     placeholder='gemini-2.0-flash'
                                                     className='h-12'
@@ -362,10 +378,12 @@ export default function FeatherAiAgentPage() {
                                     {providerValue === 'openai' && (
                                         <>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>API Key</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.api_key')}
+                                                </Label>
                                                 <Input
                                                     type='password'
-                                                    placeholder='Enter API key to change'
+                                                    placeholder={t('admin.featherai_agent.config.api_key_placeholder')}
                                                     className='h-12'
                                                     value={String(getSettingValue('chatbot_openai_api_key') || '')}
                                                     onChange={(e) =>
@@ -374,7 +392,9 @@ export default function FeatherAiAgentPage() {
                                                 />
                                             </div>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>Model</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.model')}
+                                                </Label>
                                                 <Input
                                                     placeholder='gpt-4o-mini'
                                                     className='h-12'
@@ -385,7 +405,9 @@ export default function FeatherAiAgentPage() {
                                                 />
                                             </div>
                                             <div className='space-y-3 md:col-span-2'>
-                                                <Label className='text-sm font-semibold'>Base URL</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.base_url')}
+                                                </Label>
                                                 <Input
                                                     placeholder='https://api.openai.com'
                                                     className='h-12'
@@ -401,10 +423,12 @@ export default function FeatherAiAgentPage() {
                                     {providerValue === 'openrouter' && (
                                         <>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>API Key</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.api_key')}
+                                                </Label>
                                                 <Input
                                                     type='password'
-                                                    placeholder='Enter API key to change'
+                                                    placeholder={t('admin.featherai_agent.config.api_key_placeholder')}
                                                     className='h-12'
                                                     value={String(getSettingValue('chatbot_openrouter_api_key') || '')}
                                                     onChange={(e) =>
@@ -413,7 +437,9 @@ export default function FeatherAiAgentPage() {
                                                 />
                                             </div>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>Model</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.model')}
+                                                </Label>
                                                 <Input
                                                     placeholder='openai/gpt-4o-mini'
                                                     className='h-12'
@@ -429,7 +455,9 @@ export default function FeatherAiAgentPage() {
                                     {providerValue === 'ollama' && (
                                         <>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>Base URL</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.base_url')}
+                                                </Label>
                                                 <Input
                                                     placeholder='http://localhost:11434'
                                                     className='h-12'
@@ -440,7 +468,9 @@ export default function FeatherAiAgentPage() {
                                                 />
                                             </div>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>Model</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.model')}
+                                                </Label>
                                                 <Input
                                                     placeholder='llama3.2'
                                                     className='h-12'
@@ -456,7 +486,9 @@ export default function FeatherAiAgentPage() {
                                     {providerValue === 'grok' && (
                                         <>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>xAI (Grok) API Key</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.grok_api_key')}
+                                                </Label>
                                                 <Input
                                                     type='password'
                                                     className='h-12'
@@ -467,7 +499,9 @@ export default function FeatherAiAgentPage() {
                                                 />
                                             </div>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>xAI (Grok) Model</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.grok_model')}
+                                                </Label>
                                                 <Input
                                                     placeholder='grok-2-1212'
                                                     className='h-12'
@@ -483,10 +517,12 @@ export default function FeatherAiAgentPage() {
                                     {providerValue === 'perplexity' && (
                                         <>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>API Key</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.api_key')}
+                                                </Label>
                                                 <Input
                                                     type='password'
-                                                    placeholder='Enter API key to change'
+                                                    placeholder={t('admin.featherai_agent.config.api_key_placeholder')}
                                                     className='h-12'
                                                     value={String(getSettingValue('chatbot_perplexity_api_key') || '')}
                                                     onChange={(e) =>
@@ -495,7 +531,9 @@ export default function FeatherAiAgentPage() {
                                                 />
                                             </div>
                                             <div className='space-y-3'>
-                                                <Label className='text-sm font-semibold'>Model</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.model')}
+                                                </Label>
                                                 <Input
                                                     placeholder='sonar-pro'
                                                     className='h-12'
@@ -506,7 +544,9 @@ export default function FeatherAiAgentPage() {
                                                 />
                                             </div>
                                             <div className='space-y-3 md:col-span-2'>
-                                                <Label className='text-sm font-semibold'>Base URL</Label>
+                                                <Label className='text-sm font-semibold'>
+                                                    {t('admin.featherai_agent.config.base_url')}
+                                                </Label>
                                                 <Input
                                                     placeholder='https://api.perplexity.ai'
                                                     className='h-12'
diff --git a/frontendv2/src/app/(app)/admin/featherzerotrust/tabs/LogsTab.tsx b/frontendv2/src/app/(app)/admin/featherzerotrust/tabs/LogsTab.tsx
index b67bb4bb8..a409c5e23 100644
--- a/frontendv2/src/app/(app)/admin/featherzerotrust/tabs/LogsTab.tsx
+++ b/frontendv2/src/app/(app)/admin/featherzerotrust/tabs/LogsTab.tsx
@@ -315,9 +315,11 @@ const LogsTab = () => {
             <Sheet open={drawerOpen} onOpenChange={setDrawerOpen}>
                 <SheetContent side='right' className='overflow-y-auto sm:max-w-2xl'>
                     <SheetHeader>
-                        <SheetTitle>Execution Details</SheetTitle>
+                        <SheetTitle>{t('admin.featherzerotrust.logs.executionDetails')}</SheetTitle>
                         <SheetDescription>
-                            Detailed scan results for execution ID: {executionLog?.execution_id}
+                            {t('admin.featherzerotrust.logs.executionDetailsDescription', {
+                                id: executionLog?.execution_id ?? '',
+                            })}
                         </SheetDescription>
                     </SheetHeader>
 
@@ -331,7 +333,9 @@ const LogsTab = () => {
                                 <div className='grid grid-cols-2 gap-4'>
                                     <Card className='bg-muted/30 border-border/50'>
                                         <CardContent className='p-4'>
-                                            <div className='text-muted-foreground text-xs'>Total Servers</div>
+                                            <div className='text-muted-foreground text-xs'>
+                                                {t('admin.featherzerotrust.logs.totalServers')}
+                                            </div>
                                             <div className='text-2xl font-bold'>
                                                 {executionLog.total_servers_scanned}
                                             </div>
@@ -345,7 +349,9 @@ const LogsTab = () => {
                                         )}
                                     >
                                         <CardContent className='p-4'>
-                                            <div className='text-muted-foreground text-xs'>Total Detections</div>
+                                            <div className='text-muted-foreground text-xs'>
+                                                {t('admin.featherzerotrust.logs.totalDetections')}
+                                            </div>
                                             <div
                                                 className={cn(
                                                     'text-2xl font-bold',
diff --git a/frontendv2/src/app/(app)/admin/layout.tsx b/frontendv2/src/app/(app)/admin/layout.tsx
index 91ab4f26d..1bd1d5778 100644
--- a/frontendv2/src/app/(app)/admin/layout.tsx
+++ b/frontendv2/src/app/(app)/admin/layout.tsx
@@ -15,10 +15,11 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 import DashboardShell from '@/components/layout/DashboardShell';
 import PermissionGuard from '@/components/auth/PermissionGuard';
+import Permissions from '@/lib/permissions';
 
 export default function AdminLayout({ children }: { children: React.ReactNode }) {
     return (
-        <PermissionGuard>
+        <PermissionGuard permission={Permissions.ADMIN_DASHBOARD_VIEW}>
             <DashboardShell>{children}</DashboardShell>
         </PermissionGuard>
     );
diff --git a/frontendv2/src/app/(app)/admin/mail-templates/page.tsx b/frontendv2/src/app/(app)/admin/mail-templates/page.tsx
index fcf8ae1c0..b6c110c70 100644
--- a/frontendv2/src/app/(app)/admin/mail-templates/page.tsx
+++ b/frontendv2/src/app/(app)/admin/mail-templates/page.tsx
@@ -360,7 +360,7 @@ export default function MailTemplatesPage() {
                                         <Button
                                             variant='ghost'
                                             size='sm'
-                                            title='Preview'
+                                            title={t('common.preview')}
                                             onClick={() => openPreview(template)}
                                         >
                                             <Eye className='h-4 w-4' />
@@ -368,7 +368,7 @@ export default function MailTemplatesPage() {
                                         <Button
                                             variant='ghost'
                                             size='sm'
-                                            title='Edit'
+                                            title={t('common.edit')}
                                             onClick={() => openEdit(template)}
                                         >
                                             <Pencil className='h-4 w-4' />
@@ -376,7 +376,7 @@ export default function MailTemplatesPage() {
                                         <Button
                                             variant='ghost'
                                             size='sm'
-                                            title='Delete'
+                                            title={t('common.delete')}
                                             className='text-destructive hover:text-destructive hover:bg-destructive/10'
                                             onClick={() => handleDelete(template.id)}
                                         >
@@ -488,7 +488,7 @@ export default function MailTemplatesPage() {
                                         defaultLanguage='html'
                                         value={formData.body}
                                         onChange={(value) => setFormData({ ...formData, body: value || '' })}
-                                        title='Editor'
+                                        title={t('admin.mail_templates.form.editor')}
                                     />
                                     <p className='text-muted-foreground text-xs'>
                                         {t('admin.mail_templates.form.html_help')}
@@ -505,7 +505,7 @@ export default function MailTemplatesPage() {
                                     <iframe
                                         srcDoc={formData.body}
                                         className='h-full w-full border-none'
-                                        title='Live Preview'
+                                        title={t('admin.mail_templates.form.live_preview')}
                                     />
                                 </div>
                             </div>
@@ -553,7 +553,7 @@ export default function MailTemplatesPage() {
                                         defaultLanguage='html'
                                         value={formData.body}
                                         onChange={(value) => setFormData({ ...formData, body: value || '' })}
-                                        title='Editor'
+                                        title={t('admin.mail_templates.form.editor')}
                                     />
                                     <p className='text-muted-foreground text-xs'>
                                         {t('admin.mail_templates.form.html_help')}
@@ -570,7 +570,7 @@ export default function MailTemplatesPage() {
                                     <iframe
                                         srcDoc={formData.body}
                                         className='h-full w-full border-none'
-                                        title='Live Preview'
+                                        title={t('admin.mail_templates.form.live_preview')}
                                     />
                                 </div>
                             </div>
@@ -621,7 +621,7 @@ export default function MailTemplatesPage() {
                             </div>
                         </div>
                         <SheetFooter>
-                            <Button onClick={() => setPreviewOpen(false)}>Close</Button>
+                            <Button onClick={() => setPreviewOpen(false)}>{t('common.close')}</Button>
                         </SheetFooter>
                     </div>
                 </div>
diff --git a/frontendv2/src/app/(app)/admin/nodes/[id]/components/ModulesTab.tsx b/frontendv2/src/app/(app)/admin/nodes/[id]/components/ModulesTab.tsx
index 4991515de..aab5063a9 100644
--- a/frontendv2/src/app/(app)/admin/nodes/[id]/components/ModulesTab.tsx
+++ b/frontendv2/src/app/(app)/admin/nodes/[id]/components/ModulesTab.tsx
@@ -99,11 +99,11 @@ export function ModulesTab({ node }: ModulesTabProps) {
             if (data.success) {
                 setConfigData(JSON.stringify(data.data.config || {}, null, 4));
             } else {
-                toast.error(data.message || 'Failed to fetch module configuration');
+                toast.error(data.message || t('admin.node.view.modules.config_fetch_failed'));
                 setConfigModalOpen(false);
             }
         } catch (err: unknown) {
-            let msg = 'Failed to fetch module configuration';
+            let msg = t('admin.node.view.modules.config_fetch_failed');
             if (axios.isAxiosError(err)) {
                 msg = err.response?.data?.message || err.message;
             }
@@ -122,7 +122,7 @@ export function ModulesTab({ node }: ModulesTabProps) {
             try {
                 parsedConfig = JSON.parse(configData);
             } catch {
-                toast.error('Invalid JSON configuration');
+                toast.error(t('admin.node.view.modules.invalid_json_config'));
                 setSavingConfig(false);
                 return;
             }
diff --git a/frontendv2/src/app/(app)/admin/nodes/[id]/components/WingsConfigTab.tsx b/frontendv2/src/app/(app)/admin/nodes/[id]/components/WingsConfigTab.tsx
index 81a20d1d1..ce1730aa8 100644
--- a/frontendv2/src/app/(app)/admin/nodes/[id]/components/WingsConfigTab.tsx
+++ b/frontendv2/src/app/(app)/admin/nodes/[id]/components/WingsConfigTab.tsx
@@ -136,10 +136,12 @@ export function WingsConfigTab({ node }: WingsConfigTabProps) {
                     {error ? (
                         <div className='border-destructive/20 bg-destructive/5 rounded-2xl border p-6 text-center'>
                             <AlertTriangle className='text-destructive mx-auto mb-3 h-8 w-8' />
-                            <h3 className='text-destructive mb-1 text-sm font-bold'>Failed to Load Configuration</h3>
+                            <h3 className='text-destructive mb-1 text-sm font-bold'>
+                                {t('admin.node.view.config.load_failed_title')}
+                            </h3>
                             <p className='text-destructive/80 mb-4 text-xs'>{error}</p>
                             <Button variant='outline' size='sm' onClick={fetchConfig} className='rounded-xl'>
-                                Try Again
+                                {t('common.retry')}
                             </Button>
                         </div>
                     ) : (
diff --git a/frontendv2/src/app/(app)/admin/nodes/[id]/edit/AllocationsTab.tsx b/frontendv2/src/app/(app)/admin/nodes/[id]/edit/AllocationsTab.tsx
index 6a2225df4..f714e0efc 100644
--- a/frontendv2/src/app/(app)/admin/nodes/[id]/edit/AllocationsTab.tsx
+++ b/frontendv2/src/app/(app)/admin/nodes/[id]/edit/AllocationsTab.tsx
@@ -16,6 +16,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 'use client';
 
 import { useState, useEffect, useCallback } from 'react';
+import { useRouter } from 'next/navigation';
 import axios from 'axios';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { PageCard } from '@/components/featherui/PageCard';
@@ -72,6 +73,7 @@ interface AllocationsTabProps {
 
 export function AllocationsTab({ nodeId, nodeName }: AllocationsTabProps) {
     const { t } = useTranslation();
+    const router = useRouter();
     const [loading, setLoading] = useState(true);
     const [allocations, setAllocations] = useState<Allocation[]>([]);
     const [searchQuery, setSearchQuery] = useState('');
@@ -100,9 +102,21 @@ export function AllocationsTab({ nodeId, nodeName }: AllocationsTabProps) {
     const [bulkDeleteConfirm, setBulkDeleteConfirm] = useState(false);
     const [deleteUnusedConfirm, setDeleteUnusedConfirm] = useState(false);
     const [deleteUnusedIpFilter, setDeleteUnusedIpFilter] = useState('');
+    const [bulkAddressOpen, setBulkAddressOpen] = useState(false);
+    const [bulkAddressForm, setBulkAddressForm] = useState({
+        from_ip: '',
+        to_ip: '',
+        ip_alias: '',
+        update_alias: false,
+    });
     const [submitting, setSubmitting] = useState(false);
 
     const availableIPs = ['0.0.0.0', ...nodeIPs.filter((ip) => ip !== '0.0.0.0')];
+    const allocationIpOptions = Array.from(
+        new Set([...allocations.map((allocation) => allocation.ip), ...availableIPs]),
+    )
+        .filter(Boolean)
+        .sort();
 
     const fetchAllocations = useCallback(async () => {
         setLoading(true);
@@ -229,6 +243,51 @@ export function AllocationsTab({ nodeId, nodeName }: AllocationsTabProps) {
         }
     };
 
+    const handleBulkAddressUpdate = async () => {
+        const fromIp = bulkAddressForm.from_ip.trim();
+        const toIp = bulkAddressForm.to_ip.trim();
+
+        if (!fromIp || (!toIp && !bulkAddressForm.update_alias)) {
+            toast.error(t('admin.node.allocations.messages.bulk_address_missing'));
+            return;
+        }
+
+        setSubmitting(true);
+        try {
+            const payload: {
+                node_id: string | number;
+                from_ip: string;
+                to_ip?: string;
+                ip_alias?: string | null;
+            } = {
+                node_id: nodeId,
+                from_ip: fromIp,
+            };
+
+            if (toIp) {
+                payload.to_ip = toIp;
+            }
+
+            if (bulkAddressForm.update_alias) {
+                payload.ip_alias = bulkAddressForm.ip_alias.trim() || null;
+            }
+
+            await axios.patch('/api/admin/allocations/bulk-address', payload);
+            toast.success(t('admin.node.allocations.messages.bulk_address_success'));
+            setBulkAddressOpen(false);
+            setBulkAddressForm({ from_ip: '', to_ip: '', ip_alias: '', update_alias: false });
+            fetchAllocations();
+        } catch (error: unknown) {
+            console.error('Error updating allocation addresses:', error);
+            const errorMessage = axios.isAxiosError(error)
+                ? error.response?.data?.message
+                : t('admin.node.allocations.messages.bulk_address_failed');
+            toast.error(errorMessage || t('admin.node.allocations.messages.bulk_address_failed'));
+        } finally {
+            setSubmitting(false);
+        }
+    };
+
     const toggleSelection = (id: number) => {
         setSelectedIds((prev) => (prev.includes(id) ? prev.filter((i) => i !== id) : [...prev, id]));
     };
@@ -257,6 +316,10 @@ export function AllocationsTab({ nodeId, nodeName }: AllocationsTabProps) {
                             <Trash2 className='mr-2 h-4 w-4' />
                             {t('admin.node.allocations.delete_unused')}
                         </Button>
+                        <Button variant='outline' size='sm' onClick={() => setBulkAddressOpen(true)}>
+                            <RefreshCw className='mr-2 h-4 w-4' />
+                            {t('admin.node.allocations.change_address')}
+                        </Button>
                         <Button size='sm' onClick={() => setCreatingAllocation(true)}>
                             <Plus className='mr-2 h-4 w-4' />
                             {t('admin.node.allocations.create_allocation')}
@@ -388,9 +451,15 @@ export function AllocationsTab({ nodeId, nodeName }: AllocationsTabProps) {
                                             </td>
                                             <td className='px-4 py-3'>
                                                 {allocation.server_id ? (
-                                                    <span className='text-primary font-medium'>
+                                                    <button
+                                                        type='button'
+                                                        className='text-primary hover:text-primary/80 cursor-pointer font-medium hover:underline'
+                                                        onClick={() =>
+                                                            router.push(`/admin/servers/${allocation.server_id}/edit`)
+                                                        }
+                                                    >
                                                         {allocation.server_name || allocation.server_id}
-                                                    </span>
+                                                    </button>
                                                 ) : (
                                                     <span className='text-muted-foreground'>-</span>
                                                 )}
@@ -706,6 +775,85 @@ export function AllocationsTab({ nodeId, nodeName }: AllocationsTabProps) {
                 </div>
             </Sheet>
 
+            <Sheet open={bulkAddressOpen} onOpenChange={setBulkAddressOpen}>
+                <SheetHeader>
+                    <SheetTitle>{t('admin.node.allocations.bulk_address.title')}</SheetTitle>
+                    <SheetDescription>{t('admin.node.allocations.bulk_address.description')}</SheetDescription>
+                </SheetHeader>
+                <div className='mt-8 space-y-6'>
+                    <div className='space-y-2'>
+                        <Label className='text-sm font-semibold'>
+                            {t('admin.node.allocations.bulk_address.from_ip')}
+                        </Label>
+                        <Input
+                            list='allocation-ip-options'
+                            placeholder='0.0.0.0'
+                            value={bulkAddressForm.from_ip}
+                            className='h-11 font-mono'
+                            onChange={(e) => setBulkAddressForm((prev) => ({ ...prev, from_ip: e.target.value }))}
+                        />
+                        <datalist id='allocation-ip-options'>
+                            {allocationIpOptions.map((ip) => (
+                                <option key={ip} value={ip} />
+                            ))}
+                        </datalist>
+                    </div>
+
+                    <div className='space-y-2'>
+                        <Label className='text-sm font-semibold'>
+                            {t('admin.node.allocations.bulk_address.to_ip')}
+                        </Label>
+                        <Input
+                            placeholder='6.6.6.6'
+                            value={bulkAddressForm.to_ip}
+                            className='h-11 font-mono'
+                            onChange={(e) => setBulkAddressForm((prev) => ({ ...prev, to_ip: e.target.value }))}
+                        />
+                        <p className='text-muted-foreground text-[10px] leading-relaxed italic'>
+                            {t('admin.node.allocations.bulk_address.to_ip_help')}
+                        </p>
+                    </div>
+
+                    <div className='bg-muted/30 border-border/50 flex items-start gap-3 rounded-2xl border p-4'>
+                        <input
+                            type='checkbox'
+                            id='bulkAllocationAddressAlias'
+                            className='border-border bg-background mt-1 rounded'
+                            checked={bulkAddressForm.update_alias}
+                            onChange={(e) =>
+                                setBulkAddressForm((prev) => ({ ...prev, update_alias: e.target.checked }))
+                            }
+                        />
+                        <div className='flex-1 space-y-3'>
+                            <Label
+                                htmlFor='bulkAllocationAddressAlias'
+                                className='cursor-pointer text-sm font-semibold'
+                            >
+                                {t('admin.node.allocations.bulk_address.update_alias')}
+                            </Label>
+                            <Input
+                                placeholder='domain.com'
+                                value={bulkAddressForm.ip_alias}
+                                className='h-11 font-mono'
+                                disabled={!bulkAddressForm.update_alias}
+                                onChange={(e) => setBulkAddressForm((prev) => ({ ...prev, ip_alias: e.target.value }))}
+                            />
+                            <p className='text-muted-foreground text-[10px] leading-relaxed italic'>
+                                {t('admin.node.allocations.bulk_address.alias_help')}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+                <SheetFooter>
+                    <Button variant='outline' onClick={() => setBulkAddressOpen(false)}>
+                        {t('common.cancel')}
+                    </Button>
+                    <Button onClick={handleBulkAddressUpdate} loading={submitting}>
+                        {t('admin.node.allocations.bulk_address.submit')}
+                    </Button>
+                </SheetFooter>
+            </Sheet>
+
             <AlertDialog open={bulkDeleteConfirm} onOpenChange={setBulkDeleteConfirm}>
                 <AlertDialogContent>
                     <AlertDialogHeader>
diff --git a/frontendv2/src/app/(app)/admin/nodes/[id]/edit/WingsTab.tsx b/frontendv2/src/app/(app)/admin/nodes/[id]/edit/WingsTab.tsx
index 5eda3da6c..67e045afc 100644
--- a/frontendv2/src/app/(app)/admin/nodes/[id]/edit/WingsTab.tsx
+++ b/frontendv2/src/app/(app)/admin/nodes/[id]/edit/WingsTab.tsx
@@ -38,6 +38,39 @@ interface SetupCommandData {
     config_path_hint: string;
 }
 
+interface CommandBlockProps {
+    command: string;
+    copyLabel: string;
+    onCopy: () => void;
+    preClassName?: string;
+}
+
+function CommandBlock({ command, copyLabel, onCopy, preClassName }: CommandBlockProps) {
+    return (
+        <div className='overflow-hidden rounded-xl border border-zinc-800 bg-zinc-950'>
+            <div className='flex justify-end border-b border-zinc-800 bg-zinc-900 px-3 py-2'>
+                <Button
+                    type='button'
+                    variant='plain'
+                    size='sm'
+                    className='border border-zinc-600 bg-zinc-800 text-zinc-100 hover:border-zinc-500 hover:bg-zinc-700 hover:text-white'
+                    onClick={onCopy}
+                >
+                    <Copy className='mr-2 h-4 w-4 shrink-0' />
+                    <span className='truncate'>{copyLabel}</span>
+                </Button>
+            </div>
+            <pre
+                className={
+                    preClassName ?? 'overflow-x-auto p-4 font-mono text-xs break-all whitespace-pre-wrap text-zinc-300'
+                }
+            >
+                {command}
+            </pre>
+        </div>
+    );
+}
+
 export function WingsTab({ nodeId, wingsConfigYaml, handleResetKey, resetting }: WingsTabProps) {
     const { t } = useTranslation();
     const [setupData, setSetupData] = useState<SetupCommandData | null>(null);
@@ -79,21 +112,11 @@ export function WingsTab({ nodeId, wingsConfigYaml, handleResetKey, resetting }:
                                 <p className='text-foreground text-xs font-semibold'>
                                     {t('admin.node.wings.setup_step_1')}
                                 </p>
-                                <div className='group relative'>
-                                    <pre className='overflow-x-auto rounded-xl border border-white/5 bg-zinc-950 p-4 font-mono text-xs break-all whitespace-pre-wrap text-zinc-300'>
-                                        {setupData.install_command}
-                                    </pre>
-                                    <Button
-                                        type='button'
-                                        variant='outline'
-                                        size='sm'
-                                        className='absolute top-2 right-2 border-white/10 bg-zinc-900/80 backdrop-blur-md hover:bg-zinc-800'
-                                        onClick={() => copyToClipboard(setupData.install_command, t)}
-                                    >
-                                        <Copy className='mr-2 h-4 w-4' />
-                                        {t('admin.node.wings.copy_setup_command')}
-                                    </Button>
-                                </div>
+                                <CommandBlock
+                                    command={setupData.install_command}
+                                    copyLabel={t('admin.node.wings.copy_setup_command')}
+                                    onCopy={() => copyToClipboard(setupData.install_command, t)}
+                                />
                             </div>
                             {/* Step 2: Fetch config and restart */}
                             {setupData.setup_command && (
@@ -101,21 +124,11 @@ export function WingsTab({ nodeId, wingsConfigYaml, handleResetKey, resetting }:
                                     <p className='text-foreground text-xs font-semibold'>
                                         {t('admin.node.wings.setup_step_2')}
                                     </p>
-                                    <div className='group relative'>
-                                        <pre className='overflow-x-auto rounded-xl border border-white/5 bg-zinc-950 p-4 font-mono text-xs break-all whitespace-pre-wrap text-zinc-300'>
-                                            {setupData.setup_command}
-                                        </pre>
-                                        <Button
-                                            type='button'
-                                            variant='outline'
-                                            size='sm'
-                                            className='absolute top-2 right-2 border-white/10 bg-zinc-900/80 backdrop-blur-md hover:bg-zinc-800'
-                                            onClick={() => copyToClipboard(setupData.setup_command, t)}
-                                        >
-                                            <Copy className='mr-2 h-4 w-4' />
-                                            {t('admin.node.wings.copy_setup_command')}
-                                        </Button>
-                                    </div>
+                                    <CommandBlock
+                                        command={setupData.setup_command}
+                                        copyLabel={t('admin.node.wings.copy_setup_command')}
+                                        onCopy={() => copyToClipboard(setupData.setup_command, t)}
+                                    />
                                 </div>
                             )}
                             <p className='text-muted-foreground text-xs'>{t('admin.node.wings.setup_command_then')}</p>
@@ -131,21 +144,12 @@ export function WingsTab({ nodeId, wingsConfigYaml, handleResetKey, resetting }:
             <PageCard title={t('admin.node.wings.config_title')} icon={Shield}>
                 <div className='space-y-6'>
                     <p className='text-muted-foreground text-sm'>{t('admin.node.wings.config_help')}</p>
-                    <div className='group relative'>
-                        <pre className='scrollbar-thin scrollbar-thumb-white/10 scrollbar-track-transparent overflow-x-auto rounded-2xl border border-white/5 bg-zinc-950 p-6 font-mono text-xs text-zinc-300'>
-                            {wingsConfigYaml}
-                        </pre>
-                        <Button
-                            type='button'
-                            variant='outline'
-                            size='sm'
-                            className='absolute top-3 right-3 border-white/10 bg-zinc-900/80 backdrop-blur-md hover:bg-zinc-800'
-                            onClick={() => copyToClipboard(wingsConfigYaml, t)}
-                        >
-                            <Copy className='mr-2 h-4 w-4' />
-                            {t('admin.node.wings.copy_config')}
-                        </Button>
-                    </div>
+                    <CommandBlock
+                        command={wingsConfigYaml}
+                        copyLabel={t('admin.node.wings.copy_config')}
+                        onCopy={() => copyToClipboard(wingsConfigYaml, t)}
+                        preClassName='scrollbar-thin scrollbar-thumb-white/10 scrollbar-track-transparent overflow-x-auto p-6 font-mono text-xs whitespace-pre text-zinc-300'
+                    />
 
                     <div className='space-y-4 border-t border-white/5 pt-6'>
                         <div className='flex items-center justify-between'>
diff --git a/frontendv2/src/app/(app)/admin/nodes/[id]/edit/page.tsx b/frontendv2/src/app/(app)/admin/nodes/[id]/edit/page.tsx
index 208cb2985..63f8075f3 100644
--- a/frontendv2/src/app/(app)/admin/nodes/[id]/edit/page.tsx
+++ b/frontendv2/src/app/(app)/admin/nodes/[id]/edit/page.tsx
@@ -41,7 +41,9 @@ import {
     MapPin,
     ChevronLeft,
     ChevronRight,
+    ArrowLeftRight,
 } from 'lucide-react';
+import { MassTransferServersDialog } from '@/components/admin/MassTransferServersDialog';
 
 import { DetailsTab } from './DetailsTab';
 import { ConfigurationTab } from './ConfigurationTab';
@@ -101,6 +103,7 @@ export default function EditNodePage() {
     const [resetting, setResetting] = useState(false);
     const [activeTab, setActiveTab] = useState(tabFromUrl === 'wings' ? 'wings' : 'details');
     const [locationModalOpen, setLocationModalOpen] = useState(false);
+    const [massTransferOpen, setMassTransferOpen] = useState(false);
 
     const { fetchWidgets, getWidgets } = usePluginWidgets('admin-nodes-edit');
 
@@ -501,11 +504,17 @@ remote: '${typeof window !== 'undefined' ? window.location.origin : 'https://pan
                 description={t('admin.node.form.edit_description')}
                 icon={Server}
                 actions={
-                    <div className='flex gap-2'>
+                    <div className='flex flex-wrap gap-2'>
                         <Button variant='outline' onClick={() => router.back()}>
                             <ArrowLeft className='mr-2 h-4 w-4' />
                             {t('common.back')}
                         </Button>
+                        {nodeData ? (
+                            <Button variant='outline' onClick={() => setMassTransferOpen(true)}>
+                                <ArrowLeftRight className='mr-2 h-4 w-4' />
+                                {t('admin.node.mass_transfer.button')}
+                            </Button>
+                        ) : null}
                         <Button onClick={() => handleSubmit()} loading={saving}>
                             <Save className='mr-2 h-4 w-4' />
                             {t('admin.node.form.submit_save')}
@@ -825,6 +834,15 @@ remote: '${typeof window !== 'undefined' ? window.location.origin : 'https://pan
                 widgets={getWidgets('admin-nodes-edit', 'bottom-of-page')}
                 context={{ id: nodeId as string }}
             />
+
+            {nodeData ? (
+                <MassTransferServersDialog
+                    sourceNodeId={Number(nodeId)}
+                    sourceNodeName={nodeData.name}
+                    open={massTransferOpen}
+                    onOpenChange={setMassTransferOpen}
+                />
+            ) : null}
         </div>
     );
 }
diff --git a/frontendv2/src/app/(app)/admin/nodes/page.tsx b/frontendv2/src/app/(app)/admin/nodes/page.tsx
index 351ebb147..a749b9dc3 100644
--- a/frontendv2/src/app/(app)/admin/nodes/page.tsx
+++ b/frontendv2/src/app/(app)/admin/nodes/page.tsx
@@ -42,7 +42,9 @@ import {
     MapPin,
     Shield,
     Network,
+    ArrowLeftRight,
 } from 'lucide-react';
+import { MassTransferServersDialog } from '@/components/admin/MassTransferServersDialog';
 
 interface Node {
     id: number;
@@ -97,6 +99,7 @@ export default function NodesPage() {
     const [refreshKey, setRefreshKey] = useState(0);
     const [confirmDeleteId, setConfirmDeleteId] = useState<number | null>(null);
     const [deleting, setDeleting] = useState(false);
+    const [massTransferNode, setMassTransferNode] = useState<Node | null>(null);
 
     const [pagination, setPagination] = useState<Pagination>({
         page: 1,
@@ -372,6 +375,14 @@ export default function NodesPage() {
                                         >
                                             <DatabaseIcon className='h-4 w-4' />
                                         </Button>
+                                        <Button
+                                            size='sm'
+                                            variant='ghost'
+                                            onClick={() => setMassTransferNode(node)}
+                                            title={t('admin.node.mass_transfer.button')}
+                                        >
+                                            <ArrowLeftRight className='h-4 w-4' />
+                                        </Button>
                                         <Button
                                             size='sm'
                                             variant='ghost'
@@ -471,6 +482,18 @@ export default function NodesPage() {
             </PageCard>
 
             <WidgetRenderer widgets={getWidgets('admin-nodes', 'bottom-of-page')} />
+
+            {massTransferNode ? (
+                <MassTransferServersDialog
+                    sourceNodeId={massTransferNode.id}
+                    sourceNodeName={massTransferNode.name}
+                    open={!!massTransferNode}
+                    onOpenChange={(open) => {
+                        if (!open) setMassTransferNode(null);
+                    }}
+                    onCompleted={() => setRefreshKey((prev) => prev + 1)}
+                />
+            ) : null}
         </div>
     );
 }
diff --git a/frontendv2/src/app/(app)/admin/oidc-providers/page.tsx b/frontendv2/src/app/(app)/admin/oidc-providers/page.tsx
index f06d66e69..ef222e611 100644
--- a/frontendv2/src/app/(app)/admin/oidc-providers/page.tsx
+++ b/frontendv2/src/app/(app)/admin/oidc-providers/page.tsx
@@ -57,7 +57,7 @@ export default function OidcProvidersPage() {
 
     const copyToClipboard = (text: string) => {
         navigator.clipboard.writeText(text);
-        toast.success('Copied to clipboard');
+        toast.success(t('common.copiedToClipboard'));
     };
 
     const fetchProviders = useCallback(async () => {
diff --git a/frontendv2/src/app/(app)/admin/plugins/page.tsx b/frontendv2/src/app/(app)/admin/plugins/page.tsx
index faa538086..e44b38227 100644
--- a/frontendv2/src/app/(app)/admin/plugins/page.tsx
+++ b/frontendv2/src/app/(app)/admin/plugins/page.tsx
@@ -149,6 +149,7 @@ export default function PluginsPage() {
     const [updateRequirements, setUpdateRequirements] = useState<UpdateRequirements | null>(null);
     const [installingUpdateId, setInstallingUpdateId] = useState<string | null>(null);
     const [pluginsWithUpdates, setPluginsWithUpdates] = useState<Plugin[]>([]);
+    const [bulkUpdatingPlugins, setBulkUpdatingPlugins] = useState(false);
 
     const { fetchWidgets, getWidgets } = usePluginWidgets('admin-plugins');
 
@@ -557,6 +558,57 @@ export default function PluginsPage() {
         }
     };
 
+    const installAllUpdates = async () => {
+        if (bulkUpdatingPlugins || pluginsWithUpdates.length === 0) return;
+
+        setBulkUpdatingPlugins(true);
+        const queuedIdentifiers = pluginsWithUpdates.map((plugin) => plugin.identifier);
+        const failures: string[] = [];
+        let updatedCount = 0;
+
+        try {
+            for (const plugin of pluginsWithUpdates) {
+                setInstallingUpdateId(plugin.identifier);
+                try {
+                    await axios.post('/api/admin/plugins/online/install', {
+                        identifier: plugin.identifier,
+                        queued_identifiers: queuedIdentifiers,
+                    });
+                    updatedCount += 1;
+                } catch (error) {
+                    const message = axios.isAxiosError(error)
+                        ? error.response?.data?.message || t('admin.plugins.messages.update_failed')
+                        : t('admin.plugins.messages.update_failed');
+                    failures.push(`${plugin.name || plugin.identifier}: ${message}`);
+                }
+            }
+
+            if (failures.length === 0) {
+                toast.success(t('admin.plugins.messages.bulk_update_success', { count: String(updatedCount) }));
+            } else if (updatedCount > 0) {
+                toast.error(
+                    t('admin.plugins.messages.bulk_update_partial', {
+                        success: String(updatedCount),
+                        failed: String(failures.length),
+                    }),
+                );
+                console.error('Some plugin updates failed:', failures);
+            } else {
+                toast.error(t('admin.plugins.messages.bulk_update_failed'));
+                console.error('Plugin updates failed:', failures);
+            }
+
+            if (updatedCount > 0) {
+                fetchPlugins();
+                checkAllUpdates();
+                setTimeout(() => window.location.reload(), 1500);
+            }
+        } finally {
+            setInstallingUpdateId(null);
+            setBulkUpdatingPlugins(false);
+        }
+    };
+
     const configFields = useMemo(() => pluginConfig?.configSchema || [], [pluginConfig]);
     const hasConfigSchema = configFields.length > 0;
 
@@ -577,6 +629,16 @@ export default function PluginsPage() {
                             <RefreshCw className={`mr-2 h-4 w-4 ${updateCheckLoading ? 'animate-spin' : ''}`} />
                             {t('admin.plugins.actions.check_updates')}
                         </Button>
+                        {pluginsWithUpdates.length > 0 && (
+                            <Button
+                                variant='outline'
+                                onClick={installAllUpdates}
+                                disabled={bulkUpdatingPlugins || !!installingUpdateId}
+                            >
+                                <RefreshCw className={`mr-2 h-4 w-4 ${bulkUpdatingPlugins ? 'animate-spin' : ''}`} />
+                                {t('admin.plugins.actions.update_all', { count: String(pluginsWithUpdates.length) })}
+                            </Button>
+                        )}
                         <Button variant='outline' asChild>
                             <label className='cursor-pointer'>
                                 <Upload className='mr-2 h-4 w-4' />
@@ -614,6 +676,14 @@ export default function PluginsPage() {
                                     </Badge>
                                 ))}
                             </div>
+                            <Button
+                                size='sm'
+                                onClick={installAllUpdates}
+                                disabled={bulkUpdatingPlugins || !!installingUpdateId}
+                            >
+                                <RefreshCw className={`mr-2 h-4 w-4 ${bulkUpdatingPlugins ? 'animate-spin' : ''}`} />
+                                {t('admin.plugins.actions.update_all', { count: String(pluginsWithUpdates.length) })}
+                            </Button>
                         </div>
                     </div>
                 </div>
diff --git a/frontendv2/src/app/(app)/admin/pterodactyl-importer/page.tsx b/frontendv2/src/app/(app)/admin/pterodactyl-importer/page.tsx
index a07a50430..87f4ee147 100644
--- a/frontendv2/src/app/(app)/admin/pterodactyl-importer/page.tsx
+++ b/frontendv2/src/app/(app)/admin/pterodactyl-importer/page.tsx
@@ -249,14 +249,14 @@ export default function PterodactylImporterPage() {
 
             if (buffer === cheatCode) {
                 setBypassPrerequisites(true);
-                toast.success('Cheat code activated: Prerequisites bypassed!');
+                toast.success(t('admin.pterodactyl_importer.toasts.cheat_code_activated'));
                 buffer = '';
             }
         };
 
         window.addEventListener('keydown', handleKeyDown);
         return () => window.removeEventListener('keydown', handleKeyDown);
-    }, []);
+    }, [t]);
 
     return (
         <div className='space-y-6'>
diff --git a/frontendv2/src/app/(app)/admin/servers/[id]/edit/ActionsTab.tsx b/frontendv2/src/app/(app)/admin/servers/[id]/edit/ActionsTab.tsx
index 5e5bebab2..fb70aaa15 100644
--- a/frontendv2/src/app/(app)/admin/servers/[id]/edit/ActionsTab.tsx
+++ b/frontendv2/src/app/(app)/admin/servers/[id]/edit/ActionsTab.tsx
@@ -24,6 +24,7 @@ import { Button } from '@/components/featherui/Button';
 import { Badge } from '@/components/ui/badge';
 import { Input } from '@/components/featherui/Input';
 import { HeadlessModal } from '@/components/ui/headless-modal';
+import { Checkbox } from '@/components/ui/checkbox';
 import {
     AlertDialog,
     AlertDialogAction,
@@ -34,6 +35,12 @@ import {
     AlertDialogHeader,
     AlertDialogTitle,
 } from '@/components/ui/alert-dialog';
+import {
+    ModerationReasonFields,
+    ModerationReasonValue,
+    isModerationReasonValid,
+} from '@/components/admin/ModerationReasonFields';
+import { ModerationStatusCard, ModerationStaffActor } from '@/components/admin/ModerationStatusCard';
 import { toast } from 'sonner';
 import { Pause, Play, Trash2, AlertTriangle, ArrowLeftRight, Search, ChevronRight, Loader2 } from 'lucide-react';
 import { ApiNode, ApiAllocation } from '@/types/adminServerTypes';
@@ -42,11 +49,28 @@ interface ActionsTabProps {
     serverId: string;
     serverName: string;
     isSuspended: boolean;
+    suspensionReason?: string | null;
+    suspendedAt?: string | null;
+    suspendedBy?: ModerationStaffActor | null;
     currentNodeId?: number | null;
     onRefresh: () => void;
 }
 
-export function ActionsTab({ serverId, serverName, isSuspended, currentNodeId, onRefresh }: ActionsTabProps) {
+const emptyReason: ModerationReasonValue = {
+    reason_category: '',
+    reason_details: '',
+};
+
+export function ActionsTab({
+    serverId,
+    serverName,
+    isSuspended,
+    suspensionReason,
+    suspendedAt,
+    suspendedBy,
+    currentNodeId,
+    onRefresh,
+}: ActionsTabProps) {
     const { t } = useTranslation();
     const router = useRouter();
     const [suspending, setSuspending] = useState(false);
@@ -58,6 +82,7 @@ export function ActionsTab({ serverId, serverName, isSuspended, currentNodeId, o
     const [allocationModalOpen, setAllocationModalOpen] = useState(false);
     const [selectedNode, setSelectedNode] = useState<ApiNode | null>(null);
     const [selectedAllocation, setSelectedAllocation] = useState<ApiAllocation | null>(null);
+    const [autoAllocate, setAutoAllocate] = useState(true);
     const [nodes, setNodes] = useState<ApiNode[]>([]);
     const [allocations, setAllocations] = useState<ApiAllocation[]>([]);
     const [nodeSearch, setNodeSearch] = useState('');
@@ -66,16 +91,29 @@ export function ActionsTab({ serverId, serverName, isSuspended, currentNodeId, o
     const [loadingAllocations, setLoadingAllocations] = useState(false);
 
     const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
+    const [suspendDialogOpen, setSuspendDialogOpen] = useState(false);
+    const [suspendReason, setSuspendReason] = useState<ModerationReasonValue>(emptyReason);
 
     const handleSuspend = async () => {
+        if (!isModerationReasonValid(suspendReason)) {
+            toast.error(t('admin.moderation.reason_required'));
+            return;
+        }
+
         setSuspending(true);
         try {
-            await axios.post(`/api/admin/servers/${serverId}/suspend`);
+            await axios.post(`/api/admin/servers/${serverId}/suspend`, suspendReason);
             toast.success(t('admin.servers.edit.actions.suspend_success'));
+            setSuspendDialogOpen(false);
+            setSuspendReason(emptyReason);
             onRefresh();
-        } catch (error) {
+        } catch (error: unknown) {
             console.error('Error suspending server:', error);
-            toast.error(t('admin.servers.edit.actions.suspend_failed'));
+            const message =
+                axios.isAxiosError(error) && error.response?.data?.message
+                    ? String(error.response.data.message)
+                    : t('admin.servers.edit.actions.suspend_failed');
+            toast.error(message);
         } finally {
             setSuspending(false);
         }
@@ -154,13 +192,21 @@ export function ActionsTab({ serverId, serverName, isSuspended, currentNodeId, o
     };
 
     const handleTransfer = async () => {
-        if (!selectedNode || !selectedAllocation) return;
+        if (!selectedNode || (!autoAllocate && !selectedAllocation)) return;
         setTransferring(true);
         try {
-            await axios.post(`/api/admin/servers/${serverId}/transfer`, {
+            const payload: {
+                destination_node_id: number;
+                destination_allocation_id?: number;
+                auto_allocate?: boolean;
+            } = {
                 destination_node_id: selectedNode.id,
-                destination_allocation_id: selectedAllocation.id,
-            });
+                auto_allocate: autoAllocate,
+            };
+            if (!autoAllocate && selectedAllocation) {
+                payload.destination_allocation_id = selectedAllocation.id;
+            }
+            await axios.post(`/api/admin/servers/${serverId}/transfer`, payload);
             toast.success(t('admin.servers.messages.transfer_initiated'));
             setTransferDialogOpen(false);
             onRefresh();
@@ -178,26 +224,44 @@ export function ActionsTab({ serverId, serverName, isSuspended, currentNodeId, o
                 title={t('admin.servers.edit.actions.suspension_title')}
                 description={t('admin.servers.edit.actions.suspension_description')}
             >
-                <div className='flex items-center justify-between'>
-                    <div className='flex items-center gap-3'>
-                        <span className='text-sm'>{t('admin.servers.edit.actions.status')}:</span>
-                        <Badge variant={isSuspended ? 'destructive' : 'default'}>
-                            {isSuspended
-                                ? t('admin.servers.edit.actions.suspended')
-                                : t('admin.servers.edit.actions.active')}
-                        </Badge>
+                <div className='space-y-4'>
+                    <div className='flex items-center justify-between'>
+                        <div className='flex items-center gap-3'>
+                            <span className='text-sm'>{t('admin.servers.edit.actions.status')}:</span>
+                            <Badge variant={isSuspended ? 'destructive' : 'default'}>
+                                {isSuspended
+                                    ? t('admin.servers.edit.actions.suspended')
+                                    : t('admin.servers.edit.actions.active')}
+                            </Badge>
+                        </div>
+                        {isSuspended ? (
+                            <Button variant='outline' onClick={handleUnsuspend} loading={suspending}>
+                                <Play className='mr-2 h-4 w-4' />
+                                {t('admin.servers.edit.actions.unsuspend')}
+                            </Button>
+                        ) : (
+                            <Button
+                                variant='destructive'
+                                onClick={() => {
+                                    setSuspendReason(emptyReason);
+                                    setSuspendDialogOpen(true);
+                                }}
+                                loading={suspending}
+                            >
+                                <Pause className='mr-2 h-4 w-4' />
+                                {t('admin.servers.edit.actions.suspend')}
+                            </Button>
+                        )}
                     </div>
-                    {isSuspended ? (
-                        <Button variant='outline' onClick={handleUnsuspend} loading={suspending}>
-                            <Play className='mr-2 h-4 w-4' />
-                            {t('admin.servers.edit.actions.unsuspend')}
-                        </Button>
-                    ) : (
-                        <Button variant='destructive' onClick={handleSuspend} loading={suspending}>
-                            <Pause className='mr-2 h-4 w-4' />
-                            {t('admin.servers.edit.actions.suspend')}
-                        </Button>
-                    )}
+
+                    <ModerationStatusCard
+                        active={isSuspended}
+                        reason={suspensionReason}
+                        actedAt={suspendedAt}
+                        actedBy={suspendedBy}
+                        title={t('admin.moderation.server_suspended_title')}
+                        inactiveLabel={t('admin.moderation.server_not_suspended')}
+                    />
                 </div>
             </PageCard>
 
@@ -236,6 +300,7 @@ export function ActionsTab({ serverId, serverName, isSuspended, currentNodeId, o
                     onClick={() => {
                         setSelectedNode(null);
                         setSelectedAllocation(null);
+                        setAutoAllocate(true);
                         setTransferDialogOpen(true);
                     }}
                 >
@@ -293,6 +358,34 @@ export function ActionsTab({ serverId, serverName, isSuspended, currentNodeId, o
                 </AlertDialog>
             </PageCard>
 
+            <AlertDialog open={suspendDialogOpen} onOpenChange={setSuspendDialogOpen}>
+                <AlertDialogContent className='max-w-lg'>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle className='flex items-center gap-2'>
+                            <AlertTriangle className='h-5 w-5 text-red-500' />
+                            {t('admin.servers.edit.actions.suspend_confirm_title')}
+                        </AlertDialogTitle>
+                        <AlertDialogDescription>
+                            {t('admin.servers.edit.actions.suspend_confirm_description', { name: serverName })}
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+                    <ModerationReasonFields value={suspendReason} onChange={setSuspendReason} disabled={suspending} />
+                    <AlertDialogFooter>
+                        <AlertDialogCancel disabled={suspending}>{t('common.cancel')}</AlertDialogCancel>
+                        <AlertDialogAction
+                            onClick={(e) => {
+                                e.preventDefault();
+                                void handleSuspend();
+                            }}
+                            className='bg-red-600 hover:bg-red-700'
+                            disabled={suspending || !isModerationReasonValid(suspendReason)}
+                        >
+                            {suspending ? t('common.loading') : t('admin.servers.edit.actions.suspend')}
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
+
             <AlertDialog open={transferDialogOpen} onOpenChange={setTransferDialogOpen}>
                 <AlertDialogContent>
                     <AlertDialogHeader>
@@ -315,29 +408,47 @@ export function ActionsTab({ serverId, serverName, isSuspended, currentNodeId, o
                             </span>
                             <ChevronRight className='h-4 w-4' />
                         </Button>
-                        <Button
-                            variant='outline'
-                            className='w-full justify-between'
-                            disabled={!selectedNode}
-                            onClick={() => {
-                                if (!selectedNode) return;
-                                fetchAllocations(selectedNode.id);
-                                setAllocationModalOpen(true);
-                            }}
-                        >
-                            <span>
-                                {selectedAllocation
-                                    ? `${selectedAllocation.ip}:${selectedAllocation.port}`
-                                    : t('admin.servers.transfer.select_allocation')}
-                            </span>
-                            <ChevronRight className='h-4 w-4' />
-                        </Button>
+                        <label className='flex cursor-pointer items-start gap-3 rounded-xl border p-3'>
+                            <Checkbox
+                                checked={autoAllocate}
+                                onCheckedChange={(v) => {
+                                    const enabled = v === true;
+                                    setAutoAllocate(enabled);
+                                    if (enabled) setSelectedAllocation(null);
+                                }}
+                            />
+                            <div>
+                                <p className='text-sm font-medium'>{t('admin.servers.transfer.auto_allocate')}</p>
+                                <p className='text-muted-foreground text-xs'>
+                                    {t('admin.servers.transfer.auto_allocate_help')}
+                                </p>
+                            </div>
+                        </label>
+                        {!autoAllocate ? (
+                            <Button
+                                variant='outline'
+                                className='w-full justify-between'
+                                disabled={!selectedNode}
+                                onClick={() => {
+                                    if (!selectedNode) return;
+                                    fetchAllocations(selectedNode.id);
+                                    setAllocationModalOpen(true);
+                                }}
+                            >
+                                <span>
+                                    {selectedAllocation
+                                        ? `${selectedAllocation.ip}:${selectedAllocation.port}`
+                                        : t('admin.servers.transfer.select_allocation')}
+                                </span>
+                                <ChevronRight className='h-4 w-4' />
+                            </Button>
+                        ) : null}
                     </div>
                     <AlertDialogFooter>
                         <AlertDialogCancel>{t('common.cancel')}</AlertDialogCancel>
                         <AlertDialogAction
                             onClick={handleTransfer}
-                            disabled={!selectedNode || !selectedAllocation || transferring}
+                            disabled={!selectedNode || (!autoAllocate && !selectedAllocation) || transferring}
                         >
                             {transferring ? <Loader2 className='mr-2 h-4 w-4 animate-spin' /> : null}
                             {t('admin.servers.transfer.submit')}
diff --git a/frontendv2/src/app/(app)/admin/servers/[id]/edit/StartupTab.tsx b/frontendv2/src/app/(app)/admin/servers/[id]/edit/StartupTab.tsx
index 6bcaaf0a2..e07b1a96b 100644
--- a/frontendv2/src/app/(app)/admin/servers/[id]/edit/StartupTab.tsx
+++ b/frontendv2/src/app/(app)/admin/servers/[id]/edit/StartupTab.tsx
@@ -15,13 +15,47 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 'use client';
 
+import type { Dispatch, SetStateAction } from 'react';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { PageCard } from '@/components/featherui/PageCard';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
-import { TabProps } from './types';
+import { Button } from '@/components/featherui/Button';
+import { Plus, Trash2, Lock } from 'lucide-react';
+import { CustomVariable, TabProps } from './types';
 
-export function StartupTab({ form, setForm, errors }: TabProps) {
+interface StartupTabProps extends TabProps {
+    customVariables: CustomVariable[];
+    customVariableForm: {
+        name: string;
+        env_variable: string;
+        variable_value: string;
+        is_encrypted: boolean;
+    };
+    customVariableSaving: boolean;
+    setCustomVariableForm: Dispatch<
+        SetStateAction<{
+            name: string;
+            env_variable: string;
+            variable_value: string;
+            is_encrypted: boolean;
+        }>
+    >;
+    onAddCustomVariable: () => void;
+    onDeleteCustomVariable: (variable: CustomVariable) => void;
+}
+
+export function StartupTab({
+    form,
+    setForm,
+    errors,
+    customVariables,
+    customVariableForm,
+    customVariableSaving,
+    setCustomVariableForm,
+    onAddCustomVariable,
+    onDeleteCustomVariable,
+}: StartupTabProps) {
     const { t } = useTranslation();
 
     return (
@@ -51,6 +85,109 @@ export function StartupTab({ form, setForm, errors }: TabProps) {
                         <code className='bg-muted rounded px-2 py-1 text-xs'>{'{{SERVER_PORT}}'}</code>
                     </div>
                 </div>
+
+                <div className='border-border/50 bg-muted/20 mt-6 space-y-4 rounded-xl border p-4'>
+                    <div>
+                        <p className='text-sm font-medium'>Custom environment variables</p>
+                        <p className='text-muted-foreground mt-1 text-xs'>
+                            These are synced to Wings without a server transfer. Encrypted values are hidden after
+                            creation.
+                        </p>
+                    </div>
+
+                    {customVariables.length > 0 && (
+                        <div className='grid grid-cols-1 gap-3 md:grid-cols-2'>
+                            {customVariables.map((variable) => (
+                                <div
+                                    key={variable.id}
+                                    className='border-border/50 bg-background/50 flex items-center justify-between gap-3 rounded-xl border p-3'
+                                >
+                                    <div className='min-w-0'>
+                                        <div className='flex items-center gap-2'>
+                                            <p className='truncate text-sm font-medium'>{variable.name}</p>
+                                            {Number(variable.is_encrypted) === 1 && (
+                                                <Lock className='text-muted-foreground h-3.5 w-3.5 shrink-0' />
+                                            )}
+                                        </div>
+                                        <p className='text-muted-foreground mt-1 truncate font-mono text-xs'>
+                                            {variable.env_variable}={variable.variable_value}
+                                        </p>
+                                    </div>
+                                    <Button
+                                        variant='outline'
+                                        size='sm'
+                                        onClick={() => onDeleteCustomVariable(variable)}
+                                        disabled={customVariableSaving}
+                                        className='shrink-0'
+                                    >
+                                        <Trash2 className='h-3.5 w-3.5' />
+                                    </Button>
+                                </div>
+                            ))}
+                        </div>
+                    )}
+
+                    <div className='grid grid-cols-1 gap-3 md:grid-cols-3'>
+                        <Input
+                            value={customVariableForm.name}
+                            onChange={(e) => setCustomVariableForm((prev) => ({ ...prev, name: e.target.value }))}
+                            disabled={customVariableSaving}
+                            placeholder='Display name'
+                        />
+                        <Input
+                            value={customVariableForm.env_variable}
+                            onChange={(e) =>
+                                setCustomVariableForm((prev) => ({
+                                    ...prev,
+                                    env_variable: e.target.value.toUpperCase(),
+                                }))
+                            }
+                            disabled={customVariableSaving}
+                            placeholder='ENV_NAME'
+                            className='font-mono'
+                        />
+                        <div className='flex gap-3'>
+                            <Input
+                                value={customVariableForm.variable_value}
+                                onChange={(e) =>
+                                    setCustomVariableForm((prev) => ({
+                                        ...prev,
+                                        variable_value: e.target.value,
+                                    }))
+                                }
+                                disabled={customVariableSaving}
+                                placeholder='Value'
+                                className='font-mono'
+                            />
+                            <Button
+                                variant='default'
+                                size='default'
+                                onClick={onAddCustomVariable}
+                                disabled={customVariableSaving}
+                                loading={customVariableSaving}
+                                className='shrink-0'
+                            >
+                                <Plus className='h-4 w-4' />
+                            </Button>
+                        </div>
+                    </div>
+
+                    <label className='text-muted-foreground flex cursor-pointer items-start gap-2 text-xs'>
+                        <input
+                            type='checkbox'
+                            checked={customVariableForm.is_encrypted}
+                            onChange={(e) =>
+                                setCustomVariableForm((prev) => ({
+                                    ...prev,
+                                    is_encrypted: e.target.checked,
+                                }))
+                            }
+                            disabled={customVariableSaving}
+                            className='mt-0.5 h-4 w-4 rounded border-white/20 bg-white/5'
+                        />
+                        <span>Encrypt this value and hide it after save</span>
+                    </label>
+                </div>
             </div>
         </PageCard>
     );
diff --git a/frontendv2/src/app/(app)/admin/servers/[id]/edit/page.tsx b/frontendv2/src/app/(app)/admin/servers/[id]/edit/page.tsx
index 49974ac61..dc8a1cd96 100644
--- a/frontendv2/src/app/(app)/admin/servers/[id]/edit/page.tsx
+++ b/frontendv2/src/app/(app)/admin/servers/[id]/edit/page.tsx
@@ -15,10 +15,11 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 'use client';
 
-import { useState, useCallback, useEffect, useRef, useMemo } from 'react';
+import { useState, useCallback, useEffect, useRef } from 'react';
 import axios from 'axios';
 import { useParams, usePathname, useRouter, useSearchParams } from 'next/navigation';
 import { useTranslation } from '@/contexts/TranslationContext';
+import { useDateFormatOptions } from '@/contexts/PreferencesContext';
 import { Button } from '@/components/featherui/Button';
 import { Input } from '@/components/ui/input';
 import { PageHeader } from '@/components/featherui/PageHeader';
@@ -43,8 +44,8 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import { Sheet, SheetHeader, SheetTitle, SheetDescription, SheetContent } from '@/components/ui/sheet';
 import { Badge } from '@/components/ui/badge';
 import { Avatar, AvatarImage } from '@/components/ui/avatar';
-import { HeadlessModal } from '@/components/ui/headless-modal';
 import { toast } from 'sonner';
+import { formatDateTimeInTz, formatRelativeTime } from '@/lib/dateUtils';
 
 import { DetailsTab } from './DetailsTab';
 import { ResourcesTab } from './ResourcesTab';
@@ -55,6 +56,7 @@ import { AllocationsTab } from './AllocationsTab';
 import { MountsTab } from './MountsTab';
 import type { AssignableMountRow } from './MountsTab';
 import { ActionsTab } from './ActionsTab';
+import { AllocationPickerSheet } from '@/components/admin/AllocationPickerSheet';
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { WidgetRenderer } from '@/components/server/WidgetRenderer';
 
@@ -68,6 +70,7 @@ import {
     Realm,
     Spell,
     SpellVariable,
+    CustomVariable,
 } from './types';
 
 const initialFormData: ServerFormData = {
@@ -120,6 +123,7 @@ interface ServerVariableResponse {
 
 export default function EditServerPage() {
     const { t } = useTranslation();
+    const dateOpts = useDateFormatOptions();
     const router = useRouter();
     const pathname = usePathname();
     const searchParams = useSearchParams();
@@ -134,12 +138,23 @@ export default function EditServerPage() {
     const [form, setForm] = useState<ServerFormData>(initialFormData);
     const [selectedEntities, setSelectedEntities] = useState<SelectedEntities>(initialSelectedEntities);
     const [isSuspended, setIsSuspended] = useState(false);
+    const [suspensionReason, setSuspensionReason] = useState<string | null>(null);
+    const [suspendedAt, setSuspendedAt] = useState<string | null>(null);
+    const [suspendedBy, setSuspendedBy] = useState<{ uuid?: string | null; username?: string | null } | null>(null);
 
     const [location, setLocation] = useState<Location | null>(null);
     const [node, setNode] = useState<Node | null>(null);
 
     const [spellDetails, setSpellDetails] = useState<Spell | null>(null);
     const [spellVariables, setSpellVariables] = useState<SpellVariable[]>([]);
+    const [customVariables, setCustomVariables] = useState<CustomVariable[]>([]);
+    const [customVariableSaving, setCustomVariableSaving] = useState(false);
+    const [customVariableForm, setCustomVariableForm] = useState({
+        name: '',
+        env_variable: '',
+        variable_value: '',
+        is_encrypted: false,
+    });
     const [dockerImages, setDockerImages] = useState<string[]>([]);
 
     const [ownerModalOpen, setOwnerModalOpen] = useState(false);
@@ -187,6 +202,15 @@ export default function EditServerPage() {
     const [debouncedSpellSearch, setDebouncedSpellSearch] = useState('');
 
     const [allocationSearch, setAllocationSearch] = useState('');
+    const [debouncedAllocationSearch, setDebouncedAllocationSearch] = useState('');
+    const [allocationPagination, setAllocationPagination] = useState({
+        current_page: 1,
+        per_page: 20,
+        total_records: 0,
+        total_pages: 0,
+        has_next: false,
+        has_prev: false,
+    });
 
     const tabStorageKey = `featherpanel_admin_server_edit_tab_${serverId}`;
     const isAllowedTab = useCallback(
@@ -241,17 +265,13 @@ export default function EditServerPage() {
         fetchWidgets();
     }, [fetchWidgets]);
 
-    const filteredAllocations = useMemo(() => {
-        if (!allocationSearch) return allocations;
-        const lowerSearch = allocationSearch.toLowerCase();
-        return allocations.filter((a) => {
-            return (
-                a.ip.toLowerCase().includes(lowerSearch) ||
-                String(a.port).includes(lowerSearch) ||
-                (a.ip_alias && a.ip_alias.toLowerCase().includes(lowerSearch))
-            );
-        });
-    }, [allocations, allocationSearch]);
+    useEffect(() => {
+        const timer = setTimeout(() => {
+            setDebouncedAllocationSearch(allocationSearch);
+            setAllocationPagination((prev) => ({ ...prev, current_page: 1 }));
+        }, 500);
+        return () => clearTimeout(timer);
+    }, [allocationSearch]);
 
     useEffect(() => {
         const timer = setTimeout(() => {
@@ -322,6 +342,7 @@ export default function EditServerPage() {
                 }
 
                 const variablesList = (server.variables || []) as ServerVariableResponse[];
+                setCustomVariables((server.custom_variables || []) as CustomVariable[]);
                 const mappedVariables: SpellVariable[] = variablesList.map((v) => ({
                     id: v.variable_id,
                     name: v.name,
@@ -410,6 +431,9 @@ export default function EditServerPage() {
                 });
 
                 setIsSuspended(Boolean(server.suspended));
+                setSuspensionReason(server.suspension_reason ?? null);
+                setSuspendedAt(server.suspended_at ?? null);
+                setSuspendedBy(server.suspended_by ?? null);
                 setNode(serverNode || null);
                 setLocation(serverLocation);
 
@@ -482,6 +506,79 @@ export default function EditServerPage() {
         fetchServerData();
     }, [fetchServerData]);
 
+    const handleAddCustomVariable = useCallback(async () => {
+        const name = customVariableForm.name.trim();
+        const envVariable = customVariableForm.env_variable.trim().toUpperCase();
+
+        if (!name || !envVariable) {
+            toast.error('Name and environment variable are required');
+            return;
+        }
+
+        if (!/^[A-Z_][A-Z0-9_]*$/.test(envVariable)) {
+            toast.error(
+                'Env variable must use uppercase letters, numbers, and underscores, and cannot start with a number',
+            );
+            return;
+        }
+
+        setCustomVariableSaving(true);
+        try {
+            const { data } = await axios.post<{ success: boolean; message?: string }>(
+                `/api/admin/servers/${serverId}/custom-variables`,
+                {
+                    name,
+                    env_variable: envVariable,
+                    variable_value: customVariableForm.variable_value,
+                    is_encrypted: customVariableForm.is_encrypted,
+                },
+            );
+
+            if (data.success) {
+                toast.success('Custom variable added');
+                setCustomVariableForm({ name: '', env_variable: '', variable_value: '', is_encrypted: false });
+                await fetchServerData();
+            } else {
+                toast.error(data.message || 'Failed to add custom variable');
+            }
+        } catch (error) {
+            toast.error(
+                axios.isAxiosError(error)
+                    ? error.response?.data?.message || 'Failed to add custom variable'
+                    : 'Failed to add custom variable',
+            );
+        } finally {
+            setCustomVariableSaving(false);
+        }
+    }, [customVariableForm, fetchServerData, serverId]);
+
+    const handleDeleteCustomVariable = useCallback(
+        async (variable: CustomVariable) => {
+            setCustomVariableSaving(true);
+            try {
+                const { data } = await axios.delete<{ success: boolean; message?: string }>(
+                    `/api/admin/servers/${serverId}/custom-variables/${variable.id}`,
+                );
+
+                if (data.success) {
+                    toast.success('Custom variable deleted');
+                    await fetchServerData();
+                } else {
+                    toast.error(data.message || 'Failed to delete custom variable');
+                }
+            } catch (error) {
+                toast.error(
+                    axios.isAxiosError(error)
+                        ? error.response?.data?.message || 'Failed to delete custom variable'
+                        : 'Failed to delete custom variable',
+                );
+            } finally {
+                setCustomVariableSaving(false);
+            }
+        },
+        [fetchServerData, serverId],
+    );
+
     useEffect(() => {
         if (!form.spell_id) {
             setSpellDetails(null);
@@ -638,49 +735,97 @@ export default function EditServerPage() {
         }
     }, [spellModalOpen, form.realms_id, spellPagination.current_page, debouncedSpellSearch, fetchSpells]);
 
-    const fetchAllocations = async (mode: 'form' | 'primary' | 'assign' = 'form') => {
+    const matchesAllocationSearch = useCallback((allocation: Allocation, search: string) => {
+        if (!search) return true;
+        const lowerSearch = search.toLowerCase();
+        return (
+            allocation.ip.toLowerCase().includes(lowerSearch) ||
+            String(allocation.port).includes(lowerSearch) ||
+            (allocation.ip_alias && allocation.ip_alias.toLowerCase().includes(lowerSearch))
+        );
+    }, []);
+
+    const fetchAllocations = useCallback(async () => {
         if (!node?.id) return;
         try {
-            if (mode === 'primary') {
+            const listParams = {
+                node_id: node.id,
+                not_used: true,
+                search: debouncedAllocationSearch || undefined,
+                page: allocationPagination.current_page,
+                limit: allocationPagination.per_page,
+            };
+
+            if (allocationModalMode === 'primary') {
                 const [availableRes, assignedRes] = await Promise.all([
-                    axios.get('/api/admin/allocations', { params: { not_used: true } }),
+                    axios.get('/api/admin/allocations', { params: listParams }),
                     axios.get(`/api/admin/servers/${serverId}/allocations`),
                 ]);
 
-                const available = (availableRes.data?.data?.allocations || []).filter(
-                    (a: Allocation) => a.node_id === node.id,
+                const available = (availableRes.data?.data?.allocations || []) as Allocation[];
+                const assigned = ((assignedRes.data?.data?.allocations || []) as Allocation[]).filter(
+                    (allocation) =>
+                        allocation.node_id === node.id &&
+                        matchesAllocationSearch(allocation, debouncedAllocationSearch),
                 );
-                const assigned = assignedRes.data?.data?.allocations || [];
 
                 const merged = new Map<number, Allocation>();
-                [...available, ...assigned].forEach((a: Allocation) => {
-                    merged.set(a.id, a);
+                [...available, ...assigned].forEach((allocation) => {
+                    merged.set(allocation.id, allocation);
                 });
 
                 setAllocations(Array.from(merged.values()));
+                if (availableRes.data?.data?.pagination) {
+                    setAllocationPagination((prev) => ({
+                        ...prev,
+                        ...availableRes.data.data.pagination,
+                    }));
+                }
                 return;
             }
 
-            const { data } = await axios.get('/api/admin/allocations', { params: { not_used: true } });
-            const allAllocations = data.data.allocations || [];
-
-            const filtered = allAllocations.filter((a: Allocation) => a.node_id === node.id);
+            const { data } = await axios.get('/api/admin/allocations', { params: listParams });
+            let nextAllocations = (data.data.allocations || []) as Allocation[];
 
             if (form.allocation_id && selectedEntities.allocation) {
-                if (!filtered.find((a: Allocation) => a.id === form.allocation_id)) {
-                    filtered.push(selectedEntities.allocation);
+                if (!nextAllocations.find((allocation) => allocation.id === form.allocation_id)) {
+                    nextAllocations = [...nextAllocations, selectedEntities.allocation];
                 }
             }
 
-            setAllocations(filtered);
+            setAllocations(nextAllocations);
+            if (data.data.pagination) {
+                setAllocationPagination((prev) => ({
+                    ...prev,
+                    ...data.data.pagination,
+                }));
+            }
         } catch (error) {
             console.error('Error fetching allocations:', error);
         }
-    };
+    }, [
+        node?.id,
+        allocationModalMode,
+        debouncedAllocationSearch,
+        allocationPagination.current_page,
+        allocationPagination.per_page,
+        serverId,
+        form.allocation_id,
+        selectedEntities.allocation,
+        matchesAllocationSearch,
+    ]);
+
+    useEffect(() => {
+        if (allocationModalOpen && node?.id) {
+            fetchAllocations();
+        }
+    }, [allocationModalOpen, node?.id, fetchAllocations]);
 
-    const openAllocationModal = async (mode: 'form' | 'primary' | 'assign') => {
+    const openAllocationModal = (mode: 'form' | 'primary' | 'assign') => {
         setAllocationModalMode(mode);
-        await fetchAllocations(mode);
+        setAllocationSearch('');
+        setDebouncedAllocationSearch('');
+        setAllocationPagination((prev) => ({ ...prev, current_page: 1 }));
         setAllocationModalOpen(true);
     };
 
@@ -971,7 +1116,17 @@ export default function EditServerPage() {
                     </TabsContent>
 
                     <TabsContent value='startup' className='mt-0 focus-visible:ring-0 focus-visible:outline-none'>
-                        <StartupTab form={form} setForm={setForm} errors={errors} />
+                        <StartupTab
+                            form={form}
+                            setForm={setForm}
+                            errors={errors}
+                            customVariables={customVariables}
+                            customVariableForm={customVariableForm}
+                            customVariableSaving={customVariableSaving}
+                            setCustomVariableForm={setCustomVariableForm}
+                            onAddCustomVariable={handleAddCustomVariable}
+                            onDeleteCustomVariable={handleDeleteCustomVariable}
+                        />
                     </TabsContent>
 
                     <TabsContent value='mounts' className='mt-0 focus-visible:ring-0 focus-visible:outline-none'>
@@ -997,6 +1152,9 @@ export default function EditServerPage() {
                             serverId={serverId}
                             serverName={form.name}
                             isSuspended={isSuspended}
+                            suspensionReason={suspensionReason}
+                            suspendedAt={suspendedAt}
+                            suspendedBy={suspendedBy}
                             currentNodeId={node?.id}
                             onRefresh={fetchServerData}
                         />
@@ -1105,7 +1263,9 @@ export default function EditServerPage() {
                                                 {user.last_seen && (
                                                     <div className='text-muted-foreground mt-1 text-xs'>
                                                         {t('admin.users.last_seen')}:{' '}
-                                                        {new Date(user.last_seen).toLocaleDateString()}
+                                                        <span title={formatDateTimeInTz(user.last_seen, dateOpts)}>
+                                                            {formatRelativeTime(user.last_seen, dateOpts)}
+                                                        </span>
                                                     </div>
                                                 )}
                                             </div>
@@ -1451,80 +1611,22 @@ export default function EditServerPage() {
                 </SheetContent>
             </Sheet>
 
-            <SelectionModal
-                isOpen={allocationModalOpen}
-                onClose={() => setAllocationModalOpen(false)}
-                title={t('admin.servers.form.select_allocation')}
-                items={filteredAllocations}
-                onSelect={handleSelectAllocation}
-                search={allocationSearch}
-                onSearchChange={setAllocationSearch}
-                renderItem={(item: Allocation) => (
-                    <div>
-                        <div className='font-mono font-medium'>
-                            {item.ip}:{item.port}
-                        </div>
-                        {item.ip_alias && <div className='text-muted-foreground text-xs'>{item.ip_alias}</div>}
-                    </div>
-                )}
-            />
+            {node?.id != null && (
+                <AllocationPickerSheet
+                    open={allocationModalOpen}
+                    onOpenChange={setAllocationModalOpen}
+                    nodeId={node.id}
+                    allocations={allocations}
+                    allocationSearch={allocationSearch}
+                    setAllocationSearch={setAllocationSearch}
+                    allocationPagination={allocationPagination}
+                    setAllocationPagination={setAllocationPagination}
+                    fetchAllocations={fetchAllocations}
+                    onSelectAllocation={handleSelectAllocation}
+                />
+            )}
 
             <WidgetRenderer widgets={getWidgets('admin-servers-edit', 'bottom-of-page')} context={{ id: serverId }} />
         </div>
     );
 }
-
-interface SelectionModalProps<T> {
-    isOpen: boolean;
-    onClose: () => void;
-    title: string;
-    items: T[];
-    onSelect: (item: T) => void;
-    search: string;
-    onSearchChange: (val: string) => void;
-    renderItem: (item: T) => React.ReactNode;
-}
-
-function SelectionModal<T extends { id: number | string }>({
-    isOpen,
-    onClose,
-    title,
-    items,
-    onSelect,
-    search,
-    onSearchChange,
-    renderItem,
-}: SelectionModalProps<T>) {
-    const { t } = useTranslation();
-    return (
-        <HeadlessModal isOpen={isOpen} onClose={onClose} title={title} className='max-w-xl'>
-            <div className='space-y-4'>
-                <div className='group relative'>
-                    <SearchIcon className='text-muted-foreground group-focus-within:text-primary absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2 transition-colors' />
-                    <Input
-                        placeholder={t('common.search')}
-                        value={search}
-                        onChange={(e) => onSearchChange(e.target.value)}
-                        className='h-10 pl-10'
-                    />
-                </div>
-
-                <div className='custom-scrollbar max-h-100 space-y-2 overflow-y-auto pr-1'>
-                    {items.length === 0 ? (
-                        <div className='text-muted-foreground py-8 text-center'>{t('common.no_results')}</div>
-                    ) : (
-                        items.map((item) => (
-                            <div
-                                key={item.id}
-                                className='border-border/50 hover:border-primary hover:bg-primary/5 cursor-pointer rounded-xl border p-3 transition-all'
-                                onClick={() => onSelect(item)}
-                            >
-                                {renderItem(item)}
-                            </div>
-                        ))
-                    )}
-                </div>
-            </div>
-        </HeadlessModal>
-    );
-}
diff --git a/frontendv2/src/app/(app)/admin/servers/[id]/edit/types.ts b/frontendv2/src/app/(app)/admin/servers/[id]/edit/types.ts
index 496b51895..e6f5ed174 100644
--- a/frontendv2/src/app/(app)/admin/servers/[id]/edit/types.ts
+++ b/frontendv2/src/app/(app)/admin/servers/[id]/edit/types.ts
@@ -75,7 +75,7 @@ export interface Allocation {
     id: number;
     ip: string;
     port: number;
-    ip_alias: string | null;
+    ip_alias?: string | null;
     server_id: number | null;
     node_id: number;
     is_primary?: boolean;
@@ -108,6 +108,18 @@ export interface SpellVariable {
     field_type: string;
 }
 
+export interface CustomVariable {
+    id: number;
+    server_id: number;
+    user_id: number;
+    name: string;
+    env_variable: string;
+    variable_value: string;
+    is_encrypted: number;
+    created_at?: string;
+    updated_at?: string;
+}
+
 export interface ServerFormData {
     name: string;
     description: string;
diff --git a/frontendv2/src/app/(app)/admin/servers/create/page.tsx b/frontendv2/src/app/(app)/admin/servers/create/page.tsx
index a728968b9..b471d2b12 100644
--- a/frontendv2/src/app/(app)/admin/servers/create/page.tsx
+++ b/frontendv2/src/app/(app)/admin/servers/create/page.tsx
@@ -290,12 +290,12 @@ export default function CreateServerPage() {
                 }
             } catch (error) {
                 console.error('Error fetching spell details:', error);
-                toast.error('Failed to fetch spell details');
+                toast.error(t('admin.servers.form.messages.spell_details_failed'));
             }
         };
 
         fetchSpellDetails();
-    }, [formData.spellId]);
+    }, [formData.spellId, t]);
 
     useEffect(() => {
         const timer = setTimeout(() => {
@@ -614,16 +614,16 @@ export default function CreateServerPage() {
             const { data } = await axios.put('/api/admin/servers', payload);
 
             if (data.success) {
-                toast.success('Server created successfully!');
+                toast.success(t('admin.servers.form.messages.created'));
                 router.push('/admin/servers');
             } else {
-                toast.error(data.message || 'Failed to create server');
+                toast.error(data.message || t('admin.servers.form.messages.create_failed'));
             }
         } catch (error) {
             if (isAxiosError(error)) {
-                toast.error(error.response?.data?.message || 'Failed to create server');
+                toast.error(error.response?.data?.message || t('admin.servers.form.messages.create_failed'));
             } else {
-                toast.error('An unexpected error occurred');
+                toast.error(t('account.unexpectedError'));
             }
         } finally {
             setSubmitting(false);
diff --git a/frontendv2/src/app/(app)/admin/servers/create/types.ts b/frontendv2/src/app/(app)/admin/servers/create/types.ts
index 29b1cd246..f13adfa6e 100644
--- a/frontendv2/src/app/(app)/admin/servers/create/types.ts
+++ b/frontendv2/src/app/(app)/admin/servers/create/types.ts
@@ -55,7 +55,7 @@ export interface Allocation {
     id: number;
     ip: string;
     port: number;
-    ip_alias?: string;
+    ip_alias?: string | null;
     server_id: number | null;
     node_id: number;
 }
diff --git a/frontendv2/src/app/(app)/admin/servers/page.tsx b/frontendv2/src/app/(app)/admin/servers/page.tsx
index 2433a397c..1960ae582 100644
--- a/frontendv2/src/app/(app)/admin/servers/page.tsx
+++ b/frontendv2/src/app/(app)/admin/servers/page.tsx
@@ -15,10 +15,11 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 'use client';
 
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback, type ReactNode, type ElementType } from 'react';
 import { useRouter } from 'next/navigation';
 import axios, { isAxiosError } from 'axios';
 import { useTranslation } from '@/contexts/TranslationContext';
+import { useDateFormatOptions } from '@/contexts/PreferencesContext';
 import { PageHeader } from '@/components/featherui/PageHeader';
 import { Button } from '@/components/featherui/Button';
 import { Input } from '@/components/featherui/Input';
@@ -52,9 +53,11 @@ import {
     AlertTriangle,
     Network,
     Terminal,
+    Clock,
 } from 'lucide-react';
 import { StatusBadge } from '@/components/servers/StatusBadge';
 import { displayStatus } from '@/lib/server-utils';
+import { formatDateTimeInTz, formatRelativeTime } from '@/lib/dateUtils';
 import { ApiServer, Pagination, ApiNode, ApiAllocation } from '@/types/adminServerTypes';
 import type { Server as ServerType } from '@/types/server';
 import { Sheet, SheetContent, SheetHeader, SheetTitle, SheetDescription, SheetFooter } from '@/components/ui/sheet';
@@ -75,6 +78,7 @@ import { Checkbox } from '@/components/ui/checkbox';
 
 export default function ServersPage() {
     const { t } = useTranslation();
+    const dateOpts = useDateFormatOptions();
     const router = useRouter();
 
     const [loading, setLoading] = useState(true);
@@ -97,6 +101,7 @@ export default function ServersPage() {
     const [isAllocationModalOpen, setIsAllocationModalOpen] = useState(false);
     const [selectedNode, setSelectedNode] = useState<ApiNode | null>(null);
     const [selectedAllocation, setSelectedAllocation] = useState<ApiAllocation | null>(null);
+    const [transferAutoAllocate, setTransferAutoAllocate] = useState(true);
     const [nodesList, setNodesList] = useState<ApiNode[]>([]);
     const [allocationsList, setAllocationsList] = useState<ApiAllocation[]>([]);
     const [loadingNodes, setLoadingNodes] = useState(false);
@@ -342,6 +347,7 @@ export default function ServersPage() {
         setTransferServer(server);
         setSelectedNode(null);
         setSelectedAllocation(null);
+        setTransferAutoAllocate(true);
         setIsTransferDialogOpen(true);
     };
 
@@ -386,14 +392,22 @@ export default function ServersPage() {
     };
 
     const initiateTransfer = async () => {
-        if (!transferServer || !selectedNode || !selectedAllocation) return;
+        if (!transferServer || !selectedNode || (!transferAutoAllocate && !selectedAllocation)) return;
 
         setIsInitiatingTransfer(true);
         try {
-            await axios.post(`/api/admin/servers/${transferServer.id}/transfer`, {
+            const payload: {
+                destination_node_id: number;
+                destination_allocation_id?: number;
+                auto_allocate?: boolean;
+            } = {
                 destination_node_id: selectedNode.id,
-                destination_allocation_id: selectedAllocation.id,
-            });
+                auto_allocate: transferAutoAllocate,
+            };
+            if (!transferAutoAllocate && selectedAllocation) {
+                payload.destination_allocation_id = selectedAllocation.id;
+            }
+            await axios.post(`/api/admin/servers/${transferServer.id}/transfer`, payload);
             toast.success(t('admin.servers.messages.transfer_initiated'));
             setIsTransferDialogOpen(false);
             setRefreshKey((prev) => prev + 1);
@@ -787,6 +801,26 @@ export default function ServersPage() {
                                                 <HardDrive className='h-3.5 w-3.5' />
                                                 <span>{formatDisk(server.disk)}</span>
                                             </div>
+                                            {server.owner?.last_seen && (
+                                                <div className='text-muted-foreground flex items-center gap-1.5 text-xs'>
+                                                    <Clock className='h-3.5 w-3.5' />
+                                                    <span>
+                                                        {t('admin.servers.owner_last_seen')}:{' '}
+                                                        <span
+                                                            title={
+                                                                server.owner.last_seen
+                                                                    ? formatDateTimeInTz(
+                                                                          server.owner.last_seen,
+                                                                          dateOpts,
+                                                                      )
+                                                                    : undefined
+                                                            }
+                                                        >
+                                                            {formatRelativeTime(server.owner.last_seen, dateOpts)}
+                                                        </span>
+                                                    </span>
+                                                </div>
+                                            )}
                                         </div>
                                     }
                                     actions={
@@ -983,17 +1017,41 @@ export default function ServersPage() {
                                                     <DetailItem
                                                         label={t('admin.servers.details.labels.created')}
                                                         value={
-                                                            selectedServer?.created_at
-                                                                ? new Date(selectedServer.created_at).toLocaleString()
-                                                                : 'N/A'
+                                                            selectedServer?.created_at ? (
+                                                                <span
+                                                                    title={formatDateTimeInTz(
+                                                                        selectedServer.created_at,
+                                                                        dateOpts,
+                                                                    )}
+                                                                >
+                                                                    {formatRelativeTime(
+                                                                        selectedServer.created_at,
+                                                                        dateOpts,
+                                                                    )}
+                                                                </span>
+                                                            ) : (
+                                                                'N/A'
+                                                            )
                                                         }
                                                     />
                                                     <DetailItem
                                                         label={t('admin.servers.details.labels.updated')}
                                                         value={
-                                                            selectedServer?.updated_at
-                                                                ? new Date(selectedServer.updated_at).toLocaleString()
-                                                                : 'N/A'
+                                                            selectedServer?.updated_at ? (
+                                                                <span
+                                                                    title={formatDateTimeInTz(
+                                                                        selectedServer.updated_at,
+                                                                        dateOpts,
+                                                                    )}
+                                                                >
+                                                                    {formatRelativeTime(
+                                                                        selectedServer.updated_at,
+                                                                        dateOpts,
+                                                                    )}
+                                                                </span>
+                                                            ) : (
+                                                                'N/A'
+                                                            )
                                                         }
                                                     />
                                                 </div>
@@ -1095,6 +1153,16 @@ export default function ServersPage() {
                                                 title={t('admin.servers.details.labels.owner')}
                                                 name={selectedServer?.owner?.username}
                                                 detail={selectedServer?.owner?.email}
+                                                secondary={
+                                                    selectedServer?.owner?.last_seen
+                                                        ? `${t('admin.users.last_seen')}: ${formatRelativeTime(selectedServer.owner.last_seen, dateOpts)}`
+                                                        : undefined
+                                                }
+                                                secondaryTitle={
+                                                    selectedServer?.owner?.last_seen
+                                                        ? formatDateTimeInTz(selectedServer.owner.last_seen, dateOpts)
+                                                        : undefined
+                                                }
                                             />
                                             <RelationCard
                                                 icon={Network}
@@ -1647,35 +1715,57 @@ export default function ServersPage() {
                                 </Button>
                             </div>
 
-                            <div className='space-y-2'>
-                                <label className='text-sm font-bold'>
-                                    {t('admin.servers.transfer.destination_allocation')}
-                                </label>
-                                <Button
-                                    variant='outline'
-                                    className='border-border bg-background/50 h-12 w-full justify-between rounded-xl border px-4'
-                                    onClick={() => {
-                                        if (selectedNode) {
-                                            fetchAllocations(selectedNode.id);
-                                            setIsAllocationModalOpen(true);
-                                        } else {
-                                            toast.error(t('admin.servers.transfer.select_node'));
-                                        }
+                            <label className='flex cursor-pointer items-start gap-3 rounded-xl border p-4'>
+                                <Checkbox
+                                    checked={transferAutoAllocate}
+                                    onCheckedChange={(v) => {
+                                        const enabled = v === true;
+                                        setTransferAutoAllocate(enabled);
+                                        if (enabled) setSelectedAllocation(null);
                                     }}
-                                    disabled={isInitiatingTransfer || !selectedNode}
-                                >
-                                    <span
-                                        className={
-                                            selectedAllocation ? 'text-foreground font-medium' : 'text-muted-foreground'
-                                        }
+                                    disabled={isInitiatingTransfer}
+                                />
+                                <div>
+                                    <p className='text-sm font-bold'>{t('admin.servers.transfer.auto_allocate')}</p>
+                                    <p className='text-muted-foreground text-xs'>
+                                        {t('admin.servers.transfer.auto_allocate_help')}
+                                    </p>
+                                </div>
+                            </label>
+
+                            {!transferAutoAllocate ? (
+                                <div className='space-y-2'>
+                                    <label className='text-sm font-bold'>
+                                        {t('admin.servers.transfer.destination_allocation')}
+                                    </label>
+                                    <Button
+                                        variant='outline'
+                                        className='border-border bg-background/50 h-12 w-full justify-between rounded-xl border px-4'
+                                        onClick={() => {
+                                            if (selectedNode) {
+                                                fetchAllocations(selectedNode.id);
+                                                setIsAllocationModalOpen(true);
+                                            } else {
+                                                toast.error(t('admin.servers.transfer.select_node'));
+                                            }
+                                        }}
+                                        disabled={isInitiatingTransfer || !selectedNode}
                                     >
-                                        {selectedAllocation
-                                            ? `${selectedAllocation.ip}:${selectedAllocation.port}`
-                                            : t('admin.servers.transfer.select_allocation')}
-                                    </span>
-                                    <ChevronRight className='text-muted-foreground h-4 w-4' />
-                                </Button>
-                            </div>
+                                        <span
+                                            className={
+                                                selectedAllocation
+                                                    ? 'text-foreground font-medium'
+                                                    : 'text-muted-foreground'
+                                            }
+                                        >
+                                            {selectedAllocation
+                                                ? `${selectedAllocation.ip}:${selectedAllocation.port}`
+                                                : t('admin.servers.transfer.select_allocation')}
+                                        </span>
+                                        <ChevronRight className='text-muted-foreground h-4 w-4' />
+                                    </Button>
+                                </div>
+                            ) : null}
                         </div>
 
                         <div className='space-y-4'>
@@ -1709,7 +1799,9 @@ export default function ServersPage() {
                         </AlertDialogCancel>
                         <Button
                             onClick={initiateTransfer}
-                            disabled={!selectedNode || !selectedAllocation || isInitiatingTransfer}
+                            disabled={
+                                !selectedNode || (!transferAutoAllocate && !selectedAllocation) || isInitiatingTransfer
+                            }
                             className='h-11 rounded-xl bg-amber-500 px-6 text-white hover:bg-amber-600'
                         >
                             {isInitiatingTransfer ? (
@@ -1734,7 +1826,7 @@ export default function ServersPage() {
                     <div className='relative'>
                         <Search className='text-muted-foreground absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2' />
                         <Input
-                            placeholder='Search nodes...'
+                            placeholder={t('admin.servers.transfer.search_nodes')}
                             value={nodeSearch}
                             onChange={(e) => {
                                 setNodeSearch(e.target.value);
@@ -1749,7 +1841,7 @@ export default function ServersPage() {
                                 <Loader2 className='text-primary h-6 w-6 animate-spin' />
                             </div>
                         ) : nodesList.length === 0 ? (
-                            <div className='text-muted-foreground py-10 text-center'>No results found</div>
+                            <div className='text-muted-foreground py-10 text-center'>{t('common.no_results')}</div>
                         ) : (
                             nodesList.map((node) => (
                                 <button
@@ -1786,7 +1878,7 @@ export default function ServersPage() {
                     <div className='relative'>
                         <Search className='text-muted-foreground absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2' />
                         <Input
-                            placeholder='Search allocations...'
+                            placeholder={t('admin.servers.transfer.search_allocations')}
                             value={allocationSearch}
                             onChange={(e) => {
                                 setAllocationSearch(e.target.value);
@@ -1801,7 +1893,9 @@ export default function ServersPage() {
                                 <Loader2 className='text-primary h-6 w-6 animate-spin' />
                             </div>
                         ) : allocationsList.length === 0 ? (
-                            <div className='text-muted-foreground py-10 text-center'>No free allocations found</div>
+                            <div className='text-muted-foreground py-10 text-center'>
+                                {t('admin.servers.transfer.no_free_allocations')}
+                            </div>
                         ) : (
                             allocationsList.map((allc) => (
                                 <button
@@ -1842,7 +1936,7 @@ function DetailItem({
     truncate = false,
 }: {
     label: string;
-    value: React.ReactNode;
+    value: ReactNode;
     isMono?: boolean;
     truncate?: boolean;
 }) {
@@ -1861,11 +1955,15 @@ function RelationCard({
     title,
     name,
     detail,
+    secondary,
+    secondaryTitle,
 }: {
-    icon: React.ElementType;
+    icon: ElementType;
     title: string;
     name: string | undefined;
     detail?: string;
+    secondary?: ReactNode;
+    secondaryTitle?: string;
 }) {
     return (
         <div className='bg-muted/30 border-border/50 group hover:border-primary/30 rounded-2xl border p-4 transition-all'>
@@ -1879,6 +1977,11 @@ function RelationCard({
             </div>
             <p className='truncate text-sm font-bold'>{name || 'N/A'}</p>
             {detail && <p className='text-muted-foreground truncate text-xs'>{detail}</p>}
+            {secondary && (
+                <p className='text-muted-foreground mt-1 truncate text-xs' title={secondaryTitle}>
+                    {secondary}
+                </p>
+            )}
         </div>
     );
 }
diff --git a/frontendv2/src/app/(app)/admin/settings/page.tsx b/frontendv2/src/app/(app)/admin/settings/page.tsx
index c7c69fff3..8722a61ba 100644
--- a/frontendv2/src/app/(app)/admin/settings/page.tsx
+++ b/frontendv2/src/app/(app)/admin/settings/page.tsx
@@ -428,15 +428,15 @@ export default function SettingsPage() {
         try {
             const response = await axios.post('/api/admin/settings/email/test');
             if (response.data.success) {
-                toast.success(response.data.message || 'Test email sent successfully! Please check your inbox.');
+                toast.success(response.data.message || t('admin.settings.email_test.success'));
             } else {
-                toast.error(response.data.message || 'Failed to send test email');
+                toast.error(response.data.message || t('admin.settings.email_test.failed_short'));
             }
         } catch (error: unknown) {
             if (axios.isAxiosError(error) && error.response?.data?.message) {
                 toast.error(error.response.data.message);
             } else {
-                toast.error('Failed to send test email. Please check your SMTP settings.');
+                toast.error(t('admin.settings.email_test.failed'));
             }
         } finally {
             setSendingTestEmail(false);
diff --git a/frontendv2/src/app/(app)/admin/spells/[id]/edit/page.tsx b/frontendv2/src/app/(app)/admin/spells/[id]/edit/page.tsx
index 2c2f55c83..d210bf798 100644
--- a/frontendv2/src/app/(app)/admin/spells/[id]/edit/page.tsx
+++ b/frontendv2/src/app/(app)/admin/spells/[id]/edit/page.tsx
@@ -328,7 +328,7 @@ export default function EditSpellPage() {
             <div className='flex items-center justify-center py-12'>
                 <div className='flex items-center gap-3'>
                     <div className='border-primary h-6 w-6 animate-spin rounded-full border-2 border-t-transparent'></div>
-                    <span className='text-muted-foreground'>Loading spell...</span>
+                    <span className='text-muted-foreground'>{t('admin.spells.form.loading_spell')}</span>
                 </div>
             </div>
         );
@@ -346,7 +346,7 @@ export default function EditSpellPage() {
                     <div className='flex items-center gap-2'>
                         <Button variant='outline' onClick={() => router.push('/admin/spells')}>
                             <ArrowLeft className='mr-2 h-4 w-4' />
-                            Back
+                            {t('common.back')}
                         </Button>
                         <Button onClick={handleSave} loading={saving}>
                             {t('admin.spells.form.submit_update')}
@@ -368,7 +368,7 @@ export default function EditSpellPage() {
                 </TabsList>
 
                 <TabsContent value='general' className='space-y-4'>
-                    <PageCard title='Basic Information' icon={Sparkles}>
+                    <PageCard title={t('admin.spells.form.basic_information')} icon={Sparkles}>
                         <div className='space-y-4'>
                             <div className='grid grid-cols-2 gap-4'>
                                 <div className='space-y-2'>
@@ -426,7 +426,7 @@ export default function EditSpellPage() {
                 </TabsContent>
 
                 <TabsContent value='docker' className='space-y-4'>
-                    <PageCard title='Docker Configuration' icon={Container}>
+                    <PageCard title={t('admin.spells.form.docker_configuration')} icon={Container}>
                         <div className='space-y-4'>
                             <div className='space-y-2'>
                                 <Label>{t('admin.spells.form.docker_images')}</Label>
@@ -495,7 +495,7 @@ export default function EditSpellPage() {
                 </TabsContent>
 
                 <TabsContent value='features' className='space-y-4'>
-                    <PageCard title='Server Features' icon={Zap}>
+                    <PageCard title={t('admin.spells.form.server_features')} icon={Zap}>
                         <div className='space-y-2'>
                             <Label>{t('admin.spells.form.features')}</Label>
                             <div className='space-y-2'>
@@ -526,7 +526,7 @@ export default function EditSpellPage() {
                 </TabsContent>
 
                 <TabsContent value='config' className='space-y-4'>
-                    <PageCard title='Server Configuration' icon={FileCode}>
+                    <PageCard title={t('admin.spells.form.server_configuration')} icon={FileCode}>
                         <div className='space-y-4'>
                             <div className='space-y-2'>
                                 <Label>{t('admin.spells.form.file_denylist')}</Label>
@@ -579,7 +579,7 @@ export default function EditSpellPage() {
                 </TabsContent>
 
                 <TabsContent value='script' className='space-y-4'>
-                    <PageCard title='Installation & Startup Scripts' icon={Terminal}>
+                    <PageCard title={t('admin.spells.form.installation_startup_scripts')} icon={Terminal}>
                         <div className='space-y-4'>
                             <div className='space-y-2'>
                                 <Label>{t('admin.spells.form.script_install')}</Label>
diff --git a/frontendv2/src/app/(app)/admin/spells/create/page.tsx b/frontendv2/src/app/(app)/admin/spells/create/page.tsx
index 110fe0daf..3358008c7 100644
--- a/frontendv2/src/app/(app)/admin/spells/create/page.tsx
+++ b/frontendv2/src/app/(app)/admin/spells/create/page.tsx
@@ -93,7 +93,7 @@ export default function CreateSpellPage() {
 
     const handleCreate = async () => {
         if (!form.name || !form.realm_id) {
-            toast.error('Name and Realm are required');
+            toast.error(t('admin.spells.messages.name_realm_required'));
             return;
         }
 
@@ -167,7 +167,7 @@ export default function CreateSpellPage() {
                     <div className='flex items-center gap-2'>
                         <Button variant='outline' onClick={() => router.push('/admin/spells')}>
                             <ArrowLeft className='mr-2 h-4 w-4' />
-                            Back
+                            {t('common.back')}
                         </Button>
                         <Button onClick={handleCreate} loading={saving}>
                             {t('admin.spells.form.submit_create')}
@@ -188,7 +188,7 @@ export default function CreateSpellPage() {
                 </TabsList>
 
                 <TabsContent value='general' className='space-y-4'>
-                    <PageCard title='Basic Information' icon={Sparkles}>
+                    <PageCard title={t('admin.spells.form.basic_information')} icon={Sparkles}>
                         <div className='space-y-4'>
                             <div className='grid grid-cols-2 gap-4'>
                                 <div className='space-y-2'>
@@ -260,7 +260,7 @@ export default function CreateSpellPage() {
                 </TabsContent>
 
                 <TabsContent value='docker' className='space-y-4'>
-                    <PageCard title='Docker Configuration' icon={Container}>
+                    <PageCard title={t('admin.spells.form.docker_configuration')} icon={Container}>
                         <div className='space-y-4'>
                             <div className='space-y-2'>
                                 <Label>{t('admin.spells.form.docker_images')}</Label>
@@ -330,7 +330,7 @@ export default function CreateSpellPage() {
                 </TabsContent>
 
                 <TabsContent value='features' className='space-y-4'>
-                    <PageCard title='Server Features' icon={Zap}>
+                    <PageCard title={t('admin.spells.form.server_features')} icon={Zap}>
                         <div className='space-y-2'>
                             <Label>{t('admin.spells.form.features')}</Label>
                             <div className='space-y-2'>
@@ -362,7 +362,7 @@ export default function CreateSpellPage() {
                 </TabsContent>
 
                 <TabsContent value='config' className='space-y-4'>
-                    <PageCard title='Server Configuration' icon={FileCode}>
+                    <PageCard title={t('admin.spells.form.server_configuration')} icon={FileCode}>
                         <div className='space-y-4'>
                             <div className='space-y-2'>
                                 <Label>{t('admin.spells.form.file_denylist')}</Label>
@@ -415,7 +415,7 @@ export default function CreateSpellPage() {
                 </TabsContent>
 
                 <TabsContent value='script' className='space-y-4'>
-                    <PageCard title='Installation & Startup Scripts' icon={Terminal}>
+                    <PageCard title={t('admin.spells.form.installation_startup_scripts')} icon={Terminal}>
                         <div className='space-y-4'>
                             <div className='space-y-2'>
                                 <Label>{t('admin.spells.form.script_install')}</Label>
diff --git a/frontendv2/src/app/(app)/admin/spells/page.tsx b/frontendv2/src/app/(app)/admin/spells/page.tsx
index a63dd2318..8238200f5 100644
--- a/frontendv2/src/app/(app)/admin/spells/page.tsx
+++ b/frontendv2/src/app/(app)/admin/spells/page.tsx
@@ -15,7 +15,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 'use client';
 
-import { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef, useCallback } from 'react';
 import { useRouter, useSearchParams } from 'next/navigation';
 import axios, { isAxiosError } from 'axios';
 import { useTranslation } from '@/contexts/TranslationContext';
@@ -45,6 +45,12 @@ import {
     Trash2,
     ChevronLeft,
     ChevronRight,
+    ArrowUp,
+    ArrowDown,
+    Save,
+    X,
+    AlertCircle,
+    GripVertical,
     Download,
     Upload,
     CloudDownload,
@@ -65,6 +71,7 @@ interface Spell {
     uuid: string;
     realm_id: number;
     realm_name?: string;
+    sort_order?: number;
     banner?: string;
     update_url?: string;
     created_at: string;
@@ -112,6 +119,9 @@ export default function SpellsPage() {
     const [importDialogOpen, setImportDialogOpen] = useState(false);
     const [importRealmId, setImportRealmId] = useState('');
     const [importing, setImporting] = useState(false);
+    const [isReorderMode, setIsReorderMode] = useState(false);
+    const [reorderLoading, setReorderLoading] = useState(false);
+    const [hasOrderChanges, setHasOrderChanges] = useState(false);
 
     const realmIdParam = searchParams?.get('realm_id');
 
@@ -261,13 +271,13 @@ export default function SpellsPage() {
 
     const handleImportDialogSubmit = async () => {
         if (!importRealmId) {
-            toast.error('Please select a realm');
+            toast.error(t('admin.spells.messages.select_realm'));
             return;
         }
 
         const file = (window as unknown as { __importFile?: File }).__importFile;
         if (!file) {
-            toast.error('No file selected');
+            toast.error(t('admin.spells.messages.no_file_selected'));
             setImportDialogOpen(false);
             return;
         }
@@ -275,6 +285,94 @@ export default function SpellsPage() {
         await performImport(file, importRealmId);
     };
 
+    const fetchAllSpellsForReorder = useCallback(async (): Promise<boolean> => {
+        if (!realmIdParam) return false;
+        const pageSize = 100;
+        try {
+            let page = 1;
+            const allSpells: Spell[] = [];
+            let totalRecords = 0;
+            while (true) {
+                const { data } = await axios.get('/api/admin/spells', {
+                    params: {
+                        page,
+                        limit: pageSize,
+                        realm_id: realmIdParam,
+                    },
+                });
+                const pag = data.data.pagination;
+                totalRecords = pag.total_records;
+                const batch = (data.data.spells || []) as Spell[];
+                allSpells.push(...batch);
+                if (allSpells.length >= totalRecords || !pag.has_next) {
+                    break;
+                }
+                page += 1;
+            }
+            const sorted = [...allSpells].sort(
+                (a, b) => (a.sort_order ?? 0) - (b.sort_order ?? 0) || a.name.localeCompare(b.name),
+            );
+            setSpells(sorted);
+            return true;
+        } catch {
+            toast.error(t('admin.spells.messages.fetch_failed'));
+            return false;
+        }
+    }, [realmIdParam, t]);
+
+    const moveSpell = (spellId: number, direction: 'up' | 'down') => {
+        const index = spells.findIndex((s) => s.id === spellId);
+        if (index === -1) return;
+        const newIndex = direction === 'up' ? index - 1 : index + 1;
+        if (newIndex < 0 || newIndex >= spells.length) return;
+
+        const next = [...spells];
+        const [moved] = next.splice(index, 1);
+        next.splice(newIndex, 0, moved);
+        setSpells(
+            next.map((spell, idx) => ({
+                ...spell,
+                sort_order: idx * 10,
+            })),
+        );
+        setHasOrderChanges(true);
+    };
+
+    const saveSpellOrder = async () => {
+        if (!realmIdParam) return;
+        setReorderLoading(true);
+        try {
+            await axios.post('/api/admin/spells/reorder', {
+                realm_id: parseInt(realmIdParam, 10),
+                spells: spells.map((spell) => ({
+                    id: spell.id,
+                    sort_order: spell.sort_order ?? 0,
+                })),
+            });
+            toast.success(t('admin.spells.order.messages.saved'));
+            setHasOrderChanges(false);
+            setIsReorderMode(false);
+            setPagination((p) => ({ ...p, page: 1 }));
+            setRefreshKey((prev) => prev + 1);
+        } catch {
+            toast.error(t('admin.spells.order.messages.save_failed'));
+        } finally {
+            setReorderLoading(false);
+        }
+    };
+
+    const toggleReorderMode = async () => {
+        if (!isReorderMode) {
+            const ok = await fetchAllSpellsForReorder();
+            if (!ok) return;
+        } else {
+            setPagination((p) => ({ ...p, page: 1 }));
+            setRefreshKey((prev) => prev + 1);
+            setHasOrderChanges(false);
+        }
+        setIsReorderMode(!isReorderMode);
+    };
+
     const subtitle = currentRealm
         ? t('admin.spells.subtitle_realm', { realm: currentRealm.name })
         : t('admin.spells.subtitle');
@@ -287,53 +385,78 @@ export default function SpellsPage() {
                 description={subtitle}
                 icon={Sparkles}
                 actions={
-                    <div className='flex items-center gap-2'>
-                        {currentRealm && (
-                            <Button variant='outline' onClick={() => router.push('/admin/spells')}>
-                                <FolderTree className='mr-2 h-4 w-4' />
-                                {t('admin.spells.viewall')}
+                    <div className='flex flex-wrap items-center gap-2'>
+                        {currentRealm && !isReorderMode && (
+                            <>
+                                <Button variant='outline' onClick={toggleReorderMode} className='gap-2'>
+                                    <ArrowUp className='h-4 w-4' />
+                                    <ArrowDown className='h-4 w-4' />
+                                    <span className='hidden sm:inline'>{t('admin.spells.order.title')}</span>
+                                </Button>
+                                <Button variant='outline' onClick={() => router.push('/admin/spells')}>
+                                    <FolderTree className='mr-2 h-4 w-4' />
+                                    {t('admin.spells.viewall')}
+                                </Button>
+                            </>
+                        )}
+                        {currentRealm && isReorderMode && (
+                            <>
+                                {hasOrderChanges && (
+                                    <Button onClick={saveSpellOrder} loading={reorderLoading} className='gap-2'>
+                                        <Save className='h-4 w-4' />
+                                        {t('common.save')}
+                                    </Button>
+                                )}
+                                <Button variant='outline' onClick={toggleReorderMode}>
+                                    <X className='mr-2 h-4 w-4' />
+                                    {t('common.cancel')}
+                                </Button>
+                            </>
+                        )}
+                        {!isReorderMode && (
+                            <Button variant='outline' onClick={() => router.push('/admin/feathercloud/spells')}>
+                                <CloudDownload className='mr-2 h-4 w-4' />
+                                {t('admin.spells.browse_marketplace')}
                             </Button>
                         )}
-                        <Button variant='outline' onClick={() => router.push('/admin/feathercloud/spells')}>
-                            <CloudDownload className='mr-2 h-4 w-4' />
-                            {t('admin.spells.browse_marketplace')}
-                        </Button>
                     </div>
                 }
             />
 
             <WidgetRenderer widgets={getWidgets('admin-spells', 'after-header')} />
 
-            <div className='bg-card/40 flex flex-col items-center gap-4 rounded-2xl p-4 shadow-sm backdrop-blur-md sm:flex-row'>
-                <div className='group relative w-full flex-1'>
-                    <Search className='text-muted-foreground group-focus-within:text-primary absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2 transition-colors' />
-                    <Input
-                        placeholder={t('admin.spells.search_placeholder')}
-                        value={searchQuery}
-                        onChange={(e) => setSearchQuery(e.target.value)}
-                        className='h-11 w-full pl-10'
-                    />
-                </div>
-                <div className='flex gap-2'>
-                    <Button onClick={() => router.push('/admin/spells/create')}>
-                        <Plus className='mr-2 h-4 w-4' />
-                        {t('admin.spells.create')}
-                    </Button>
-                    <Button variant='outline' onClick={() => fileInputRef.current?.click()}>
-                        <Upload className='mr-2 h-4 w-4' />
-                        {t('admin.spells.import')}
-                    </Button>
-                    <input
-                        ref={fileInputRef}
-                        type='file'
-                        accept='application/json'
-                        className='hidden'
-                        onChange={handleImport}
-                    />
+            {!isReorderMode && (
+                <div className='bg-card/40 flex flex-col items-center gap-4 rounded-2xl p-4 shadow-sm backdrop-blur-md sm:flex-row'>
+                    <div className='group relative w-full flex-1'>
+                        <Search className='text-muted-foreground group-focus-within:text-primary absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2 transition-colors' />
+                        <Input
+                            placeholder={t('admin.spells.search_placeholder')}
+                            value={searchQuery}
+                            onChange={(e) => setSearchQuery(e.target.value)}
+                            className='h-11 w-full pl-10'
+                        />
+                    </div>
+                    <div className='flex gap-2'>
+                        <Button onClick={() => router.push('/admin/spells/create')}>
+                            <Plus className='mr-2 h-4 w-4' />
+                            {t('admin.spells.create')}
+                        </Button>
+                        <Button variant='outline' onClick={() => fileInputRef.current?.click()}>
+                            <Upload className='mr-2 h-4 w-4' />
+                            {t('admin.spells.import')}
+                        </Button>
+                        <input
+                            ref={fileInputRef}
+                            type='file'
+                            accept='application/json'
+                            className='hidden'
+                            onChange={handleImport}
+                        />
+                    </div>
                 </div>
-            </div>
+            )}
 
-            {pagination.totalPages > 1 && !loading && (
+            {pagination.totalPages > 1 && !loading && !isReorderMode && (
                 <div className='border-border bg-card/50 mb-4 flex items-center justify-between gap-4 rounded-xl border px-4 py-3'>
                     <Button
                         variant='outline'
@@ -372,6 +495,55 @@ export default function SpellsPage() {
                         <Button onClick={() => router.push('/admin/spells/create')}>{t('admin.spells.create')}</Button>
                     }
                 />
+            ) : isReorderMode ? (
+                <div className='space-y-6'>
+                    {hasOrderChanges && (
+                        <div className='flex items-center gap-2 rounded-2xl border border-amber-500/20 bg-amber-500/10 p-4 text-sm text-amber-600'>
+                            <AlertCircle className='h-4 w-4' />
+                            {t('admin.spells.order.unsaved_changes')}
+                        </div>
+                    )}
+                    <PageCard title={t('admin.spells.order.subtitle')} icon={GripVertical}>
+                        <div className='divide-border/50 divide-y'>
+                            {spells.map((spell, index) => (
+                                <div
+                                    key={spell.id}
+                                    className='hover:bg-muted/30 flex items-center gap-4 p-4 transition-colors'
+                                >
+                                    <div className='bg-muted text-muted-foreground flex h-8 w-8 shrink-0 items-center justify-center rounded-lg text-sm font-semibold'>
+                                        {index + 1}
+                                    </div>
+                                    <div className='flex flex-col gap-0.5'>
+                                        <Button
+                                            variant='ghost'
+                                            size='icon'
+                                            className='h-6 w-6'
+                                            onClick={() => moveSpell(spell.id, 'up')}
+                                            disabled={index === 0}
+                                        >
+                                            <ArrowUp className='h-3 w-3' />
+                                        </Button>
+                                        <Button
+                                            variant='ghost'
+                                            size='icon'
+                                            className='h-6 w-6'
+                                            onClick={() => moveSpell(spell.id, 'down')}
+                                            disabled={index === spells.length - 1}
+                                        >
+                                            <ArrowDown className='h-3 w-3' />
+                                        </Button>
+                                    </div>
+                                    <div className='min-w-0 flex-1'>
+                                        <p className='truncate font-bold'>{spell.name}</p>
+                                        {spell.author ? (
+                                            <p className='text-muted-foreground truncate text-xs'>{spell.author}</p>
+                                        ) : null}
+                                    </div>
+                                </div>
+                            ))}
+                        </div>
+                    </PageCard>
+                </div>
             ) : (
                 <div className='grid grid-cols-1 gap-4'>
                     <WidgetRenderer widgets={getWidgets('admin-spells', 'before-list')} />
@@ -423,7 +595,7 @@ export default function SpellsPage() {
                 </div>
             )}
 
-            {pagination.totalPages > 1 && (
+            {pagination.totalPages > 1 && !isReorderMode && (
                 <div className='mt-8 flex items-center justify-center gap-2'>
                     <Button
                         variant='outline'
@@ -447,40 +619,44 @@ export default function SpellsPage() {
                 </div>
             )}
 
-            <PageCard title={t('admin.spells.help.cross_compatible.title')} icon={Sparkles} variant='default'>
-                <p className='text-muted-foreground text-sm leading-relaxed'>
-                    {t('admin.spells.help.cross_compatible.description')}
-                </p>
-            </PageCard>
-
-            <div className='grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-4'>
-                <PageCard title={t('admin.spells.help.what_are_spells.title')} icon={BookOpen}>
+            {!isReorderMode && (
+                <PageCard title={t('admin.spells.help.cross_compatible.title')} icon={Sparkles} variant='default'>
                     <p className='text-muted-foreground text-sm leading-relaxed'>
-                        {t('admin.spells.help.what_are_spells.description')}
+                        {t('admin.spells.help.cross_compatible.description')}
                     </p>
                 </PageCard>
-                <PageCard title={t('admin.spells.help.how_to_use.title')} icon={Box}>
-                    <p className='text-muted-foreground text-sm leading-relaxed'>
-                        {t('admin.spells.help.how_to_use.description')}
-                    </p>
-                </PageCard>
-                <PageCard title={t('admin.spells.help.under_the_hood.title')} icon={Wrench}>
-                    <p className='text-muted-foreground text-sm leading-relaxed'>
-                        {t('admin.spells.help.under_the_hood.description')}
-                    </p>
-                </PageCard>
-                <PageCard title={t('admin.spells.help.sources.title')} icon={GitBranch}>
-                    <p className='text-muted-foreground text-sm leading-relaxed'>
-                        {t('admin.spells.help.sources.description')}
-                    </p>
-                </PageCard>
-            </div>
+            )}
+
+            {!isReorderMode && (
+                <div className='grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-4'>
+                    <PageCard title={t('admin.spells.help.what_are_spells.title')} icon={BookOpen}>
+                        <p className='text-muted-foreground text-sm leading-relaxed'>
+                            {t('admin.spells.help.what_are_spells.description')}
+                        </p>
+                    </PageCard>
+                    <PageCard title={t('admin.spells.help.how_to_use.title')} icon={Box}>
+                        <p className='text-muted-foreground text-sm leading-relaxed'>
+                            {t('admin.spells.help.how_to_use.description')}
+                        </p>
+                    </PageCard>
+                    <PageCard title={t('admin.spells.help.under_the_hood.title')} icon={Wrench}>
+                        <p className='text-muted-foreground text-sm leading-relaxed'>
+                            {t('admin.spells.help.under_the_hood.description')}
+                        </p>
+                    </PageCard>
+                    <PageCard title={t('admin.spells.help.sources.title')} icon={GitBranch}>
+                        <p className='text-muted-foreground text-sm leading-relaxed'>
+                            {t('admin.spells.help.sources.description')}
+                        </p>
+                    </PageCard>
+                </div>
+            )}
 
             <Dialog open={importDialogOpen} onOpenChange={setImportDialogOpen}>
                 <DialogContent>
                     <DialogHeader>
                         <DialogTitle>{t('admin.spells.import')}</DialogTitle>
-                        <DialogDescription>Select the realm where you want to import this spell.</DialogDescription>
+                        <DialogDescription>{t('admin.spells.import_dialog_description')}</DialogDescription>
                     </DialogHeader>
                     <div className='space-y-4 py-4'>
                         <div className='space-y-2'>
diff --git a/frontendv2/src/app/(app)/admin/subdomains/page.tsx b/frontendv2/src/app/(app)/admin/subdomains/page.tsx
index 68c7d3b51..76e49078b 100644
--- a/frontendv2/src/app/(app)/admin/subdomains/page.tsx
+++ b/frontendv2/src/app/(app)/admin/subdomains/page.tsx
@@ -237,11 +237,11 @@ export default function AdminSubdomainsPage() {
             });
         } catch (error) {
             console.error('Error fetching domains:', error);
-            toast.error('Failed to fetch domains.');
+            toast.error(t('admin.subdomains.messages.fetch_domains_failed'));
         } finally {
             setLoading(false);
         }
-    }, [pagination.page, pagination.pageSize, debouncedSearchQuery]);
+    }, [pagination.page, pagination.pageSize, debouncedSearchQuery, t]);
 
     const fetchInitialData = useCallback(async () => {
         try {
@@ -264,9 +264,9 @@ export default function AdminSubdomainsPage() {
             setSpells(spellsData || []);
         } catch (error) {
             console.error('Error fetching initial data:', error);
-            toast.error('Failed to load global settings.');
+            toast.error(t('admin.subdomains.messages.load_settings_failed'));
         }
-    }, []);
+    }, [t]);
 
     useEffect(() => {
         fetchDomains();
@@ -313,12 +313,12 @@ export default function AdminSubdomainsPage() {
                 payload.cloudflare_api_key = settingsForm.cloudflare_api_key.trim();
             }
             await axios.patch('/api/admin/subdomains/settings', payload);
-            toast.success('Cloudflare settings updated successfully.');
+            toast.success(t('admin.subdomains.messages.cloudflare_settings_saved'));
             setSettingsForm((prev) => ({ ...prev, cloudflare_api_key: '' }));
             fetchInitialData();
         } catch (error) {
             console.error('Error saving settings:', error);
-            toast.error('Failed to save settings.');
+            toast.error(t('admin.subdomains.messages.save_settings_failed'));
         } finally {
             setSavingSettings(false);
         }
@@ -339,16 +339,16 @@ export default function AdminSubdomainsPage() {
 
             if (dialogMode === 'create') {
                 await axios.put('/api/admin/subdomains', payload);
-                toast.success('Domain created successfully.');
+                toast.success(t('admin.subdomains.messages.domain_created'));
             } else if (selectedDomain) {
                 await axios.patch(`/api/admin/subdomains/${selectedDomain.uuid}`, payload);
-                toast.success('Domain updated successfully.');
+                toast.success(t('admin.subdomains.messages.domain_updated'));
             }
             setManageOpen(false);
             setRefreshKey((prev) => prev + 1);
         } catch (error: unknown) {
             console.error('Error saving domain:', error);
-            let msg = 'Failed to save domain configuration.';
+            let msg = t('admin.subdomains.messages.domain_save_failed');
             if (isAxiosError(error) && error.response?.data?.message) {
                 msg = error.response.data.message;
             }
@@ -367,11 +367,11 @@ export default function AdminSubdomainsPage() {
             return;
         try {
             await axios.delete(`/api/admin/subdomains/${domain.uuid}`);
-            toast.success('Domain deleted successfully.');
+            toast.success(t('admin.subdomains.messages.domain_deleted'));
             setRefreshKey((prev) => prev + 1);
         } catch (error) {
             console.error('Error deleting domain:', error);
-            toast.error('Failed to delete domain.');
+            toast.error(t('admin.subdomains.messages.domain_delete_failed'));
         }
     };
 
@@ -410,7 +410,7 @@ export default function AdminSubdomainsPage() {
             setManageOpen(true);
         } catch (error) {
             console.error('Error fetching domain details:', error);
-            toast.error('Failed to load domain details.');
+            toast.error(t('admin.subdomains.messages.domain_details_failed'));
         }
     };
 
@@ -426,13 +426,13 @@ export default function AdminSubdomainsPage() {
             setDomainEntries(entries || []);
         } catch (error) {
             console.error('Error fetching subdomain list:', error);
-            toast.error('Failed to load subdomain list.');
+            toast.error(t('admin.subdomains.messages.subdomain_list_failed'));
         }
     };
 
     const addSpell = () => {
         if (spells.length === 0) {
-            toast.error('Please create a spell first in the Spells section.');
+            toast.error(t('admin.subdomains.messages.create_spell_first'));
             return;
         }
         setDomainForm((prev) => ({
@@ -659,18 +659,23 @@ export default function AdminSubdomainsPage() {
                                         <Button
                                             variant='ghost'
                                             size='sm'
-                                            title='View entries'
+                                            title={t('admin.subdomains.viewEntries')}
                                             onClick={() => openDetails(domain)}
                                         >
                                             <Eye className='h-4 w-4' />
                                         </Button>
-                                        <Button variant='ghost' size='sm' title='Edit' onClick={() => openEdit(domain)}>
+                                        <Button
+                                            variant='ghost'
+                                            size='sm'
+                                            title={t('common.edit')}
+                                            onClick={() => openEdit(domain)}
+                                        >
                                             <Pencil className='h-4 w-4' />
                                         </Button>
                                         <Button
                                             variant='ghost'
                                             size='sm'
-                                            title='Delete'
+                                            title={t('common.delete')}
                                             className='text-destructive hover:text-destructive hover:bg-destructive/10'
                                             onClick={() => handleDelete(domain)}
                                         >
diff --git a/frontendv2/src/app/(app)/admin/tickets/[uuid]/components/TicketSidebar.tsx b/frontendv2/src/app/(app)/admin/tickets/[uuid]/components/TicketSidebar.tsx
index 474f95126..172e82e5b 100644
--- a/frontendv2/src/app/(app)/admin/tickets/[uuid]/components/TicketSidebar.tsx
+++ b/frontendv2/src/app/(app)/admin/tickets/[uuid]/components/TicketSidebar.tsx
@@ -377,18 +377,22 @@ export function TicketSidebar({
             ) : (
                 <Card className='text-muted-foreground border-border/10 bg-card/30 p-8 text-center'>
                     <User className='mx-auto mb-3 h-10 w-10 opacity-20' />
-                    <p className='text-sm'>User info unavailable</p>
+                    <p className='text-sm'>{t('admin.tickets.sidebar.user_info_unavailable')}</p>
                 </Card>
             )}
 
             <Card className='bg-card/50 border-border/10 space-y-3 p-4 shadow-sm backdrop-blur-sm'>
                 <div className='border-border/5 flex items-center gap-2 border-b pb-2'>
                     <Info className='text-primary h-3.5 w-3.5' />
-                    <h4 className='text-foreground text-[10px] font-black tracking-widest uppercase'>Ticket Info</h4>
+                    <h4 className='text-foreground text-[10px] font-black tracking-widest uppercase'>
+                        {t('admin.tickets.sidebar.ticket_info')}
+                    </h4>
                 </div>
                 <div className='space-y-3'>
                     <div className='flex items-center justify-between'>
-                        <span className='text-muted-foreground text-xs font-medium'>Status</span>
+                        <span className='text-muted-foreground text-xs font-medium'>
+                            {t('admin.tickets.sidebar.meta.status')}
+                        </span>
                         <div className='flex items-center gap-2'>
                             <div
                                 className='h-2 w-2 animate-pulse rounded-full'
@@ -400,7 +404,9 @@ export function TicketSidebar({
                         </div>
                     </div>
                     <div className='flex items-center justify-between'>
-                        <span className='text-muted-foreground text-xs font-medium'>Priority</span>
+                        <span className='text-muted-foreground text-xs font-medium'>
+                            {t('admin.tickets.sidebar.meta.priority')}
+                        </span>
                         <div className='flex items-center gap-2'>
                             <div
                                 className='h-2 w-2 rotate-45 rounded-full'
@@ -412,11 +418,15 @@ export function TicketSidebar({
                         </div>
                     </div>
                     <div className='flex items-center justify-between'>
-                        <span className='text-muted-foreground text-xs font-medium'>Category</span>
+                        <span className='text-muted-foreground text-xs font-medium'>
+                            {t('admin.tickets.sidebar.meta.category')}
+                        </span>
                         <span className='text-xs font-bold'>{ticket.category?.name}</span>
                     </div>
                     <div className='flex items-center justify-between'>
-                        <span className='text-muted-foreground text-xs font-medium'>Created</span>
+                        <span className='text-muted-foreground text-xs font-medium'>
+                            {t('admin.tickets.sidebar.meta.created')}
+                        </span>
                         <span className='text-xs font-bold'>{new Date(ticket.created_at).toLocaleDateString()}</span>
                     </div>
                 </div>
diff --git a/frontendv2/src/app/(app)/admin/tickets/[uuid]/page.tsx b/frontendv2/src/app/(app)/admin/tickets/[uuid]/page.tsx
index 272393f95..587b284eb 100644
--- a/frontendv2/src/app/(app)/admin/tickets/[uuid]/page.tsx
+++ b/frontendv2/src/app/(app)/admin/tickets/[uuid]/page.tsx
@@ -373,7 +373,7 @@ export default function TicketViewPage() {
     if (!ticket) return null;
 
     return (
-        <div className='mx-auto flex h-[calc(100vh-6rem)] max-w-[1600px] flex-col pt-2 pb-6'>
+        <div className='mx-auto flex h-[calc(100vh-6rem)] max-w-[1800px] flex-col px-2 pt-2 pb-6 sm:px-4'>
             <WidgetRenderer widgets={getWidgets('admin-tickets-view', 'top-of-page')} />
 
             <div className='mb-4 flex shrink-0 items-center justify-between px-1'>
@@ -396,7 +396,7 @@ export default function TicketViewPage() {
                 </div>
 
                 <div className='flex items-center gap-2'>
-                    <div className='lg:hidden'>
+                    <div className='xl:hidden'>
                         <Button
                             variant='ghost'
                             size='icon'
@@ -466,14 +466,17 @@ export default function TicketViewPage() {
 
             <WidgetRenderer widgets={getWidgets('admin-tickets-view', 'after-header')} />
 
-            <div className='grid min-h-0 flex-1 grid-cols-1 gap-6 lg:grid-cols-12'>
-                <div className='bg-card border-border/50 flex h-full flex-col overflow-hidden rounded-2xl border shadow-sm lg:col-span-8'>
-                    <div className='custom-scrollbar flex-1 space-y-6 overflow-y-auto p-4 sm:p-6' ref={scrollRef}>
+            <div className='grid min-h-0 flex-1 grid-cols-1 gap-4 xl:grid-cols-12 xl:gap-6'>
+                <div className='bg-card border-border/50 flex h-full flex-col overflow-hidden rounded-2xl border shadow-sm xl:col-span-9 2xl:col-span-10'>
+                    <div
+                        className='custom-scrollbar flex-1 space-y-7 overflow-y-auto p-4 sm:p-6 lg:p-8'
+                        ref={scrollRef}
+                    >
                         <div className='group flex gap-4'>
                             <Avatar className='ring-border/50 mt-1 h-10 w-10 ring-2'>
                                 <AvatarImage src={ticket.user.avatar} />
                             </Avatar>
-                            <div className='max-w-[85%] flex-1 space-y-1'>
+                            <div className='max-w-[92%] flex-1 space-y-1 lg:max-w-[88%]'>
                                 <div className='flex items-center gap-2'>
                                     <span className='text-sm font-bold'>
                                         {t('admin.tickets.view.original_request')}
@@ -513,7 +516,7 @@ export default function TicketViewPage() {
 
                                     <div
                                         className={cn(
-                                            'flex max-w-[85%] flex-col lg:max-w-[75%]',
+                                            'flex max-w-[92%] flex-col lg:max-w-[84%] 2xl:max-w-[78%]',
                                             isStaff ? 'items-end' : 'items-start',
                                         )}
                                     >
@@ -764,7 +767,7 @@ export default function TicketViewPage() {
                     <WidgetRenderer widgets={getWidgets('admin-tickets-view', 'after-messages')} />
                 </div>
 
-                <div className='hidden h-full overflow-hidden lg:col-span-4 lg:block'>
+                <div className='hidden h-full overflow-hidden xl:col-span-3 xl:block 2xl:col-span-2'>
                     <TicketSidebar
                         ticket={ticket}
                         userDetails={userDetails}
@@ -868,16 +871,16 @@ export default function TicketViewPage() {
             >
                 <div>
                     <SheetHeader>
-                        <SheetTitle>{mailPreview?.subject || 'Email Preview'}</SheetTitle>
+                        <SheetTitle>{mailPreview?.subject || t('admin.tickets.view.mail_preview_title')}</SheetTitle>
                         <SheetDescription>
                             {mailPreview?.created_at && new Date(mailPreview.created_at).toLocaleString()}
                         </SheetDescription>
                     </SheetHeader>
                     <div className='mt-6 h-[calc(100vh-140px)] overflow-hidden rounded-xl border p-0'>
                         <iframe
-                            srcDoc={mailPreview?.body || 'No content'}
+                            srcDoc={mailPreview?.body || t('common.no_content')}
                             className='h-full w-full bg-white text-black'
-                            title='Email Body'
+                            title={t('admin.tickets.view.email_body')}
                         />
                     </div>
                 </div>
diff --git a/frontendv2/src/app/(app)/admin/translations/page.tsx b/frontendv2/src/app/(app)/admin/translations/page.tsx
index 3de3c22b9..25255dc35 100644
--- a/frontendv2/src/app/(app)/admin/translations/page.tsx
+++ b/frontendv2/src/app/(app)/admin/translations/page.tsx
@@ -206,14 +206,14 @@ export default function TranslationsPage() {
         try {
             const langCode = newLangCode.trim().toLowerCase();
             if (!langCode || !/^[a-z]{2}(-[a-z]{2})?$/.test(langCode)) {
-                toast.error('Invalid language code. Use ISO 639-1 format (e.g., en, de, fr)');
+                toast.error(t('admin.translations.messages.invalid_language_code'));
                 setIsSubmitting(false);
                 return;
             }
 
             const existingLanguage = translationFiles.some((file) => file.code === langCode);
             if (existingLanguage) {
-                toast.info(`Translation file "${langCode}.json" already exists. Opening it for editing.`);
+                toast.info(t('admin.translations.messages.file_exists_opening', { lang: langCode }));
                 setCreateOpen(false);
                 setNewLangCode('');
                 await loadTranslationContent(langCode);
@@ -230,7 +230,7 @@ export default function TranslationsPage() {
             console.error('Error creating translation file:', error);
             if (isAxiosError(error) && error.response?.data?.error_code === 'FILE_EXISTS') {
                 const langCode = newLangCode.trim().toLowerCase();
-                toast.info(`Translation file "${langCode}.json" already exists. Opening it for editing.`);
+                toast.info(t('admin.translations.messages.file_exists_opening', { lang: langCode }));
                 setCreateOpen(false);
                 await loadTranslationContent(langCode);
                 setNewLangCode('');
@@ -309,7 +309,7 @@ export default function TranslationsPage() {
             window.URL.revokeObjectURL(url);
         } catch (error) {
             console.error('Error downloading translation file:', error);
-            toast.error('Failed to download translation file');
+            toast.error(t('admin.translations.messages.download_failed'));
         }
     };
 
diff --git a/frontendv2/src/app/(app)/admin/updates/page.tsx b/frontendv2/src/app/(app)/admin/updates/page.tsx
index 281e73697..ae55671c6 100644
--- a/frontendv2/src/app/(app)/admin/updates/page.tsx
+++ b/frontendv2/src/app/(app)/admin/updates/page.tsx
@@ -248,7 +248,7 @@ export default function AdminUpdatesPage() {
     const handleBulkUpdate = async () => {
         if (selectedNodes.size === 0 && selectedPlugins.size === 0) return;
         setIsBulkUpdating(true);
-        const toastId = toast.loading('Starting bulk updates...');
+        const toastId = toast.loading(t('admin_updates.messages.bulk_starting'));
 
         try {
             const nodeUpdates = Array.from(selectedNodes).map((id) =>
@@ -261,13 +261,13 @@ export default function AdminUpdatesPage() {
 
             await Promise.allSettled([...nodeUpdates, ...pluginUpdatesReq]);
 
-            toast.success('Bulk update process initiated!', { id: toastId });
+            toast.success(t('admin_updates.messages.bulk_started'), { id: toastId });
             setSelectedNodes(new Set());
             setSelectedPlugins(new Set());
             checkAllUpdates();
         } catch (error) {
             console.error(error);
-            toast.error('Some updates failed to start.', { id: toastId });
+            toast.error(t('admin_updates.messages.bulk_failed'), { id: toastId });
         } finally {
             setIsBulkUpdating(false);
         }
diff --git a/frontendv2/src/app/(app)/admin/users/[uuid]/edit/page.tsx b/frontendv2/src/app/(app)/admin/users/[uuid]/edit/page.tsx
index e82fbd744..5c2d41e4c 100644
--- a/frontendv2/src/app/(app)/admin/users/[uuid]/edit/page.tsx
+++ b/frontendv2/src/app/(app)/admin/users/[uuid]/edit/page.tsx
@@ -49,6 +49,22 @@ import { Avatar, AvatarImage } from '@/components/ui/avatar';
 import { toast } from 'sonner';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } from '@/components/ui/dialog';
+import {
+    AlertDialog,
+    AlertDialogAction,
+    AlertDialogCancel,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+} from '@/components/ui/alert-dialog';
+import {
+    ModerationReasonFields,
+    ModerationReasonValue,
+    isModerationReasonValid,
+} from '@/components/admin/ModerationReasonFields';
+import { ModerationStatusCard } from '@/components/admin/ModerationStatusCard';
 import { copyToClipboard } from '@/lib/utils';
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { WidgetRenderer } from '@/components/server/WidgetRenderer';
@@ -72,6 +88,9 @@ interface ApiUser {
     first_ip?: string;
     last_ip?: string;
     banned?: string;
+    ban_reason?: string | null;
+    banned_at?: string | null;
+    banned_by?: { uuid?: string | null; username?: string | null } | null;
     two_fa_enabled?: string;
     two_fa_blocked?: string;
     deleted?: boolean | string;
@@ -157,6 +176,12 @@ export default function UserEditPage({ params }: { params: Promise<{ uuid: strin
     const [sendEmailOpen, setSendEmailOpen] = useState(false);
     const [sendingEmail, setSendingEmail] = useState(false);
     const [sendEmailData, setSendEmailData] = useState({ subject: '', body: '' });
+    const [banDialogOpen, setBanDialogOpen] = useState(false);
+    const [banSubmitting, setBanSubmitting] = useState(false);
+    const [banReason, setBanReason] = useState<ModerationReasonValue>({
+        reason_category: '',
+        reason_details: '',
+    });
 
     const { fetchWidgets, getWidgets } = usePluginWidgets('admin-users-edit');
 
@@ -279,20 +304,64 @@ export default function UserEditPage({ params }: { params: Promise<{ uuid: strin
 
     const toggleBanUser = async () => {
         if (!user) return;
-        if (!confirm(t('admin.users.messages.ban_confirm'))) return;
+
         const currentlyBanned = user.banned === 'true';
+        if (currentlyBanned) {
+            if (!confirm(t('admin.users.messages.unban_confirm'))) return;
+            setBanSubmitting(true);
+            try {
+                const { data } = await axios.patch(`/api/admin/users/${user.uuid}`, {
+                    banned: 'false',
+                });
+                if (data?.success) {
+                    toast.success(t('admin.users.messages.unbanned'));
+                    await fetchUser();
+                } else {
+                    toast.error(data?.message || t('admin.users.messages.ban_failed'));
+                }
+            } catch (error: unknown) {
+                const message =
+                    axios.isAxiosError(error) && error.response?.data?.message
+                        ? String(error.response.data.message)
+                        : t('admin.users.messages.ban_failed');
+                toast.error(message);
+            } finally {
+                setBanSubmitting(false);
+            }
+            return;
+        }
+
+        setBanReason({ reason_category: '', reason_details: '' });
+        setBanDialogOpen(true);
+    };
+
+    const confirmBanUser = async () => {
+        if (!user || !isModerationReasonValid(banReason)) {
+            toast.error(t('admin.moderation.reason_required'));
+            return;
+        }
+
+        setBanSubmitting(true);
         try {
             const { data } = await axios.patch(`/api/admin/users/${user.uuid}`, {
-                banned: currentlyBanned ? 'false' : 'true',
+                banned: 'true',
+                ...banReason,
             });
             if (data?.success) {
-                toast.success(currentlyBanned ? t('admin.users.messages.unbanned') : t('admin.users.messages.banned'));
+                toast.success(t('admin.users.messages.banned'));
+                setBanDialogOpen(false);
                 await fetchUser();
             } else {
                 toast.error(data?.message || t('admin.users.messages.ban_failed'));
             }
-        } catch {
-            toast.error(t('admin.users.messages.ban_failed'));
+        } catch (error: unknown) {
+            const message =
+                axios.isAxiosError(error) && error.response?.data?.message
+                    ? String(error.response.data.message)
+                    : t('admin.users.messages.ban_failed');
+            toast.error(message);
+        } finally {
+            setBanSubmitting(false);
         }
     };
 
@@ -693,11 +762,21 @@ export default function UserEditPage({ params }: { params: Promise<{ uuid: strin
                     </PageCard>
 
                     <PageCard title={t('admin.users.edit.actions.title')} icon={Shield} variant='default'>
-                        <div className='space-y-3'>
+                        <div className='space-y-4'>
+                            <ModerationStatusCard
+                                active={user.banned === 'true'}
+                                reason={user.ban_reason}
+                                actedAt={user.banned_at}
+                                actedBy={user.banned_by}
+                                title={t('admin.moderation.user_banned_title')}
+                                inactiveLabel={t('admin.moderation.user_not_banned')}
+                            />
+
                             <Button
                                 variant={user.banned === 'true' ? 'default' : 'destructive'}
                                 className='w-full justify-start'
                                 onClick={toggleBanUser}
+                                loading={banSubmitting}
                             >
                                 {user.banned === 'true' ? (
                                     <>
@@ -1183,6 +1262,34 @@ export default function UserEditPage({ params }: { params: Promise<{ uuid: strin
                 </DialogContent>
             </Dialog>
 
+            <AlertDialog open={banDialogOpen} onOpenChange={setBanDialogOpen}>
+                <AlertDialogContent className='max-w-lg'>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle className='flex items-center gap-2'>
+                            <AlertTriangle className='h-5 w-5 text-red-500' />
+                            {t('admin.users.edit.ban_confirm_title')}
+                        </AlertDialogTitle>
+                        <AlertDialogDescription>
+                            {t('admin.users.edit.ban_confirm_description', { username: user.username })}
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+                    <ModerationReasonFields value={banReason} onChange={setBanReason} disabled={banSubmitting} />
+                    <AlertDialogFooter>
+                        <AlertDialogCancel disabled={banSubmitting}>{t('common.cancel')}</AlertDialogCancel>
+                        <AlertDialogAction
+                            onClick={(e) => {
+                                e.preventDefault();
+                                void confirmBanUser();
+                            }}
+                            className='bg-red-600 hover:bg-red-700'
+                            disabled={banSubmitting || !isModerationReasonValid(banReason)}
+                        >
+                            {banSubmitting ? t('common.loading') : t('admin.users.edit.ban_user')}
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
+
             <WidgetRenderer widgets={getWidgets('admin-users-edit', 'bottom-of-page')} context={widgetContext} />
         </div>
     );
diff --git a/frontendv2/src/app/(app)/admin/users/page.tsx b/frontendv2/src/app/(app)/admin/users/page.tsx
index eed5f74e3..9c2d673d0 100644
--- a/frontendv2/src/app/(app)/admin/users/page.tsx
+++ b/frontendv2/src/app/(app)/admin/users/page.tsx
@@ -18,6 +18,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 import { useState, useEffect } from 'react';
 import { useRouter } from 'next/navigation';
 import { useTranslation } from '@/contexts/TranslationContext';
+import { useDateFormatOptions } from '@/contexts/PreferencesContext';
 import axios from 'axios';
 import {
     Users as UsersIcon,
@@ -30,6 +31,7 @@ import {
     ChevronRight,
     AlertCircle,
     UserPlus,
+    CheckCircle2,
 } from 'lucide-react';
 import { PageHeader } from '@/components/featherui/PageHeader';
 import { ResourceCard, type ResourceBadge } from '@/components/featherui/ResourceCard';
@@ -43,6 +45,7 @@ import { Select } from '@/components/ui/select-native';
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { WidgetRenderer } from '@/components/server/WidgetRenderer';
 import { toast } from 'sonner';
+import { formatDateTimeInTz, formatRelativeTime } from '@/lib/dateUtils';
 
 interface UserRole {
     name: string;
@@ -56,6 +59,7 @@ interface ApiUser {
     avatar: string;
     username: string;
     email: string;
+    email_verified?: boolean;
     role?: UserRole;
     banned?: string;
     two_fa_enabled?: string;
@@ -90,6 +94,7 @@ interface AvailableRole {
 
 export default function UsersPage() {
     const { t } = useTranslation();
+    const dateOpts = useDateFormatOptions();
     const router = useRouter();
 
     const [users, setUsers] = useState<ApiUser[]>([]);
@@ -214,6 +219,27 @@ export default function UsersPage() {
         }
     };
 
+    const handleForceVerifyEmail = async (user: ApiUser) => {
+        if (!confirm(t('admin.users.messages.force_verify_email_confirm', { username: user.username }))) {
+            return;
+        }
+
+        try {
+            const { data } = await axios.post(`/api/admin/users/${user.uuid}/verify-email`);
+            if (data?.success) {
+                toast.success(t('admin.users.messages.force_verify_email_success'));
+                setRefreshKey((prev) => prev + 1);
+            } else {
+                toast.error(data?.message || t('admin.users.messages.force_verify_email_failed'));
+            }
+        } catch (error: unknown) {
+            const errorMessage =
+                (error as { response?: { data?: { message?: string } } })?.response?.data?.message ||
+                t('admin.users.messages.force_verify_email_failed');
+            toast.error(errorMessage);
+        }
+    };
+
     const paginationBar = (
         <div className='border-border bg-card/50 flex items-center justify-between gap-4 rounded-xl border px-4 py-3'>
             <Button
@@ -371,6 +397,14 @@ export default function UsersPage() {
                             });
                         }
 
+                        const isEmailUnverified = user.email_verified === false;
+                        if (isEmailUnverified) {
+                            badges.push({
+                                label: t('admin.users.badges.email_unverified'),
+                                className: 'bg-yellow-500/10 text-yellow-700 border-yellow-500/20',
+                            });
+                        }
+
                         if (user.discord_oauth2_linked === 'true') {
                             badges.push({
                                 label: t('admin.users.badges.discord_linked'),
@@ -409,13 +443,17 @@ export default function UsersPage() {
                                             {user.last_seen && (
                                                 <div className='flex items-center gap-1.5'>
                                                     <span className='font-semibold'>{t('admin.users.last_seen')}:</span>
-                                                    {user.last_seen}
+                                                    <span title={formatDateTimeInTz(user.last_seen, dateOpts)}>
+                                                        {formatRelativeTime(user.last_seen, dateOpts)}
+                                                    </span>
                                                 </div>
                                             )}
                                             {user.created_at && (
                                                 <div className='flex items-center gap-1.5'>
                                                     <span className='font-semibold'>{t('admin.users.created')}:</span>
-                                                    {user.created_at}
+                                                    <span title={formatDateTimeInTz(user.created_at, dateOpts)}>
+                                                        {formatRelativeTime(user.created_at, dateOpts)}
+                                                    </span>
                                                 </div>
                                             )}
                                             {user.last_ip && (
@@ -449,6 +487,19 @@ export default function UsersPage() {
                                         >
                                             <Eye className='h-4 w-4' />
                                         </Button>
+                                        {isEmailUnverified && (
+                                            <Button
+                                                variant='outline'
+                                                size='sm'
+                                                onClick={(e) => {
+                                                    e.stopPropagation();
+                                                    handleForceVerifyEmail(user);
+                                                }}
+                                                title={t('admin.users.actions.force_verify_email')}
+                                            >
+                                                <CheckCircle2 className='h-4 w-4' />
+                                            </Button>
+                                        )}
                                         <Button
                                             variant='destructive'
                                             size='sm'
diff --git a/frontendv2/src/app/(app)/admin/vds-nodes/[id]/edit/IpPoolTab.tsx b/frontendv2/src/app/(app)/admin/vds-nodes/[id]/edit/IpPoolTab.tsx
index 316c12258..c95b73fb2 100644
--- a/frontendv2/src/app/(app)/admin/vds-nodes/[id]/edit/IpPoolTab.tsx
+++ b/frontendv2/src/app/(app)/admin/vds-nodes/[id]/edit/IpPoolTab.tsx
@@ -174,12 +174,12 @@ export function IpPoolTab({ nodeId, nodeName }: IpPoolTabProps) {
             ),
         );
         if (entries.length === 0) {
-            toast.error('Add at least one IP (one per line, comma, or space separated).');
+            toast.error(t('admin.vdsNodes.ips.bulk_empty'));
             return;
         }
         const invalid = entries.find((ip) => !ipRegex.test(ip));
         if (invalid) {
-            toast.error(`Invalid IP in list: ${invalid}`);
+            toast.error(t('admin.vdsNodes.ips.bulk_invalid_ip', { ip: invalid }));
             return;
         }
         if (createForm.cidr !== '') {
@@ -567,7 +567,7 @@ export function IpPoolTab({ nodeId, nodeName }: IpPoolTabProps) {
                             }
                             onClick={() => setCreateMode('single')}
                         >
-                            Single
+                            {t('admin.vdsNodes.ips.single')}
                         </Button>
                         <Button
                             type='button'
@@ -579,21 +579,19 @@ export function IpPoolTab({ nodeId, nodeName }: IpPoolTabProps) {
                             }
                             onClick={() => setCreateMode('bulk')}
                         >
-                            Bulk
+                            {t('admin.vdsNodes.ips.bulk')}
                         </Button>
                     </div>
                     {createMode === 'bulk' && (
                         <div className='space-y-2'>
-                            <Label className='text-sm font-semibold'>IP list</Label>
+                            <Label className='text-sm font-semibold'>{t('admin.vdsNodes.ips.bulk_list')}</Label>
                             <Textarea
                                 placeholder={'10.0.0.10\n10.0.0.11\n10.0.0.12'}
                                 value={bulkIpsInput}
                                 className='min-h-[120px] font-mono'
                                 onChange={(e) => setBulkIpsInput(e.target.value)}
                             />
-                            <p className='text-muted-foreground text-xs'>
-                                One IP per line, or comma/space separated. CIDR/gateway/notes apply to all.
-                            </p>
+                            <p className='text-muted-foreground text-xs'>{t('admin.vdsNodes.ips.bulk_help')}</p>
                         </div>
                     )}
                     {createMode === 'single' && (
diff --git a/frontendv2/src/app/(app)/admin/vm-instances/[id]/edit/DisksTab.tsx b/frontendv2/src/app/(app)/admin/vm-instances/[id]/edit/DisksTab.tsx
index 4fc4c613b..ce84e4793 100644
--- a/frontendv2/src/app/(app)/admin/vm-instances/[id]/edit/DisksTab.tsx
+++ b/frontendv2/src/app/(app)/admin/vm-instances/[id]/edit/DisksTab.tsx
@@ -181,17 +181,17 @@ export function DisksTab({
                     <Label className='mb-2 block'>{t('admin.vmInstances.resize_disk') ?? 'Expand disk'}</Label>
                     <form onSubmit={onResizeDisk} className='flex flex-wrap items-end gap-3'>
                         <div className='min-w-[160px]'>
-                            <Label className='text-xs'>Disk</Label>
+                            <Label className='text-xs'>{t('admin.vmInstances.resize_disk_label')}</Label>
                             <HeadlessSelect
                                 value={resizeDisk}
                                 onChange={(v) => setResizeDisk(String(v))}
                                 options={diskOptions}
-                                placeholder='Select…'
+                                placeholder={t('common.select')}
                                 buttonClassName='mt-1 h-10 w-full'
                             />
                         </div>
                         <div>
-                            <Label className='text-xs'>Size</Label>
+                            <Label className='text-xs'>{t('admin.vmInstances.resize_size_label')}</Label>
                             <Input
                                 value={resizeSize}
                                 onChange={(e) => setResizeSize(e.target.value)}
diff --git a/frontendv2/src/app/(app)/admin/vm-instances/[id]/edit/page.tsx b/frontendv2/src/app/(app)/admin/vm-instances/[id]/edit/page.tsx
index 5e80ec5f2..b28a9c3a9 100644
--- a/frontendv2/src/app/(app)/admin/vm-instances/[id]/edit/page.tsx
+++ b/frontendv2/src/app/(app)/admin/vm-instances/[id]/edit/page.tsx
@@ -36,7 +36,24 @@ import {
     Search as SearchIcon,
     Ban,
     ShieldCheck,
+    AlertTriangle,
 } from 'lucide-react';
+import {
+    AlertDialog,
+    AlertDialogAction,
+    AlertDialogCancel,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+} from '@/components/ui/alert-dialog';
+import {
+    ModerationReasonFields,
+    ModerationReasonValue,
+    isModerationReasonValid,
+} from '@/components/admin/ModerationReasonFields';
+import { ModerationStatusCard, ModerationStaffActor } from '@/components/admin/ModerationStatusCard';
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { WidgetRenderer } from '@/components/server/WidgetRenderer';
 
@@ -104,6 +121,11 @@ export default function VmInstanceEditPage() {
     const [nodeEfiStorageDefault, setNodeEfiStorageDefault] = useState('');
     const [nodeTpmStorageDefault, setNodeTpmStorageDefault] = useState('');
     const [suspending, setSuspending] = useState(false);
+    const [suspendDialogOpen, setSuspendDialogOpen] = useState(false);
+    const [suspendReason, setSuspendReason] = useState<ModerationReasonValue>({
+        reason_category: '',
+        reason_details: '',
+    });
     const [vmBackupLimit, setVmBackupLimit] = useState(5);
     const [vmBackupRetention, setVmBackupRetention] = useState<'inherit' | 'hard_limit' | 'fifo_rolling'>('inherit');
 
@@ -463,7 +485,7 @@ export default function VmInstanceEditPage() {
     const handleResizeDisk = async (e: React.FormEvent) => {
         e.preventDefault();
         if (!resizeDisk || !resizeSize.trim()) {
-            toast.error('Select a disk and enter size (e.g. +5G)');
+            toast.error(t('admin.vmInstances.resize_input_required'));
             return;
         }
         setResizing(true);
@@ -528,10 +550,17 @@ export default function VmInstanceEditPage() {
     };
 
     const handleSuspend = async () => {
+        if (!isModerationReasonValid(suspendReason)) {
+            toast.error(t('admin.moderation.reason_required'));
+            return;
+        }
+
         setSuspending(true);
         try {
-            await axios.post(`/api/admin/vm-instances/${id}/suspend`);
+            await axios.post(`/api/admin/vm-instances/${id}/suspend`, suspendReason);
             toast.success(t('admin.vmInstances.suspend_success') ?? 'VM instance suspended');
+            setSuspendDialogOpen(false);
+            setSuspendReason({ reason_category: '', reason_details: '' });
             await fetchInstance();
         } catch (err) {
             const msg = axios.isAxiosError(err) ? (err.response?.data?.message ?? err.message) : String(err);
@@ -646,7 +675,10 @@ export default function VmInstanceEditPage() {
                             <Button
                                 variant='outline'
                                 size='sm'
-                                onClick={handleSuspend}
+                                onClick={() => {
+                                    setSuspendReason({ reason_category: '', reason_details: '' });
+                                    setSuspendDialogOpen(true);
+                                }}
                                 disabled={suspending}
                                 className='border-amber-500/20 text-amber-600 hover:bg-amber-500/10 hover:text-amber-700'
                             >
@@ -666,6 +698,15 @@ export default function VmInstanceEditPage() {
                 }
             />
 
+            <ModerationStatusCard
+                active={instance.suspended === 1}
+                reason={instance.suspension_reason as string | null | undefined}
+                actedAt={instance.suspended_at as string | null | undefined}
+                actedBy={instance.suspended_by as ModerationStaffActor | null | undefined}
+                title={t('admin.moderation.vds_suspended_title')}
+                inactiveLabel={t('admin.moderation.vds_not_suspended')}
+            />
+
             <Tabs
                 value={activeTab}
                 onValueChange={handleTabChange}
@@ -851,6 +892,36 @@ export default function VmInstanceEditPage() {
                     </div>
                 </SheetContent>
             </Sheet>
+
+            <AlertDialog open={suspendDialogOpen} onOpenChange={setSuspendDialogOpen}>
+                <AlertDialogContent className='max-w-lg'>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle className='flex items-center gap-2'>
+                            <AlertTriangle className='h-5 w-5 text-red-500' />
+                            {t('admin.vmInstances.suspend_confirm_title')}
+                        </AlertDialogTitle>
+                        <AlertDialogDescription>
+                            {t('admin.vmInstances.suspend_confirm_description', {
+                                hostname: String(instance.hostname ?? hostname ?? id),
+                            })}
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+                    <ModerationReasonFields value={suspendReason} onChange={setSuspendReason} disabled={suspending} />
+                    <AlertDialogFooter>
+                        <AlertDialogCancel disabled={suspending}>{t('common.cancel')}</AlertDialogCancel>
+                        <AlertDialogAction
+                            onClick={(e) => {
+                                e.preventDefault();
+                                void handleSuspend();
+                            }}
+                            className='bg-red-600 hover:bg-red-700'
+                            disabled={suspending || !isModerationReasonValid(suspendReason)}
+                        >
+                            {suspending ? t('common.loading') : t('admin.vmInstances.suspend')}
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
         </div>
     );
 }
diff --git a/frontendv2/src/app/(app)/admin/vm-instances/create/page.tsx b/frontendv2/src/app/(app)/admin/vm-instances/create/page.tsx
index 43ce288f1..eddeab43b 100644
--- a/frontendv2/src/app/(app)/admin/vm-instances/create/page.tsx
+++ b/frontendv2/src/app/(app)/admin/vm-instances/create/page.tsx
@@ -336,7 +336,7 @@ export default function VmInstancesCreatePage() {
     const handleNext = () => {
         if (wizardBlockedByInfra || wizardNavWaitingInfra) {
             if (wizardBlockedByInfra) {
-                toast.error('Add at least one VPS location and one VDS node before continuing.');
+                toast.error(t('admin.vmInstances.infrastructure_required_to_continue'));
             }
             return;
         }
@@ -405,7 +405,7 @@ export default function VmInstancesCreatePage() {
     const handleCreate = async () => {
         if (wizardBlockedByInfra || wizardNavWaitingInfra) {
             if (wizardBlockedByInfra) {
-                toast.error('Add at least one VPS location and one VDS node before continuing.');
+                toast.error(t('admin.vmInstances.infrastructure_required_to_continue'));
             }
             return;
         }
@@ -448,7 +448,7 @@ export default function VmInstancesCreatePage() {
         }
         setSubmitting(true);
         setCreatingMessage(null);
-        const toastId = toast.loading('Initiating VM creation…');
+        const toastId = toast.loading(t('admin.vmInstances.initiating_creation'));
         try {
             const payload: Record<string, unknown> = {
                 vm_node_id: nodeId,
@@ -560,14 +560,19 @@ export default function VmInstancesCreatePage() {
                                 <AlertTriangle className='h-5 w-5' aria-hidden />
                             </div>
                             <div className='min-w-0 space-y-1'>
-                                <p className='text-sm leading-snug font-semibold'>Infrastructure required</p>
+                                <p className='text-sm leading-snug font-semibold'>
+                                    {t('admin.vmInstances.infrastructure_required')}
+                                </p>
                                 <p className='text-muted-foreground text-sm leading-relaxed'>
                                     {infraGate.vpsLocations === 0
-                                        ? 'Create at least one VPS location first.'
-                                        : 'Create at least one VDS node and link it to a location.'}
+                                        ? t('admin.vmInstances.create_vps_location_first')
+                                        : t('admin.vmInstances.create_vds_node_first')}
                                 </p>
                                 <p className='text-muted-foreground/80 text-xs'>
-                                    {infraGate.vpsLocations} VPS location(s) · {infraGate.vdsNodes} VDS node(s)
+                                    {t('admin.vmInstances.infrastructure_counts', {
+                                        locations: infraGate.vpsLocations.toString(),
+                                        nodes: infraGate.vdsNodes.toString(),
+                                    })}
                                 </p>
                             </div>
                         </div>
@@ -577,7 +582,7 @@ export default function VmInstancesCreatePage() {
                                 variant='ghost'
                                 size='icon'
                                 className='text-muted-foreground hover:text-foreground h-10 w-10 rounded-xl'
-                                title='Recheck infrastructure'
+                                title={t('admin.vmInstances.recheck_infrastructure')}
                                 onClick={() => void refreshInfrastructureCheck()}
                             >
                                 <RefreshCw className='h-4 w-4' />
@@ -927,7 +932,7 @@ export default function VmInstancesCreatePage() {
                                                     variant='ghost'
                                                     size='icon'
                                                     onClick={() => openIpPickerForRow(row.key, 'create')}
-                                                    title='Create IP and assign'
+                                                    title={t('admin.vmInstances.create_ip_and_assign')}
                                                     className='self-end sm:self-auto'
                                                 >
                                                     <Plus className='h-4 w-4' />
diff --git a/frontendv2/src/app/(app)/auth/layout.tsx b/frontendv2/src/app/(app)/auth/layout.tsx
index 1789d1bde..80fa0e25b 100644
--- a/frontendv2/src/app/(app)/auth/layout.tsx
+++ b/frontendv2/src/app/(app)/auth/layout.tsx
@@ -21,12 +21,11 @@ import ThemeCustomizer from '@/components/layout/ThemeCustomizer';
 import BackgroundWrapper from '@/components/theme/BackgroundWrapper';
 import { useTheme } from '@/contexts/ThemeContext';
 import { useSettings } from '@/contexts/SettingsContext';
-import { useTranslation } from '@/contexts/TranslationContext';
+import { PanelBrandingFooter } from '@/components/branding/PanelBrandingFooter';
 
 export default function AuthLayout({ children }: { children: React.ReactNode }) {
     const { theme } = useTheme();
-    const { core, settings } = useSettings();
-    const { t } = useTranslation();
+    const { settings } = useSettings();
 
     const appName = settings?.app_name || 'FeatherPanel';
     const logoUrl =
@@ -68,27 +67,7 @@ export default function AuthLayout({ children }: { children: React.ReactNode })
                         </div>
                     </div>
 
-                    <div className='text-muted-foreground mt-8 text-center text-xs transition-all duration-200'>
-                        <p className='mb-2 font-medium'>
-                            {t('branding.running_on', { name: appName, version: core?.version || '' }).trim()}
-                        </p>
-                        <a
-                            href='https://featherpanel.com'
-                            target='_blank'
-                            rel='noopener noreferrer'
-                            className='text-primary hover:text-primary/80 inline-flex items-center gap-1.5 font-medium underline-offset-4 transition-all duration-200 hover:underline'
-                        >
-                            {t('branding.copyright', { company: 'MythicalSystems' })}
-                            <svg className='h-3.5 w-3.5' fill='none' viewBox='0 0 24 24' stroke='currentColor'>
-                                <path
-                                    strokeLinecap='round'
-                                    strokeLinejoin='round'
-                                    strokeWidth={2}
-                                    d='M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14'
-                                />
-                            </svg>
-                        </a>
-                    </div>
+                    <PanelBrandingFooter appName={appName} className='mt-8' />
                 </div>
             </div>
         </BackgroundWrapper>
diff --git a/frontendv2/src/app/(app)/auth/login/LoginForm.tsx b/frontendv2/src/app/(app)/auth/login/LoginForm.tsx
index 0543a9e25..bbea380c8 100644
--- a/frontendv2/src/app/(app)/auth/login/LoginForm.tsx
+++ b/frontendv2/src/app/(app)/auth/login/LoginForm.tsx
@@ -24,7 +24,7 @@ import { Select } from '@/components/ui/select-native';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { useSettings } from '@/contexts/SettingsContext';
 import { useSession } from '@/contexts/SessionContext';
-import { Mail, Lock, ArrowRight, KeyRound, ArrowLeft, Fingerprint } from 'lucide-react';
+import { Mail, Lock, ArrowRight, KeyRound, ArrowLeft, Fingerprint, Network } from 'lucide-react';
 import { Captcha } from '@/components/Captcha';
 import { isCaptchaConfigured, isRecaptchaV3Configured, obtainCaptchaResponseToken } from '@/lib/captchaGate';
 import { startAuthentication } from '@simplewebauthn/browser';
@@ -93,6 +93,8 @@ export default function LoginForm() {
     const [loading, setLoading] = useState(false);
     const [error, setError] = useState('');
     const [success, setSuccess] = useState('');
+    const [unverifiedIdentifier, setUnverifiedIdentifier] = useState<string | null>(null);
+    const [resendVerificationLoading, setResendVerificationLoading] = useState(false);
     const [turnstileKey, setTurnstileKey] = useState(0);
 
     // Multi-step login state (when email login is enabled)
@@ -115,6 +117,52 @@ export default function LoginForm() {
         setTurnstileKey((prev) => prev + 1);
     };
 
+    const handleResendVerificationEmail = async () => {
+        if (!unverifiedIdentifier) return;
+
+        setResendVerificationLoading(true);
+        setSuccess('');
+
+        try {
+            const response = await authApi.resendVerificationEmail({
+                username_or_email: unverifiedIdentifier,
+            });
+
+            if (response.success) {
+                setSuccess(response.message || t('auth.verify_email.resend_sent'));
+            } else {
+                setError(response.message || t('common.error'));
+            }
+        } catch (err: unknown) {
+            const error = err as { response?: { data?: { message?: string } } };
+            setError(error.response?.data?.message || t('common.error'));
+        } finally {
+            setResendVerificationLoading(false);
+        }
+    };
+
+    const renderLoginError = () => {
+        if (!error) return null;
+
+        return (
+            <div className='bg-destructive/10 border-destructive/20 text-destructive animate-fade-in rounded-xl border p-4 text-sm'>
+                <p>{error}</p>
+                {unverifiedIdentifier && (
+                    <Button
+                        type='button'
+                        variant='outline'
+                        size='sm'
+                        className='mt-3 w-full'
+                        loading={resendVerificationLoading}
+                        onClick={handleResendVerificationEmail}
+                    >
+                        {t('auth.verify_email.resend')}
+                    </Button>
+                )}
+            </div>
+        );
+    };
+
     async function submitPasswordLogin(usernameOrEmail: string) {
         let captchaToken = '';
         if (showCaptcha) {
@@ -126,6 +174,7 @@ export default function LoginForm() {
         }
 
         setLoading(true);
+        setUnverifiedIdentifier(null);
 
         try {
             const response = await authApi.login({
@@ -153,6 +202,9 @@ export default function LoginForm() {
                     }
                 }, 1000);
             } else {
+                if (response.error_code === 'EMAIL_NOT_VERIFIED') {
+                    setUnverifiedIdentifier(usernameOrEmail);
+                }
                 setError(response.message || t('common.error'));
                 resetCaptcha();
             }
@@ -167,6 +219,10 @@ export default function LoginForm() {
                 return;
             }
 
+            if (error.response?.data?.error_code === 'EMAIL_NOT_VERIFIED') {
+                setUnverifiedIdentifier(usernameOrEmail);
+            }
+
             setError(error.response?.data?.message || t('common.error'));
             resetCaptcha();
         } finally {
@@ -335,7 +391,7 @@ export default function LoginForm() {
         }
 
         if (!selectedLdapProvider) {
-            setError('Please select an LDAP provider');
+            setError(t('auth.login.selectLdapProvider'));
             return;
         }
 
@@ -708,6 +764,27 @@ export default function LoginForm() {
     const isLoginMethodPasswordStep = isLoginMethodStep && !showEmailLogin;
     const isEmailLoginVerifyStep = showEmailLogin && emailLoginStep === 'code';
     const emailForLoginCodeSubtitle = emailLoginForm.email || identifierValue;
+    const renderLdapLoginButton = (className = '') => (
+        <Button
+            type='button'
+            variant='outline'
+            className={`group border-primary/20 bg-primary/5 hover:border-primary/50 hover:bg-primary/10 h-auto w-full justify-between px-3 py-3 text-left ${className}`}
+            onClick={() => setShowLdapLogin(true)}
+        >
+            <span className='flex min-w-0 items-center gap-3'>
+                <span className='bg-primary/15 text-primary flex h-9 w-9 shrink-0 items-center justify-center rounded-lg'>
+                    <Network className='h-4 w-4' />
+                </span>
+                <span className='min-w-0'>
+                    <span className='text-foreground block text-sm font-semibold'>{t('auth.login.ldapLogin')}</span>
+                    <span className='text-muted-foreground block truncate text-xs font-normal'>
+                        {t('auth.login.ldapLoginDescription')}
+                    </span>
+                </span>
+            </span>
+            <ArrowRight className='text-muted-foreground group-hover:text-primary h-4 w-4 shrink-0 transition-colors' />
+        </Button>
+    );
 
     return (
         <div ref={loginFormsRootRef} className='space-y-6'>
@@ -835,7 +912,10 @@ export default function LoginForm() {
                                     label={t('auth.login.username')}
                                     type='text'
                                     value={identifierValue}
-                                    onChange={(e) => setIdentifierValue(e.target.value)}
+                                    onChange={(e) => {
+                                        setIdentifierValue(e.target.value);
+                                        setUnverifiedIdentifier(null);
+                                    }}
                                     required
                                     autoComplete='username webauthn'
                                     autoFocus
@@ -858,16 +938,7 @@ export default function LoginForm() {
                                     </div>
                                 )}
 
-                                {ldapEnabled && (
-                                    <Button
-                                        type='button'
-                                        variant='ghost'
-                                        className='text-muted-foreground w-full text-sm'
-                                        onClick={() => setShowLdapLogin(true)}
-                                    >
-                                        LDAP Login
-                                    </Button>
-                                )}
+                                {ldapEnabled && renderLdapLoginButton()}
                             </form>
                         ) : showEmailLogin ? (
                             // Email code login flow (when user clicked "Request Login Code")
@@ -1087,11 +1158,7 @@ export default function LoginForm() {
                                     {t('common.back')}
                                 </Button>
 
-                                {error && (
-                                    <div className='bg-destructive/10 border-destructive/20 text-destructive animate-fade-in rounded-xl border p-4 text-sm'>
-                                        {error}
-                                    </div>
-                                )}
+                                {renderLoginError()}
                                 {success && (
                                     <div className='animate-fade-in rounded-xl border border-green-500/20 bg-green-500/10 p-4 text-sm text-green-600 dark:text-green-400'>
                                         {success}
@@ -1101,8 +1168,24 @@ export default function LoginForm() {
                         )
                     ) : showLdapLogin && ldapEnabled ? (
                         <form onSubmit={handleLdapLogin} className='space-y-5'>
+                            <div className='border-primary/20 bg-primary/5 rounded-2xl border p-4'>
+                                <div className='flex items-start gap-3'>
+                                    <div className='bg-primary/15 text-primary flex h-10 w-10 shrink-0 items-center justify-center rounded-xl'>
+                                        <Network className='h-5 w-5' />
+                                    </div>
+                                    <div className='min-w-0 flex-1'>
+                                        <h3 className='text-foreground text-sm font-semibold'>
+                                            {t('auth.login.ldapLoginTitle')}
+                                        </h3>
+                                        <p className='text-muted-foreground mt-1 text-xs leading-relaxed'>
+                                            {t('auth.login.ldapLoginSubtitle')}
+                                        </p>
+                                    </div>
+                                </div>
+                            </div>
+
                             <Select
-                                label='LDAP Provider'
+                                label={t('auth.login.ldapProvider')}
                                 value={selectedLdapProvider}
                                 onChange={(e) => setSelectedLdapProvider(e.target.value)}
                                 required
@@ -1115,14 +1198,14 @@ export default function LoginForm() {
                             </Select>
 
                             <Input
-                                label='LDAP Username'
+                                label={t('auth.login.ldapUsername')}
                                 type='text'
                                 value={form.username_or_email || ''}
                                 onChange={(e) => setForm({ ...form, username_or_email: e.target.value })}
                                 required
                                 autoComplete='username'
                                 icon={<Mail className='h-5 w-5' />}
-                                placeholder='Enter your LDAP username'
+                                placeholder={t('auth.login.ldapUsernamePlaceholder')}
                             />
 
                             {showCaptcha && (
@@ -1154,17 +1237,24 @@ export default function LoginForm() {
                             <Button type='submit' className='group w-full' loading={loading}>
                                 {!loading && (
                                     <>
-                                        Login with LDAP
+                                        {t('auth.login.loginWithLdap')}
                                         <ArrowRight className='ml-2 h-4 w-4 transition-transform group-hover:translate-x-1' />
                                     </>
                                 )}
                             </Button>
 
-                            {error && (
-                                <div className='bg-destructive/10 border-destructive/20 text-destructive animate-fade-in rounded-xl border p-4 text-sm'>
-                                    {error}
-                                </div>
-                            )}
+                            <Button
+                                type='button'
+                                variant='ghost'
+                                size='sm'
+                                className='text-muted-foreground hover:text-foreground h-8 w-full text-xs'
+                                onClick={() => setShowLdapLogin(false)}
+                            >
+                                <ArrowLeft className='mr-1 h-3.5 w-3.5' />
+                                {t('common.back')}
+                            </Button>
+
+                            {renderLoginError()}
                             {success && (
                                 <div className='animate-fade-in rounded-xl border border-green-500/20 bg-green-500/10 p-4 text-sm text-green-600 dark:text-green-400'>
                                     {success}
@@ -1307,7 +1397,10 @@ export default function LoginForm() {
                                 label={t('auth.login.username')}
                                 type='text'
                                 value={form.username_or_email || ''}
-                                onChange={(e) => setForm({ ...form, username_or_email: e.target.value })}
+                                onChange={(e) => {
+                                    setForm({ ...form, username_or_email: e.target.value });
+                                    setUnverifiedIdentifier(null);
+                                }}
                                 required
                                 autoComplete='username webauthn'
                                 icon={<Mail className='h-5 w-5' />}
@@ -1362,21 +1455,33 @@ export default function LoginForm() {
                                 <p className='text-muted-foreground text-center text-[11px] font-medium tracking-wide'>
                                     {t('auth.login.or')}
                                 </p>
-                                <div className='flex flex-wrap justify-center gap-2'>
+                                <div className='flex flex-col gap-2'>
                                     <Button
                                         type='button'
                                         variant='outline'
-                                        size='sm'
-                                        className='min-w-36'
+                                        className='group h-auto w-full justify-between px-3 py-3 text-left'
                                         disabled={loading}
                                         onClick={() => {
                                             const u = (form.username_or_email || '').trim();
                                             void runPasskeyAuthentication(u || undefined);
                                         }}
                                     >
-                                        <Fingerprint className='mr-2 h-4 w-4' />
-                                        {t('auth.passkey.signIn')}
+                                        <span className='flex min-w-0 items-center gap-3'>
+                                            <span className='bg-primary/10 text-primary flex h-9 w-9 shrink-0 items-center justify-center rounded-lg'>
+                                                <Fingerprint className='h-4 w-4' />
+                                            </span>
+                                            <span className='min-w-0'>
+                                                <span className='text-foreground block text-sm font-semibold'>
+                                                    {t('auth.passkey.signIn')}
+                                                </span>
+                                                <span className='text-muted-foreground block truncate text-xs font-normal'>
+                                                    {t('auth.passkey.description')}
+                                                </span>
+                                            </span>
+                                        </span>
+                                        <ArrowRight className='text-muted-foreground group-hover:text-primary h-4 w-4 shrink-0 transition-colors' />
                                     </Button>
+                                    {ldapEnabled && renderLdapLoginButton()}
                                 </div>
                             </div>
 
diff --git a/frontendv2/src/app/(app)/auth/setup-2fa/SetupTwoFactorForm.tsx b/frontendv2/src/app/(app)/auth/setup-2fa/SetupTwoFactorForm.tsx
index 1d3512801..22cf13451 100644
--- a/frontendv2/src/app/(app)/auth/setup-2fa/SetupTwoFactorForm.tsx
+++ b/frontendv2/src/app/(app)/auth/setup-2fa/SetupTwoFactorForm.tsx
@@ -103,7 +103,7 @@ export default function SetupTwoFactorForm() {
         }
 
         if (code.length !== 6) {
-            setError('Verification code must be 6 digits');
+            setError(t('validation.verification_code_6_digits'));
             return;
         }
 
@@ -213,7 +213,7 @@ export default function SetupTwoFactorForm() {
                             variant='outline'
                             size='icon'
                             onClick={copySecret}
-                            title='Copy to clipboard'
+                            title={t('common.copy_to_clipboard')}
                         >
                             <Clipboard className='h-4 w-4' />
                         </Button>
diff --git a/frontendv2/src/app/(app)/auth/verify-2fa/VerifyTwoFactorForm.tsx b/frontendv2/src/app/(app)/auth/verify-2fa/VerifyTwoFactorForm.tsx
index 1d4f71a24..1f4243033 100644
--- a/frontendv2/src/app/(app)/auth/verify-2fa/VerifyTwoFactorForm.tsx
+++ b/frontendv2/src/app/(app)/auth/verify-2fa/VerifyTwoFactorForm.tsx
@@ -55,12 +55,12 @@ export default function VerifyTwoFactorForm() {
         }
 
         if (code.length !== 6) {
-            setError('Verification code must be 6 digits');
+            setError(t('validation.verification_code_6_digits'));
             return;
         }
 
         if (!email) {
-            setError('Email is required');
+            setError(t('validation.email_required'));
             return;
         }
 
diff --git a/frontendv2/src/app/(app)/dashboard/account/page.tsx b/frontendv2/src/app/(app)/dashboard/account/page.tsx
index 078e09365..19e6608a8 100644
--- a/frontendv2/src/app/(app)/dashboard/account/page.tsx
+++ b/frontendv2/src/app/(app)/dashboard/account/page.tsx
@@ -20,6 +20,8 @@ import { useSearchParams, useRouter } from 'next/navigation';
 import NextImage from 'next/image';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { useSession } from '@/contexts/SessionContext';
+import { useDateFormatOptions } from '@/contexts/PreferencesContext';
+import { formatDateInTz } from '@/lib/dateUtils';
 import { Tab } from '@headlessui/react';
 import { cn } from '@/lib/utils';
 import ProfileTab from '@/components/account/ProfileTab';
@@ -34,6 +36,7 @@ import { WidgetRenderer } from '@/components/server/WidgetRenderer';
 export default function AccountPage() {
     const { t } = useTranslation();
     const { user } = useSession();
+    const dateOpts = useDateFormatOptions();
     const searchParams = useSearchParams();
     const router = useRouter();
 
@@ -62,15 +65,8 @@ export default function AccountPage() {
 
     const formatDate = (dateString?: string) => {
         if (!dateString) return t('account.unknown');
-        try {
-            return new Date(dateString).toLocaleDateString('en-US', {
-                year: 'numeric',
-                month: 'long',
-                day: 'numeric',
-            });
-        } catch {
-            return t('account.unknown');
-        }
+        const formatted = formatDateInTz(dateString, dateOpts);
+        return formatted === '-' ? t('account.unknown') : formatted;
     };
 
     const getUserInitials = () => {
diff --git a/frontendv2/src/app/(app)/dashboard/layout.tsx b/frontendv2/src/app/(app)/dashboard/layout.tsx
index f968c7202..236dcac15 100644
--- a/frontendv2/src/app/(app)/dashboard/layout.tsx
+++ b/frontendv2/src/app/(app)/dashboard/layout.tsx
@@ -15,11 +15,17 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 import DashboardShell from '@/components/layout/DashboardShell';
 import { Metadata } from 'next';
+import ChatbotWidget from '@/components/ai/ChatbotWidget';
 
 export const metadata: Metadata = {
     title: 'Dashboard',
 };
 
 export default function DashboardLayout({ children }: { children: React.ReactNode }) {
-    return <DashboardShell>{children}</DashboardShell>;
+    return (
+        <>
+            <DashboardShell>{children}</DashboardShell>
+            <ChatbotWidget />
+        </>
+    );
 }
diff --git a/frontendv2/src/app/(app)/dashboard/page.tsx b/frontendv2/src/app/(app)/dashboard/page.tsx
index a3f4d06d9..c4f481d5c 100644
--- a/frontendv2/src/app/(app)/dashboard/page.tsx
+++ b/frontendv2/src/app/(app)/dashboard/page.tsx
@@ -30,6 +30,8 @@ import {
 } from 'lucide-react';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { useSession } from '@/contexts/SessionContext';
+import { useDateFormatOptions } from '@/contexts/PreferencesContext';
+import { formatRelativeTime } from '@/lib/dateUtils';
 import Link from 'next/link';
 import Image from 'next/image';
 import axios from 'axios';
@@ -157,6 +159,7 @@ function DashboardBlockChrome({
 export default function DashboardPage() {
     const { t } = useTranslation();
     const { user } = useSession();
+    const dateOpts = useDateFormatOptions();
     const [allServers, setAllServers] = useState<ServerData[]>([]);
     const [vms, setVms] = useState<VmInstance[]>([]);
     const [serverTotal, setServerTotal] = useState(0);
@@ -318,32 +321,7 @@ export default function DashboardPage() {
         };
     };
 
-    const formatDate = (dateString: string): string => {
-        if (!dateString) return '-';
-        try {
-            const date = new Date(dateString);
-            const now = new Date();
-            const diffInHours = Math.abs(now.getTime() - date.getTime()) / (1000 * 60 * 60);
-
-            if (diffInHours < 1) {
-                return t('common.time.just_now');
-            } else if (diffInHours < 24) {
-                const hours = Math.floor(diffInHours);
-
-                return t('common.time.hours_ago', { count: hours.toString(), s: hours > 1 ? 's' : '' });
-            } else if (diffInHours < 48) {
-                return t('common.time.yesterday');
-            } else {
-                return (
-                    date.toLocaleDateString() +
-                    ' ' +
-                    date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })
-                );
-            }
-        } catch {
-            return dateString;
-        }
-    };
+    const formatDate = (dateString: string): string => formatRelativeTime(dateString, dateOpts);
 
     const BLOCK_LABEL_KEYS: Record<DashboardBlockId, string> = {
         hero: 'dashboard.layout.block_labels.hero',
diff --git a/frontendv2/src/app/(app)/dashboard/status/page.tsx b/frontendv2/src/app/(app)/dashboard/status/page.tsx
index 9233c8e63..aa7dbb6db 100644
--- a/frontendv2/src/app/(app)/dashboard/status/page.tsx
+++ b/frontendv2/src/app/(app)/dashboard/status/page.tsx
@@ -36,6 +36,7 @@ import { toast } from 'sonner';
 
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { WidgetRenderer } from '@/components/server/WidgetRenderer';
+import { PoweredByFeatherPanel } from '@/components/branding/PoweredByFeatherPanel';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { formatMemory, formatDisk } from '@/lib/server-utils';
 import { cn } from '@/lib/utils';
@@ -665,6 +666,10 @@ export default function StatusPage() {
             )}
 
             <WidgetRenderer widgets={getWidgets('dashboard-status', 'bottom-of-page')} />
+
+            <div className='flex justify-center pt-2'>
+                <PoweredByFeatherPanel variant={isPublicStatusPage ? 'footer' : 'inline'} />
+            </div>
         </div>
     );
 }
diff --git a/frontendv2/src/app/(app)/dashboard/tickets/[uuid]/page.tsx b/frontendv2/src/app/(app)/dashboard/tickets/[uuid]/page.tsx
index 752e5ba61..d188a33af 100644
--- a/frontendv2/src/app/(app)/dashboard/tickets/[uuid]/page.tsx
+++ b/frontendv2/src/app/(app)/dashboard/tickets/[uuid]/page.tsx
@@ -280,7 +280,7 @@ export default function TicketViewPage() {
     }
 
     return (
-        <div className='mx-auto flex h-[calc(100vh-6rem)] max-w-[1700px] flex-col px-1 pt-2 pb-6 sm:px-2'>
+        <div className='flex h-[calc(100vh-6rem)] w-full flex-col pt-2 pb-6'>
             <WidgetRenderer widgets={getWidgets('dashboard-tickets-view', 'top-of-page')} />
 
             <div className='border-border/50 bg-card/60 mb-4 flex shrink-0 items-center justify-between rounded-2xl border p-3 px-1 shadow-[0_10px_30px_-24px_rgba(0,0,0,0.7)] backdrop-blur-xl sm:p-4'>
@@ -315,16 +315,16 @@ export default function TicketViewPage() {
             </div>
             <WidgetRenderer widgets={getWidgets('dashboard-tickets-view', 'after-header')} />
 
-            <div className='grid min-h-0 flex-1 grid-cols-1 gap-6 lg:grid-cols-12'>
-                <div className='bg-card/65 border-border/50 flex h-full flex-col overflow-hidden rounded-2xl border shadow-[0_12px_36px_-24px_rgba(0,0,0,0.75)] backdrop-blur-xl lg:col-span-8'>
-                    <div className='custom-scrollbar flex-1 space-y-8 overflow-y-auto p-4 sm:p-6'>
+            <div className='grid min-h-0 flex-1 grid-cols-1 gap-4 xl:grid-cols-12 xl:gap-6'>
+                <div className='bg-card/65 border-border/50 flex h-full flex-col overflow-hidden rounded-2xl border shadow-[0_12px_36px_-24px_rgba(0,0,0,0.75)] backdrop-blur-xl xl:col-span-9 2xl:col-span-10'>
+                    <div className='custom-scrollbar flex-1 space-y-8 overflow-y-auto p-4 sm:p-6 lg:p-8'>
                         <div className='group flex gap-4'>
                             <Avatar className='ring-border/50 bg-primary/10 text-primary mt-1 h-10 w-10 ring-2'>
                                 <div className='flex h-full w-full items-center justify-center'>
                                     <FileText className='h-4 w-4' />
                                 </div>
                             </Avatar>
-                            <div className='max-w-[85%] flex-1 space-y-1'>
+                            <div className='max-w-[92%] flex-1 space-y-1 lg:max-w-[88%]'>
                                 <div className='flex items-center gap-2'>
                                     <span className='text-sm font-semibold'>{t('tickets.originalRequest')}</span>
                                     <span className='text-muted-foreground text-xs'>
@@ -362,7 +362,7 @@ export default function TicketViewPage() {
 
                                     <div
                                         className={clsx(
-                                            'flex max-w-[85%] flex-col lg:max-w-[75%]',
+                                            'flex max-w-[92%] flex-col lg:max-w-[84%] 2xl:max-w-[78%]',
                                             isMe ? 'items-end' : 'items-start',
                                         )}
                                     >
@@ -605,7 +605,7 @@ export default function TicketViewPage() {
                     <WidgetRenderer widgets={getWidgets('dashboard-tickets-view', 'after-messages')} />
                 </div>
 
-                <div className='custom-scrollbar h-full space-y-4 overflow-y-auto pb-6 lg:col-span-4'>
+                <div className='custom-scrollbar h-full space-y-4 overflow-y-auto pb-6 xl:col-span-3 2xl:col-span-2'>
                     <WidgetRenderer widgets={getWidgets('dashboard-tickets-view', 'sidebar-top')} />
 
                     <Card className='border-border/50 bg-card/65 sticky top-2 shadow-[0_12px_36px_-24px_rgba(0,0,0,0.75)] backdrop-blur-xl'>
diff --git a/frontendv2/src/app/(app)/error.tsx b/frontendv2/src/app/(app)/error.tsx
index d40acca5d..a66deec63 100644
--- a/frontendv2/src/app/(app)/error.tsx
+++ b/frontendv2/src/app/(app)/error.tsx
@@ -20,9 +20,9 @@ import Link from 'next/link';
 import { Button } from '@/components/ui/button';
 import { useTheme } from '@/contexts/ThemeContext';
 import { backgroundFitToCssSize } from '@/lib/backgroundImageFit';
-import { useSettings } from '@/contexts/SettingsContext';
 import { useTranslation } from '@/contexts/TranslationContext';
 import ThemeCustomizer from '@/components/layout/ThemeCustomizer';
+import { PanelBrandingFooter } from '@/components/branding/PanelBrandingFooter';
 import { Home, RefreshCw } from 'lucide-react';
 
 /** Detect errors caused by stale cached assets after a new deploy (chunk load failures). */
@@ -55,7 +55,6 @@ function hardRefresh(): void {
 
 export default function Error({ error, reset }: { error: Error & { digest?: string }; reset: () => void }) {
     const { backgroundType, backgroundImage, backdropBlur, backdropDarken, backgroundImageFit } = useTheme();
-    const { core } = useSettings();
     const { t } = useTranslation();
     const staleVersion = isStaleVersionError(error);
 
@@ -203,27 +202,7 @@ export default function Error({ error, reset }: { error: Error & { digest?: stri
                 </div>
             </div>
 
-            <div className='text-muted-foreground relative z-10 mt-8 text-center text-xs'>
-                <p className='mb-2 font-medium'>
-                    {t('branding.running_on', { name: 'FeatherPanel', version: core?.version || '' }).trim()}
-                </p>
-                <a
-                    href='https://featherpanel.com'
-                    target='_blank'
-                    rel='noopener noreferrer'
-                    className='text-primary hover:text-primary/80 inline-flex items-center gap-1.5 font-medium underline-offset-4 transition-all duration-200 hover:underline'
-                >
-                    {t('branding.copyright', { company: 'MythicalSystems' })}
-                    <svg className='h-3.5 w-3.5' fill='none' viewBox='0 0 24 24' stroke='currentColor'>
-                        <path
-                            strokeLinecap='round'
-                            strokeLinejoin='round'
-                            strokeWidth={2}
-                            d='M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14'
-                        />
-                    </svg>
-                </a>
-            </div>
+            <PanelBrandingFooter className='relative z-10 mt-8' />
         </div>
     );
 }
diff --git a/frontendv2/src/app/(app)/layout.tsx b/frontendv2/src/app/(app)/layout.tsx
index 42ff52237..006c82c38 100644
--- a/frontendv2/src/app/(app)/layout.tsx
+++ b/frontendv2/src/app/(app)/layout.tsx
@@ -19,6 +19,7 @@ import { ThemeProvider } from '@/contexts/ThemeContext';
 import { SettingsProvider } from '@/contexts/SettingsContext';
 import { TranslationProvider } from '@/contexts/TranslationContext';
 import { SessionProvider } from '@/contexts/SessionContext';
+import { PreferencesProvider } from '@/contexts/PreferencesContext';
 import { NotificationProvider } from '@/contexts/NotificationContext';
 import AppContent from '@/components/common/AppContent';
 import { Toaster } from 'sonner';
@@ -149,9 +150,18 @@ export default async function RootLayout({ children }: { children: React.ReactNo
                     rose: '347 77% 50%',
                     slate: '215 20% 45%',
                   };
+                  var foregrounds = {
+                    orange: '0 0% 9%',
+                    teal: '0 0% 9%',
+                    yellow: '0 0% 9%',
+                    cyan: '0 0% 9%',
+                    lime: '0 0% 9%',
+                    amber: '0 0% 9%'
+                  };
                   document.documentElement.classList.add(theme);
                   document.documentElement.style.setProperty('--primary', colors[accentColor] || colors.purple);
                   document.documentElement.style.setProperty('--ring', colors[accentColor] || colors.purple);
+                  document.documentElement.style.setProperty('--primary-foreground', foregrounds[accentColor] || '0 0% 98%');
                   // Initialize motion preference for app-wide transitions.
                   const savedMotion = localStorage.getItem('motionLevel');
                   const prefersReduced = window.matchMedia('(prefers-reduced-motion: reduce)').matches;
@@ -279,14 +289,16 @@ export default async function RootLayout({ children }: { children: React.ReactNo
                     <ThemeProvider>
                         <TranslationProvider>
                             <SessionProvider>
-                                <NotificationProvider>
-                                    <PluginAssets />
-                                    <ChunkLoadErrorHandler />
-                                    <SystemHealthCheck />
-                                    <PwaInstaller />
-                                    <AppContent>{children}</AppContent>
-                                    <Toaster richColors position='top-right' />
-                                </NotificationProvider>
+                                <PreferencesProvider>
+                                    <NotificationProvider>
+                                        <PluginAssets />
+                                        <ChunkLoadErrorHandler />
+                                        <SystemHealthCheck />
+                                        <PwaInstaller />
+                                        <AppContent>{children}</AppContent>
+                                        <Toaster richColors position='top-right' />
+                                    </NotificationProvider>
+                                </PreferencesProvider>
                             </SessionProvider>
                         </TranslationProvider>
                     </ThemeProvider>
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/activities/page.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/activities/page.tsx
index af27d1239..abb3d7896 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/activities/page.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/activities/page.tsx
@@ -19,6 +19,8 @@ import React, { useState, useEffect, useCallback } from 'react';
 import { useParams, useRouter } from 'next/navigation';
 import axios from 'axios';
 import { useTranslation } from '@/contexts/TranslationContext';
+import { useDateFormatOptions } from '@/contexts/PreferencesContext';
+import { formatDateTimeInTz, formatRelativeTime } from '@/lib/dateUtils';
 import { useServerPermissions } from '@/hooks/useServerPermissions';
 import { Dialog, DialogFooter, DialogHeader, DialogTitle, DialogDescription } from '@/components/ui/dialog';
 import {
@@ -156,6 +158,7 @@ export default function ServerActivityPage() {
     const uuidShort = params.uuidShort as string;
     const router = useRouter();
     const { t } = useTranslation();
+    const dateOpts = useDateFormatOptions();
     const { hasPermission, loading: permissionsLoading } = useServerPermissions(uuidShort);
 
     const [loading, setLoading] = useState(true);
@@ -353,26 +356,9 @@ export default function ServerActivityPage() {
         return formatEvent(item.event);
     }
 
-    function formatRelativeTime(timestamp?: string) {
+    function formatItemTime(timestamp?: string) {
         if (!timestamp) return '';
-        const now = new Date();
-        const date = new Date(timestamp);
-        const diffInSeconds = Math.floor((now.getTime() - date.getTime()) / 1000);
-
-        if (diffInSeconds < 60) return t('serverActivities.justNow');
-        if (diffInSeconds < 3600) {
-            const minutes = Math.floor(diffInSeconds / 60);
-            return t('serverActivities.minutesAgo', { minutes: String(minutes) });
-        }
-        if (diffInSeconds < 86400) {
-            const hours = Math.floor(diffInSeconds / 3600);
-            return t('serverActivities.hoursAgo', { hours: String(hours) });
-        }
-        if (diffInSeconds < 604800) {
-            const days = Math.floor(diffInSeconds / 86400);
-            return t('serverActivities.daysAgo', { days: String(days) });
-        }
-        return date.toLocaleDateString();
+        return formatRelativeTime(timestamp, dateOpts);
     }
 
     const detailsPairs =
@@ -601,9 +587,7 @@ export default function ServerActivityPage() {
                                                 <div className='text-muted-foreground flex items-center gap-2'>
                                                     <Clock className='h-4 w-4 opacity-50' />
                                                     <span className='text-sm font-semibold'>
-                                                        {activity.timestamp
-                                                            ? formatRelativeTime(activity.timestamp)
-                                                            : '-'}
+                                                        {activity.timestamp ? formatItemTime(activity.timestamp) : '-'}
                                                     </span>
                                                 </div>
                                                 {activity.ip && (
@@ -739,7 +723,7 @@ export default function ServerActivityPage() {
                                             <Clock className='text-muted-foreground h-4 w-4 shrink-0' />
                                             <span>
                                                 {selectedItem.timestamp
-                                                    ? new Date(selectedItem.timestamp).toLocaleString()
+                                                    ? formatDateTimeInTz(selectedItem.timestamp, dateOpts)
                                                     : '—'}
                                             </span>
                                         </dd>
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileBreadcrumbs.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileBreadcrumbs.tsx
index b11d30bc6..1e9fb46ef 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileBreadcrumbs.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileBreadcrumbs.tsx
@@ -19,6 +19,7 @@ import { Input } from '@/components/ui/input';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { useRef, useState } from 'react';
 import { cn } from '@/lib/utils';
+import { ARCHIVE_EXTRACT_DRAG_MIME } from '@/lib/files-api';
 
 interface FileBreadcrumbsProps {
     currentDirectory: string;
@@ -45,32 +46,34 @@ interface CrumbButtonProps {
 function CrumbButton({ path, isCurrent, onDropFilesToPath, onClick, className, title, children }: CrumbButtonProps) {
     const [isDropTarget, setIsDropTarget] = useState(false);
     const dragCounterRef = useRef(0);
-    const canAccept = !!onDropFilesToPath && !isCurrent;
+    const canAccept = !!onDropFilesToPath;
 
-    const isInternal = (e: React.DragEvent) => e.dataTransfer.types.includes(DRAG_MIME);
+    const isPanelFileDrag = (e: React.DragEvent) =>
+        e.dataTransfer.types.includes(DRAG_MIME) || e.dataTransfer.types.includes(ARCHIVE_EXTRACT_DRAG_MIME);
 
     const handleDragEnter = (e: React.DragEvent) => {
-        if (!canAccept || !isInternal(e)) return;
+        if (!canAccept || !isPanelFileDrag(e)) return;
         e.preventDefault();
         e.stopPropagation();
         dragCounterRef.current += 1;
         setIsDropTarget(true);
     };
     const handleDragOver = (e: React.DragEvent) => {
-        if (!canAccept || !isInternal(e)) return;
+        if (!canAccept || !isPanelFileDrag(e)) return;
         e.preventDefault();
         e.stopPropagation();
-        e.dataTransfer.dropEffect = 'move';
+        const copy = e.dataTransfer.types.includes(ARCHIVE_EXTRACT_DRAG_MIME);
+        e.dataTransfer.dropEffect = copy ? 'copy' : 'move';
     };
     const handleDragLeave = (e: React.DragEvent) => {
-        if (!canAccept || !isInternal(e)) return;
+        if (!canAccept || !isPanelFileDrag(e)) return;
         e.preventDefault();
         e.stopPropagation();
         dragCounterRef.current = Math.max(0, dragCounterRef.current - 1);
         if (dragCounterRef.current === 0) setIsDropTarget(false);
     };
     const handleDrop = (e: React.DragEvent) => {
-        if (!canAccept || !isInternal(e)) return;
+        if (!canAccept || !isPanelFileDrag(e)) return;
         e.preventDefault();
         e.stopPropagation();
         dragCounterRef.current = 0;
@@ -82,11 +85,10 @@ function CrumbButton({ path, isCurrent, onDropFilesToPath, onClick, className, t
         <Button
             variant='ghost'
             size='sm'
-            className={cn(
-                className,
-                isDropTarget && !isCurrent && 'bg-primary/15 text-primary ring-primary/70 ring-2 ring-inset',
-            )}
-            onClick={onClick}
+            className={cn(className, isDropTarget && 'bg-primary/15 text-primary ring-primary/70 ring-2 ring-inset')}
+            onClick={() => {
+                if (!isCurrent) onClick();
+            }}
             title={title}
             onDragEnter={handleDragEnter}
             onDragOver={handleDragOver}
@@ -142,7 +144,7 @@ export function FileBreadcrumbs({
                                 className={cn(
                                     'h-8 px-2 whitespace-nowrap transition-colors',
                                     isCurrent
-                                        ? 'text-foreground pointer-events-none bg-white/5 font-bold'
+                                        ? 'text-foreground cursor-default bg-white/5 font-bold'
                                         : 'text-muted-foreground hover:text-foreground hover:bg-white/5',
                                 )}
                                 onClick={() => onNavigate(path)}
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileList.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileList.tsx
index a07a968b2..a67964f4a 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileList.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileList.tsx
@@ -14,6 +14,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 */
 
 import { FileObject } from '@/types/server';
+import { filterSelectableFiles } from '@/lib/feather-trash';
 import { FileRow } from './FileRow';
 import { Checkbox } from '@/components/ui/checkbox';
 import { Loader2, FolderOpen, Sparkles } from 'lucide-react';
@@ -35,6 +36,7 @@ interface FileListProps {
     canEdit: boolean;
     canDelete: boolean;
     canDownload: boolean;
+    acceptArchiveExtract?: boolean;
     serverUuid: string;
     currentDirectory: string;
     anchorName?: string | null;
@@ -56,6 +58,7 @@ export function FileList({
     canEdit,
     canDelete,
     canDownload,
+    acceptArchiveExtract = false,
     serverUuid,
     currentDirectory,
     anchorName = null,
@@ -111,7 +114,9 @@ export function FileList({
         );
     }
 
-    const allSelected = files.length > 0 && selectedFiles.length === files.length;
+    const selectableFiles = filterSelectableFiles(files);
+    const selectableNames = selectableFiles.map((f) => f.name);
+    const allSelected = selectableNames.length > 0 && selectableNames.every((n) => selectedFiles.includes(n));
 
     return (
         <div className='overflow-hidden rounded-3xl border border-gray-200 bg-white backdrop-blur-xl dark:border-white/10 dark:bg-white/5'>
@@ -119,17 +124,22 @@ export function FileList({
                 className='text-foreground/60 flex items-center gap-3 border-b border-gray-200 bg-gray-50/50 px-4 py-4 text-[10px] font-bold tracking-[0.2em] uppercase dark:border-white/10 dark:bg-white/5 dark:text-white/40'
                 style={{ color: 'hsl(var(--foreground))', opacity: 0.6 }}
             >
-                <div className='flex flex-1 items-center gap-3'>
+                <div className='flex shrink-0 items-center'>
                     <Checkbox
                         checked={allSelected}
                         onCheckedChange={onSelectAll}
                         className='border-primary/50 data-[state=checked]:bg-primary data-[state=checked]:border-primary transition-colors'
                     />
-                    <span>{t('files.list.header_name')}</span>
                 </div>
-                <div className='hidden w-32 text-right sm:block'>{t('files.list.header_size')}</div>
-                <div className='hidden w-40 text-right sm:block'>{t('files.list.header_modified')}</div>
-                <div className='w-10'></div>
+                <div className='w-9 shrink-0' aria-hidden />
+                <div className='min-w-0 flex-1 truncate'>{t('files.list.header_name')}</div>
+                <div className='hidden w-[5.5rem] shrink-0 text-right sm:block'>{t('files.list.header_size')}</div>
+                <div className='hidden w-[9rem] shrink-0 truncate text-right sm:block'>
+                    {t('files.list.header_modified')}
+                </div>
+                <div className='w-9 shrink-0 text-center'>
+                    <span className='hidden sm:block'>{t('files.list.header_actions')}</span>
+                </div>
             </div>
 
             <div className='divide-y divide-gray-200 dark:divide-white/5'>
@@ -150,6 +160,7 @@ export function FileList({
                         canEdit={canEdit}
                         canDelete={canDelete}
                         canDownload={canDownload}
+                        acceptArchiveExtract={acceptArchiveExtract}
                         serverUuid={serverUuid}
                         currentDirectory={currentDirectory}
                     />
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileRow.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileRow.tsx
index 898cd2d88..adb40fceb 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileRow.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/FileRow.tsx
@@ -14,7 +14,9 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 */
 
 import { FileObject } from '@/types/server';
-import { formatFileSize, formatDate } from '@/lib/utils';
+import { formatFileSize } from '@/lib/utils';
+import { formatDateTimeInTz, formatRelativeTime, parseApiDate } from '@/lib/dateUtils';
+import { useDateFormatOptions } from '@/contexts/PreferencesContext';
 import {
     Folder,
     FileText,
@@ -29,8 +31,10 @@ import {
     Settings,
     File as FileIcon,
     Fingerprint,
+    PackageSearch,
     type LucideIcon,
 } from 'lucide-react';
+import { isTrashShortcut } from '@/lib/feather-trash';
 import Link from 'next/link';
 import { Button } from '@/components/featherui/Button';
 import {
@@ -46,11 +50,32 @@ import { isBinaryLikeFileName, isDecompressibleArchiveFileName } from '@/lib/bin
 import { useTranslation } from '@/contexts/TranslationContext';
 import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
+import { ARCHIVE_EXTRACT_DRAG_MIME } from '@/lib/files-api';
 
 const isImageName = (name: string) => /\.(png|jpg|jpeg|gif|webp|svg)$/i.test(name);
 const isEditableFile = (size: number, name: string) =>
     size < 1024 * 1024 * 5 && !isBinaryLikeFileName(name) && !isImageName(name);
 
+function formatListEntrySize(file: FileObject): string {
+    if (file.isFile) {
+        return formatFileSize(file.size);
+    }
+    if (file.directory_size !== undefined && file.directory_size !== null) {
+        return formatFileSize(file.directory_size);
+    }
+    return '—';
+}
+
+function formatListEntrySizeMobile(file: FileObject, folderLabel: string): string {
+    if (file.isFile) {
+        return formatFileSize(file.size);
+    }
+    if (file.directory_size !== undefined && file.directory_size !== null) {
+        return formatFileSize(file.directory_size);
+    }
+    return folderLabel;
+}
+
 interface FileRowProps {
     file: FileObject;
     selected: boolean;
@@ -67,6 +92,8 @@ interface FileRowProps {
     canEdit: boolean;
     canDelete: boolean;
     canDownload: boolean;
+    /** Accept drag-and-drop from archive browse (extract) onto this folder row */
+    acceptArchiveExtract?: boolean;
     serverUuid: string;
     currentDirectory: string;
 }
@@ -190,10 +217,22 @@ export function FileRow({
     canEdit,
     canDelete,
     canDownload,
+    acceptArchiveExtract = false,
     serverUuid,
     currentDirectory,
 }: FileRowProps) {
     const { t } = useTranslation();
+    const virtualTrash = isTrashShortcut(file);
+    const dateOpts = useDateFormatOptions();
+    const { modifiedRelative, modifiedTitle } = useMemo(() => {
+        if (!parseApiDate(file.modified_at)) {
+            return { modifiedRelative: t('common.not_available'), modifiedTitle: undefined as string | undefined };
+        }
+        return {
+            modifiedRelative: formatRelativeTime(file.modified_at, dateOpts),
+            modifiedTitle: formatDateTimeInTz(file.modified_at, dateOpts),
+        };
+    }, [file.modified_at, dateOpts, t]);
     const rowRef = useRef<HTMLDivElement>(null);
     const [isDropTarget, setIsDropTarget] = useState(false);
     const dragCounterRef = useRef(0);
@@ -205,7 +244,22 @@ export function FileRow({
         }
     }, [isAnchor]);
 
+    const canBrowseArchive = file.isFile && isDecompressibleArchiveFileName(file.name) && (canEdit || canDownload);
+
     const menuActions = useMemo<MenuAction[]>(() => {
+        if (virtualTrash) {
+            const items: MenuAction[] = [{ key: 'trash-open', label: t('files.row.trash_open'), Icon: Trash2 }];
+            if (canDelete && (file.trashItemCount ?? 0) > 0) {
+                items.push({
+                    key: 'trash-empty',
+                    label: t('files.row.trash_empty'),
+                    Icon: Trash2,
+                    danger: true,
+                    separatorBefore: true,
+                });
+            }
+            return items;
+        }
         const items: MenuAction[] = [];
         if (file.isFile && isImageName(file.name)) {
             items.push({ key: 'preview', label: t('files.row.preview'), Icon: Eye });
@@ -226,6 +280,9 @@ export function FileRow({
         if (file.isFile && canDownload) {
             items.push({ key: 'hash', label: t('files.row.hash'), Icon: Fingerprint });
         }
+        if (canBrowseArchive) {
+            items.push({ key: 'browse-archive', label: t('files.row.browse_archive'), Icon: PackageSearch });
+        }
         if (file.isFile && isDecompressibleArchiveFileName(file.name) && canEdit) {
             items.push({ key: 'decompress', label: t('files.row.extract'), Icon: Archive });
         }
@@ -243,14 +300,20 @@ export function FileRow({
             });
         }
         return items;
-    }, [file, canEdit, canDelete, canDownload, t]);
+    }, [file, canEdit, canDelete, canDownload, t, canBrowseArchive, virtualTrash]);
 
     const handleRowClick = (e: React.MouseEvent) => {
         if (onRowClick?.(file, e)) {
             return;
         }
+        if (virtualTrash) {
+            onNavigate(file.name);
+            return;
+        }
         if (!file.isFile) {
             onNavigate(file.name);
+        } else if (canBrowseArchive) {
+            onAction('browse-archive', file);
         } else if (isEditableFile(file.size, file.name) && canEdit) {
             onAction('edit', file);
         } else if (isImageName(file.name)) {
@@ -266,7 +329,7 @@ export function FileRow({
         setContextMenu({ x: e.clientX, y: e.clientY });
     };
 
-    const isFolderDropTarget = !file.isFile && canEdit && !!onDropFiles;
+    const isFolderDropTarget = !virtualTrash && !file.isFile && !!onDropFiles && (canEdit || acceptArchiveExtract);
 
     const handleDragStart = (e: React.DragEvent) => {
         if (!onDragStart) {
@@ -282,10 +345,14 @@ export function FileRow({
         onDragEnd?.(file, e);
     };
 
-    const isInternalDrag = (e: React.DragEvent) => e.dataTransfer.types.includes(DRAG_MIME);
+    const acceptsFolderDrop = (e: React.DragEvent) => {
+        if (canEdit && e.dataTransfer.types.includes(DRAG_MIME)) return true;
+        if (acceptArchiveExtract && e.dataTransfer.types.includes(ARCHIVE_EXTRACT_DRAG_MIME)) return true;
+        return false;
+    };
 
     const handleDragEnter = (e: React.DragEvent) => {
-        if (!isFolderDropTarget || !isInternalDrag(e)) return;
+        if (!isFolderDropTarget || !acceptsFolderDrop(e)) return;
         e.preventDefault();
         e.stopPropagation();
         dragCounterRef.current += 1;
@@ -293,14 +360,19 @@ export function FileRow({
     };
 
     const handleDragOver = (e: React.DragEvent) => {
-        if (!isFolderDropTarget || !isInternalDrag(e)) return;
+        if (!isFolderDropTarget || !acceptsFolderDrop(e)) return;
         e.preventDefault();
         e.stopPropagation();
-        e.dataTransfer.dropEffect = isDragging ? 'none' : 'move';
+        const archiveDrag = acceptArchiveExtract && e.dataTransfer.types.includes(ARCHIVE_EXTRACT_DRAG_MIME);
+        if (archiveDrag) {
+            e.dataTransfer.dropEffect = 'copy';
+        } else {
+            e.dataTransfer.dropEffect = isDragging ? 'none' : 'move';
+        }
     };
 
     const handleDragLeave = (e: React.DragEvent) => {
-        if (!isFolderDropTarget || !isInternalDrag(e)) return;
+        if (!isFolderDropTarget || !acceptsFolderDrop(e)) return;
         e.preventDefault();
         e.stopPropagation();
         dragCounterRef.current = Math.max(0, dragCounterRef.current - 1);
@@ -310,19 +382,20 @@ export function FileRow({
     };
 
     const handleDrop = (e: React.DragEvent) => {
-        if (!isFolderDropTarget || !isInternalDrag(e)) return;
+        if (!isFolderDropTarget || !acceptsFolderDrop(e)) return;
         e.preventDefault();
         e.stopPropagation();
         dragCounterRef.current = 0;
         setIsDropTarget(false);
-        if (isDragging) return;
+        const archiveDrag = acceptArchiveExtract && e.dataTransfer.types.includes(ARCHIVE_EXTRACT_DRAG_MIME);
+        if (!archiveDrag && isDragging) return;
         onDropFiles?.(file, e);
     };
 
     return (
         <div
             ref={rowRef}
-            draggable={!!onDragStart}
+            draggable={!virtualTrash && !!onDragStart}
             onDragStart={handleDragStart}
             onDragEnd={handleDragEnd}
             onDragEnter={handleDragEnter}
@@ -339,124 +412,168 @@ export function FileRow({
             )}
             onClick={handleRowClick}
         >
-            <div className='pointer-events-none flex min-w-0 flex-1 items-center gap-3'>
-                <div className='pointer-events-auto' onClick={(e) => e.stopPropagation()}>
-                    <Checkbox
-                        checked={selected}
-                        onCheckedChange={() => onSelect(file.name)}
-                        className='border-primary/50 data-[state=checked]:bg-primary data-[state=checked]:border-primary'
-                    />
-                </div>
+            <div className='pointer-events-auto shrink-0' onClick={(e) => e.stopPropagation()}>
+                <Checkbox
+                    checked={selected}
+                    disabled={virtualTrash}
+                    onCheckedChange={() => onSelect(file.name)}
+                    className='border-primary/50 data-[state=checked]:bg-primary data-[state=checked]:border-primary disabled:cursor-not-allowed disabled:opacity-40'
+                />
+            </div>
 
-                <div
-                    className={cn(
-                        'flex h-9 w-9 shrink-0 items-center justify-center rounded-lg border border-white/5 transition-all group-hover:scale-110',
-                        file.isFile
-                            ? 'bg-gray-100 text-gray-500 dark:bg-white/5 dark:text-gray-400'
-                            : 'bg-amber-500/10 text-amber-500',
-                    )}
-                >
-                    {file.isFile ? (
-                        isImageName(file.name) ? (
-                            <Eye className='h-4.5 w-4.5' />
-                        ) : (
-                            <FileText className='h-4.5 w-4.5' />
-                        )
+            <div
+                className={cn(
+                    'flex h-9 w-9 shrink-0 items-center justify-center rounded-lg border border-white/5 transition-all group-hover:scale-110',
+                    virtualTrash
+                        ? 'border-primary/20 bg-primary/10 text-primary'
+                        : file.isFile
+                          ? 'bg-gray-100 text-gray-500 dark:bg-white/5 dark:text-gray-400'
+                          : 'bg-amber-500/10 text-amber-500',
+                )}
+            >
+                {virtualTrash ? (
+                    <Trash2 className='h-4.5 w-4.5' />
+                ) : file.isFile ? (
+                    isImageName(file.name) ? (
+                        <Eye className='h-4.5 w-4.5' />
+                    ) : canBrowseArchive ? (
+                        <Archive className='h-4.5 w-4.5' />
                     ) : (
-                        <Folder className='h-4.5 w-4.5 fill-amber-500/10' />
-                    )}
-                </div>
+                        <FileText className='h-4.5 w-4.5' />
+                    )
+                ) : (
+                    <Folder className='h-4.5 w-4.5 fill-amber-500/10' />
+                )}
+            </div>
 
-                <div className='pointer-events-auto flex-1 overflow-hidden'>
-                    {(() => {
-                        const fullPath = currentDirectory.endsWith('/')
-                            ? `${currentDirectory}${file.name}`
-                            : `${currentDirectory}/${file.name}`;
-
-                        if (!file.isFile) {
-                            return (
-                                <Link
-                                    href={`?path=${encodeURIComponent(fullPath)}`}
-                                    className='text-primary block truncate text-sm font-semibold'
-                                    onClick={(e) => {
-                                        if (onRowClick?.(file, e)) {
-                                            e.preventDefault();
-                                            return;
-                                        }
+            <div className='pointer-events-auto min-w-0 flex-1 overflow-hidden'>
+                {(() => {
+                    const fullPath = currentDirectory.endsWith('/')
+                        ? `${currentDirectory}${file.name}`
+                        : `${currentDirectory}/${file.name}`;
+
+                    if (virtualTrash) {
+                        return (
+                            <Link
+                                href={`/server/${serverUuid}/files/trash`}
+                                className='text-primary block truncate text-sm font-semibold'
+                                onClick={(e) => {
+                                    if (onRowClick?.(file, e)) {
                                         e.preventDefault();
-                                        onNavigate(file.name);
-                                    }}
-                                >
-                                    {file.name}
-                                </Link>
-                            );
-                        } else if (isEditableFile(file.size, file.name) && canEdit) {
-                            return (
-                                <Link
-                                    href={`/server/${serverUuid}/files/edit?file=${encodeURIComponent(file.name)}&directory=${encodeURIComponent(currentDirectory || '/')}`}
-                                    className='text-primary block truncate text-sm font-semibold'
-                                    onClick={(e) => {
-                                        if (onRowClick?.(file, e)) {
-                                            e.preventDefault();
-                                        }
-                                    }}
-                                >
-                                    {file.name}
-                                </Link>
-                            );
-                        } else if (isImageName(file.name)) {
-                            return (
-                                <button
-                                    onClick={(e) => {
-                                        if (onRowClick?.(file, e)) {
-                                            e.preventDefault();
-                                            e.stopPropagation();
-                                            return;
-                                        }
+                                        return;
+                                    }
+                                    e.preventDefault();
+                                    onNavigate(file.name);
+                                }}
+                            >
+                                {file.name}
+                            </Link>
+                        );
+                    }
+
+                    if (!file.isFile) {
+                        return (
+                            <Link
+                                href={`?path=${encodeURIComponent(fullPath)}`}
+                                className='text-primary block truncate text-sm font-semibold'
+                                onClick={(e) => {
+                                    if (onRowClick?.(file, e)) {
+                                        e.preventDefault();
+                                        return;
+                                    }
+                                    e.preventDefault();
+                                    onNavigate(file.name);
+                                }}
+                            >
+                                {file.name}
+                            </Link>
+                        );
+                    } else if (isEditableFile(file.size, file.name) && canEdit) {
+                        return (
+                            <Link
+                                href={`/server/${serverUuid}/files/edit?file=${encodeURIComponent(file.name)}&directory=${encodeURIComponent(currentDirectory || '/')}`}
+                                className='text-primary block truncate text-sm font-semibold'
+                                onClick={(e) => {
+                                    if (onRowClick?.(file, e)) {
+                                        e.preventDefault();
+                                    }
+                                }}
+                            >
+                                {file.name}
+                            </Link>
+                        );
+                    } else if (isImageName(file.name)) {
+                        return (
+                            <button
+                                onClick={(e) => {
+                                    if (onRowClick?.(file, e)) {
                                         e.preventDefault();
                                         e.stopPropagation();
-                                        onAction('preview', file);
-                                    }}
-                                    className='text-primary block w-full truncate text-left text-sm font-semibold'
-                                >
-                                    {file.name}
-                                </button>
-                            );
-                        } else {
-                            return (
-                                <span
-                                    className='text-primary block cursor-default truncate text-sm font-semibold opacity-90'
-                                    onClick={(e) => e.stopPropagation()}
-                                    title={t('files.row.cant_preview')}
-                                >
-                                    {file.name}
-                                </span>
-                            );
-                        }
-                    })()}
-                    <div className='text-muted-foreground flex items-center gap-2 text-[10px] font-medium tracking-wider uppercase sm:hidden'>
-                        <span>{file.isFile ? formatFileSize(file.size) : t('files.row.folder_label')}</span>
-                        <span className='opacity-30'>•</span>
-                        <span>{formatDate(file.modified_at)}</span>
-                    </div>
+                                        return;
+                                    }
+                                    e.preventDefault();
+                                    e.stopPropagation();
+                                    onAction('preview', file);
+                                }}
+                                className='text-primary block w-full truncate text-left text-sm font-semibold'
+                            >
+                                {file.name}
+                            </button>
+                        );
+                    } else if (canBrowseArchive) {
+                        return (
+                            <button
+                                type='button'
+                                onClick={(e) => {
+                                    if (onRowClick?.(file, e)) {
+                                        e.preventDefault();
+                                        e.stopPropagation();
+                                        return;
+                                    }
+                                    e.preventDefault();
+                                    e.stopPropagation();
+                                    onAction('browse-archive', file);
+                                }}
+                                className='text-primary block w-full truncate text-left text-sm font-semibold'
+                            >
+                                {file.name}
+                            </button>
+                        );
+                    } else {
+                        return (
+                            <span
+                                className='text-primary block cursor-default truncate text-sm font-semibold opacity-90'
+                                onClick={(e) => e.stopPropagation()}
+                                title={t('files.row.cant_preview')}
+                            >
+                                {file.name}
+                            </span>
+                        );
+                    }
+                })()}
+                <div className='text-muted-foreground flex items-center gap-2 text-[10px] font-medium tracking-wider uppercase sm:hidden'>
+                    <span>{formatListEntrySizeMobile(file, t('files.row.folder_label'))}</span>
+                    <span className='opacity-30'>•</span>
+                    <span title={modifiedTitle}>{modifiedRelative}</span>
                 </div>
             </div>
 
             <div
-                className='text-muted-foreground hidden w-32 px-4 text-xs font-semibold sm:block'
+                className='text-muted-foreground hidden w-[5.5rem] shrink-0 text-right text-xs font-semibold tabular-nums sm:block'
                 style={{ opacity: 0.8 }}
             >
-                {file.isFile ? formatFileSize(file.size) : '-'}
+                {formatListEntrySize(file)}
             </div>
 
             <div
-                className='text-muted-foreground hidden w-48 px-4 text-xs font-semibold sm:block'
+                className='text-muted-foreground hidden w-[9rem] shrink-0 truncate text-right text-xs font-semibold sm:block'
                 style={{ opacity: 0.8 }}
+                title={modifiedTitle}
             >
-                {formatDate(file.modified_at)}
+                {modifiedRelative}
             </div>
 
-            <div className='flex w-10 justify-end'>
+            <div className='flex w-9 shrink-0 justify-end'>
                 <DropdownMenu>
                     <DropdownMenuTrigger
                         as={Button}
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/ArchiveBrowseDialog.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/ArchiveBrowseDialog.tsx
new file mode 100644
index 000000000..a99d27c96
--- /dev/null
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/ArchiveBrowseDialog.tsx
@@ -0,0 +1,327 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+'use client';
+
+import { useEffect, useState, type DragEvent } from 'react';
+import {
+    ARCHIVE_EXTRACT_DRAG_MIME,
+    filesApi,
+    type ArchiveExtractDragPayload,
+    type ArchiveListEntry,
+} from '@/lib/files-api';
+import { Button } from '@/components/featherui/Button';
+import { useTranslation } from '@/contexts/TranslationContext';
+import { formatFileSize } from '@/lib/utils';
+import { Archive, ChevronLeft, File as FileIcon, Folder, GripVertical, X } from 'lucide-react';
+import { toast } from 'sonner';
+import { cn } from '@/lib/utils';
+
+export interface ArchiveBrowsePanelProps {
+    open: boolean;
+    onOpenChange: (open: boolean) => void;
+    uuid: string;
+    /** Server file-manager directory containing the archive */
+    serverDirectory: string;
+    /** Archive file name only (e.g. backup.zip) */
+    archiveFileName: string;
+    /** When true, rows are draggable into the file manager and full extract is available */
+    canExtract?: boolean;
+    /** Extract selected archive entries into an absolute destination path in the server file manager. */
+    onExtractEntries?: (entries: string[], destinationPath: string) => void;
+    /** Called after a successful full-archive extract (decompress) */
+    onExtractComplete?: () => void;
+}
+
+export function ArchiveBrowsePanel({
+    open,
+    onOpenChange,
+    uuid,
+    serverDirectory,
+    archiveFileName,
+    canExtract = false,
+    onExtractEntries,
+    onExtractComplete,
+}: ArchiveBrowsePanelProps) {
+    const { t } = useTranslation();
+    const [innerPath, setInnerPath] = useState('');
+    const [entries, setEntries] = useState<ArchiveListEntry[]>([]);
+    const [truncated, setTruncated] = useState(false);
+    const [loading, setLoading] = useState(false);
+    const [fullExtracting, setFullExtracting] = useState(false);
+
+    useEffect(() => {
+        let cancelled = false;
+        (async () => {
+            if (!open || !archiveFileName) return;
+            setLoading(true);
+            try {
+                const data = await filesApi.listArchiveDirectory(
+                    uuid,
+                    serverDirectory || '/',
+                    archiveFileName,
+                    innerPath,
+                );
+                if (!cancelled) {
+                    setEntries(data.contents);
+                    setTruncated(data.truncated);
+                }
+            } catch {
+                if (!cancelled) {
+                    toast.error(t('files.archive_browser.error'));
+                    setEntries([]);
+                    setTruncated(false);
+                    onOpenChange(false);
+                }
+            } finally {
+                if (!cancelled) {
+                    setLoading(false);
+                }
+            }
+        })();
+        return () => {
+            cancelled = true;
+        };
+    }, [archiveFileName, innerPath, onOpenChange, open, serverDirectory, t, uuid]);
+
+    useEffect(() => {
+        if (open) {
+            setInnerPath('');
+        }
+    }, [open, archiveFileName]);
+
+    const goUp = () => {
+        if (!innerPath) return;
+        const parts = innerPath.split('/').filter(Boolean);
+        parts.pop();
+        setInnerPath(parts.join('/'));
+    };
+
+    const titlePath = innerPath ? `${archiveFileName} / ${innerPath}` : archiveFileName;
+
+    const extractEntry = (entryPath: string, destinationPath: string) => {
+        if (!canExtract || !onExtractEntries) return;
+        onExtractEntries([entryPath], destinationPath);
+    };
+
+    const handleArchiveEntryDragStart = (e: DragEvent, entryPath: string) => {
+        if (!canExtract) {
+            e.preventDefault();
+            return;
+        }
+        const payload: ArchiveExtractDragPayload = {
+            root: serverDirectory || '/',
+            file: archiveFileName,
+            entries: [entryPath],
+        };
+        try {
+            e.dataTransfer.setData(ARCHIVE_EXTRACT_DRAG_MIME, JSON.stringify(payload));
+            e.dataTransfer.setData('text/plain', entryPath);
+            e.dataTransfer.effectAllowed = 'copy';
+        } catch {
+            e.preventDefault();
+        }
+    };
+
+    const close = () => onOpenChange(false);
+
+    const handleExtractEntireArchive = async () => {
+        if (!canExtract || !archiveFileName) return;
+        const toastId = toast.loading(t('files.messages.extracting'));
+        setFullExtracting(true);
+        try {
+            await filesApi.decompressFile(uuid, serverDirectory || '/', archiveFileName);
+            toast.success(t('files.messages.extracted'), { id: toastId });
+            onExtractComplete?.();
+            onOpenChange(false);
+        } catch (error) {
+            const err = error as { response?: { data?: { error?: string } } };
+            const errorMessage = err.response?.data?.error || t('files.messages.extract_failed');
+            toast.error(errorMessage, { id: toastId });
+        } finally {
+            setFullExtracting(false);
+        }
+    };
+
+    if (!open || !archiveFileName) return null;
+
+    return (
+        <section className='border-primary/20 bg-card/70 animate-in fade-in slide-in-from-top-2 overflow-hidden rounded-3xl border shadow-sm backdrop-blur-xl'>
+            <div className='border-border/60 flex flex-col gap-4 border-b p-5 lg:flex-row lg:items-start lg:justify-between'>
+                <div className='flex min-w-0 gap-4'>
+                    <div className='bg-primary/10 text-primary flex h-12 w-12 shrink-0 items-center justify-center rounded-2xl'>
+                        <Archive className='h-6 w-6' />
+                    </div>
+                    <div className='min-w-0 space-y-1'>
+                        <h3 className='text-lg font-bold'>{t('files.archive_browser.title')}</h3>
+                        <p className='text-muted-foreground font-mono text-xs break-all' title={titlePath}>
+                            {titlePath}
+                        </p>
+                        {canExtract ? (
+                            <p className='text-muted-foreground max-w-3xl text-xs leading-relaxed'>
+                                {t('files.archive_browser.drag_hint')}
+                            </p>
+                        ) : null}
+                    </div>
+                </div>
+
+                <div className='flex shrink-0 flex-wrap items-center gap-2'>
+                    <Button
+                        type='button'
+                        variant='outline'
+                        size='sm'
+                        disabled={!innerPath || loading}
+                        onClick={goUp}
+                        className='gap-1'
+                    >
+                        <ChevronLeft className='h-4 w-4' />
+                        {t('files.archive_browser.up')}
+                    </Button>
+                    {canExtract ? (
+                        <Button
+                            type='button'
+                            variant='outline'
+                            size='sm'
+                            disabled={fullExtracting || !archiveFileName}
+                            onClick={() => void handleExtractEntireArchive()}
+                        >
+                            {fullExtracting
+                                ? t('files.archive_browser.extract_full_loading')
+                                : t('files.archive_browser.extract_full')}
+                        </Button>
+                    ) : null}
+                    <Button type='button' variant='ghost' size='sm' onClick={close} className='gap-1'>
+                        <X className='h-4 w-4' />
+                        {t('files.archive_browser.close')}
+                    </Button>
+                </div>
+            </div>
+
+            <div className='p-5'>
+                <div className='border-border bg-muted/25 max-h-[60vh] min-h-[320px] overflow-y-auto rounded-2xl border text-sm'>
+                    {loading ? (
+                        <div className='text-muted-foreground p-4'>{t('files.archive_browser.loading')}</div>
+                    ) : entries.length === 0 ? (
+                        <div className='text-muted-foreground p-4'>{t('files.archive_browser.empty')}</div>
+                    ) : (
+                        <ul className='divide-border divide-y'>
+                            {entries.map((entry) => (
+                                <li key={entry.path}>
+                                    {entry.directory ? (
+                                        <div className='hover:bg-muted/50 flex w-full items-stretch'>
+                                            <button
+                                                type='button'
+                                                className='hover:bg-muted/60 flex min-w-0 flex-1 items-center gap-3 px-4 py-3 text-left'
+                                                onClick={() => setInnerPath(entry.path)}
+                                            >
+                                                <Folder className='text-primary h-4 w-4 shrink-0' />
+                                                <span className='min-w-0 flex-1 truncate font-medium'>
+                                                    {entry.name}
+                                                </span>
+                                            </button>
+                                            {canExtract ? (
+                                                <div className='border-border flex shrink-0 items-center gap-2 border-l px-2'>
+                                                    <Button
+                                                        type='button'
+                                                        variant='ghost'
+                                                        size='sm'
+                                                        onClick={() => extractEntry(entry.path, serverDirectory || '/')}
+                                                        className='h-8 px-2 text-xs'
+                                                    >
+                                                        {t('files.archive_browser.extract_here')}
+                                                    </Button>
+                                                    <Button
+                                                        type='button'
+                                                        variant='ghost'
+                                                        size='sm'
+                                                        onClick={() => extractEntry(entry.path, '/')}
+                                                        className='h-8 px-2 text-xs'
+                                                    >
+                                                        {t('files.archive_browser.extract_root')}
+                                                    </Button>
+                                                    <div
+                                                        draggable
+                                                        onDragStart={(event) =>
+                                                            handleArchiveEntryDragStart(event, entry.path)
+                                                        }
+                                                        className='text-muted-foreground hover:text-foreground hover:bg-muted/80 flex cursor-grab items-center rounded-md px-2 py-1.5 active:cursor-grabbing'
+                                                        title={t('files.archive_browser.drag_handle')}
+                                                    >
+                                                        <GripVertical className='h-4 w-4' />
+                                                    </div>
+                                                </div>
+                                            ) : null}
+                                        </div>
+                                    ) : (
+                                        <div
+                                            draggable={canExtract}
+                                            onDragStart={
+                                                canExtract
+                                                    ? (event) => handleArchiveEntryDragStart(event, entry.path)
+                                                    : undefined
+                                            }
+                                            className={cn(
+                                                'flex items-center gap-3 px-4 py-3',
+                                                canExtract && 'cursor-grab active:cursor-grabbing',
+                                            )}
+                                        >
+                                            {canExtract ? (
+                                                <GripVertical className='text-muted-foreground h-4 w-4 shrink-0' />
+                                            ) : (
+                                                <FileIcon className='text-muted-foreground h-4 w-4 shrink-0' />
+                                            )}
+                                            <span className='min-w-0 flex-1 truncate'>{entry.name}</span>
+                                            <span className='text-muted-foreground shrink-0 tabular-nums'>
+                                                {formatFileSize(entry.size)}
+                                            </span>
+                                            {canExtract ? (
+                                                <div className='flex shrink-0 items-center gap-2'>
+                                                    <Button
+                                                        type='button'
+                                                        variant='ghost'
+                                                        size='sm'
+                                                        onClick={() => extractEntry(entry.path, serverDirectory || '/')}
+                                                        className='h-8 px-2 text-xs'
+                                                    >
+                                                        {t('files.archive_browser.extract_here')}
+                                                    </Button>
+                                                    <Button
+                                                        type='button'
+                                                        variant='ghost'
+                                                        size='sm'
+                                                        onClick={() => extractEntry(entry.path, '/')}
+                                                        className='h-8 px-2 text-xs'
+                                                    >
+                                                        {t('files.archive_browser.extract_root')}
+                                                    </Button>
+                                                </div>
+                                            ) : null}
+                                        </div>
+                                    )}
+                                </li>
+                            ))}
+                        </ul>
+                    )}
+                </div>
+
+                {truncated ? (
+                    <p className='text-muted-foreground mt-3 text-xs'>{t('files.archive_browser.truncated')}</p>
+                ) : null}
+            </div>
+        </section>
+    );
+}
+
+export const ArchiveBrowseDialog = ArchiveBrowsePanel;
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/DeleteDialog.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/DeleteDialog.tsx
index 230bb2188..f9cbe284b 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/DeleteDialog.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/DeleteDialog.tsx
@@ -13,7 +13,7 @@ by the Free Software Foundation, either version 3 of the License, or
 See the LICENSE file or <https://www.gnu.org/licenses/>.
 */
 
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { Button } from '@/components/featherui/Button';
 import {
     Dialog,
@@ -24,7 +24,12 @@ import {
     DialogTitle,
 } from '@/components/ui/dialog';
 import { filesApi } from '@/lib/files-api';
+import { filterFeatherTrashNames } from '@/lib/feather-trash';
 import { useTranslation } from '@/contexts/TranslationContext';
+import { useSettings } from '@/contexts/SettingsContext';
+import { isEnabled } from '@/lib/utils';
+import { toast } from 'sonner';
+import { Trash2 } from 'lucide-react';
 
 interface DeleteDialogProps {
     open: boolean;
@@ -35,44 +40,104 @@ interface DeleteDialogProps {
     onSuccess: () => void;
 }
 
+function DeleteFileList({ files }: { files: string[] }) {
+    if (files.length === 0) return null;
+    return (
+        <div className='border-border bg-muted/40 max-h-36 overflow-y-auto rounded-lg border p-3'>
+            <ul className='space-y-1'>
+                {files.map((f) => (
+                    <li key={f} className='text-foreground truncate font-mono text-xs'>
+                        {f}
+                    </li>
+                ))}
+            </ul>
+        </div>
+    );
+}
+
 export function DeleteDialog({ open, onOpenChange, uuid, root, files, onSuccess }: DeleteDialogProps) {
     const { t } = useTranslation();
+    const { settings } = useSettings();
     const [loading, setLoading] = useState(false);
 
-    const handleDelete = async () => {
+    const trashEnabled = isEnabled(settings?.file_trash_enabled);
+    const safeFiles = useMemo(() => filterFeatherTrashNames(files), [files]);
+
+    const handleClose = (next: boolean) => {
+        if (!loading) onOpenChange(next);
+    };
+
+    const handleDelete = async (permanent: boolean) => {
+        if (safeFiles.length === 0) {
+            toast.error(t('files.messages.delete_failed'));
+            return;
+        }
         setLoading(true);
         try {
-            await filesApi.deleteFiles(uuid, root, files);
+            await filesApi.deleteFiles(uuid, root, safeFiles, permanent);
+            toast.success(
+                trashEnabled && !permanent ? t('files.messages.moved_to_trash') : t('files.messages.deleted'),
+            );
             onSuccess();
             onOpenChange(false);
         } catch (error) {
             console.error(error);
+            toast.error(t('files.messages.delete_failed'));
         } finally {
             setLoading(false);
         }
     };
 
+    if (trashEnabled) {
+        return (
+            <Dialog open={open} onOpenChange={handleClose}>
+                <DialogContent className='sm:max-w-md'>
+                    <DialogHeader>
+                        <DialogTitle>{t('files.dialogs.delete.title_trash')}</DialogTitle>
+                        <DialogDescription>
+                            {t('files.dialogs.delete.description_trash', { count: String(safeFiles.length) })}
+                        </DialogDescription>
+                    </DialogHeader>
+                    <DeleteFileList files={safeFiles} />
+                    <DialogFooter className='gap-2 sm:gap-0'>
+                        <Button variant='ghost' onClick={() => handleClose(false)} disabled={loading}>
+                            {t('files.dialogs.delete.cancel')}
+                        </Button>
+                        <Button
+                            variant='ghost'
+                            className='text-destructive hover:bg-destructive/10 hover:text-destructive'
+                            onClick={() => handleDelete(true)}
+                            disabled={loading}
+                        >
+                            {t('files.dialogs.delete.delete_permanent_short')}
+                        </Button>
+                        <Button onClick={() => handleDelete(false)} disabled={loading}>
+                            {loading
+                                ? t('files.dialogs.delete.moving_to_trash')
+                                : t('files.dialogs.delete.move_to_trash')}
+                        </Button>
+                    </DialogFooter>
+                </DialogContent>
+            </Dialog>
+        );
+    }
+
     return (
-        <Dialog open={open} onOpenChange={onOpenChange}>
-            <DialogContent>
+        <Dialog open={open} onOpenChange={handleClose}>
+            <DialogContent className='sm:max-w-md'>
                 <DialogHeader>
                     <DialogTitle>{t('files.dialogs.delete.title')}</DialogTitle>
-                    <DialogDescription className='text-destructive'>
-                        {t('files.dialogs.delete.description', { count: String(files.length) })}
+                    <DialogDescription>
+                        {t('files.dialogs.delete.description', { count: String(safeFiles.length) })}
                     </DialogDescription>
                 </DialogHeader>
-                <div className='bg-muted/50 text-muted-foreground max-h-32 overflow-y-auto rounded p-2 text-sm'>
-                    <ul className='list-inside list-disc'>
-                        {files.map((f) => (
-                            <li key={f}>{f}</li>
-                        ))}
-                    </ul>
-                </div>
-                <DialogFooter>
-                    <Button variant='ghost' onClick={() => onOpenChange(false)} disabled={loading}>
+                <DeleteFileList files={safeFiles} />
+                <DialogFooter className='gap-2 sm:gap-0'>
+                    <Button variant='ghost' onClick={() => handleClose(false)} disabled={loading}>
                         {t('files.dialogs.delete.cancel')}
                     </Button>
-                    <Button variant='destructive' onClick={handleDelete} disabled={loading}>
+                    <Button variant='destructive' onClick={() => handleDelete(true)} disabled={loading}>
+                        <Trash2 className='mr-2 h-4 w-4' />
                         {loading ? t('files.dialogs.delete.deleting') : t('files.dialogs.delete.delete')}
                     </Button>
                 </DialogFooter>
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/EmptyTrashDialog.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/EmptyTrashDialog.tsx
new file mode 100644
index 000000000..80afc69ad
--- /dev/null
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/EmptyTrashDialog.tsx
@@ -0,0 +1,68 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+import { Button } from '@/components/featherui/Button';
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+} from '@/components/ui/dialog';
+import { useTranslation } from '@/contexts/TranslationContext';
+import { Trash2 } from 'lucide-react';
+
+interface EmptyTrashDialogProps {
+    open: boolean;
+    onOpenChange: (open: boolean) => void;
+    onConfirm: () => void;
+    loading?: boolean;
+    disabled?: boolean;
+}
+
+export function EmptyTrashDialog({
+    open,
+    onOpenChange,
+    onConfirm,
+    loading = false,
+    disabled = false,
+}: EmptyTrashDialogProps) {
+    const { t } = useTranslation();
+
+    const handleClose = (next: boolean) => {
+        if (!loading) onOpenChange(next);
+    };
+
+    return (
+        <Dialog open={open} onOpenChange={handleClose}>
+            <DialogContent className='sm:max-w-md'>
+                <DialogHeader>
+                    <DialogTitle>{t('files.trash.empty_dialog.title')}</DialogTitle>
+                    <DialogDescription>{t('files.trash.empty_dialog.description')}</DialogDescription>
+                </DialogHeader>
+                <DialogFooter className='gap-2 sm:gap-0'>
+                    <Button variant='ghost' onClick={() => handleClose(false)} disabled={loading}>
+                        {t('files.trash.empty_dialog.cancel')}
+                    </Button>
+                    <Button variant='destructive' onClick={onConfirm} disabled={loading || disabled}>
+                        <Trash2 className='mr-2 h-4 w-4' />
+                        {loading ? t('files.trash.empty_dialog.confirming') : t('files.trash.empty_dialog.confirm')}
+                    </Button>
+                </DialogFooter>
+            </DialogContent>
+        </Dialog>
+    );
+}
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/RestoreTrashDialog.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/RestoreTrashDialog.tsx
new file mode 100644
index 000000000..06acbe0cd
--- /dev/null
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/RestoreTrashDialog.tsx
@@ -0,0 +1,86 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+import { useState } from 'react';
+import { Button } from '@/components/featherui/Button';
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+} from '@/components/ui/dialog';
+import { useTranslation } from '@/contexts/TranslationContext';
+import { ArchiveRestore } from 'lucide-react';
+
+interface RestoreTrashDialogProps {
+    open: boolean;
+    onOpenChange: (open: boolean) => void;
+    count: number;
+    onConfirm: (overwrite: boolean) => void;
+    loading?: boolean;
+}
+
+export function RestoreTrashDialog({ open, onOpenChange, count, onConfirm, loading = false }: RestoreTrashDialogProps) {
+    const { t } = useTranslation();
+    const [overwrite, setOverwrite] = useState(false);
+
+    const handleClose = (next: boolean) => {
+        if (!loading) {
+            if (!next) setOverwrite(false);
+            onOpenChange(next);
+        }
+    };
+
+    return (
+        <Dialog open={open} onOpenChange={handleClose}>
+            <DialogContent className='sm:max-w-md'>
+                <DialogHeader>
+                    <DialogTitle>{t('files.trash.restore_dialog.title')}</DialogTitle>
+                    <DialogDescription>
+                        {t('files.trash.restore_dialog.description', { count: String(count) })}
+                    </DialogDescription>
+                </DialogHeader>
+                <label className='flex cursor-pointer items-start gap-3 rounded-lg border border-black/5 p-3 dark:border-white/10'>
+                    <input
+                        type='checkbox'
+                        className='mt-0.5'
+                        checked={overwrite}
+                        onChange={(e) => setOverwrite(e.target.checked)}
+                        disabled={loading}
+                    />
+                    <span className='text-sm'>
+                        <span className='text-foreground font-medium'>
+                            {t('files.trash.restore_dialog.overwrite_label')}
+                        </span>
+                        <span className='text-muted-foreground mt-1 block text-xs'>
+                            {t('files.trash.restore_dialog.overwrite_hint')}
+                        </span>
+                    </span>
+                </label>
+                <DialogFooter className='gap-2 sm:gap-0'>
+                    <Button variant='ghost' onClick={() => handleClose(false)} disabled={loading}>
+                        {t('files.trash.restore_dialog.cancel')}
+                    </Button>
+                    <Button onClick={() => onConfirm(overwrite)} disabled={loading}>
+                        <ArchiveRestore className='mr-2 h-4 w-4' />
+                        {loading ? t('files.trash.restore_dialog.confirming') : t('files.trash.restore_dialog.confirm')}
+                    </Button>
+                </DialogFooter>
+            </DialogContent>
+        </Dialog>
+    );
+}
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/index.ts b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/index.ts
index dda3fef55..e262b15fb 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/index.ts
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/dialogs/index.ts
@@ -16,6 +16,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 export * from './CreateFolderDialog';
 export * from './CreateFileDialog';
 export * from './DeleteDialog';
+export * from './EmptyTrashDialog';
 export * from './RenameDialog';
 export * from './ImagePreviewDialog';
 export * from './PermissionsDialog';
@@ -25,3 +26,4 @@ export * from './WipeAllDialog';
 export * from './IgnoredContentDialog';
 export * from './CompressDialog';
 export * from './FileHashDialog';
+export * from './ArchiveBrowseDialog';
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/trash/TrashActionToolbar.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/trash/TrashActionToolbar.tsx
new file mode 100644
index 000000000..c1051c6a8
--- /dev/null
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/trash/TrashActionToolbar.tsx
@@ -0,0 +1,145 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+import Link from 'next/link';
+import { Button } from '@/components/featherui/Button';
+import { useTranslation } from '@/contexts/TranslationContext';
+import { cn } from '@/lib/utils';
+import { ArchiveRestore, ArrowLeft, RefreshCw, Trash2 } from 'lucide-react';
+
+interface TrashActionToolbarProps {
+    serverUuid: string;
+    loading: boolean;
+    selectedCount: number;
+    canUpdate: boolean;
+    canDelete: boolean;
+    hasEntries: boolean;
+    busy: boolean;
+    onRefresh: () => void;
+    onClearSelection: () => void;
+    onRestore: () => void;
+    onDeletePermanent: () => void;
+    onEmpty: () => void;
+}
+
+export function TrashActionToolbar({
+    serverUuid,
+    loading,
+    selectedCount,
+    canUpdate,
+    canDelete,
+    hasEntries,
+    busy,
+    onRefresh,
+    onClearSelection,
+    onRestore,
+    onDeletePermanent,
+    onEmpty,
+}: TrashActionToolbarProps) {
+    const { t } = useTranslation();
+    const hasSelection = selectedCount > 0;
+
+    return (
+        <div className='sticky top-0 z-20 pb-4'>
+            <div className='flex flex-col gap-4 rounded-xl border border-black/5 bg-white/80 p-2 backdrop-blur-xl transition-all duration-300 sm:flex-row sm:items-center sm:justify-between dark:border-white/10 dark:bg-white/5'>
+                {hasSelection ? (
+                    <>
+                        <div className='flex items-center gap-3 px-2'>
+                            <div className='bg-primary/10 text-primary animate-in zoom-in-50 flex h-8 w-8 items-center justify-center rounded-lg duration-300'>
+                                <span className='text-xs font-bold'>{selectedCount}</span>
+                            </div>
+                            <span className='text-muted-foreground xs:inline hidden text-sm font-medium'>
+                                {t('files.toolbar.selected')}
+                            </span>
+                            <div className='bg-border xs:block mx-1 hidden h-4 w-px' />
+                            <Button
+                                variant='ghost'
+                                size='sm'
+                                onClick={onClearSelection}
+                                className='text-muted-foreground hover:text-foreground h-8 px-3 text-xs font-bold tracking-wider uppercase'
+                            >
+                                {t('files.toolbar.cancel')}
+                            </Button>
+                        </div>
+                        <div className='no-scrollbar flex items-center gap-1.5 overflow-x-auto pl-2'>
+                            {canUpdate && (
+                                <Button
+                                    variant='secondary'
+                                    size='sm'
+                                    onClick={onRestore}
+                                    disabled={busy}
+                                    className='h-9 bg-black/5 px-4 hover:bg-black/10 dark:bg-white/10 dark:hover:bg-white/20'
+                                >
+                                    <ArchiveRestore className='mr-2 h-4 w-4' />
+                                    <span className='hidden sm:inline'>{t('files.trash.restore')}</span>
+                                </Button>
+                            )}
+                            {canDelete && (
+                                <Button
+                                    variant='secondary'
+                                    size='sm'
+                                    onClick={onDeletePermanent}
+                                    disabled={busy}
+                                    className='h-9 bg-red-500/10 px-3 text-red-600 hover:bg-red-500/20 dark:text-red-400'
+                                >
+                                    <Trash2 className='mr-2 h-4 w-4' />
+                                    <span className='hidden sm:inline'>{t('files.trash.delete_permanent')}</span>
+                                </Button>
+                            )}
+                        </div>
+                    </>
+                ) : (
+                    <>
+                        <div className='flex flex-wrap items-center gap-1.5'>
+                            <Button
+                                asChild
+                                variant='ghost'
+                                size='sm'
+                                className='text-muted-foreground hover:text-foreground h-9 px-3 hover:bg-black/5 dark:hover:bg-white/5'
+                            >
+                                <Link href={`/server/${serverUuid}/files`}>
+                                    <ArrowLeft className='mr-2 h-4 w-4' />
+                                    <span className='xs:inline hidden'>{t('files.trash.back_to_files')}</span>
+                                </Link>
+                            </Button>
+                            <Button
+                                variant='ghost'
+                                size='sm'
+                                onClick={onRefresh}
+                                disabled={loading}
+                                className='text-muted-foreground hover:text-foreground h-9 px-3 hover:bg-black/5 dark:hover:bg-white/5'
+                            >
+                                <RefreshCw className={cn('mr-2 h-4 w-4', loading && 'animate-spin')} />
+                                <span className='xs:inline hidden'>{t('files.toolbar.refresh')}</span>
+                            </Button>
+                        </div>
+                        {canDelete && (
+                            <Button
+                                variant='secondary'
+                                size='sm'
+                                onClick={onEmpty}
+                                disabled={busy || !hasEntries}
+                                className='h-9 bg-red-500/10 px-3 text-red-600 hover:bg-red-500/20 dark:text-red-400'
+                            >
+                                <Trash2 className='mr-2 h-4 w-4' />
+                                {t('files.trash.empty_all')}
+                            </Button>
+                        )}
+                    </>
+                )}
+            </div>
+        </div>
+    );
+}
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/components/trash/TrashList.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/trash/TrashList.tsx
new file mode 100644
index 000000000..7bfaf5ff9
--- /dev/null
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/components/trash/TrashList.tsx
@@ -0,0 +1,204 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+'use client';
+
+import type { MouseEvent } from 'react';
+import { useMemo } from 'react';
+import { TrashEntry } from '@/lib/files-api';
+import { formatFileSize } from '@/lib/utils';
+import { formatDateTimeInTz, formatRelativeTime, parseApiDate } from '@/lib/dateUtils';
+import { useDateFormatOptions } from '@/contexts/PreferencesContext';
+import { Checkbox } from '@/components/ui/checkbox';
+import { cn } from '@/lib/utils';
+import { FileText, Folder, Loader2, Sparkles, Trash2 } from 'lucide-react';
+import { useTranslation } from '@/contexts/TranslationContext';
+
+interface TrashListProps {
+    entries: TrashEntry[];
+    loading: boolean;
+    selectedIds: string[];
+    onToggle: (id: string) => void;
+    onToggleAll: () => void;
+}
+
+function formatPath(entry: TrashEntry): string {
+    const root = entry.original_root === '/' ? '' : entry.original_root;
+    return `${root}/${entry.original_name}`.replace(/\/+/g, '/');
+}
+
+function TrashRow({
+    entry,
+    selected,
+    onToggle,
+}: {
+    entry: TrashEntry;
+    selected: boolean;
+    onToggle: (id: string) => void;
+}) {
+    const dateOpts = useDateFormatOptions();
+    const { modifiedRelative, modifiedTitle } = useMemo(() => {
+        if (!parseApiDate(entry.deleted_at)) {
+            return { modifiedRelative: '—', modifiedTitle: undefined as string | undefined };
+        }
+        return {
+            modifiedRelative: formatRelativeTime(entry.deleted_at, dateOpts),
+            modifiedTitle: formatDateTimeInTz(entry.deleted_at, dateOpts),
+        };
+    }, [entry.deleted_at, dateOpts]);
+
+    return (
+        <div
+            role='button'
+            tabIndex={0}
+            onClick={() => onToggle(entry.id)}
+            onKeyDown={(e) => {
+                if (e.key === 'Enter' || e.key === ' ') {
+                    e.preventDefault();
+                    onToggle(entry.id);
+                }
+            }}
+            className={cn(
+                'group flex cursor-pointer items-center gap-3 border-b border-gray-200 bg-transparent px-4 py-3 transition-all select-none hover:bg-gray-50 active:scale-[0.995] dark:border-white/5 dark:hover:bg-white/5',
+                selected && 'bg-primary/5 dark:bg-primary/10',
+            )}
+        >
+            <div className='pointer-events-auto shrink-0' onClick={(e: MouseEvent) => e.stopPropagation()}>
+                <Checkbox
+                    checked={selected}
+                    onCheckedChange={() => onToggle(entry.id)}
+                    className='border-primary/50 data-[state=checked]:bg-primary data-[state=checked]:border-primary'
+                />
+            </div>
+
+            <div
+                className={cn(
+                    'flex h-9 w-9 shrink-0 items-center justify-center rounded-lg border border-white/5 transition-all group-hover:scale-110',
+                    entry.is_directory
+                        ? 'bg-amber-500/10 text-amber-500'
+                        : 'bg-gray-100 text-gray-500 dark:bg-white/5 dark:text-gray-400',
+                )}
+            >
+                {entry.is_directory ? (
+                    <Folder className='h-4.5 w-4.5 fill-amber-500/10' />
+                ) : (
+                    <FileText className='h-4.5 w-4.5' />
+                )}
+            </div>
+
+            <div className='pointer-events-auto min-w-0 flex-1 overflow-hidden'>
+                <span className='text-primary block truncate text-sm font-semibold'>{entry.original_name}</span>
+                <span className='text-muted-foreground block truncate font-mono text-[10px] font-medium tracking-wide'>
+                    {formatPath(entry)}
+                </span>
+            </div>
+
+            <div
+                className='text-muted-foreground hidden w-[5.5rem] shrink-0 text-right text-xs font-semibold tabular-nums sm:block'
+                style={{ opacity: 0.8 }}
+            >
+                {formatFileSize(entry.size)}
+            </div>
+
+            <div
+                className='text-muted-foreground hidden w-[9rem] shrink-0 truncate text-right text-xs font-semibold sm:block'
+                style={{ opacity: 0.8 }}
+                title={modifiedTitle}
+            >
+                {modifiedRelative}
+            </div>
+
+            <div className='w-9 shrink-0' aria-hidden />
+        </div>
+    );
+}
+
+export function TrashList({ entries, loading, selectedIds, onToggle, onToggleAll }: TrashListProps) {
+    const { t } = useTranslation();
+
+    if (loading && entries.length === 0) {
+        return (
+            <div className='flex h-64 items-center justify-center rounded-xl border border-white/10 bg-black/20 backdrop-blur-sm'>
+                <Loader2 className='text-primary h-8 w-8 animate-spin' />
+            </div>
+        );
+    }
+
+    if (entries.length === 0) {
+        return (
+            <div className='text-muted-foreground animate-in fade-in zoom-in-95 group relative flex h-[400px] flex-col items-center justify-center gap-6 overflow-hidden rounded-3xl border border-dashed border-white/10 bg-white/2 backdrop-blur-3xl duration-700'>
+                <div className='from-primary/5 absolute inset-0 bg-linear-to-br via-transparent to-transparent opacity-0 transition-opacity duration-1000 group-hover:opacity-100' />
+
+                <div className='relative'>
+                    <div className='relative z-10 flex h-24 w-24 items-center justify-center rounded-3xl border border-white/10 bg-white/5 text-white/20'>
+                        <Trash2 className='h-10 w-10 opacity-40 transition-transform duration-500 group-hover:scale-110' />
+                    </div>
+
+                    <div className='bg-primary/20 absolute -top-2 -right-2 h-8 w-8 animate-pulse rounded-full blur-xl' />
+                    <div className='bg-primary/10 absolute -bottom-4 -left-4 h-12 w-12 animate-pulse rounded-full blur-2xl delay-700' />
+                    <Sparkles className='text-primary/40 absolute -top-6 -left-6 h-6 w-6 animate-bounce delay-300' />
+                </div>
+
+                <div className='relative z-10 space-y-2 text-center'>
+                    <h3 className='bg-linear-to-br from-white to-white/40 bg-clip-text text-xl font-bold text-transparent'>
+                        {t('files.trash.empty_title')}
+                    </h3>
+                    <p className='mx-auto max-w-[280px] text-sm leading-relaxed text-white/40'>
+                        {t('files.trash.empty')}
+                    </p>
+                </div>
+            </div>
+        );
+    }
+
+    const allSelected = entries.length > 0 && selectedIds.length === entries.length;
+
+    return (
+        <div className='overflow-hidden rounded-3xl border border-gray-200 bg-white backdrop-blur-xl dark:border-white/10 dark:bg-white/5'>
+            <div
+                className='text-foreground/60 flex items-center gap-3 border-b border-gray-200 bg-gray-50/50 px-4 py-4 text-[10px] font-bold tracking-[0.2em] uppercase dark:border-white/10 dark:bg-white/5 dark:text-white/40'
+                style={{ color: 'hsl(var(--foreground))', opacity: 0.6 }}
+            >
+                <div className='flex shrink-0 items-center'>
+                    <Checkbox
+                        checked={allSelected}
+                        onCheckedChange={onToggleAll}
+                        className='border-primary/50 data-[state=checked]:bg-primary data-[state=checked]:border-primary transition-colors'
+                    />
+                </div>
+                <div className='w-9 shrink-0' aria-hidden />
+                <div className='min-w-0 flex-1 truncate'>{t('files.trash.list.header_name')}</div>
+                <div className='hidden w-[5.5rem] shrink-0 text-right sm:block'>
+                    {t('files.trash.list.header_size')}
+                </div>
+                <div className='hidden w-[9rem] shrink-0 truncate text-right sm:block'>
+                    {t('files.trash.list.header_deleted')}
+                </div>
+                <div className='w-9 shrink-0' aria-hidden />
+            </div>
+
+            <div className='divide-y divide-gray-200 dark:divide-white/5'>
+                {entries.map((entry) => (
+                    <TrashRow
+                        key={entry.id}
+                        entry={entry}
+                        selected={selectedIds.includes(entry.id)}
+                        onToggle={onToggle}
+                    />
+                ))}
+            </div>
+        </div>
+    );
+}
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/page.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/page.tsx
index daa369f6f..1316c9437 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/files/page.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/page.tsx
@@ -29,6 +29,7 @@ import {
     CreateFolderDialog,
     CreateFileDialog,
     DeleteDialog,
+    EmptyTrashDialog,
     RenameDialog,
     ImagePreviewDialog,
     PermissionsDialog,
@@ -38,12 +39,23 @@ import {
     IgnoredContentDialog,
     CompressDialog,
     FileHashDialog,
+    ArchiveBrowsePanel,
 } from './components/dialogs';
 import { useTranslation } from '@/contexts/TranslationContext';
+import { useSettings } from '@/contexts/SettingsContext';
+import { isEnabled } from '@/lib/utils';
 import { toast } from 'sonner';
-import { filesApi } from '@/lib/files-api';
+import { filesApi, ARCHIVE_EXTRACT_DRAG_MIME } from '@/lib/files-api';
 import { isBinaryLikeFileName } from '@/lib/binary-like-file-names';
 import { FileObject } from '@/types/server';
+import {
+    createTrashFolderEntry,
+    FEATHER_TRASH_DIR,
+    filterSelectableFiles,
+    isTrashShortcut,
+    trashStatsFromList,
+    type TrashFolderStats,
+} from '@/lib/feather-trash';
 import { Download, X, Upload, CheckCircle2, AlertCircle } from 'lucide-react';
 import React, { use } from 'react';
 import { Button } from '@/components/featherui/Button';
@@ -69,6 +81,13 @@ function resolveDirectoryTarget(currentDirectory: string, nameOrPath: string): s
     return joinPath(currentDirectory || '/', nameOrPath);
 }
 
+/** Server-relative destination for Wings archive/extract (no leading slash; empty = server root). */
+function toDestinationRelative(absoluteDir: string): string {
+    const n = normalizePath(absoluteDir || '/');
+    if (n === '/') return '';
+    return n.replace(/^\//, '');
+}
+
 async function collectFilesFromDataTransfer(dt: DataTransfer): Promise<FileWithPath[]> {
     const result: FileWithPath[] = [];
     const items = dt.items;
@@ -142,6 +161,8 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
     const router = useRouter();
     const { uuidShort } = use(params);
     const { t } = useTranslation();
+    const { settings } = useSettings();
+    const trashEnabled = isEnabled(settings?.file_trash_enabled);
 
     const {
         files,
@@ -175,6 +196,7 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
     const canCreate = hasPermission('file.create');
     const canUpdate = hasPermission('file.update');
     const canDelete = hasPermission('file.delete');
+    const canArchive = hasPermission('file.archive');
 
     const [createFolderOpen, setCreateFolderOpen] = useState(false);
     const [createFileOpen, setCreateFileOpen] = useState(false);
@@ -188,6 +210,7 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
     const [permissionsOpen, setPermissionsOpen] = useState(false);
     const [compressOpen, setCompressOpen] = useState(false);
     const [fileHashOpen, setFileHashOpen] = useState(false);
+    const [archiveBrowseOpen, setArchiveBrowseOpen] = useState(false);
     const [filesToCompress, setFilesToCompress] = useState<string[]>([]);
     const [moveCopyAction, setMoveCopyAction] = useState<'move' | 'copy'>('move');
     const [uploadQueue, setUploadQueue] = useState<UploadQueueItem[]>([]);
@@ -203,6 +226,9 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
     const [searchFiltersOpen, setSearchFiltersOpen] = useState(false);
     const [searchLoading, setSearchLoading] = useState(false);
     const [searchResults, setSearchResults] = useState<FileObject[] | null>(null);
+    const [trashStats, setTrashStats] = useState<TrashFolderStats | null>(null);
+    const [emptyTrashOpen, setEmptyTrashOpen] = useState(false);
+    const [emptyTrashBusy, setEmptyTrashBusy] = useState(false);
     const [includePattern, setIncludePattern] = useState('');
     const [excludePattern, setExcludePattern] = useState('');
     const [searchCaseInsensitive, setSearchCaseInsensitive] = useState(true);
@@ -236,7 +262,53 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
         maxSizeBytes,
     ]);
     const hasAdvancedFilters = activeAdvancedFiltersCount > 0;
-    const visibleFiles = searchResults ?? files;
+    const refreshTrashStats = useCallback(async () => {
+        if (!trashEnabled || !uuidShort) return;
+        try {
+            const data = await filesApi.listTrash(uuidShort);
+            setTrashStats(trashStatsFromList(data));
+        } catch {
+            setTrashStats({ totalSize: 0, lastModified: null, itemCount: 0 });
+        }
+    }, [trashEnabled, uuidShort]);
+
+    useEffect(() => {
+        void refreshTrashStats();
+    }, [refreshTrashStats]);
+
+    const baseFiles = searchResults ?? files;
+    const visibleFiles = useMemo(() => {
+        if (!trashEnabled || searchResults !== null) return baseFiles;
+        return [createTrashFolderEntry(trashStats ?? undefined), ...baseFiles];
+    }, [baseFiles, trashEnabled, searchResults, trashStats]);
+    const selectableFiles = useMemo(() => filterSelectableFiles(visibleFiles), [visibleFiles]);
+    const previousDirectoryRef = useRef(currentDirectory || '/');
+
+    const closeArchiveBrowse = useCallback(() => {
+        setArchiveBrowseOpen(false);
+        setActionFile((file) => (file && archiveBrowseOpen ? null : file));
+    }, [archiveBrowseOpen]);
+
+    const handleArchiveBrowseOpenChange = useCallback((open: boolean) => {
+        setArchiveBrowseOpen(open);
+        if (!open) setActionFile(null);
+    }, []);
+
+    const navigateAndCloseArchive = useCallback(
+        (path: string) => {
+            closeArchiveBrowse();
+            navigate(path);
+        },
+        [closeArchiveBrowse, navigate],
+    );
+
+    useEffect(() => {
+        const nextDirectory = currentDirectory || '/';
+        if (previousDirectoryRef.current !== nextDirectory) {
+            previousDirectoryRef.current = nextDirectory;
+            closeArchiveBrowse();
+        }
+    }, [closeArchiveBrowse, currentDirectory]);
 
     useEffect(() => {
         if (anchorName && !visibleFiles.some((f) => f.name === anchorName)) {
@@ -274,7 +346,7 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
                 }
             } catch {
                 if (!cancelled) {
-                    toast.error('Failed to search files');
+                    toast.error(t('files.search.search_failed'));
                     setSearchResults([]);
                 }
             } finally {
@@ -302,29 +374,35 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
         maxFileSizeMiB,
         includeOversized,
         hasAdvancedFilters,
+        t,
     ]);
 
     const handleSelectToggle = useCallback(
         (name: string) => {
+            const entry = visibleFiles.find((f) => f.name === name);
+            if (entry && isTrashShortcut(entry)) return;
             toggleSelect(name);
             setAnchorName(name);
             shiftPivotRef.current = null;
         },
-        [toggleSelect],
+        [toggleSelect, visibleFiles],
     );
 
     const handleSelectAllToggle = useCallback(() => {
-        if (visibleFiles.length === 0) return;
-        if (selectedFiles.length === visibleFiles.length) {
+        if (selectableFiles.length === 0) return;
+        const selectableNames = selectableFiles.map((f) => f.name);
+        const allSelected = selectableNames.length > 0 && selectableNames.every((n) => selectedFiles.includes(n));
+        if (allSelected) {
             setSelectedFiles([]);
         } else {
-            setSelectedFiles(visibleFiles.map((f) => f.name));
+            setSelectedFiles(selectableNames);
         }
         shiftPivotRef.current = null;
-    }, [visibleFiles, selectedFiles, setSelectedFiles]);
+    }, [selectableFiles, selectedFiles, setSelectedFiles]);
 
     const handleModifierClick = useCallback(
         (file: FileObject, event: React.MouseEvent) => {
+            if (isTrashShortcut(file)) return;
             const isCtrlLike = event.ctrlKey || event.metaKey;
             const isShift = event.shiftKey;
             const clickedIdx = visibleFiles.findIndex((f) => f.name === file.name);
@@ -339,7 +417,10 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
                 const effectivePivotIdx = pivotIdx !== -1 ? pivotIdx : clickedIdx;
                 const [s, e] =
                     effectivePivotIdx <= clickedIdx ? [effectivePivotIdx, clickedIdx] : [clickedIdx, effectivePivotIdx];
-                const range = visibleFiles.slice(s, e + 1).map((f) => f.name);
+                const range = visibleFiles
+                    .slice(s, e + 1)
+                    .filter((f) => !isTrashShortcut(f))
+                    .map((f) => f.name);
                 if (isCtrlLike) {
                     setSelectedFiles(Array.from(new Set([...selectedFiles, ...range])));
                 } else {
@@ -355,8 +436,35 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
         [visibleFiles, anchorName, selectedFiles, setSelectedFiles, toggleSelect],
     );
 
+    const performArchiveExtract = useCallback(
+        async (payload: { root: string; file: string; entries: string[] }, destinationRelative: string) => {
+            const toastId = toast.loading(t('files.messages.archive_members_extracting'));
+            try {
+                await filesApi.extractArchiveSelection(
+                    uuidShort,
+                    payload.root,
+                    payload.file,
+                    destinationRelative,
+                    payload.entries,
+                );
+                toast.success(t('files.messages.archive_members_extracted'), { id: toastId });
+                closeArchiveBrowse();
+                refresh();
+            } catch (error) {
+                const err = error as { response?: { data?: { error?: string } } };
+                const msg = err.response?.data?.error || t('files.messages.archive_members_extract_failed');
+                toast.error(msg, { id: toastId });
+            }
+        },
+        [closeArchiveBrowse, refresh, t, uuidShort],
+    );
+
     const handleRowDragStart = useCallback(
         (file: FileObject, event: React.DragEvent) => {
+            if (isTrashShortcut(file)) {
+                event.preventDefault();
+                return;
+            }
             if (!canUpdate) {
                 event.preventDefault();
                 return;
@@ -420,6 +528,26 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
     const handleDropOnFolder = useCallback(
         (destinationFolder: FileObject, event: React.DragEvent) => {
             try {
+                const archiveRaw = event.dataTransfer.getData(ARCHIVE_EXTRACT_DRAG_MIME);
+                if (archiveRaw) {
+                    if (!canArchive) return;
+                    const payload = JSON.parse(archiveRaw) as { root?: string; file?: string; entries?: string[] };
+                    if (
+                        typeof payload.root !== 'string' ||
+                        typeof payload.file !== 'string' ||
+                        !Array.isArray(payload.entries) ||
+                        payload.entries.length === 0
+                    ) {
+                        return;
+                    }
+                    const destAbs = joinPath(currentDirectory || '/', destinationFolder.name);
+                    const destRel = toDestinationRelative(destAbs);
+                    void performArchiveExtract(
+                        { root: payload.root, file: payload.file, entries: payload.entries as string[] },
+                        destRel,
+                    );
+                    return;
+                }
                 const raw = event.dataTransfer.getData(DRAG_MIME);
                 if (!raw) return;
                 const payload = JSON.parse(raw) as { sourceRoot?: string; files?: string[] };
@@ -434,12 +562,31 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
                 setDraggingFileNames([]);
             }
         },
-        [currentDirectory, performMoveFiles],
+        [canArchive, currentDirectory, performArchiveExtract, performMoveFiles],
     );
 
     const handleDropOnPath = useCallback(
         (destinationPath: string, event: React.DragEvent) => {
             try {
+                const archiveRaw = event.dataTransfer.getData(ARCHIVE_EXTRACT_DRAG_MIME);
+                if (archiveRaw) {
+                    if (!canArchive) return;
+                    const payload = JSON.parse(archiveRaw) as { root?: string; file?: string; entries?: string[] };
+                    if (
+                        typeof payload.root !== 'string' ||
+                        typeof payload.file !== 'string' ||
+                        !Array.isArray(payload.entries) ||
+                        payload.entries.length === 0
+                    ) {
+                        return;
+                    }
+                    const destRel = toDestinationRelative(destinationPath);
+                    void performArchiveExtract(
+                        { root: payload.root, file: payload.file, entries: payload.entries as string[] },
+                        destRel,
+                    );
+                    return;
+                }
                 const raw = event.dataTransfer.getData(DRAG_MIME);
                 if (!raw) return;
                 const payload = JSON.parse(raw) as { sourceRoot?: string; files?: string[] };
@@ -452,10 +599,37 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
                 setDraggingFileNames([]);
             }
         },
-        [currentDirectory, performMoveFiles],
+        [canArchive, currentDirectory, performArchiveExtract, performMoveFiles],
     );
 
+    const handleEmptyTrash = async () => {
+        setEmptyTrashBusy(true);
+        try {
+            await filesApi.emptyTrash(uuidShort);
+            toast.success(t('files.trash.messages.emptied'));
+            setEmptyTrashOpen(false);
+            await refreshTrashStats();
+            refresh();
+        } catch {
+            toast.error(t('files.trash.messages.empty_error'));
+        } finally {
+            setEmptyTrashBusy(false);
+        }
+    };
+
     const handleAction = (action: string, file: FileObject) => {
+        if (isTrashShortcut(file)) {
+            switch (action) {
+                case 'trash-open':
+                    router.push(`/server/${uuidShort}/files/trash`);
+                    return;
+                case 'trash-empty':
+                    setEmptyTrashOpen(true);
+                    return;
+            }
+            return;
+        }
+
         const usesSelection =
             selectedFiles.length > 1 &&
             selectedFiles.includes(file.name) &&
@@ -499,6 +673,9 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
             case 'decompress':
                 handleDecompress(file.name);
                 break;
+            case 'browse-archive':
+                setArchiveBrowseOpen(true);
+                break;
             case 'copy':
                 setMoveCopyAction('copy');
                 setMoveCopyOpen(true);
@@ -562,9 +739,13 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
             size < 1024 * 1024 * 5 && !isBinaryLikeFileName(name) && !isImage(name);
 
         const openFile = (file: FileObject) => {
+            if (isTrashShortcut(file)) {
+                router.push(`/server/${uuidShort}/files/trash`);
+                return;
+            }
             if (!file.isFile) {
                 const nextDir = resolveDirectoryTarget(currentDirectory || '/', file.name);
-                navigate(nextDir);
+                navigateAndCloseArchive(nextDir);
             } else if (isEditableFile(file.size, file.name) && canUpdate) {
                 const editPath = `/server/${uuidShort}/files/edit?file=${encodeURIComponent(
                     file.name,
@@ -601,7 +782,12 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
                 const effectivePivotIdx = pivotIdx !== -1 ? pivotIdx : nextIdx;
                 const [start, end] =
                     effectivePivotIdx <= nextIdx ? [effectivePivotIdx, nextIdx] : [nextIdx, effectivePivotIdx];
-                setSelectedFiles(visibleFiles.slice(start, end + 1).map((f) => f.name));
+                setSelectedFiles(
+                    visibleFiles
+                        .slice(start, end + 1)
+                        .filter((f) => !isTrashShortcut(f))
+                        .map((f) => f.name),
+                );
                 setAnchorName(nextName);
             } else {
                 shiftPivotRef.current = null;
@@ -629,12 +815,14 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
             if (isEditableTarget(e.target)) return;
 
             if (modifier && e.key.toLowerCase() === 'a') {
-                if (visibleFiles.length === 0) return;
+                if (selectableFiles.length === 0) return;
                 e.preventDefault();
-                if (selectedFiles.length === visibleFiles.length) {
+                const selectableNames = selectableFiles.map((f) => f.name);
+                const allSelected = selectableNames.every((n) => selectedFiles.includes(n));
+                if (allSelected) {
                     setSelectedFiles([]);
                 } else {
-                    setSelectedFiles(visibleFiles.map((f) => f.name));
+                    setSelectedFiles(selectableNames);
                 }
                 shiftPivotRef.current = null;
                 return;
@@ -660,6 +848,7 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
                 if (!canUpdate || selectedFiles.length !== 1) return;
                 e.preventDefault();
                 const file = visibleFiles.find((f) => f.name === selectedFiles[0]);
+                if (file && isTrashShortcut(file)) return;
                 if (file) {
                     setActionFile(file);
                     setRenameOpen(true);
@@ -687,7 +876,7 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
                 if (current === '/' || current === '') return;
                 e.preventDefault();
                 const parent = current.replace(/\/+$/, '').split('/').slice(0, -1).join('/') || '/';
-                navigate(parent);
+                navigateAndCloseArchive(parent);
                 return;
             }
 
@@ -721,6 +910,8 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
 
             if (e.key === ' ' && !modifier && !e.shiftKey && !e.altKey) {
                 if (!anchorName) return;
+                const anchorFile = visibleFiles.find((f) => f.name === anchorName);
+                if (anchorFile && isTrashShortcut(anchorFile)) return;
                 e.preventDefault();
                 toggleSelect(anchorName);
                 shiftPivotRef.current = null;
@@ -737,13 +928,14 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
         return () => window.removeEventListener('keydown', handleKeyDown);
     }, [
         visibleFiles,
+        selectableFiles,
         selectedFiles,
         canDelete,
         canUpdate,
         setSelectedFiles,
         anchorName,
         currentDirectory,
-        navigate,
+        navigateAndCloseArchive,
         refresh,
         toggleSelect,
         uuidShort,
@@ -991,8 +1183,11 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
     };
 
     useEffect(() => {
-        const isInternal = (e: DragEvent) =>
-            e.dataTransfer?.types?.includes('application/x-featherpanel-files') ?? false;
+        const isInternal = (e: DragEvent) => {
+            const types = e.dataTransfer?.types;
+            if (!types) return false;
+            return types.includes(DRAG_MIME) || types.includes(ARCHIVE_EXTRACT_DRAG_MIME);
+        };
 
         const handleDragOver = (e: DragEvent) => {
             if (isInternal(e)) return;
@@ -1046,7 +1241,7 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
                         onNavigate={navigate}
                         searchQuery={searchQuery}
                         onSearchChange={setSearchQuery}
-                        onDropFilesToPath={canUpdate ? handleDropOnPath : undefined}
+                        onDropFilesToPath={canUpdate || canArchive ? handleDropOnPath : undefined}
                         onToggleFilters={() => setSearchFiltersOpen(true)}
                         activeFiltersCount={activeAdvancedFiltersCount}
                     />
@@ -1353,6 +1548,29 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
 
                         <WidgetRenderer widgets={getWidgets('server-files', 'before-files-list')} />
 
+                        <ArchiveBrowsePanel
+                            open={archiveBrowseOpen}
+                            onOpenChange={handleArchiveBrowseOpenChange}
+                            uuid={uuidShort}
+                            serverDirectory={currentDirectory || '/'}
+                            archiveFileName={actionFile?.name ?? ''}
+                            canExtract={canArchive}
+                            onExtractEntries={(entries, destinationPath) => {
+                                if (!actionFile) return;
+                                void performArchiveExtract(
+                                    {
+                                        root: currentDirectory || '/',
+                                        file: actionFile.name,
+                                        entries,
+                                    },
+                                    toDestinationRelative(destinationPath),
+                                );
+                            }}
+                            onExtractComplete={() => {
+                                refresh();
+                            }}
+                        />
+
                         <FileList
                             files={visibleFiles}
                             loading={loading || searchLoading}
@@ -1361,15 +1579,22 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
                             onSelectAll={handleSelectAllToggle}
                             onModifierClick={handleModifierClick}
                             anchorName={anchorName}
-                            onNavigate={(name) => navigate(resolveDirectoryTarget(currentDirectory || '/', name))}
+                            onNavigate={(name) => {
+                                if (name === FEATHER_TRASH_DIR) {
+                                    router.push(`/server/${uuidShort}/files/trash`);
+                                    return;
+                                }
+                                navigateAndCloseArchive(resolveDirectoryTarget(currentDirectory || '/', name));
+                            }}
                             onAction={handleAction}
                             onRowDragStart={canUpdate ? handleRowDragStart : undefined}
                             onRowDragEnd={canUpdate ? handleRowDragEnd : undefined}
-                            onDropFiles={canUpdate ? handleDropOnFolder : undefined}
+                            onDropFiles={canUpdate || canArchive ? handleDropOnFolder : undefined}
                             draggingFileNames={draggingFileNames}
                             canEdit={canUpdate}
                             canDelete={canDelete}
                             canDownload={canRead}
+                            acceptArchiveExtract={canArchive}
                             serverUuid={uuidShort}
                             currentDirectory={currentDirectory || '/'}
                         />
@@ -1429,9 +1654,17 @@ export default function ServerFilesPage({ params }: { params: Promise<{ uuidShor
                 files={actionFile ? [actionFile.name] : selectedFiles}
                 onSuccess={() => {
                     refresh();
+                    void refreshTrashStats();
                     setSelectedFiles([]);
                 }}
             />
+            <EmptyTrashDialog
+                open={emptyTrashOpen}
+                onOpenChange={setEmptyTrashOpen}
+                onConfirm={handleEmptyTrash}
+                loading={emptyTrashBusy}
+                disabled={(trashStats?.itemCount ?? 0) === 0}
+            />
             <PullFileDialog
                 open={pullFileOpen}
                 onOpenChange={setPullFileOpen}
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/trash/page.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/trash/page.tsx
new file mode 100644
index 000000000..86b3add45
--- /dev/null
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/trash/page.tsx
@@ -0,0 +1,200 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+'use client';
+
+import { use, useCallback, useEffect, useMemo, useState } from 'react';
+import Link from 'next/link';
+import { PageHeader } from '@/components/featherui/PageHeader';
+import { Button } from '@/components/featherui/Button';
+import { useTranslation } from '@/contexts/TranslationContext';
+import { useSettings } from '@/contexts/SettingsContext';
+import { useServerPermissions } from '@/hooks/useServerPermissions';
+import { filesApi } from '@/lib/files-api';
+import { formatBytes } from '@/lib/format';
+import { isEnabled } from '@/lib/utils';
+import { toast } from 'sonner';
+import { TrashList } from '../components/trash/TrashList';
+import { TrashActionToolbar } from '../components/trash/TrashActionToolbar';
+import { EmptyTrashDialog } from '../components/dialogs/EmptyTrashDialog';
+import { RestoreTrashDialog } from '../components/dialogs/RestoreTrashDialog';
+import axios from 'axios';
+import { ArrowLeft } from 'lucide-react';
+
+export default function ServerTrashPage({ params }: { params: Promise<{ uuidShort: string }> }) {
+    const { uuidShort } = use(params);
+    const { t } = useTranslation();
+    const { settings } = useSettings();
+    const { hasPermission } = useServerPermissions(uuidShort);
+
+    const [entries, setEntries] = useState<Awaited<ReturnType<typeof filesApi.listTrash>>['entries']>([]);
+    const [totalSize, setTotalSize] = useState(0);
+    const [loading, setLoading] = useState(true);
+    const [selected, setSelected] = useState<string[]>([]);
+    const [emptyOpen, setEmptyOpen] = useState(false);
+    const [restoreOpen, setRestoreOpen] = useState(false);
+    const [busy, setBusy] = useState(false);
+
+    const trashEnabled = isEnabled(settings?.file_trash_enabled);
+    const canUpdate = hasPermission('file.update');
+    const canDelete = hasPermission('file.delete');
+
+    const refresh = useCallback(async () => {
+        if (!uuidShort || !trashEnabled) return;
+        setLoading(true);
+        try {
+            const data = await filesApi.listTrash(uuidShort);
+            setEntries(data.entries ?? []);
+            setTotalSize(data.total_size ?? 0);
+            setSelected([]);
+        } catch {
+            toast.error(t('files.trash.messages.load_error'));
+        } finally {
+            setLoading(false);
+        }
+    }, [uuidShort, trashEnabled, t]);
+
+    useEffect(() => {
+        refresh();
+    }, [refresh]);
+
+    const headerDescription = useMemo(() => {
+        if (entries.length === 0 && !loading) {
+            return t('files.trash.empty');
+        }
+        return t('files.trash.description', {
+            count: String(entries.length),
+            size: formatBytes(totalSize),
+        });
+    }, [entries.length, loading, t, totalSize]);
+
+    const toggleSelect = (id: string) => {
+        setSelected((prev) => (prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id]));
+    };
+
+    const toggleSelectAll = () => {
+        if (selected.length === entries.length) {
+            setSelected([]);
+        } else {
+            setSelected(entries.map((e) => e.id));
+        }
+    };
+
+    const handleRestore = async (overwrite: boolean) => {
+        if (!selected.length) return;
+        setBusy(true);
+        try {
+            await filesApi.restoreTrash(uuidShort, selected, overwrite);
+            toast.success(t('files.trash.messages.restored'));
+            setRestoreOpen(false);
+            await refresh();
+        } catch (err) {
+            const message =
+                axios.isAxiosError(err) && err.response?.data?.message
+                    ? String(err.response.data.message)
+                    : t('files.trash.messages.restore_error');
+            toast.error(message);
+        } finally {
+            setBusy(false);
+        }
+    };
+
+    const handleDeletePermanent = async () => {
+        if (!selected.length) return;
+        setBusy(true);
+        try {
+            await filesApi.deleteTrashEntries(uuidShort, selected);
+            toast.success(t('files.trash.messages.deleted'));
+            await refresh();
+        } catch {
+            toast.error(t('files.trash.messages.delete_error'));
+        } finally {
+            setBusy(false);
+        }
+    };
+
+    const handleEmpty = async () => {
+        setBusy(true);
+        try {
+            await filesApi.emptyTrash(uuidShort);
+            toast.success(t('files.trash.messages.emptied'));
+            setEmptyOpen(false);
+            await refresh();
+        } catch {
+            toast.error(t('files.trash.messages.empty_error'));
+        } finally {
+            setBusy(false);
+        }
+    };
+
+    if (!trashEnabled) {
+        return (
+            <div className='relative flex min-h-screen flex-col gap-6 pb-20'>
+                <PageHeader title={t('files.trash.title')} description={t('files.trash.disabled')} />
+                <Button asChild variant='outline'>
+                    <Link href={`/server/${uuidShort}/files`}>
+                        <ArrowLeft className='mr-2 h-4 w-4' />
+                        {t('files.trash.back_to_files')}
+                    </Link>
+                </Button>
+            </div>
+        );
+    }
+
+    return (
+        <div className='relative flex min-h-screen flex-col gap-6 pb-20'>
+            <PageHeader title={t('files.trash.title')} description={headerDescription} />
+
+            <TrashActionToolbar
+                serverUuid={uuidShort}
+                loading={loading}
+                selectedCount={selected.length}
+                canUpdate={canUpdate}
+                canDelete={canDelete}
+                hasEntries={entries.length > 0}
+                busy={busy}
+                onRefresh={refresh}
+                onClearSelection={() => setSelected([])}
+                onRestore={() => setRestoreOpen(true)}
+                onDeletePermanent={handleDeletePermanent}
+                onEmpty={() => setEmptyOpen(true)}
+            />
+
+            <TrashList
+                entries={entries}
+                loading={loading}
+                selectedIds={selected}
+                onToggle={toggleSelect}
+                onToggleAll={toggleSelectAll}
+            />
+
+            <RestoreTrashDialog
+                open={restoreOpen}
+                onOpenChange={setRestoreOpen}
+                count={selected.length}
+                onConfirm={handleRestore}
+                loading={busy}
+            />
+
+            <EmptyTrashDialog
+                open={emptyOpen}
+                onOpenChange={setEmptyOpen}
+                onConfirm={handleEmpty}
+                loading={busy}
+                disabled={entries.length === 0}
+            />
+        </div>
+    );
+}
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/schedules/[id]/edit/page.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/schedules/[id]/edit/page.tsx
index 1a3716b32..79aa31f48 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/schedules/[id]/edit/page.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/schedules/[id]/edit/page.tsx
@@ -31,6 +31,8 @@ import { useServerPermissions } from '@/hooks/useServerPermissions';
 import { useSettings } from '@/contexts/SettingsContext';
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { WidgetRenderer } from '@/components/server/WidgetRenderer';
+import { listSupportedTimezones } from '@/lib/dateUtils';
+import { useUserTimezone } from '@/contexts/PreferencesContext';
 import type { Schedule, ScheduleUpdateRequest } from '@/types/server';
 
 export default function EditSchedulePage() {
@@ -41,6 +43,7 @@ export default function EditSchedulePage() {
     const { hasPermission, loading: permissionsLoading } = useServerPermissions(uuidShort);
 
     const canUpdate = hasPermission('schedule.update');
+    const userTimezone = useUserTimezone();
 
     const [loading, setLoading] = React.useState(true);
     const [saving, setSaving] = React.useState(false);
@@ -53,10 +56,13 @@ export default function EditSchedulePage() {
         cron_day_of_month: '*',
         cron_month: '*',
         cron_day_of_week: '*',
+        timezone: userTimezone || 'UTC',
         only_when_online: 0,
         is_active: 1,
     });
 
+    const timezoneOptions = React.useMemo(() => listSupportedTimezones().map((tz) => ({ id: tz, name: tz })), []);
+
     const { getWidgets, fetchWidgets } = usePluginWidgets('server-schedules-edit');
 
     React.useEffect(() => {
@@ -77,13 +83,14 @@ export default function EditSchedulePage() {
                         cron_day_of_month: scheduleData.cron_day_of_month,
                         cron_month: scheduleData.cron_month,
                         cron_day_of_week: scheduleData.cron_day_of_week,
+                        timezone: scheduleData.timezone || 'UTC',
                         only_when_online: scheduleData.only_when_online,
                         is_active: scheduleData.is_active,
                     });
                 }
             } catch (error) {
                 console.error('Failed to fetch schedule:', error);
-                toast.error('Failed to load schedule');
+                toast.error(t('serverSchedules.loadFailed'));
                 router.push(`/server/${uuidShort}/schedules`);
             } finally {
                 setLoading(false);
@@ -95,7 +102,7 @@ export default function EditSchedulePage() {
         } else if (!permissionsLoading && !canUpdate) {
             router.push(`/server/${uuidShort}/schedules`);
         }
-    }, [uuidShort, id, canUpdate, permissionsLoading, router, settings?.server_allow_schedules]);
+    }, [uuidShort, id, canUpdate, permissionsLoading, router, settings?.server_allow_schedules, t]);
 
     React.useEffect(() => {
         fetchWidgets();
@@ -105,7 +112,7 @@ export default function EditSchedulePage() {
         e.preventDefault();
 
         if (!formData.name.trim()) {
-            toast.error('Schedule name is required');
+            toast.error(t('serverSchedules.nameRequired'));
             return;
         }
 
@@ -316,6 +323,23 @@ export default function EditSchedulePage() {
                     </div>
 
                     <p className='text-muted-foreground text-xs'>{t('serverSchedules.cronHelp')}</p>
+
+                    <div className='space-y-2.5'>
+                        <Label
+                            htmlFor='schedule-timezone'
+                            className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'
+                        >
+                            {t('serverSchedules.timezone')}
+                        </Label>
+                        <HeadlessSelect
+                            value={formData.timezone}
+                            onChange={(val) => setFormData({ ...formData, timezone: String(val) })}
+                            options={timezoneOptions}
+                            disabled={saving}
+                            buttonClassName='h-12 bg-secondary/50 border-border/10 focus:border-primary/50 rounded-xl text-sm font-extrabold transition-all'
+                        />
+                        <p className='text-muted-foreground ml-1 text-xs'>{t('serverSchedules.timezoneHelp')}</p>
+                    </div>
                 </div>
 
                 <div className='bg-card/50 border-border/50 space-y-6 rounded-3xl border p-8 backdrop-blur-3xl'>
@@ -324,9 +348,11 @@ export default function EditSchedulePage() {
                             <Calendar className='text-primary h-5 w-5' />
                         </div>
                         <div className='space-y-0.5'>
-                            <h2 className='text-xl font-black tracking-tight uppercase italic'>Options</h2>
+                            <h2 className='text-xl font-black tracking-tight uppercase italic'>
+                                {t('serverSchedules.options')}
+                            </h2>
                             <p className='text-muted-foreground text-[9px] font-bold tracking-widest uppercase opacity-50'>
-                                Configuration
+                                {t('serverSchedules.configuration')}
                             </p>
                         </div>
                     </div>
@@ -340,8 +366,8 @@ export default function EditSchedulePage() {
                                 value={String(formData.only_when_online)}
                                 onChange={(val) => setFormData({ ...formData, only_when_online: Number(val) })}
                                 options={[
-                                    { id: '0', name: 'No - Run regardless of server status' },
-                                    { id: '1', name: 'Yes - Only run when server is online' },
+                                    { id: '0', name: t('serverSchedules.runRegardless') },
+                                    { id: '1', name: t('serverSchedules.runOnlyOnline') },
                                 ]}
                                 disabled={saving}
                                 buttonClassName='h-12 bg-secondary/50 border-border/10 focus:border-primary/50 rounded-xl text-sm font-extrabold transition-all'
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/schedules/new/page.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/schedules/new/page.tsx
index 270fe6a19..a8d321426 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/schedules/new/page.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/schedules/new/page.tsx
@@ -32,6 +32,8 @@ import { useSettings } from '@/contexts/SettingsContext';
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { WidgetRenderer } from '@/components/server/WidgetRenderer';
 import { isEnabled } from '@/lib/utils';
+import { listSupportedTimezones } from '@/lib/dateUtils';
+import { useUserTimezone } from '@/contexts/PreferencesContext';
 import type { ScheduleCreateRequest } from '@/types/server';
 
 export default function CreateSchedulePage() {
@@ -42,6 +44,7 @@ export default function CreateSchedulePage() {
     const { hasPermission, loading: permissionsLoading } = useServerPermissions(uuidShort);
 
     const canCreate = hasPermission('schedule.create');
+    const userTimezone = useUserTimezone();
 
     const [saving, setSaving] = React.useState(false);
 
@@ -52,17 +55,31 @@ export default function CreateSchedulePage() {
         cron_day_of_month: '*',
         cron_month: '*',
         cron_day_of_week: '*',
+        timezone: userTimezone || 'UTC',
         only_when_online: 0,
         is_active: 1,
     });
 
+    React.useEffect(() => {
+        // Reflect a late-arriving user preference (PreferencesContext loads
+        // asynchronously on the first paint) into the form's default zone,
+        // but only while the user hasn't manually changed it.
+        setFormData((prev) =>
+            prev.timezone === 'UTC' && userTimezone && userTimezone !== 'UTC'
+                ? { ...prev, timezone: userTimezone }
+                : prev,
+        );
+    }, [userTimezone]);
+
+    const timezoneOptions = React.useMemo(() => listSupportedTimezones().map((tz) => ({ id: tz, name: tz })), []);
+
     const { getWidgets, fetchWidgets } = usePluginWidgets('server-schedules-new');
 
     const handleCreate = async (e: React.FormEvent) => {
         e.preventDefault();
 
         if (!formData.name.trim()) {
-            toast.error('Schedule name is required');
+            toast.error(t('serverSchedules.nameRequired'));
             return;
         }
 
@@ -278,6 +295,23 @@ export default function CreateSchedulePage() {
                     </div>
 
                     <p className='text-muted-foreground text-xs'>{t('serverSchedules.cronHelp')}</p>
+
+                    <div className='space-y-2.5'>
+                        <Label
+                            htmlFor='schedule-timezone'
+                            className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'
+                        >
+                            {t('serverSchedules.timezone')}
+                        </Label>
+                        <HeadlessSelect
+                            value={formData.timezone}
+                            onChange={(val) => setFormData({ ...formData, timezone: String(val) })}
+                            options={timezoneOptions}
+                            disabled={saving}
+                            buttonClassName='h-12 bg-secondary/50 border-border/10 focus:border-primary/50 rounded-xl text-sm font-extrabold transition-all'
+                        />
+                        <p className='text-muted-foreground ml-1 text-xs'>{t('serverSchedules.timezoneHelp')}</p>
+                    </div>
                 </div>
 
                 <div className='bg-card/50 border-border/50 space-y-6 rounded-3xl border p-8 backdrop-blur-3xl'>
@@ -286,9 +320,11 @@ export default function CreateSchedulePage() {
                             <Calendar className='text-primary h-5 w-5' />
                         </div>
                         <div className='space-y-0.5'>
-                            <h2 className='text-xl font-black tracking-tight uppercase italic'>Options</h2>
+                            <h2 className='text-xl font-black tracking-tight uppercase italic'>
+                                {t('serverSchedules.options')}
+                            </h2>
                             <p className='text-muted-foreground text-[9px] font-bold tracking-widest uppercase opacity-50'>
-                                Configuration
+                                {t('serverSchedules.configuration')}
                             </p>
                         </div>
                     </div>
@@ -302,8 +338,8 @@ export default function CreateSchedulePage() {
                                 value={String(formData.only_when_online)}
                                 onChange={(val) => setFormData({ ...formData, only_when_online: Number(val) })}
                                 options={[
-                                    { id: '0', name: 'No - Run regardless of server status' },
-                                    { id: '1', name: 'Yes - Only run when server is online' },
+                                    { id: '0', name: t('serverSchedules.runRegardless') },
+                                    { id: '1', name: t('serverSchedules.runOnlyOnline') },
                                 ]}
                                 disabled={saving}
                                 buttonClassName='h-12 bg-secondary/50 border-border/10 focus:border-primary/50 rounded-xl text-sm font-extrabold transition-all'
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/schedules/page.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/schedules/page.tsx
index aff344692..b2d154396 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/schedules/page.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/schedules/page.tsx
@@ -45,6 +45,8 @@ import { ResourceCard } from '@/components/featherui/ResourceCard';
 import { HeadlessModal } from '@/components/ui/headless-modal';
 import { toast } from 'sonner';
 import { useServerPermissions } from '@/hooks/useServerPermissions';
+import { formatDateTimeInTz } from '@/lib/dateUtils';
+import { useDateFormatOptions } from '@/contexts/PreferencesContext';
 import { useSettings } from '@/contexts/SettingsContext';
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { WidgetRenderer } from '@/components/server/WidgetRenderer';
@@ -64,6 +66,7 @@ export default function ServerSchedulesPage() {
     const canCreate = hasPermission('schedule.create');
     const canUpdate = hasPermission('schedule.update');
     const canDelete = hasPermission('schedule.delete');
+    const dateOpts = useDateFormatOptions();
 
     const [schedules, setSchedules] = React.useState<Schedule[]>([]);
     const [loading, setLoading] = React.useState(true);
@@ -426,16 +429,21 @@ export default function ServerSchedulesPage() {
                                 title={schedule.name}
                                 description={
                                     <div className='flex flex-col gap-1'>
-                                        <div className='text-muted-foreground flex items-center gap-3 text-xs font-medium'>
+                                        <div className='text-muted-foreground flex flex-wrap items-center gap-3 text-xs font-medium'>
                                             <span className='flex items-center gap-1.5 rounded-lg bg-white/5 px-2 py-1 font-mono'>
                                                 <Clock className='h-3 w-3' />
                                                 {formatCronExpression(schedule)}
                                             </span>
+                                            {schedule.timezone && (
+                                                <span className='flex items-center gap-1.5 px-2 py-1 font-mono'>
+                                                    {schedule.timezone}
+                                                </span>
+                                            )}
                                             {schedule.next_run_at && (
                                                 <span className='flex items-center gap-1.5 px-2 py-1'>
                                                     <CalendarClock className='h-3 w-3' />
                                                     {t('serverSchedules.nextRun')}{' '}
-                                                    {new Date(schedule.next_run_at).toLocaleString()}
+                                                    {formatDateTimeInTz(schedule.next_run_at, dateOpts)}
                                                 </span>
                                             )}
                                         </div>
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/settings/page.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/settings/page.tsx
index b3b334547..a613f5ee5 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/settings/page.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/settings/page.tsx
@@ -289,8 +289,8 @@ export default function ServerSettingsPage() {
             <PageHeader title={t('serverSettings.title')} description={t('serverSettings.description')} />
             <WidgetRenderer widgets={getWidgets('server-settings', 'after-header')} />
 
-            <div className='grid grid-cols-1 gap-8 lg:grid-cols-12'>
-                <div className='space-y-8 lg:col-span-8'>
+            <div className='grid min-w-0 grid-cols-1 gap-8 lg:grid-cols-12'>
+                <div className='min-w-0 space-y-8 lg:col-span-8'>
                     <PageCard
                         title={t('serverSettings.serverInformation')}
                         description={t('serverSettings.serverInformationDescription')}
@@ -358,19 +358,19 @@ export default function ServerSettingsPage() {
                             description={t('serverSettings.backupPolicyDescription')}
                             icon={Archive}
                         >
-                            <div className='grid grid-cols-1 gap-6 md:grid-cols-2'>
-                                <div className='space-y-2'>
+                            <div className='grid min-w-0 grid-cols-1 gap-6 md:grid-cols-2'>
+                                <div className='min-w-0 space-y-2'>
                                     <Label className='text-muted-foreground ml-1 text-xs font-bold tracking-wider uppercase'>
                                         {t('serverSettings.backupLimitReadOnlyLabel')}
                                     </Label>
                                     <div className='border-border/10 bg-muted/40 flex h-12 items-center rounded-xl border px-4 text-sm font-medium'>
                                         {server?.backup_limit === 0 ? '∞' : String(server?.backup_limit ?? '—')}
                                     </div>
-                                    <p className='text-muted-foreground ml-1 text-xs'>
+                                    <p className='text-muted-foreground ml-1 text-xs break-words'>
                                         {t('serverSettings.backupLimitReadOnlyHelp')}
                                     </p>
                                 </div>
-                                <div className='space-y-2'>
+                                <div className='min-w-0 space-y-2'>
                                     <Label className='text-muted-foreground ml-1 text-xs font-bold tracking-wider uppercase'>
                                         {t('admin.servers.form.backup_retention_mode')}
                                     </Label>
@@ -394,15 +394,15 @@ export default function ServerSettingsPage() {
                                             {t('admin.servers.form.backup_retention_fifo')}
                                         </option>
                                     </select>
-                                    <p className='text-muted-foreground ml-1 text-xs'>
+                                    <p className='text-muted-foreground ml-1 text-xs break-words'>
                                         {t('admin.servers.form.backup_retention_mode_help')}
                                     </p>
                                 </div>
                             </div>
                             {server?.fifo_rolling_enabled && server.backup_limit > 0 && (
-                                <p className='mt-4 flex items-start gap-2 text-sm text-sky-600 dark:text-sky-400'>
+                                <p className='mt-4 flex min-w-0 items-start gap-2 text-sm break-words text-sky-600 dark:text-sky-400'>
                                     <Info className='mt-0.5 h-4 w-4 shrink-0' />
-                                    <span>
+                                    <span className='min-w-0 flex-1'>
                                         {t('serverBackups.fifoRollingDescription', {
                                             limit: String(server.backup_limit),
                                         })}
@@ -558,7 +558,7 @@ export default function ServerSettingsPage() {
                     <WidgetRenderer widgets={getWidgets('server-settings', 'after-sftp-details')} />
                 </div>
 
-                <div className='space-y-8 lg:col-span-4'>
+                <div className='min-w-0 space-y-8 lg:col-span-4'>
                     {canReinstall && (
                         <>
                             <PageCard title={t('serverSettings.reinstallServer')} icon={Settings} variant='warning'>
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/startup/page.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/startup/page.tsx
index 81b8a46fb..ecca45931 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/startup/page.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/startup/page.tsx
@@ -21,7 +21,19 @@ import axios, { AxiosError } from 'axios';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { PageHeader } from '@/components/featherui/PageHeader';
 import { PageCard } from '@/components/featherui/PageCard';
-import { Zap, ChevronRight, RefreshCw, Save, Terminal, Container, Settings, Loader2, Lock } from 'lucide-react';
+import {
+    Zap,
+    ChevronRight,
+    RefreshCw,
+    Save,
+    Terminal,
+    Container,
+    Settings,
+    Loader2,
+    Lock,
+    Plus,
+    Trash2,
+} from 'lucide-react';
 import { Button } from '@/components/featherui/Button';
 import { Input } from '@/components/featherui/Input';
 import { Textarea } from '@/components/featherui/Textarea';
@@ -31,12 +43,13 @@ import { useSettings } from '@/contexts/SettingsContext';
 import { usePluginWidgets } from '@/hooks/usePluginWidgets';
 import { WidgetRenderer } from '@/components/server/WidgetRenderer';
 import { cn, isEnabled } from '@/lib/utils';
-import type { Variable, Server } from '@/types/server';
+import type { Variable, Server, CustomVariable } from '@/types/server';
 
 interface ServerResponse {
     success: boolean;
     data: Server & {
         variables: Variable[];
+        custom_variables?: CustomVariable[];
         image?: string;
     };
 }
@@ -53,12 +66,15 @@ export default function ServerStartupPage() {
     const canRead = hasPermission('startup.read');
     const canUpdateStartup = hasPermission('startup.update') && isEnabled(settings?.server_allow_startup_change);
     const canUpdateDockerImage = hasPermission('startup.docker-image');
+    const canManageCustomVariables = hasPermission('startup.update');
     const canChangeSpell = isEnabled(settings?.server_allow_egg_change);
 
     const [server, setServer] = React.useState<(Server & { variables: Variable[] }) | null>(null);
     const [loading, setLoading] = React.useState(true);
     const [saving, setSaving] = React.useState(false);
     const [variables, setVariables] = React.useState<Variable[]>([]);
+    const [customVariables, setCustomVariables] = React.useState<CustomVariable[]>([]);
+    const [customVariableSaving, setCustomVariableSaving] = React.useState(false);
     const [availableDockerImages, setAvailableDockerImages] = React.useState<string[]>([]);
     const [defaultStartupCommand, setDefaultStartupCommand] = React.useState('');
 
@@ -69,13 +85,19 @@ export default function ServerStartupPage() {
 
     const [variableValues, setVariableValues] = React.useState<Record<number, string>>({});
     const [variableErrors, setVariableErrors] = React.useState<Record<number, string>>({});
+    const [customVariableForm, setCustomVariableForm] = React.useState({
+        name: '',
+        env_variable: '',
+        variable_value: '',
+        is_encrypted: false,
+    });
 
     const parseRules = React.useCallback((rules: string) => {
         if (!rules) return [];
         const parts = rules.split('|');
         const parsed: Array<{ type: string; value?: number | string }> = [];
         for (const part of parts) {
-            if (['required', 'nullable', 'string', 'numeric', 'integer'].includes(part)) {
+            if (['required', 'nullable', 'string', 'numeric', 'integer', 'int'].includes(part)) {
                 parsed.push({ type: part });
                 continue;
             }
@@ -111,7 +133,7 @@ export default function ServerStartupPage() {
             const parsed = parseRules(rules || '');
             const hasNullable = parsed.some((r) => r.type === 'nullable');
             const isRequired = parsed.some((r) => r.type === 'required');
-            const isNumeric = parsed.some((r) => r.type === 'numeric' || r.type === 'integer');
+            const isNumeric = parsed.some((r) => r.type === 'numeric' || r.type === 'integer' || r.type === 'int');
 
             const val = value ?? '';
             const trimmedForEmptyCheck = val.trim();
@@ -206,6 +228,7 @@ export default function ServerStartupPage() {
                 setDefaultStartupCommand(s.spell?.startup || '');
                 const vars = s.variables || [];
                 setVariables(vars);
+                setCustomVariables(s.custom_variables || []);
                 const values: Record<number, string> = {};
                 vars.forEach((v) => {
                     values[v.variable_id] = v.variable_value ?? '';
@@ -319,7 +342,72 @@ export default function ServerStartupPage() {
         }
     };
 
+    const handleAddCustomVariable = async () => {
+        const name = customVariableForm.name.trim();
+        const envVariable = customVariableForm.env_variable.trim().toUpperCase();
+
+        if (!name || !envVariable) {
+            toast.error('Name and environment variable are required');
+            return;
+        }
+
+        if (!/^[A-Z_][A-Z0-9_]*$/.test(envVariable)) {
+            toast.error(
+                'Env variable must use uppercase letters, numbers, and underscores, and cannot start with a number',
+            );
+            return;
+        }
+
+        setCustomVariableSaving(true);
+        try {
+            const { data } = await axios.post<{ success: boolean; message?: string }>(
+                `/api/user/servers/${uuidShort}/custom-variables`,
+                {
+                    name,
+                    env_variable: envVariable,
+                    variable_value: customVariableForm.variable_value,
+                    is_encrypted: customVariableForm.is_encrypted,
+                },
+            );
+
+            if (data.success) {
+                toast.success('Custom variable added');
+                setCustomVariableForm({ name: '', env_variable: '', variable_value: '', is_encrypted: false });
+                await fetchData();
+            } else {
+                toast.error(data.message || 'Failed to add custom variable');
+            }
+        } catch (error) {
+            const axiosError = error as AxiosError<{ message?: string }>;
+            toast.error(axiosError.response?.data?.message || 'Failed to add custom variable');
+        } finally {
+            setCustomVariableSaving(false);
+        }
+    };
+
+    const handleDeleteCustomVariable = async (variable: CustomVariable) => {
+        setCustomVariableSaving(true);
+        try {
+            const { data } = await axios.delete<{ success: boolean; message?: string }>(
+                `/api/user/servers/${uuidShort}/custom-variables/${variable.id}`,
+            );
+
+            if (data.success) {
+                toast.success('Custom variable deleted');
+                await fetchData();
+            } else {
+                toast.error(data.message || 'Failed to delete custom variable');
+            }
+        } catch (error) {
+            const axiosError = error as AxiosError<{ message?: string }>;
+            toast.error(axiosError.response?.data?.message || 'Failed to delete custom variable');
+        } finally {
+            setCustomVariableSaving(false);
+        }
+    };
+
     const viewableVariables = variables.filter((v) => isEnabled(v.user_viewable) || canUpdateStartup);
+    const variableCount = viewableVariables.length + customVariables.length;
     const hasChanges = () => {
         if (!server) return false;
         const startupChanged = form.startup !== (server.startup || '');
@@ -443,14 +531,14 @@ export default function ServerStartupPage() {
                         icon={Settings}
                         action={
                             <div className='bg-secondary/50 border-border/10 text-muted-foreground/60 rounded-2xl border px-5 py-2 text-[10px] font-black tracking-widest uppercase'>
-                                {viewableVariables.length}{' '}
-                                {viewableVariables.length === 1
+                                {variableCount}{' '}
+                                {variableCount === 1
                                     ? t('serverStartup.variableSingular')
                                     : t('serverStartup.variablePlural')}
                             </div>
                         }
                     >
-                        {viewableVariables.length === 0 ? (
+                        {viewableVariables.length === 0 && customVariables.length === 0 ? (
                             <div className='flex flex-col items-center justify-center space-y-4 py-16 text-center'>
                                 <Settings className='text-muted-foreground/10 h-16 w-16' />
                                 <p className='text-muted-foreground leading-none font-black uppercase'>
@@ -515,6 +603,116 @@ export default function ServerStartupPage() {
                                 ))}
                             </div>
                         )}
+
+                        <div className='mt-10 space-y-6 border-t border-white/5 pt-8'>
+                            <div className='flex flex-col gap-2 sm:flex-row sm:items-end sm:justify-between'>
+                                <div>
+                                    <h3 className='text-sm font-black tracking-widest uppercase'>
+                                        Custom environment variables
+                                    </h3>
+                                    <p className='text-muted-foreground/50 mt-1 text-xs font-medium'>
+                                        Added directly to this server and synced without a transfer.
+                                    </p>
+                                </div>
+                            </div>
+
+                            {customVariables.length > 0 && (
+                                <div className='grid grid-cols-1 gap-3 md:grid-cols-2'>
+                                    {customVariables.map((variable) => (
+                                        <div
+                                            key={variable.id}
+                                            className='bg-card/50 border-border/10 flex items-center justify-between gap-3 rounded-2xl border p-4'
+                                        >
+                                            <div className='min-w-0'>
+                                                <p className='truncate text-xs font-black tracking-widest uppercase'>
+                                                    {variable.name}
+                                                </p>
+                                                <p className='text-muted-foreground/50 mt-1 truncate font-mono text-[10px]'>
+                                                    {variable.env_variable}={variable.variable_value}
+                                                </p>
+                                            </div>
+                                            {Number(variable.is_encrypted) === 1 && (
+                                                <Lock className='text-muted-foreground/50 h-3.5 w-3.5 shrink-0' />
+                                            )}
+                                            <Button
+                                                variant='outline'
+                                                size='sm'
+                                                onClick={() => handleDeleteCustomVariable(variable)}
+                                                disabled={!canManageCustomVariables || customVariableSaving}
+                                                className='shrink-0'
+                                                aria-label={`Delete ${variable.env_variable}`}
+                                            >
+                                                <Trash2 className='h-3.5 w-3.5' />
+                                            </Button>
+                                        </div>
+                                    ))}
+                                </div>
+                            )}
+
+                            {canManageCustomVariables && (
+                                <div className='bg-secondary/20 border-border/10 grid grid-cols-1 gap-3 rounded-3xl border p-4 md:grid-cols-3'>
+                                    <Input
+                                        value={customVariableForm.name}
+                                        onChange={(e) =>
+                                            setCustomVariableForm((prev) => ({ ...prev, name: e.target.value }))
+                                        }
+                                        disabled={customVariableSaving}
+                                        placeholder='Display name'
+                                    />
+                                    <Input
+                                        value={customVariableForm.env_variable}
+                                        onChange={(e) =>
+                                            setCustomVariableForm((prev) => ({
+                                                ...prev,
+                                                env_variable: e.target.value.toUpperCase(),
+                                            }))
+                                        }
+                                        disabled={customVariableSaving}
+                                        placeholder='ENV_NAME'
+                                        className='font-mono text-xs'
+                                    />
+                                    <div className='flex gap-3'>
+                                        <Input
+                                            value={customVariableForm.variable_value}
+                                            onChange={(e) =>
+                                                setCustomVariableForm((prev) => ({
+                                                    ...prev,
+                                                    variable_value: e.target.value,
+                                                }))
+                                            }
+                                            disabled={customVariableSaving}
+                                            placeholder='Value'
+                                            className='font-mono text-xs'
+                                        />
+                                        <Button
+                                            variant='default'
+                                            size='default'
+                                            onClick={handleAddCustomVariable}
+                                            disabled={customVariableSaving}
+                                            loading={customVariableSaving}
+                                            className='shrink-0'
+                                        >
+                                            <Plus className='h-4 w-4' />
+                                        </Button>
+                                    </div>
+                                    <label className='text-muted-foreground/70 flex items-start gap-2 text-xs md:col-span-3'>
+                                        <input
+                                            type='checkbox'
+                                            checked={customVariableForm.is_encrypted}
+                                            onChange={(e) =>
+                                                setCustomVariableForm((prev) => ({
+                                                    ...prev,
+                                                    is_encrypted: e.target.checked,
+                                                }))
+                                            }
+                                            disabled={customVariableSaving}
+                                            className='mt-0.5 h-4 w-4 rounded border-white/20 bg-white/5'
+                                        />
+                                        <span>Encrypt this value and hide it after save</span>
+                                    </label>
+                                </div>
+                            )}
+                        </div>
                     </PageCard>
                     <WidgetRenderer widgets={getWidgets('server-startup', 'after-variables')} />
                 </div>
diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/subdomains/new/page.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/subdomains/new/page.tsx
index 778b90ed2..c988ed9f6 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/subdomains/new/page.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/subdomains/new/page.tsx
@@ -301,13 +301,12 @@ export default function CreateSubdomainPage() {
                             <li className='text-muted-foreground flex gap-3 text-xs'>
                                 <span className='bg-primary mt-1.5 h-1.5 w-1.5 shrink-0 rounded-full' />
                                 <span>
-                                    Subdomains allow you to give your server a custom address, like{' '}
-                                    <code>play.example.com</code>.
+                                    {t('serverSubdomains.guide_custom_address')} <code>play.example.com</code>.
                                 </span>
                             </li>
                             <li className='text-muted-foreground flex gap-3 text-xs'>
                                 <span className='bg-primary mt-1.5 h-1.5 w-1.5 shrink-0 rounded-full' />
-                                <span>You can create multiple subdomains for different purposes.</span>
+                                <span>{t('serverSubdomains.guide_multiple')}</span>
                             </li>
                         </ul>
                     </div>
diff --git a/frontendv2/src/app/(app)/vds/[id]/activities/page.tsx b/frontendv2/src/app/(app)/vds/[id]/activities/page.tsx
index 04aa9d24d..d9c268678 100644
--- a/frontendv2/src/app/(app)/vds/[id]/activities/page.tsx
+++ b/frontendv2/src/app/(app)/vds/[id]/activities/page.tsx
@@ -19,6 +19,8 @@ import React, { useState, useEffect, useCallback } from 'react';
 import { useParams, useRouter, usePathname } from 'next/navigation';
 import axios from 'axios';
 import { useTranslation } from '@/contexts/TranslationContext';
+import { useDateFormatOptions } from '@/contexts/PreferencesContext';
+import { formatDateTimeInTz, formatRelativeTime } from '@/lib/dateUtils';
 import { useVmInstance } from '@/contexts/VmInstanceContext';
 import { Dialog, DialogFooter, DialogHeader, DialogTitle, DialogDescription } from '@/components/ui/dialog';
 import {
@@ -109,41 +111,12 @@ function getEventIconClass(event: string) {
     return 'text-primary bg-primary/10 border-primary/20';
 }
 
-function formatRelativeTime(timestamp?: string, t?: (key: string, vars?: Record<string, string>) => string): string {
-    if (!timestamp) return '';
-    const now = new Date();
-    const date = new Date(timestamp);
-    const diffInSeconds = Math.floor((now.getTime() - date.getTime()) / 1000);
-
-    if (!t) {
-        if (diffInSeconds < 60) return 'Just now';
-        if (diffInSeconds < 3600) return `${Math.floor(diffInSeconds / 60)}m ago`;
-        if (diffInSeconds < 86400) return `${Math.floor(diffInSeconds / 3600)}h ago`;
-        if (diffInSeconds < 604800) return `${Math.floor(diffInSeconds / 86400)}d ago`;
-        return date.toLocaleDateString();
-    }
-
-    if (diffInSeconds < 60) return t('serverActivities.justNow');
-    if (diffInSeconds < 3600) {
-        const minutes = Math.floor(diffInSeconds / 60);
-        return t('serverActivities.minutesAgo', { minutes: String(minutes) });
-    }
-    if (diffInSeconds < 86400) {
-        const hours = Math.floor(diffInSeconds / 3600);
-        return t('serverActivities.hoursAgo', { hours: String(hours) });
-    }
-    if (diffInSeconds < 604800) {
-        const days = Math.floor(diffInSeconds / 86400);
-        return t('serverActivities.daysAgo', { days: String(days) });
-    }
-    return date.toLocaleDateString();
-}
-
 export default function VdsActivitiesPage() {
     const { id } = useParams() as { id: string };
     const router = useRouter();
     const pathname = usePathname();
     const { t } = useTranslation();
+    const dateOpts = useDateFormatOptions();
     const { instance, loading: instanceLoading, hasPermission } = useVmInstance();
     const { fetchWidgets, getWidgets } = usePluginWidgets('vds-activities');
 
@@ -242,18 +215,18 @@ export default function VdsActivitiesPage() {
                     to: p.to || 0,
                 });
             } catch {
-                toast.error('Failed to fetch activity log');
+                toast.error(t('vds.activities.fetch_failed'));
             } finally {
                 setLoading(false);
             }
         },
-        [id, searchQuery, selectedEventFilter],
+        [id, searchQuery, selectedEventFilter, t],
     );
 
     useEffect(() => {
         if (!instanceLoading) {
             if (!hasPermission('activity.read')) {
-                toast.error('You do not have permission to view this activity log');
+                toast.error(t('vds.activities.permission_denied'));
                 router.push(`/vds/${id}`);
                 return;
             }
@@ -323,7 +296,7 @@ export default function VdsActivitiesPage() {
         return (
             <div className='flex flex-col items-center justify-center py-24 text-center'>
                 <AlertTriangle className='text-destructive mb-4 h-12 w-12' />
-                <h2 className='text-xl font-black'>Instance Not Found</h2>
+                <h2 className='text-xl font-black'>{t('vds.console.not_found_title')}</h2>
             </div>
         );
     }
@@ -488,7 +461,9 @@ export default function VdsActivitiesPage() {
                                         <div className='text-muted-foreground flex items-center gap-2'>
                                             <Clock className='h-4 w-4 opacity-50' />
                                             <span className='text-sm font-semibold'>
-                                                {activity.timestamp ? formatRelativeTime(activity.timestamp, t) : '—'}
+                                                {activity.timestamp
+                                                    ? formatRelativeTime(activity.timestamp, dateOpts)
+                                                    : '—'}
                                             </span>
                                         </div>
                                         {activity.ip && (
@@ -619,7 +594,7 @@ export default function VdsActivitiesPage() {
                                     <DialogDescription className='text-xl font-medium opacity-70'>
                                         VDS Activity —{' '}
                                         {selectedItem.timestamp
-                                            ? new Date(selectedItem.timestamp).toLocaleString()
+                                            ? formatDateTimeInTz(selectedItem.timestamp, dateOpts)
                                             : '—'}
                                     </DialogDescription>
                                 </div>
@@ -649,7 +624,7 @@ export default function VdsActivitiesPage() {
                                         </span>
                                         <span className='text-lg font-bold'>
                                             {selectedItem.timestamp
-                                                ? new Date(selectedItem.timestamp).toLocaleString()
+                                                ? formatDateTimeInTz(selectedItem.timestamp, dateOpts)
                                                 : '—'}
                                         </span>
                                     </div>
@@ -690,7 +665,7 @@ export default function VdsActivitiesPage() {
                                         className='h-8 border-white/5 px-4 font-black tracking-wider uppercase opacity-40 hover:opacity-100'
                                         onClick={() => {
                                             navigator.clipboard.writeText(rawJson);
-                                            toast.success('Payload copied');
+                                            toast.success(t('vds.activities.payload_copied'));
                                         }}
                                     >
                                         <Copy className='mr-2 h-3.5 w-3.5' />
diff --git a/frontendv2/src/app/(app)/vds/[id]/backups/page.tsx b/frontendv2/src/app/(app)/vds/[id]/backups/page.tsx
index b0e50d67b..3f46af088 100644
--- a/frontendv2/src/app/(app)/vds/[id]/backups/page.tsx
+++ b/frontendv2/src/app/(app)/vds/[id]/backups/page.tsx
@@ -98,7 +98,7 @@ export default function VdsBackupsPage() {
         try {
             const { data } = await axios.get<ListBackupsResponse>(`/api/user/vm-instances/${id}/backups`);
             if (!data.success) {
-                toast.error(data.message || 'Failed to fetch backups');
+                toast.error(data.message || t('serverBackups.failedToFetch'));
                 return;
             }
             setBackups(data.data.backups || []);
@@ -111,7 +111,7 @@ export default function VdsBackupsPage() {
         } finally {
             setLoading(false);
         }
-    }, [id]);
+    }, [id, t]);
 
     useEffect(() => {
         if (!instanceLoading && !instance) {
@@ -160,10 +160,10 @@ export default function VdsBackupsPage() {
                 // Storage is enforced server-side from the VDS node default.
             });
             if (!data.success) {
-                toast.error(data.message || 'Failed to start backup');
+                toast.error(data.message || t('serverBackups.startFailed'));
                 return;
             }
-            toast.success('Backup started. This may take a few minutes.');
+            toast.success(t('serverBackups.startSuccess'));
             setConfirmCreateOpen(false);
             fetchBackups();
         } catch (err) {
@@ -185,10 +185,10 @@ export default function VdsBackupsPage() {
                 },
             });
             if (!data.success) {
-                toast.error(data.message || 'Failed to delete backup');
+                toast.error(data.message || t('serverBackups.deleteFailed'));
                 return;
             }
-            toast.success('Backup deleted');
+            toast.success(t('serverBackups.deleteSuccessShort'));
             setConfirmDeleteOpen(false);
             setSelectedForDelete(null);
             fetchBackups();
@@ -209,11 +209,11 @@ export default function VdsBackupsPage() {
                 storage: selectedForRestore.storage,
             });
             if (!data.success) {
-                toast.error(data.message || 'Failed to start restore');
+                toast.error(data.message || t('serverBackups.restoreStartFailed'));
                 return;
             }
             const restoreId = data.data?.restore_id;
-            toast.success('Restore started. This may take several minutes.');
+            toast.success(t('serverBackups.restoreStarted'));
             setConfirmRestoreOpen(false);
             setSelectedForRestore(null);
 
@@ -235,7 +235,7 @@ export default function VdsBackupsPage() {
 
         const poll = async () => {
             if (attempts >= maxAttempts) {
-                toast.error('Restore is taking longer than expected. Please check manually.');
+                toast.error(t('serverBackups.restoreTakingLong'));
                 return;
             }
 
@@ -245,11 +245,11 @@ export default function VdsBackupsPage() {
 
                 const status = data.data?.status;
                 if (status === 'active') {
-                    toast.success('Restore completed successfully!');
+                    toast.success(t('serverBackups.restoreCompleted'));
                     fetchBackups();
                     return;
                 } else if (status === 'failed') {
-                    toast.error(data.data?.error || 'Restore failed');
+                    toast.error(data.data?.error || t('serverBackups.restoreFailed'));
                     return;
                 }
 
diff --git a/frontendv2/src/app/(app)/vds/[id]/network/page.tsx b/frontendv2/src/app/(app)/vds/[id]/network/page.tsx
index 0cc81b441..f9cbeba35 100644
--- a/frontendv2/src/app/(app)/vds/[id]/network/page.tsx
+++ b/frontendv2/src/app/(app)/vds/[id]/network/page.tsx
@@ -154,7 +154,7 @@ export default function VdsNetworkingPage() {
                 actions={
                     <div className='flex w-full sm:w-auto sm:justify-end'>
                         <Button
-                            variant='glass'
+                            variant='outline'
                             size='sm'
                             onClick={fetchNetworking}
                             disabled={loading}
@@ -287,7 +287,7 @@ export default function VdsNetworkingPage() {
 
                         {canSettings ? (
                             <div className='flex justify-end pt-2'>
-                                <Button variant='glass' disabled={saving} onClick={handleApplyDns}>
+                                <Button variant='default' disabled={saving} onClick={handleApplyDns}>
                                     {saving && <Loader2 className='mr-2 h-4 w-4 animate-spin' />}
                                     {t('vds.networking.dns.apply_button') ?? 'Apply'}
                                 </Button>
diff --git a/frontendv2/src/app/(app)/vds/[id]/settings/page.tsx b/frontendv2/src/app/(app)/vds/[id]/settings/page.tsx
index b13f72c1b..36abc4f87 100644
--- a/frontendv2/src/app/(app)/vds/[id]/settings/page.tsx
+++ b/frontendv2/src/app/(app)/vds/[id]/settings/page.tsx
@@ -179,11 +179,11 @@ export default function VdsSettingsPage() {
 
     const handleReinstall = async () => {
         if (!selectedTemplate) {
-            toast.error('Please select a template first.');
+            toast.error(t('vds.settings.reinstall.select_template_first'));
             return;
         }
         setReinstalling(true);
-        const toastId = toast.loading('Initiating reinstall…');
+        const toastId = toast.loading(t('vds.settings.reinstall.initiating'));
         try {
             const payload: Record<string, unknown> = { template_id: selectedTemplate };
             if (isQemu) {
@@ -193,19 +193,19 @@ export default function VdsSettingsPage() {
             }
             const { data } = await axios.post(`/api/user/vm-instances/${id}/reinstall`, payload);
             if (!data.success) {
-                toast.error(data.message || 'Failed to start reinstall.', { id: toastId });
+                toast.error(data.message || t('vds.settings.reinstall.start_failed'), { id: toastId });
                 setReinstalling(false);
                 return;
             }
 
             const reinstallId: string | undefined = data.data?.reinstall_id;
             if (!reinstallId) {
-                toast.error('Reinstall did not return a reinstall_id', { id: toastId });
+                toast.error(t('vds.settings.reinstall.missing_id'), { id: toastId });
                 setReinstalling(false);
                 return;
             }
 
-            toast.loading(data.message || 'Reinstall initiated. This may take several minutes.', { id: toastId });
+            toast.loading(data.message || t('vds.settings.reinstall.started'), { id: toastId });
             setReinstallOpen(false);
 
             // Poll reinstall status until active or failed (mirrors admin VM flow).
@@ -213,7 +213,7 @@ export default function VdsSettingsPage() {
             let polls = 0;
             const poll = async (): Promise<void> => {
                 if (polls >= MAX_POLLS) {
-                    toast.error('Reinstall timed out waiting for completion', { id: toastId });
+                    toast.error(t('vds.settings.reinstall.timeout'), { id: toastId });
                     setReinstalling(false);
                     return;
                 }
@@ -223,14 +223,14 @@ export default function VdsSettingsPage() {
                     const s = statusRes.data?.data;
 
                     if (s?.status === 'completed' || s?.status === 'active') {
-                        toast.success('VDS reinstalled successfully.', { id: toastId });
+                        toast.success(t('vds.settings.reinstall.success'), { id: toastId });
                         await refreshInstance();
                         setReinstalling(false);
                         return;
                     }
 
                     if (s?.status === 'failed') {
-                        toast.error(s?.error ?? 'Reinstall failed', { id: toastId });
+                        toast.error(s?.error ?? t('vds.settings.reinstall.failed'), { id: toastId });
                         setReinstalling(false);
                         return;
                     }
@@ -263,12 +263,12 @@ export default function VdsSettingsPage() {
                 tpm_enabled: tpmEnabled,
                 serial0_enabled: serial0Enabled,
             });
-            toast.success(t('vds.settings.hardware.apply_success') ?? 'Hardware updated.');
+            toast.success(t('vds.settings.hardware.apply_success'));
             await refreshInstance();
             await fetchQemuHardware();
         } catch (err) {
             const msg = axios.isAxiosError(err) ? (err.response?.data?.message ?? err.message) : String(err);
-            toast.error(msg || (t('vds.settings.hardware.apply_failed') ?? 'Failed to update hardware.'));
+            toast.error(msg || t('vds.settings.hardware.apply_failed'));
         } finally {
             setQemuHardwareSaving(false);
         }
@@ -281,16 +281,16 @@ export default function VdsSettingsPage() {
         try {
             const { data } = await axios.post(`/api/user/vm-instances/${id}/iso-unmount`);
             if (!data?.success) {
-                toast.error(data?.message ?? 'Failed to unmount ISO');
+                toast.error(data?.message ?? t('vds.settings.iso.toast_unmount_failed'));
                 return;
             }
 
-            toast.success(t('vds.settings.iso.toast_unmounted') ?? 'ISO unmounted successfully');
+            toast.success(t('vds.settings.iso.toast_unmounted'));
             await fetchIsoCurrent();
             await refreshInstance();
         } catch (err) {
             const msg = axios.isAxiosError(err) ? (err.response?.data?.message ?? err.message) : String(err);
-            toast.error(msg || (t('vds.settings.iso.toast_unmount_failed') ?? 'Failed to unmount ISO'));
+            toast.error(msg || t('vds.settings.iso.toast_unmount_failed'));
         } finally {
             setIsoUninstalling(false);
         }
@@ -299,11 +299,11 @@ export default function VdsSettingsPage() {
     const handleFetchAndMountIsoFromUrl = async () => {
         const url = isoUrl.trim();
         if (!url) {
-            toast.error(t('vds.settings.iso.errors.url_required') ?? 'Enter an ISO URL');
+            toast.error(t('vds.settings.iso.errors.url_required'));
             return;
         }
         if (!isoStorage) {
-            toast.error(t('vds.settings.iso.errors.storage_required') ?? 'Select an ISO storage');
+            toast.error(t('vds.settings.iso.errors.storage_required'));
             return;
         }
 
@@ -312,17 +312,17 @@ export default function VdsSettingsPage() {
             const payload = { storage: isoStorage, url };
             const { data } = await axios.post(`/api/user/vm-instances/${id}/iso-fetch-and-mount`, payload);
             if (!data?.success) {
-                toast.error(data?.message ?? 'Failed to fetch & mount ISO');
+                toast.error(data?.message ?? t('vds.settings.iso.toast_fetch_failed'));
                 return;
             }
 
             const taskId = data?.data?.task_id as string | undefined;
             if (!taskId) {
-                toast.error(data?.message ?? 'Failed to queue ISO task');
+                toast.error(data?.message ?? t('vds.settings.iso.toast_queue_failed'));
                 return;
             }
 
-            toast.info(data?.message ?? 'ISO fetch queued');
+            toast.info(data?.message ?? t('vds.settings.iso.toast_fetch_queued'));
 
             // Poll until the Rust runner completes the task.
             const MAX_POLLS = 180; // ~9 minutes @ 3s
@@ -330,7 +330,7 @@ export default function VdsSettingsPage() {
 
             const poll = async () => {
                 if (polls >= MAX_POLLS) {
-                    toast.error('ISO fetch timed out');
+                    toast.error(t('vds.settings.iso.fetch_timeout'));
                     setIsoFetchingFromUrl(false);
                     return;
                 }
@@ -340,9 +340,8 @@ export default function VdsSettingsPage() {
                     const s = statusRes.data?.data;
 
                     if (s?.status === 'completed') {
-                        const mountedMsg = t('vds.settings.iso.toast_mounted') ?? 'ISO mounted successfully';
-                        const rebootHint =
-                            t('vds.settings.iso.toast_reboot_hint') ?? 'Reboot the VM to boot from the ISO.';
+                        const mountedMsg = t('vds.settings.iso.toast_mounted');
+                        const rebootHint = t('vds.settings.iso.toast_reboot_hint');
                         toast.success(`${mountedMsg} ${rebootHint}`);
 
                         setIsoUrl('');
@@ -353,7 +352,7 @@ export default function VdsSettingsPage() {
                     }
 
                     if (s?.status === 'failed') {
-                        toast.error(s?.error ?? t('vds.settings.iso.toast_fetch_failed') ?? 'Failed to fetch ISO');
+                        toast.error(s?.error ?? t('vds.settings.iso.toast_fetch_failed'));
                         setIsoFetchingFromUrl(false);
                         return;
                     }
@@ -369,7 +368,7 @@ export default function VdsSettingsPage() {
             void poll();
         } catch (err) {
             const msg = axios.isAxiosError(err) ? (err.response?.data?.message ?? err.message) : String(err);
-            toast.error(msg || (t('vds.settings.iso.toast_fetch_failed') ?? 'Failed to fetch ISO'));
+            toast.error(msg || t('vds.settings.iso.toast_fetch_failed'));
             setIsoFetchingFromUrl(false);
         }
     };
@@ -379,7 +378,7 @@ export default function VdsSettingsPage() {
             <div className='flex min-h-[60vh] items-center justify-center'>
                 <div className='flex flex-col items-center gap-4'>
                     <Loader2 className='text-primary h-10 w-10 animate-spin' />
-                    <p className='text-muted-foreground animate-pulse font-medium'>Loading VDS settings…</p>
+                    <p className='text-muted-foreground animate-pulse font-medium'>{t('vds.settings.loading')}</p>
                 </div>
             </div>
         );
@@ -392,9 +391,9 @@ export default function VdsSettingsPage() {
                     <div className='bg-destructive/10 mx-auto flex h-20 w-20 items-center justify-center rounded-3xl'>
                         <AlertTriangle className='text-destructive h-10 w-10' />
                     </div>
-                    <h2 className='text-2xl font-black'>VDS Not Found</h2>
+                    <h2 className='text-2xl font-black'>{t('vds.console.not_found_title')}</h2>
                     <Button variant='outline' onClick={() => router.push('/dashboard')}>
-                        Go Back
+                        {t('common.goBack')}
                     </Button>
                 </div>
             </div>
@@ -411,11 +410,13 @@ export default function VdsSettingsPage() {
                     <Lock className='h-10 w-10 text-red-400' />
                 </div>
                 <div>
-                    <h2 className='font-header text-2xl font-black tracking-tighter uppercase italic'>Access Denied</h2>
-                    <p className='text-muted-foreground mt-2'>You do not have permission to access VDS settings.</p>
+                    <h2 className='font-header text-2xl font-black tracking-tighter uppercase italic'>
+                        {t('common.accessDenied')}
+                    </h2>
+                    <p className='text-muted-foreground mt-2'>{t('vds.settings.access_denied')}</p>
                 </div>
                 <Button variant='outline' onClick={() => router.push(`/vds/${id}`)}>
-                    Go Back
+                    {t('common.goBack')}
                 </Button>
             </div>
         );
@@ -426,19 +427,19 @@ export default function VdsSettingsPage() {
             <WidgetRenderer widgets={getWidgets('vds-settings', 'top-of-page')} />
 
             <PageHeader
-                title='VDS Settings'
-                description='Manage your VDS instance settings and reinstall options.'
+                title={t('vds.settings.title')}
+                description={t('vds.settings.description')}
                 actions={
                     <div className='flex w-full sm:w-auto sm:justify-end'>
                         <Button
-                            variant='glass'
+                            variant='outline'
                             size='sm'
                             onClick={fetchTemplates}
                             disabled={templatesLoading}
-                            aria-label='Refresh'
+                            aria-label={t('common.refresh')}
                         >
                             <RefreshCw className={cn('h-4 w-4 sm:mr-1.5', templatesLoading && 'animate-spin')} />
-                            <span className='hidden sm:inline'>Refresh</span>
+                            <span className='hidden sm:inline'>{t('common.refresh')}</span>
                         </Button>
                     </div>
                 }
@@ -449,15 +450,21 @@ export default function VdsSettingsPage() {
                 <CardHeader>
                     <CardTitle className='flex items-center gap-2 text-sm font-black tracking-widest uppercase'>
                         <Server className='text-primary h-4 w-4' />
-                        Instance Info
+                        {t('vds.settings.instance_info.title')}
                     </CardTitle>
                 </CardHeader>
                 <CardContent className='grid grid-cols-2 gap-4 md:grid-cols-4'>
                     {[
-                        { label: 'Hostname', value: instance.hostname ?? '—' },
-                        { label: 'VMID', value: String(instance.vmid) },
-                        { label: 'Type', value: instance.vm_type?.toUpperCase() ?? 'QEMU' },
-                        { label: 'Node', value: instance.node_name ?? instance.pve_node ?? '—' },
+                        { label: t('vds.settings.instance_info.hostname'), value: instance.hostname ?? '—' },
+                        { label: t('vds.settings.instance_info.vmid'), value: String(instance.vmid) },
+                        {
+                            label: t('vds.settings.instance_info.type'),
+                            value: instance.vm_type?.toUpperCase() ?? 'QEMU',
+                        },
+                        {
+                            label: t('vds.settings.instance_info.node'),
+                            value: instance.node_name ?? instance.pve_node ?? '—',
+                        },
                     ].map(({ label, value }) => (
                         <div key={label} className='flex flex-col gap-1'>
                             <span className='text-muted-foreground/50 text-[10px] font-black tracking-widest uppercase'>
@@ -475,24 +482,23 @@ export default function VdsSettingsPage() {
                     <CardHeader>
                         <CardTitle className='flex items-center gap-2 text-sm font-black tracking-widest uppercase'>
                             <Server className='text-primary h-4 w-4' />
-                            {t('vds.settings.hardware.title') ?? 'QEMU Hardware (EFI / TPM)'}
+                            {t('vds.settings.hardware.title')}
                         </CardTitle>
                         <CardDescription className='text-muted-foreground'>
-                            {t('vds.settings.hardware.description') ??
-                                'Enable UEFI (EFI disk) and TPM 2.0 state disk for this QEMU VM.'}
+                            {t('vds.settings.hardware.description')}
                         </CardDescription>
                     </CardHeader>
                     <CardContent className='space-y-5'>
                         {qemuHardwareLoading ? (
                             <div className='text-muted-foreground flex items-center gap-2'>
                                 <Loader2 className='h-4 w-4 animate-spin' />
-                                {t('vds.settings.hardware.loading') ?? 'Loading hardware…'}
+                                {t('vds.settings.hardware.loading')}
                             </div>
                         ) : (
                             <div className='space-y-4'>
                                 <div className='space-y-2'>
                                     <div className='text-muted-foreground text-xs font-semibold'>
-                                        {t('vds.settings.hardware.bios_label') ?? 'BIOS / Firmware'}
+                                        {t('vds.settings.hardware.bios_label')}
                                     </div>
                                     <select
                                         value={biosMode}
@@ -507,12 +513,8 @@ export default function VdsSettingsPage() {
                                         }
                                         className='bg-muted/30 border-border/30 h-11 w-full rounded-xl border px-3'
                                     >
-                                        <option value='seabios'>
-                                            {t('vds.settings.hardware.bios_seabios') ?? 'Legacy (SeaBIOS)'}
-                                        </option>
-                                        <option value='ovmf'>
-                                            {t('vds.settings.hardware.bios_ovmf') ?? 'UEFI (OVMF)'}
-                                        </option>
+                                        <option value='seabios'>{t('vds.settings.hardware.bios_seabios')}</option>
+                                        <option value='ovmf'>{t('vds.settings.hardware.bios_ovmf')}</option>
                                     </select>
                                 </div>
 
@@ -527,11 +529,10 @@ export default function VdsSettingsPage() {
                                                 if (next) setBiosMode('ovmf');
                                             }}
                                         />
-                                        {t('vds.settings.hardware.efi_label') ?? 'Enable EFI disk'}
+                                        {t('vds.settings.hardware.efi_label')}
                                     </label>
                                     <p className='text-muted-foreground text-xs'>
-                                        {t('vds.settings.hardware.efi_help') ??
-                                            'Adds efidisk0 (UEFI firmware required for TPM).'}
+                                        {t('vds.settings.hardware.efi_help')}
                                     </p>
                                 </div>
 
@@ -549,11 +550,10 @@ export default function VdsSettingsPage() {
                                                 }
                                             }}
                                         />
-                                        {t('vds.settings.hardware.tpm_label') ?? 'Enable TPM 2.0'}
+                                        {t('vds.settings.hardware.tpm_label')}
                                     </label>
                                     <p className='text-muted-foreground text-xs'>
-                                        {t('vds.settings.hardware.tpm_help') ??
-                                            'Adds tpmstate0 (v2.0). Usually requires EFI/OVMF.'}
+                                        {t('vds.settings.hardware.tpm_help')}
                                     </p>
                                 </div>
 
@@ -567,23 +567,21 @@ export default function VdsSettingsPage() {
                                                 setSerial0Enabled(!disable);
                                             }}
                                         />
-                                        {t('vds.settings.hardware.disable_serial_label') ??
-                                            'Disable serial port (Windows)'}
+                                        {t('vds.settings.hardware.disable_serial_label')}
                                     </label>
                                     <p className='text-muted-foreground text-xs'>
-                                        {t('vds.settings.hardware.disable_serial_help') ??
-                                            'Removes `serial0` so the console renders graphical output instead of serial.'}
+                                        {t('vds.settings.hardware.disable_serial_help')}
                                     </p>
                                 </div>
 
                                 <div className='flex justify-end pt-2'>
                                     <Button
-                                        variant='glass'
+                                        variant='default'
                                         disabled={qemuHardwareSaving || qemuHardwareLoading}
                                         onClick={handleApplyQemuHardware}
                                     >
                                         {qemuHardwareSaving && <Loader2 className='mr-2 h-4 w-4 animate-spin' />}
-                                        {t('vds.settings.hardware.apply_button') ?? 'Apply'}
+                                        {t('vds.settings.hardware.apply_button')}
                                     </Button>
                                 </div>
                             </div>
@@ -598,21 +596,21 @@ export default function VdsSettingsPage() {
                     <CardHeader>
                         <CardTitle className='flex items-center gap-2 text-sm font-black tracking-widest uppercase'>
                             <Server className='text-primary h-4 w-4' />
-                            {t('vds.settings.iso.title') ?? 'ISO Mount'}
+                            {t('vds.settings.iso.title')}
                         </CardTitle>
                         <CardDescription className='text-muted-foreground'>
-                            {t('vds.settings.iso.description') ?? 'Use ISO URL to boot this VM from it.'}
+                            {t('vds.settings.iso.description')}
                         </CardDescription>
                     </CardHeader>
                     <CardContent className='space-y-5'>
                         <div className='space-y-2'>
                             <div className='text-muted-foreground text-xs font-semibold'>
-                                {t('vds.settings.iso.current_label') ?? 'Current ISO'}
+                                {t('vds.settings.iso.current_label')}
                             </div>
                             {isoCurrentLoading ? (
                                 <div className='text-muted-foreground flex items-center gap-2'>
                                     <Loader2 className='h-4 w-4 animate-spin' />
-                                    {t('vds.settings.iso.loading') ?? 'Loading…'}
+                                    {t('vds.settings.iso.loading')}
                                 </div>
                             ) : mountedIso ? (
                                 <div className='border-border/50 bg-muted/20 flex flex-col gap-1 rounded-xl border px-3 py-2'>
@@ -620,40 +618,38 @@ export default function VdsSettingsPage() {
                                         {mountedIso.filename ?? mountedIso.volid}
                                     </div>
                                     <div className='text-muted-foreground text-xs'>
-                                        {t('vds.settings.iso.mounted_as') ?? 'Mounted as'}{' '}
+                                        {t('vds.settings.iso.mounted_as')}{' '}
                                         <span className='font-mono'>{mountedIso.slot ?? 'ide2'}</span>
                                     </div>
                                 </div>
                             ) : (
-                                <p className='text-muted-foreground text-sm italic'>
-                                    {t('vds.settings.iso.none') ?? 'No ISO mounted.'}
-                                </p>
+                                <p className='text-muted-foreground text-sm italic'>{t('vds.settings.iso.none')}</p>
                             )}
 
                             <div className='flex justify-end pt-3'>
                                 <Button
-                                    variant='glass'
+                                    variant='default'
                                     disabled={!mountedIso || isoUninstalling}
                                     onClick={handleUnmountIso}
                                 >
                                     {isoUninstalling && <Loader2 className='mr-2 h-4 w-4 animate-spin' />}
-                                    {t('vds.settings.iso.unmount_button') ?? 'Unmount ISO'}
+                                    {t('vds.settings.iso.unmount_button')}
                                 </Button>
                             </div>
                         </div>
 
                         <div className='space-y-2'>
                             <div className='text-muted-foreground text-xs font-semibold'>
-                                {t('vds.settings.iso.storage_label') ?? 'ISO Storage'}
+                                {t('vds.settings.iso.storage_label')}
                             </div>
                             {isoStoragesLoading ? (
                                 <div className='text-muted-foreground flex items-center gap-2'>
                                     <Loader2 className='h-4 w-4 animate-spin' />
-                                    {t('vds.settings.iso.loading') ?? 'Loading…'}
+                                    {t('vds.settings.iso.loading')}
                                 </div>
                             ) : isoStorages.length === 0 ? (
                                 <p className='text-muted-foreground text-sm italic'>
-                                    {t('vds.settings.iso.no_storages') ?? 'No ISO storage available'}
+                                    {t('vds.settings.iso.no_storages')}
                                 </p>
                             ) : (
                                 <div className='bg-muted/30 border-border/30 flex h-11 w-full items-center rounded-xl border px-4 font-mono text-sm'>
@@ -665,12 +661,12 @@ export default function VdsSettingsPage() {
                         <div className='space-y-3'>
                             <div className='space-y-2'>
                                 <div className='text-muted-foreground text-xs font-semibold'>
-                                    {t('vds.settings.iso.url_label') ?? 'ISO URL'}
+                                    {t('vds.settings.iso.url_label')}
                                 </div>
                                 <Input
                                     value={isoUrl}
                                     onChange={(e) => setIsoUrl(e.target.value)}
-                                    placeholder={t('vds.settings.iso.url_placeholder') ?? 'https://example.com/my.iso'}
+                                    placeholder={t('vds.settings.iso.url_placeholder')}
                                     disabled={isoUninstalling || isoFetchingFromUrl}
                                     className='bg-muted/30'
                                 />
@@ -678,12 +674,12 @@ export default function VdsSettingsPage() {
 
                             <div className='flex justify-end pt-2'>
                                 <Button
-                                    variant='glass'
+                                    variant='default'
                                     disabled={isoUninstalling || isoFetchingFromUrl || !isoStorage || !isoUrl.trim()}
                                     onClick={handleFetchAndMountIsoFromUrl}
                                 >
                                     {isoFetchingFromUrl && <Loader2 className='mr-2 h-4 w-4 animate-spin' />}
-                                    {t('vds.settings.iso.fetch_button') ?? 'Fetch & Mount'}
+                                    {t('vds.settings.iso.fetch_button')}
                                 </Button>
                             </div>
                         </div>
@@ -697,10 +693,10 @@ export default function VdsSettingsPage() {
                     <CardHeader>
                         <CardTitle className='flex items-center gap-2 text-sm font-black tracking-widest uppercase'>
                             <RotateCcw className='text-primary h-4 w-4' />
-                            {t('vds.settings.reinstall.title') ?? 'Reinstall Operating System'}
+                            {t('vds.settings.reinstall.title')}
                         </CardTitle>
                         <CardDescription className='text-muted-foreground'>
-                            {t('vds.settings.reinstall.description') ?? 'Permanently wipe and reinstall your VDS.'}
+                            {t('vds.settings.reinstall.description')}
                         </CardDescription>
                     </CardHeader>
                     <CardContent className='space-y-4'>
@@ -736,7 +732,7 @@ export default function VdsSettingsPage() {
                         )}
 
                         <Button
-                            variant='destructive'
+                            variant='default'
                             size='default'
                             disabled={!selectedTemplate || templatesLoading}
                             onClick={() => setReinstallOpen(true)}
@@ -843,7 +839,7 @@ export default function VdsSettingsPage() {
                         {t('vds.settings.reinstall.cancel_button')}
                     </Button>
                     <Button
-                        variant='destructive'
+                        variant='default'
                         size='default'
                         onClick={handleReinstall}
                         disabled={reinstalling}
diff --git a/frontendv2/src/app/(app)/vds/[id]/users/page.tsx b/frontendv2/src/app/(app)/vds/[id]/users/page.tsx
index eb589bbc9..edb6aaf28 100644
--- a/frontendv2/src/app/(app)/vds/[id]/users/page.tsx
+++ b/frontendv2/src/app/(app)/vds/[id]/users/page.tsx
@@ -81,20 +81,20 @@ export default function VdsSubusersPage() {
             const axiosError = error as AxiosError<{ message: string }>;
             // 403 means subuser trying to access — redirect
             if (axiosError.response?.status === 403) {
-                toast.error('Only the VM owner can manage subusers.');
+                toast.error(t('vds.subusers.owner_only'));
                 router.push(`/vds/${id}`);
                 return;
             }
-            toast.error('Failed to fetch subusers');
+            toast.error(t('vds.subusers.fetch_failed'));
         } finally {
             setLoading(false);
         }
-    }, [id, router]);
+    }, [id, router, t]);
 
     React.useEffect(() => {
         if (!instanceLoading) {
             if (!instance?.is_owner) {
-                toast.error('Only the VM owner can manage subusers.');
+                toast.error(t('vds.subusers.owner_only'));
                 router.push(`/vds/${id}`);
                 return;
             }
@@ -113,11 +113,11 @@ export default function VdsSubusersPage() {
 
     const handleAdd = async () => {
         if (!addEmail || !addEmail.includes('@')) {
-            toast.error('Please enter a valid email address.');
+            toast.error(t('validation.email'));
             return;
         }
         if (addPermissions.length === 0) {
-            toast.error('Select at least one permission.');
+            toast.error(t('vds.subusers.select_permission'));
             return;
         }
         setAddLoading(true);
@@ -127,17 +127,17 @@ export default function VdsSubusersPage() {
                 permissions: addPermissions,
             });
             if (data.success) {
-                toast.success('Subuser added successfully.');
+                toast.success(t('vds.subusers.added'));
                 setIsAddOpen(false);
                 setAddEmail('');
                 setAddPermissions(['power', 'console']);
                 fetchSubusers();
             } else {
-                toast.error(data.message || 'Failed to add subuser.');
+                toast.error(data.message || t('vds.subusers.add_failed'));
             }
         } catch (error) {
             const axiosError = error as AxiosError<{ message: string }>;
-            toast.error(axiosError.response?.data?.message || 'Failed to add subuser.');
+            toast.error(axiosError.response?.data?.message || t('vds.subusers.add_failed'));
         } finally {
             setAddLoading(false);
         }
@@ -149,15 +149,15 @@ export default function VdsSubusersPage() {
         try {
             const { data } = await axios.delete(`/api/user/vm-instances/${id}/subusers/${selectedSubuser.id}`);
             if (data.success) {
-                toast.success('Subuser removed.');
+                toast.success(t('vds.subusers.removed'));
                 setIsDeleteOpen(false);
                 fetchSubusers();
             } else {
-                toast.error(data.message || 'Failed to remove subuser.');
+                toast.error(data.message || t('vds.subusers.remove_failed'));
             }
         } catch (error) {
             const axiosError = error as AxiosError<{ message: string }>;
-            toast.error(axiosError.response?.data?.message || 'Failed to remove subuser.');
+            toast.error(axiosError.response?.data?.message || t('vds.subusers.remove_failed'));
         } finally {
             setDeleting(false);
         }
@@ -184,15 +184,15 @@ export default function VdsSubusersPage() {
                 permissions: editPerms,
             });
             if (data.success) {
-                toast.success('Permissions updated.');
+                toast.success(t('vds.subusers.permissions_updated'));
                 setIsPermOpen(false);
                 fetchSubusers();
             } else {
-                toast.error(data.message || 'Failed to update permissions.');
+                toast.error(data.message || t('vds.subusers.permissions_update_failed'));
             }
         } catch (error) {
             const axiosError = error as AxiosError<{ message: string }>;
-            toast.error(axiosError.response?.data?.message || 'Failed to update permissions.');
+            toast.error(axiosError.response?.data?.message || t('vds.subusers.permissions_update_failed'));
         } finally {
             setSavingPerms(false);
         }
@@ -211,7 +211,7 @@ export default function VdsSubusersPage() {
         return (
             <div className='flex flex-col items-center justify-center py-24 text-center'>
                 <AlertTriangle className='text-destructive mb-4 h-12 w-12' />
-                <h2 className='text-xl font-black'>Instance Not Found</h2>
+                <h2 className='text-xl font-black'>{t('vds.console.not_found_title')}</h2>
             </div>
         );
     }
@@ -223,8 +223,8 @@ export default function VdsSubusersPage() {
                     <Lock className='h-10 w-10 text-red-400' />
                 </div>
                 <div>
-                    <h2 className='text-2xl font-black'>Access Denied</h2>
-                    <p className='text-muted-foreground mt-2'>Only the VM owner can manage subusers.</p>
+                    <h2 className='text-2xl font-black'>{t('common.accessDenied')}</h2>
+                    <p className='text-muted-foreground mt-2'>{t('vds.subusers.owner_only')}</p>
                 </div>
                 <Button variant='outline' onClick={() => router.push(`/vds/${id}`)}>
                     Go Back
@@ -276,7 +276,7 @@ export default function VdsSubusersPage() {
 
             {subusers.length === 0 ? (
                 <EmptyState
-                    title='No Subusers'
+                    title={t('vds.subusers.no_subusers')}
                     description='Add a subuser to grant them access to this VDS instance.'
                     icon={Users}
                     action={
@@ -339,7 +339,7 @@ export default function VdsSubusersPage() {
             <HeadlessModal
                 isOpen={isAddOpen}
                 onClose={() => setIsAddOpen(false)}
-                title='Add Subuser'
+                title={t('vds.subusers.add')}
                 description='Enter the email address of the user you want to add and select their permissions.'
             >
                 <div className='space-y-6 py-4'>
@@ -437,7 +437,7 @@ export default function VdsSubusersPage() {
             <HeadlessModal
                 isOpen={isDeleteOpen}
                 onClose={() => setIsDeleteOpen(false)}
-                title='Remove Subuser'
+                title={t('vds.subusers.remove')}
                 description={`Are you sure you want to remove ${selectedSubuser?.username || `user #${selectedSubuser?.user_id}`} from this VDS instance?`}
             >
                 <div className='border-border/5 flex justify-end gap-3 border-t pt-6'>
@@ -471,7 +471,7 @@ export default function VdsSubusersPage() {
             <HeadlessModal
                 isOpen={isPermOpen}
                 onClose={() => setIsPermOpen(false)}
-                title='Edit Permissions'
+                title={t('vds.subusers.edit_permissions')}
                 description={`Manage permissions for ${permSubuser?.username || `user #${permSubuser?.user_id}`}`}
                 className='max-w-lg'
             >
diff --git a/frontendv2/src/components/Navbar.tsx b/frontendv2/src/components/Navbar.tsx
index 3d058e523..838e6708c 100644
--- a/frontendv2/src/components/Navbar.tsx
+++ b/frontendv2/src/components/Navbar.tsx
@@ -28,6 +28,7 @@ import { useNavbarHoverReveal } from '@/hooks/useNavbarHoverReveal';
 import { useNavbarSticky } from '@/hooks/useNavbarSticky';
 import { useChromeLayout } from '@/hooks/useChromeLayout';
 import { NavbarClassicChrome, NavbarModernChrome } from '@/components/NavbarChromeVariants';
+import { ServerSwitcher } from '@/components/server/ServerSwitcher';
 
 interface NavbarProps {
     onMenuClick: () => void;
@@ -45,8 +46,8 @@ export default function Navbar({ onMenuClick }: NavbarProps) {
     const isOnAdminPage = pathname?.startsWith('/admin');
     const serverName = isOnServerPage ? serverContext?.server?.name : null;
     const isKnowledgeBaseSection = pathname?.startsWith('/dashboard/knowledgebase');
-    const headerTitle =
-        serverName ?? (isKnowledgeBaseSection ? t('dashboard.knowledgebase.title') : t('dashboard.title'));
+    const headerTitle = isKnowledgeBaseSection ? t('dashboard.knowledgebase.title') : t('dashboard.title');
+    const headerContent = isOnServerPage ? <ServerSwitcher fallbackTitle={serverName ?? undefined} /> : undefined;
 
     const userNavigation = [{ name: t('navbar.profile'), href: '/dashboard/account', icon: CircleUser }];
 
@@ -91,6 +92,7 @@ export default function Navbar({ onMenuClick }: NavbarProps) {
     const chromeProps = {
         onMenuClick,
         headerTitle,
+        headerContent,
         showAdminAreaButton,
         adminAreaHref,
         user,
diff --git a/frontendv2/src/components/NavbarChromeVariants.tsx b/frontendv2/src/components/NavbarChromeVariants.tsx
index 622409e2a..d6f90900c 100644
--- a/frontendv2/src/components/NavbarChromeVariants.tsx
+++ b/frontendv2/src/components/NavbarChromeVariants.tsx
@@ -15,7 +15,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 'use client';
 
-import type { Dispatch, SetStateAction } from 'react';
+import type { Dispatch, ReactNode, SetStateAction } from 'react';
 import { Fragment } from 'react';
 import { Menu, Transition } from '@headlessui/react';
 import {
@@ -34,11 +34,13 @@ import type { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.
 import Image from 'next/image';
 import { cn, copyToClipboard } from '@/lib/utils';
 import ThemeCustomizer from '@/components/layout/ThemeCustomizer';
+import { PoweredByFeatherPanel } from '@/components/branding/PoweredByFeatherPanel';
 import type { UserInfo } from '@/contexts/SessionContext';
 
 export type NavbarChromeProps = {
     onMenuClick: () => void;
     headerTitle: string;
+    headerContent?: ReactNode;
     showAdminAreaButton: boolean;
     adminAreaHref: string;
     user: UserInfo | null;
@@ -62,6 +64,7 @@ export function NavbarClassicChrome(props: NavbarChromeProps) {
     const {
         onMenuClick,
         headerTitle,
+        headerContent,
         showAdminAreaButton,
         adminAreaHref,
         user,
@@ -81,7 +84,7 @@ export function NavbarClassicChrome(props: NavbarChromeProps) {
     return (
         <div
             className={cn(
-                'border-border/20 bg-card/78 z-30 flex h-14 shrink-0 items-center gap-x-2 border-b px-2 backdrop-blur-xl sm:h-16 sm:gap-x-4 sm:px-6 lg:px-8',
+                'border-border/50 bg-card z-30 flex h-14 shrink-0 items-center gap-x-2 border-b px-2 sm:h-16 sm:gap-x-4 sm:px-6 lg:px-8',
                 navbarSticky ? 'sticky top-0' : 'relative',
                 desktopHoverDock && 'lg:static lg:top-auto',
             )}
@@ -100,12 +103,14 @@ export function NavbarClassicChrome(props: NavbarChromeProps) {
 
             <div className='flex min-w-0 flex-1 gap-x-2 self-stretch sm:gap-x-4 lg:gap-x-6'>
                 <div className='flex min-w-0 flex-1 items-center'>
-                    <h1
-                        className='text-foreground min-w-0 truncate pr-2 text-base font-semibold sm:pr-1 sm:text-lg'
-                        title={headerTitle}
-                    >
-                        {headerTitle}
-                    </h1>
+                    {headerContent ?? (
+                        <h1
+                            className='text-foreground min-w-0 truncate pr-2 text-base font-semibold sm:pr-1 sm:text-lg'
+                            title={headerTitle}
+                        >
+                            {headerTitle}
+                        </h1>
+                    )}
                 </div>
 
                 <div className='flex shrink-0 items-center gap-x-1.5 sm:gap-x-3 lg:gap-x-6'>
@@ -346,16 +351,7 @@ export function NavbarClassicChrome(props: NavbarChromeProps) {
                                 </div>
 
                                 <div className='border-border/50 bg-card/80 border-t px-3 py-2'>
-                                    <p className='text-center'>
-                                        <a
-                                            href='https://featherpanel.com'
-                                            target='_blank'
-                                            rel='noopener noreferrer'
-                                            className='text-muted-foreground/80 hover:text-primary text-[10px] font-normal tracking-wide lowercase underline-offset-2 transition-colors hover:underline'
-                                        >
-                                            {t('navbar.poweredBy')}
-                                        </a>
-                                    </p>
+                                    <PoweredByFeatherPanel variant='menu' />
                                 </div>
                             </Menu.Items>
                         </Transition>
@@ -370,6 +366,7 @@ export function NavbarModernChrome(props: NavbarChromeProps) {
     const {
         onMenuClick,
         headerTitle,
+        headerContent,
         showAdminAreaButton,
         adminAreaHref,
         user,
@@ -412,12 +409,14 @@ export function NavbarModernChrome(props: NavbarChromeProps) {
 
                 <div className='flex min-w-0 flex-1 items-stretch gap-x-2 self-stretch sm:gap-x-3'>
                     <div className='flex min-w-0 flex-1 items-center'>
-                        <h1
-                            className='text-foreground truncate text-sm font-semibold tracking-tight sm:text-[0.95rem]'
-                            title={headerTitle}
-                        >
-                            {headerTitle}
-                        </h1>
+                        {headerContent ?? (
+                            <h1
+                                className='text-foreground truncate text-sm font-semibold tracking-tight sm:text-[0.95rem]'
+                                title={headerTitle}
+                            >
+                                {headerTitle}
+                            </h1>
+                        )}
                     </div>
 
                     <div className='flex shrink-0 items-center gap-1 sm:gap-2'>
@@ -652,16 +651,7 @@ export function NavbarModernChrome(props: NavbarChromeProps) {
                                     </div>
 
                                     <div className='border-border/35 border-t px-3 py-2'>
-                                        <p className='text-center'>
-                                            <a
-                                                href='https://featherpanel.com'
-                                                target='_blank'
-                                                rel='noopener noreferrer'
-                                                className='text-muted-foreground/70 hover:text-primary text-[10px] font-normal tracking-wide lowercase underline-offset-2 transition-colors hover:underline'
-                                            >
-                                                {t('navbar.poweredBy')}
-                                            </a>
-                                        </p>
+                                        <PoweredByFeatherPanel variant='menu' />
                                     </div>
                                 </Menu.Items>
                             </Transition>
diff --git a/frontendv2/src/components/Sidebar.tsx b/frontendv2/src/components/Sidebar.tsx
index 5eaf07b58..3fe945ed0 100644
--- a/frontendv2/src/components/Sidebar.tsx
+++ b/frontendv2/src/components/Sidebar.tsx
@@ -32,6 +32,7 @@ import { useNavigation } from '@/hooks/useNavigation';
 import { useTranslation } from '@/contexts/TranslationContext';
 import type { NavigationItem } from '@/types/navigation';
 import { type ChromeLayout, useChromeLayout } from '@/hooks/useChromeLayout';
+import { PoweredByFeatherPanel } from '@/components/branding/PoweredByFeatherPanel';
 
 interface SidebarProps {
     mobileOpen: boolean;
@@ -204,13 +205,13 @@ function SidebarContent({
     const isClassicChrome = chromeLayout === 'classic';
 
     const navItemBase = isClassicChrome
-        ? 'group flex items-center w-full rounded-lg text-sm font-medium transition-all'
+        ? 'group flex items-center w-full rounded-md text-sm font-medium transition-colors'
         : 'group flex items-center w-full rounded-xl text-sm font-medium transition-[background-color,box-shadow,color,transform] duration-200';
     const navItemIdle = isClassicChrome
-        ? 'text-muted-foreground hover:bg-accent hover:text-accent-foreground'
+        ? 'text-muted-foreground hover:bg-muted hover:text-foreground'
         : 'text-muted-foreground hover:bg-muted/55 hover:text-foreground dark:hover:bg-muted/20';
     const navItemActive = isClassicChrome
-        ? 'bg-primary text-primary-foreground'
+        ? 'bg-accent text-accent-foreground font-semibold ring-1 ring-border/50'
         : 'bg-primary/12 text-primary font-semibold shadow-sm ring-1 ring-inset ring-primary/15 dark:bg-primary/[0.14] dark:ring-primary/28';
 
     const badgeClass = isClassicChrome
@@ -386,7 +387,7 @@ function SidebarContent({
             <nav
                 className={cn(
                     isClassicChrome
-                        ? 'custom-scrollbar flex-1 space-y-6 overflow-y-auto px-2 py-4'
+                        ? 'custom-scrollbar flex-1 space-y-4 overflow-y-auto px-3 py-3'
                         : 'custom-scrollbar flex-1 space-y-4 overflow-y-auto py-3 sm:space-y-5',
                     !isClassicChrome && (collapsed && !mobile ? 'px-1.5' : 'px-2'),
                 )}
@@ -626,6 +627,7 @@ function SidebarContent({
                             </>
                         )}
                     </button>
+                    {!collapsed && <PoweredByFeatherPanel variant='sidebar' className='mt-2 px-1' />}
                 </div>
             )}
         </div>
@@ -640,6 +642,7 @@ export default function Sidebar({ mobileOpen, setMobileOpen, pluginFullBleed = f
     const { settings } = useSettings();
     const { navigationItems } = useNavigation();
     const { chromeLayout } = useChromeLayout();
+    const { t } = useTranslation();
     const [collapsed, setCollapsed] = useState(() => {
         if (typeof window !== 'undefined') {
             try {
@@ -652,7 +655,7 @@ export default function Sidebar({ mobileOpen, setMobileOpen, pluginFullBleed = f
     });
 
     const groupedItems = useMemo(() => {
-        return navigationItems.reduce(
+        const grouped = navigationItems.reduce(
             (acc, item) => {
                 const group = item.group || 'Other';
                 if (!acc[group]) acc[group] = [];
@@ -661,6 +664,12 @@ export default function Sidebar({ mobileOpen, setMobileOpen, pluginFullBleed = f
             },
             {} as Record<string, NavigationItem[]>,
         );
+
+        Object.values(grouped).forEach((items) => {
+            items.sort((a, b) => (a.priority ?? Number.MAX_SAFE_INTEGER) - (b.priority ?? Number.MAX_SAFE_INTEGER));
+        });
+
+        return grouped;
     }, [navigationItems]);
 
     useEffect(() => {
@@ -726,7 +735,7 @@ export default function Sidebar({ mobileOpen, setMobileOpen, pluginFullBleed = f
                                             className='border-border/50 bg-card/90 text-muted-foreground hover:bg-muted hover:text-foreground rounded-full border p-2.5 shadow-lg backdrop-blur-md transition-colors'
                                             onClick={() => setMobileOpen(false)}
                                         >
-                                            <span className='sr-only'>Close sidebar</span>
+                                            <span className='sr-only'>{t('sidebar.close')}</span>
                                             <X className='h-5 w-5' aria-hidden='true' />
                                         </button>
                                     </div>
@@ -735,8 +744,7 @@ export default function Sidebar({ mobileOpen, setMobileOpen, pluginFullBleed = f
                                 <div
                                     className={cn(
                                         'flex h-full min-h-0 grow flex-col gap-y-5 overflow-y-auto',
-                                        chromeLayout === 'classic' &&
-                                            'bg-card/70 border-border/80 border-r backdrop-blur-xl',
+                                        chromeLayout === 'classic' && 'bg-card border-border/80 border-r',
                                     )}
                                 >
                                     <SidebarContent
@@ -769,7 +777,7 @@ export default function Sidebar({ mobileOpen, setMobileOpen, pluginFullBleed = f
                         'flex h-full min-h-0 grow flex-col gap-y-5 overflow-y-auto transition-[width] duration-300 ease-out',
                         chromeLayout === 'classic'
                             ? cn(
-                                  'bg-card/70 lg:border-border/80 backdrop-blur-xl transition-all duration-300 lg:border-r',
+                                  'bg-card lg:border-border/80 transition-all duration-300 lg:border-r',
                                   collapsed ? 'w-16' : 'w-64',
                               )
                             : collapsed
diff --git a/frontendv2/src/components/account/ActivityTab.tsx b/frontendv2/src/components/account/ActivityTab.tsx
index 5606ca57c..42ba6240d 100644
--- a/frontendv2/src/components/account/ActivityTab.tsx
+++ b/frontendv2/src/components/account/ActivityTab.tsx
@@ -17,12 +17,14 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 import { useState, useEffect, useCallback } from 'react';
 import { useTranslation } from '@/contexts/TranslationContext';
+import { useDateFormatOptions } from '@/contexts/PreferencesContext';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/featherui/Input';
 import { Clock, RefreshCw, ChevronLeft, ChevronRight } from 'lucide-react';
 import axios from 'axios';
 import { toast } from 'sonner';
 import { ActivityFeed } from '@/components/dashboard/ActivityFeed';
+import { formatRelativeTime } from '@/lib/dateUtils';
 import type { Activity } from '@/types/activity';
 
 interface PaginationInfo {
@@ -38,6 +40,7 @@ interface PaginationInfo {
 
 export default function ActivityTab() {
     const { t } = useTranslation();
+    const dateOpts = useDateFormatOptions();
     const [activities, setActivities] = useState<Activity[]>([]);
     const [loading, setLoading] = useState(true);
     const [searchQuery, setSearchQuery] = useState('');
@@ -64,12 +67,12 @@ export default function ActivityTab() {
                 }
             } catch (error) {
                 console.error('Error fetching activities:', error);
-                toast.error('Failed to load activity log');
+                toast.error(t('account.activity.loadFailed'));
             } finally {
                 setLoading(false);
             }
         },
-        [searchQuery],
+        [searchQuery, t],
     );
 
     useEffect(() => {
@@ -85,31 +88,7 @@ export default function ActivityTab() {
         return () => clearTimeout(timeout);
     }, [searchQuery, fetchActivities]);
 
-    const formatDate = (dateString: string): string => {
-        if (!dateString) return '-';
-        try {
-            const date = new Date(dateString);
-            const now = new Date();
-            const diffInHours = Math.abs(now.getTime() - date.getTime()) / (1000 * 60 * 60);
-
-            if (diffInHours < 1) {
-                return t('common.time.just_now');
-            } else if (diffInHours < 24) {
-                const hours = Math.floor(diffInHours);
-                return t('common.time.hours_ago', { count: hours.toString(), s: hours > 1 ? 's' : '' });
-            } else if (diffInHours < 48) {
-                return t('common.time.yesterday');
-            } else {
-                return (
-                    date.toLocaleDateString() +
-                    ' ' +
-                    date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })
-                );
-            }
-        } catch {
-            return dateString;
-        }
-    };
+    const formatDate = (dateString: string): string => formatRelativeTime(dateString, dateOpts);
 
     const visiblePages = () => {
         if (!pagination) return [];
@@ -158,10 +137,14 @@ export default function ActivityTab() {
                 <p className='text-muted-foreground text-sm'>
                     {pagination ? (
                         <span>
-                            Showing {pagination.from} to {pagination.to} of {pagination.total_records} activities
+                            {t('account.activity.showingActivities', {
+                                from: pagination.from.toString(),
+                                to: pagination.to.toString(),
+                                total: pagination.total_records.toString(),
+                            })}
                         </span>
                     ) : (
-                        <span>{activities.length} activities</span>
+                        <span>{t('account.activity.totalActivities', { count: activities.length.toString() })}</span>
                     )}
                 </p>
                 <Button variant='outline' size='sm' onClick={() => fetchActivities(currentPage)}>
@@ -204,10 +187,12 @@ export default function ActivityTab() {
                 <div className='py-12 text-center'>
                     <Clock className='text-muted-foreground mx-auto mb-4 h-12 w-12' />
                     <h4 className='text-foreground mb-2 text-sm font-semibold'>
-                        {searchQuery ? 'No search results' : t('account.activity.noActivities')}
+                        {searchQuery ? t('account.activity.noSearchResults') : t('account.activity.noActivities')}
                     </h4>
                     <p className='text-muted-foreground text-sm'>
-                        {searchQuery ? 'Try a different search term' : 'Your recent activity will appear here'}
+                        {searchQuery
+                            ? t('account.activity.tryDifferentSearch')
+                            : t('account.activity.emptyDescription')}
                     </p>
                 </div>
             )}
diff --git a/frontendv2/src/components/account/ApiKeysTab.tsx b/frontendv2/src/components/account/ApiKeysTab.tsx
index 5b6b08a34..ca8d4c344 100644
--- a/frontendv2/src/components/account/ApiKeysTab.tsx
+++ b/frontendv2/src/components/account/ApiKeysTab.tsx
@@ -15,7 +15,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 'use client';
 
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { useSession } from '@/contexts/SessionContext';
 import { useSettings } from '@/contexts/SettingsContext';
@@ -77,7 +77,7 @@ export default function ApiKeysTab({ slug = 'account-api-keys' }: ApiKeysTabProp
 
     const canCreateApiKeys = settings?.user_allow_api_keys_create || hasPermission('admin.api.bypass_restrictions');
 
-    const fetchClients = async () => {
+    const fetchClients = useCallback(async () => {
         setLoading(true);
         try {
             const { data } = await axios.get('/api/user/api-clients');
@@ -86,16 +86,16 @@ export default function ApiKeysTab({ slug = 'account-api-keys' }: ApiKeysTabProp
             }
         } catch (error) {
             console.error('Error fetching API clients:', error);
-            toast.error('Failed to load API clients');
+            toast.error(t('account.apiKeys.loadClientsFailed'));
         } finally {
             setLoading(false);
         }
-    };
+    }, [t]);
 
     useEffect(() => {
         fetchClients();
         fetchWidgets();
-    }, [fetchWidgets]);
+    }, [fetchWidgets, fetchClients]);
 
     const filteredClients = clients.filter(
         (client) =>
@@ -146,7 +146,7 @@ export default function ApiKeysTab({ slug = 'account-api-keys' }: ApiKeysTabProp
             }
         } catch (error) {
             console.error('Error updating API client:', error);
-            toast.error('Failed to update API client');
+            toast.error(t('account.apiKeys.updateClientFailed'));
         }
     };
 
@@ -159,7 +159,7 @@ export default function ApiKeysTab({ slug = 'account-api-keys' }: ApiKeysTabProp
             }
         } catch (error) {
             console.error('Error loading API client:', error);
-            toast.error('Failed to load API client');
+            toast.error(t('account.apiKeys.loadClientFailed'));
         }
     };
 
@@ -175,7 +175,7 @@ export default function ApiKeysTab({ slug = 'account-api-keys' }: ApiKeysTabProp
             }
         } catch (error) {
             console.error('Error loading API client:', error);
-            toast.error('Failed to load API client');
+            toast.error(t('account.apiKeys.loadClientFailed'));
         }
     };
 
@@ -209,7 +209,7 @@ export default function ApiKeysTab({ slug = 'account-api-keys' }: ApiKeysTabProp
             }
         } catch (error) {
             console.error('Error regenerating API keys:', error);
-            toast.error('Failed to regenerate API keys');
+            toast.error(t('account.apiKeys.regenerateFailed'));
         }
     };
 
diff --git a/frontendv2/src/components/account/ProfileTab.tsx b/frontendv2/src/components/account/ProfileTab.tsx
index b7ebf31fe..96066c7c1 100644
--- a/frontendv2/src/components/account/ProfileTab.tsx
+++ b/frontendv2/src/components/account/ProfileTab.tsx
@@ -135,7 +135,7 @@ export default function ProfileTab() {
 
         try {
             if (isEnabled(settings?.turnstile_enabled) && !turnstileToken) {
-                toast.error('Please complete the CAPTCHA verification');
+                toast.error(t('validation.captcha_required'));
                 return;
             }
 
diff --git a/frontendv2/src/components/account/SettingsTab.tsx b/frontendv2/src/components/account/SettingsTab.tsx
index b8c9653a5..9d5873de6 100644
--- a/frontendv2/src/components/account/SettingsTab.tsx
+++ b/frontendv2/src/components/account/SettingsTab.tsx
@@ -15,20 +15,29 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 'use client';
 
-import { useState, useEffect } from 'react';
-import { useRouter } from 'next/navigation';
+import { useState, useEffect, useMemo, useRef } from 'react';
+import { useRouter, useSearchParams } from 'next/navigation';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { useSession } from '@/contexts/SessionContext';
 import { useSettings } from '@/contexts/SettingsContext';
+import { usePreferences, useDateFormatOptions } from '@/contexts/PreferencesContext';
 import { Button } from '@/components/ui/button';
-import { ShieldCheck, Check, Fingerprint, Pencil } from 'lucide-react';
+import { ShieldCheck, Check, Fingerprint, Pencil, FileText, Clock, Network } from 'lucide-react';
 import axios from 'axios';
 import { toast } from 'sonner';
 import { Captcha } from '@/components/Captcha';
 import { isEnabled } from '@/lib/utils';
+import { isCaptchaConfigured, obtainCaptchaResponseToken } from '@/lib/captchaGate';
 import { startRegistration } from '@simplewebauthn/browser';
 import { passkeysApi } from '@/lib/api/passkeys';
 import { format } from 'date-fns';
+import {
+    formatDateTimeInTz,
+    getEffectiveTimezone,
+    listSupportedTimezones,
+    parseApiDate,
+    resolveDateFnsLocale,
+} from '@/lib/dateUtils';
 import {
     Dialog,
     DialogContent,
@@ -38,14 +47,53 @@ import {
     DialogTitle,
 } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
+import { Select } from '@/components/ui/select-native';
+
+type AuthProvider = {
+    uuid: string;
+    name: string;
+};
+
+const oidcLinkErrorKeys: Record<string, string> = {
+    oidc_access_denied: 'account.oidcAccessDenied',
+    oidc_discovery_failed: 'account.oidcDiscoveryFailed',
+    oidc_email_not_verified: 'account.oidcEmailNotVerified',
+    oidc_invalid_audience: 'account.oidcInvalidAudience',
+    oidc_invalid_id_token: 'account.oidcInvalidIdToken',
+    oidc_invalid_issuer: 'account.oidcInvalidIssuer',
+    oidc_invalid_state: 'account.oidcInvalidState',
+    oidc_missing_code: 'account.oidcMissingCode',
+    oidc_missing_subject: 'account.oidcMissingSubject',
+    oidc_not_configured: 'account.oidcNotConfigured',
+    oidc_provider_missing: 'account.oidcProviderMissing',
+    oidc_provider_not_found: 'account.oidcProviderNotFound',
+    oidc_token_failed: 'account.oidcTokenFailed',
+    oidc_user_not_found: 'account.oidcUserNotFound',
+};
 
 export default function SettingsTab() {
     const { t } = useTranslation();
     const { user, fetchSession, logout } = useSession();
     const { settings } = useSettings();
+    const { preferences, timezone, setTimezone, ready: preferencesReady } = usePreferences();
+    const dateOpts = useDateFormatOptions();
     const router = useRouter();
+    const searchParams = useSearchParams();
+    const oidcCallbackHandledRef = useRef<string | null>(null);
+    const oidcLinkedParam = searchParams.get('linked');
+    const oidcErrorParam = searchParams.get('error');
+    const browserTimezone = useMemo(() => getEffectiveTimezone(null), []);
+    const supportedTimezones = useMemo(() => listSupportedTimezones(), []);
+    const [savingTimezone, setSavingTimezone] = useState(false);
+    const [tzNowTick, setTzNowTick] = useState(0);
+
+    useEffect(() => {
+        const interval = setInterval(() => setTzNowTick((n) => n + 1), 30_000);
+        return () => clearInterval(interval);
+    }, []);
     const [loading, setLoading] = useState(true);
     const [isSubmitting, setIsSubmitting] = useState(false);
+    const [isRequestingData, setIsRequestingData] = useState(false);
     const [passkeys, setPasskeys] = useState<{ id: number; label?: string | null; created_at?: string }[]>([]);
     const [passkeysLoading, setPasskeysLoading] = useState(false);
     const [addPasskeyOpen, setAddPasskeyOpen] = useState(false);
@@ -53,6 +101,13 @@ export default function SettingsTab() {
     const [renamePasskeyOpen, setRenamePasskeyOpen] = useState(false);
     const [renamePasskeyId, setRenamePasskeyId] = useState<number | null>(null);
     const [renamePasskeyDraft, setRenamePasskeyDraft] = useState('');
+    const [oidcProviders, setOidcProviders] = useState<AuthProvider[]>([]);
+    const [ldapProviders, setLdapProviders] = useState<AuthProvider[]>([]);
+    const [selectedOidcProvider, setSelectedOidcProvider] = useState('');
+    const [selectedLdapProvider, setSelectedLdapProvider] = useState('');
+    const [ldapUsername, setLdapUsername] = useState('');
+    const [ldapPassword, setLdapPassword] = useState('');
+    const [oidcLinkErrorMessage, setOidcLinkErrorMessage] = useState<string | null>(null);
     const [turnstileToken, setTurnstileToken] = useState('');
     const [turnstileKey, setTurnstileKey] = useState(0);
 
@@ -84,6 +139,67 @@ export default function SettingsTab() {
         void load();
     }, [loading, user?.uuid, t]);
 
+    useEffect(() => {
+        const loadIdentityProviders = async () => {
+            try {
+                const [oidcResponse, ldapResponse] = await Promise.all([
+                    fetch('/api/system/oidc/providers', { cache: 'no-store' }),
+                    fetch('/api/ldap/providers', { cache: 'no-store' }),
+                ]);
+
+                if (oidcResponse.ok) {
+                    const json = await oidcResponse.json();
+                    if (json.success && Array.isArray(json.data?.providers)) {
+                        setOidcProviders(json.data.providers);
+                        if (json.data.providers.length > 0) {
+                            setSelectedOidcProvider((prev) => prev || json.data.providers[0].uuid);
+                        }
+                    }
+                }
+
+                if (ldapResponse.ok) {
+                    const json = await ldapResponse.json();
+                    if (json.success && Array.isArray(json.data?.providers)) {
+                        setLdapProviders(json.data.providers);
+                        if (json.data.providers.length > 0) {
+                            setSelectedLdapProvider((prev) => prev || json.data.providers[0].uuid);
+                        }
+                    }
+                }
+            } catch (error) {
+                console.error('Error loading identity providers:', error);
+            }
+        };
+
+        void loadIdentityProviders();
+    }, []);
+
+    useEffect(() => {
+        const callbackKey =
+            oidcLinkedParam === 'oidc'
+                ? 'linked:oidc'
+                : oidcErrorParam?.startsWith('oidc_')
+                  ? `error:${oidcErrorParam}`
+                  : null;
+
+        if (!callbackKey || oidcCallbackHandledRef.current === callbackKey) {
+            return;
+        }
+
+        oidcCallbackHandledRef.current = callbackKey;
+        router.replace('/dashboard/account?tab=settings');
+
+        if (oidcLinkedParam === 'oidc') {
+            setOidcLinkErrorMessage(null);
+            toast.success(t('account.oidcLinkedSuccessfully'));
+            void fetchSession(true);
+        } else if (oidcErrorParam?.startsWith('oidc_')) {
+            const message = t(oidcLinkErrorKeys[oidcErrorParam] ?? 'account.oidcLinkFailed');
+            setOidcLinkErrorMessage(message);
+            toast.error(message);
+        }
+    }, [fetchSession, oidcErrorParam, oidcLinkedParam, router, t]);
+
     const resetTurnstile = () => {
         if (settings?.turnstile_enabled) {
             setTurnstileToken('');
@@ -98,7 +214,7 @@ export default function SettingsTab() {
     const handleDisable2FA = async () => {
         try {
             if (isEnabled(settings?.turnstile_enabled) && !turnstileToken) {
-                toast.error('Please complete the CAPTCHA verification');
+                toast.error(t('validation.captcha_required'));
                 return;
             }
 
@@ -114,11 +230,11 @@ export default function SettingsTab() {
             const response = await axios.patch('/api/user/session', payload);
 
             if (response.data?.success) {
-                toast.success('2FA disabled successfully');
+                toast.success(t('account.twoFactor.disabledSuccessfully'));
                 await fetchSession(true);
                 resetTurnstile();
             } else {
-                toast.error(response.data?.message || 'Failed to disable 2FA');
+                toast.error(response.data?.message || t('account.twoFactor.disableFailed'));
                 resetTurnstile();
             }
         } catch (error) {
@@ -126,7 +242,7 @@ export default function SettingsTab() {
             if (axios.isAxiosError(error) && error.response?.data?.message) {
                 toast.error(error.response.data.message);
             } else {
-                toast.error('Failed to disable 2FA');
+                toast.error(t('account.twoFactor.disableFailed'));
             }
             resetTurnstile();
         } finally {
@@ -143,19 +259,144 @@ export default function SettingsTab() {
             setIsSubmitting(true);
             const response = await axios.delete('/api/user/auth/discord/unlink');
             if (response.data?.success) {
-                toast.success('Discord account unlinked successfully');
+                toast.success(t('account.discordUnlinkedSuccessfully'));
                 await fetchSession(true);
             } else {
-                toast.error('Failed to unlink Discord account');
+                toast.error(t('account.discordUnlinkFailed'));
             }
         } catch (error) {
             console.error('Error unlinking Discord:', error);
-            toast.error('Failed to unlink Discord account');
+            toast.error(t('account.discordUnlinkFailed'));
+        } finally {
+            setIsSubmitting(false);
+        }
+    };
+
+    const handleLinkOidc = () => {
+        if (!selectedOidcProvider) {
+            toast.error(t('account.selectOidcProvider'));
+            return;
+        }
+
+        setOidcLinkErrorMessage(null);
+        window.location.href = `/api/user/auth/oidc/link?provider=${encodeURIComponent(selectedOidcProvider)}`;
+    };
+
+    const handleUnlinkOidc = async () => {
+        try {
+            setIsSubmitting(true);
+            const response = await axios.delete('/api/user/auth/oidc/unlink');
+            if (response.data?.success) {
+                toast.success(t('account.oidcUnlinkedSuccessfully'));
+                await fetchSession(true);
+            } else {
+                toast.error(t('account.oidcUnlinkFailed'));
+            }
+        } catch (error) {
+            console.error('Error unlinking OIDC:', error);
+            toast.error(t('account.oidcUnlinkFailed'));
+        } finally {
+            setIsSubmitting(false);
+        }
+    };
+
+    const handleLinkLdap = async () => {
+        if (!selectedLdapProvider || !ldapUsername.trim() || !ldapPassword) {
+            toast.error(t('account.ldapMissingFields'));
+            return;
+        }
+
+        try {
+            setIsSubmitting(true);
+            const response = await axios.put('/api/user/auth/ldap/link', {
+                provider_uuid: selectedLdapProvider,
+                username: ldapUsername.trim(),
+                password: ldapPassword,
+            });
+            if (response.data?.success) {
+                toast.success(t('account.ldapLinkedSuccessfully'));
+                setLdapPassword('');
+                await fetchSession(true);
+            } else {
+                toast.error(response.data?.message || t('account.ldapLinkFailed'));
+            }
+        } catch (error) {
+            console.error('Error linking LDAP:', error);
+            if (axios.isAxiosError(error) && error.response?.data?.message) {
+                toast.error(error.response.data.message);
+            } else {
+                toast.error(t('account.ldapLinkFailed'));
+            }
+        } finally {
+            setIsSubmitting(false);
+        }
+    };
+
+    const handleUnlinkLdap = async () => {
+        try {
+            setIsSubmitting(true);
+            const response = await axios.delete('/api/user/auth/ldap/unlink');
+            if (response.data?.success) {
+                toast.success(t('account.ldapUnlinkedSuccessfully'));
+                await fetchSession(true);
+            } else {
+                toast.error(t('account.ldapUnlinkFailed'));
+            }
+        } catch (error) {
+            console.error('Error unlinking LDAP:', error);
+            toast.error(t('account.ldapUnlinkFailed'));
         } finally {
             setIsSubmitting(false);
         }
     };
 
+    const handleRequestData = async () => {
+        if (!isEnabled(settings?.ticket_system_enabled)) {
+            toast.error(t('account.dataRequest.ticketSystemDisabled'));
+            return;
+        }
+
+        try {
+            setIsRequestingData(true);
+            let captchaToken = '';
+            if (isCaptchaConfigured(settings)) {
+                captchaToken = await obtainCaptchaResponseToken(settings ?? null, turnstileToken);
+                if (!captchaToken) {
+                    toast.error(t('validation.captcha_required'));
+                    resetTurnstile();
+                    return;
+                }
+            }
+
+            const payload: { turnstile_token?: string } = {};
+            if (isCaptchaConfigured(settings)) {
+                payload.turnstile_token = captchaToken;
+            }
+
+            const response = await axios.post('/api/user/data-request', payload);
+            const ticketUuid = response.data?.data?.ticket?.uuid;
+
+            if (response.data?.success && ticketUuid) {
+                toast.success(t('account.dataRequest.success'));
+                resetTurnstile();
+                router.push(`/dashboard/tickets/${ticketUuid}`);
+            } else {
+                toast.error(response.data?.message || t('account.dataRequest.failed'));
+                resetTurnstile();
+            }
+        } catch (error) {
+            console.error('Error requesting account data:', error);
+            if (axios.isAxiosError(error) && error.response?.data?.message) {
+                toast.error(error.response.data.message);
+            } else {
+                toast.error(t('account.dataRequest.failed'));
+            }
+            resetTurnstile();
+        } finally {
+            setIsRequestingData(false);
+        }
+    };
+
     const handleOpenAddPasskeyDialog = () => {
         setPasskeyNameDraft('');
         setAddPasskeyOpen(true);
@@ -252,12 +493,19 @@ export default function SettingsTab() {
             router.push('/auth/login');
         } catch (error) {
             console.error('Error during logout:', error);
-            toast.error('Logout failed');
+            toast.error(t('account.logoutFailed'));
         } finally {
             setIsSubmitting(false);
         }
     };
 
+    // `tzNowTick` is referenced here so the preview re-renders periodically.
+    const tzPreviewLabel = useMemo(
+        () => formatDateTimeInTz(new Date(), dateOpts),
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        [dateOpts, tzNowTick],
+    );
+
     if (loading) {
         return (
             <div className='flex items-center justify-center py-12'>
@@ -269,8 +517,84 @@ export default function SettingsTab() {
         );
     }
 
+    const explicitTimezone =
+        typeof preferences.timezone === 'string' && preferences.timezone.trim() !== '' ? preferences.timezone : '';
+    const oidcLinked = Boolean(user?.oidc_provider && user?.oidc_subject);
+    const ldapLinked = Boolean(user?.ldap_provider_uuid && user?.ldap_dn);
+    const linkedOidcProviderName =
+        oidcProviders.find((provider) => provider.uuid === user?.oidc_provider)?.name || user?.oidc_provider || '';
+    const linkedLdapProviderName =
+        ldapProviders.find((provider) => provider.uuid === user?.ldap_provider_uuid)?.name ||
+        user?.ldap_provider_uuid ||
+        '';
+    const handleTimezoneChange = async (value: string) => {
+        const trimmed = value.trim();
+        // Empty string clears the preference and falls back to browser detection.
+        const nextValue = trimmed === '' ? null : trimmed;
+        setSavingTimezone(true);
+        try {
+            const ok = await setTimezone(nextValue);
+            if (ok) {
+                toast.success(t('account.timezone.saved'));
+            } else {
+                toast.error(t('account.timezone.saveFailed'));
+            }
+        } catch {
+            toast.error(t('account.timezone.saveFailed'));
+        } finally {
+            setSavingTimezone(false);
+        }
+    };
+
     return (
         <div className='space-y-6'>
+            <div className='border-border/50 bg-muted/20 rounded-xl border p-4'>
+                <h3 className='text-foreground text-lg font-semibold'>{t('account.preferences.title')}</h3>
+                <p className='text-muted-foreground mt-1 text-sm'>{t('account.preferences.description')}</p>
+            </div>
+
+            <div className='border-border/50 bg-card/50 rounded-lg border p-6 backdrop-blur-xl'>
+                <div className='flex items-start gap-4'>
+                    <div className='shrink-0'>
+                        <div className='bg-primary/10 flex h-12 w-12 items-center justify-center rounded-lg'>
+                            <Clock className='text-primary h-6 w-6' />
+                        </div>
+                    </div>
+                    <div className='min-w-0 flex-1'>
+                        <div className='flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between'>
+                            <div className='flex-1'>
+                                <h4 className='text-foreground text-sm font-medium'>{t('account.timezone.title')}</h4>
+                                <p className='text-muted-foreground mt-1 max-w-xl text-sm'>
+                                    {t('account.timezone.description')}
+                                </p>
+                            </div>
+                        </div>
+                        <div className='mt-4 grid gap-3 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-center'>
+                            <Select
+                                value={explicitTimezone}
+                                onChange={(e) => void handleTimezoneChange(e.target.value)}
+                                disabled={!preferencesReady || savingTimezone}
+                            >
+                                <option value=''>
+                                    {t('account.timezone.useBrowser', { timezone: browserTimezone })}
+                                </option>
+                                {supportedTimezones.map((tz) => (
+                                    <option key={tz} value={tz}>
+                                        {tz}
+                                    </option>
+                                ))}
+                            </Select>
+                            <div className='text-muted-foreground text-xs sm:text-right'>
+                                <div>
+                                    <span className='font-medium'>{t('account.timezone.current')}:</span> {timezone}
+                                </div>
+                                <div className='font-mono text-[11px] opacity-80'>{tzPreviewLabel}</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <div className='border-border/50 bg-muted/20 rounded-xl border p-4'>
                 <h3 className='text-foreground text-lg font-semibold'>{t('account.securitySettings')}</h3>
                 <p className='text-muted-foreground mt-1 text-sm'>{t('account.securitySettingsDescription')}</p>
@@ -304,7 +628,7 @@ export default function SettingsTab() {
                             <div className='flex shrink-0 gap-2'>
                                 {user?.two_fa_enabled !== '1' ? (
                                     <Button
-                                        variant='outline'
+                                        variant='default'
                                         size='sm'
                                         disabled={isSubmitting}
                                         onClick={handleEnable2FA}
@@ -373,10 +697,15 @@ export default function SettingsTab() {
                                     const title = p.label?.trim() ? p.label : t('auth.passkey.unnamed');
                                     let dateLine = '';
                                     if (p.created_at) {
-                                        try {
-                                            dateLine = format(new Date(p.created_at), 'PP');
-                                        } catch {
-                                            dateLine = '';
+                                        const parsed = parseApiDate(p.created_at);
+                                        if (parsed) {
+                                            try {
+                                                dateLine = format(parsed, 'PP', {
+                                                    locale: resolveDateFnsLocale(dateOpts.locale),
+                                                });
+                                            } catch {
+                                                dateLine = '';
+                                            }
                                         }
                                     }
                                     return (
@@ -406,7 +735,7 @@ export default function SettingsTab() {
                                                 </Button>
                                                 <Button
                                                     type='button'
-                                                    variant='outline'
+                                                    variant='destructive'
                                                     size='sm'
                                                     disabled={isSubmitting}
                                                     onClick={() => void handleRemovePasskey(p.id)}
@@ -440,7 +769,7 @@ export default function SettingsTab() {
                         </div>
                         <div className='flex shrink-0 gap-2'>
                             {user?.discord_oauth2_linked !== 'true' ? (
-                                <Button variant='outline' size='sm' disabled={isSubmitting} onClick={handleLinkDiscord}>
+                                <Button variant='default' size='sm' disabled={isSubmitting} onClick={handleLinkDiscord}>
                                     {t('account.linkDiscord')}
                                 </Button>
                             ) : (
@@ -458,6 +787,201 @@ export default function SettingsTab() {
                 </div>
             )}
 
+            {oidcProviders.length > 0 && (
+                <div className='border-border/50 bg-card/50 rounded-lg border p-6 backdrop-blur-xl'>
+                    <div className='flex items-start gap-4'>
+                        <div className='shrink-0'>
+                            <div className='bg-primary/10 flex h-12 w-12 items-center justify-center rounded-lg'>
+                                <ShieldCheck className='text-primary h-6 w-6' />
+                            </div>
+                        </div>
+                        <div className='min-w-0 flex-1'>
+                            <div className='flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between'>
+                                <div className='flex-1'>
+                                    <h4 className='text-foreground text-sm font-medium'>{t('account.oidcAccount')}</h4>
+                                    <p className='text-muted-foreground mt-1 text-sm'>
+                                        {t('account.oidcAccountDescription')}
+                                    </p>
+                                    {oidcLinkErrorMessage && (
+                                        <p className='border-destructive/30 bg-destructive/10 text-destructive mt-3 rounded-lg border px-3 py-2 text-sm'>
+                                            {oidcLinkErrorMessage}
+                                        </p>
+                                    )}
+                                    {oidcLinked && (
+                                        <p className='text-muted-foreground mt-2 text-sm'>
+                                            <span className='font-medium'>{t('account.linkedAs')}:</span>{' '}
+                                            {linkedOidcProviderName || t('account.unknown')}
+                                            {user?.oidc_email ? ` (${user.oidc_email})` : ''}
+                                        </p>
+                                    )}
+                                </div>
+                                <div className='flex w-full shrink-0 flex-col gap-2 sm:w-72'>
+                                    {!oidcLinked ? (
+                                        <>
+                                            <Select
+                                                value={selectedOidcProvider}
+                                                onChange={(e) => setSelectedOidcProvider(e.target.value)}
+                                                disabled={isSubmitting}
+                                            >
+                                                {oidcProviders.map((provider) => (
+                                                    <option key={provider.uuid} value={provider.uuid}>
+                                                        {provider.name}
+                                                    </option>
+                                                ))}
+                                            </Select>
+                                            <Button
+                                                type='button'
+                                                variant='default'
+                                                size='sm'
+                                                disabled={isSubmitting}
+                                                onClick={handleLinkOidc}
+                                            >
+                                                {t('account.linkOidc')}
+                                            </Button>
+                                        </>
+                                    ) : (
+                                        <Button
+                                            type='button'
+                                            variant='destructive'
+                                            size='sm'
+                                            disabled={isSubmitting}
+                                            onClick={handleUnlinkOidc}
+                                        >
+                                            {t('account.unlinkOidc')}
+                                        </Button>
+                                    )}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            )}
+
+            {ldapProviders.length > 0 && (
+                <div className='border-border/50 bg-card/50 rounded-lg border p-6 backdrop-blur-xl'>
+                    <div className='flex items-start gap-4'>
+                        <div className='shrink-0'>
+                            <div className='bg-primary/10 flex h-12 w-12 items-center justify-center rounded-lg'>
+                                <Network className='text-primary h-6 w-6' />
+                            </div>
+                        </div>
+                        <div className='min-w-0 flex-1'>
+                            <div className='flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between'>
+                                <div className='flex-1'>
+                                    <h4 className='text-foreground text-sm font-medium'>{t('account.ldapAccount')}</h4>
+                                    <p className='text-muted-foreground mt-1 text-sm'>
+                                        {t('account.ldapAccountDescription')}
+                                    </p>
+                                    {ldapLinked && (
+                                        <p className='text-muted-foreground mt-2 text-sm'>
+                                            <span className='font-medium'>{t('account.linkedAs')}:</span>{' '}
+                                            {linkedLdapProviderName || t('account.unknown')}
+                                        </p>
+                                    )}
+                                </div>
+                                <div className='flex w-full shrink-0 flex-col gap-2 sm:w-72'>
+                                    {!ldapLinked ? (
+                                        <>
+                                            <Select
+                                                value={selectedLdapProvider}
+                                                onChange={(e) => setSelectedLdapProvider(e.target.value)}
+                                                disabled={isSubmitting}
+                                            >
+                                                {ldapProviders.map((provider) => (
+                                                    <option key={provider.uuid} value={provider.uuid}>
+                                                        {provider.name}
+                                                    </option>
+                                                ))}
+                                            </Select>
+                                            <Input
+                                                value={ldapUsername}
+                                                onChange={(e) => setLdapUsername(e.target.value)}
+                                                disabled={isSubmitting}
+                                                autoComplete='username'
+                                                placeholder={t('account.ldapUsernamePlaceholder')}
+                                            />
+                                            <Input
+                                                type='password'
+                                                value={ldapPassword}
+                                                onChange={(e) => setLdapPassword(e.target.value)}
+                                                disabled={isSubmitting}
+                                                autoComplete='current-password'
+                                                placeholder={t('account.ldapPasswordPlaceholder')}
+                                            />
+                                            <Button
+                                                type='button'
+                                                variant='default'
+                                                size='sm'
+                                                disabled={isSubmitting}
+                                                onClick={handleLinkLdap}
+                                            >
+                                                {t('account.linkLdap')}
+                                            </Button>
+                                        </>
+                                    ) : (
+                                        <Button
+                                            type='button'
+                                            variant='destructive'
+                                            size='sm'
+                                            disabled={isSubmitting}
+                                            onClick={handleUnlinkLdap}
+                                        >
+                                            {t('account.unlinkLdap')}
+                                        </Button>
+                                    )}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            )}
+
+            <div className='border-border/50 bg-card/50 rounded-lg border p-6 backdrop-blur-xl'>
+                <div className='flex items-start gap-4'>
+                    <div className='shrink-0'>
+                        <div className='bg-primary/10 flex h-12 w-12 items-center justify-center rounded-lg'>
+                            <FileText className='text-primary h-6 w-6' />
+                        </div>
+                    </div>
+                    <div className='min-w-0 flex-1'>
+                        <div className='flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between'>
+                            <div className='flex-1'>
+                                <h4 className='text-foreground text-sm font-medium'>
+                                    {t('account.dataRequest.title')}
+                                </h4>
+                                <p className='text-muted-foreground mt-1 text-sm'>
+                                    {isEnabled(settings?.ticket_system_enabled)
+                                        ? t('account.dataRequest.description')
+                                        : t('account.dataRequest.ticketSystemDisabledDescription')}
+                                </p>
+                            </div>
+                            <div className='flex shrink-0 flex-col items-end gap-2'>
+                                {isCaptchaConfigured(settings) && (
+                                    <Captcha
+                                        refreshKey={turnstileKey}
+                                        onVerify={(token) => setTurnstileToken(token)}
+                                        onExpire={() => setTurnstileToken('')}
+                                        onError={() => setTurnstileToken('')}
+                                    />
+                                )}
+                                <Button
+                                    type='button'
+                                    variant='outline'
+                                    size='sm'
+                                    className='shrink-0'
+                                    disabled={
+                                        isSubmitting || isRequestingData || !isEnabled(settings?.ticket_system_enabled)
+                                    }
+                                    onClick={() => void handleRequestData()}
+                                >
+                                    {isRequestingData ? t('common.loading') : t('account.dataRequest.button')}
+                                </Button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <div className='border-border/50 bg-card/50 rounded-lg border p-6 backdrop-blur-xl'>
                 <div className='flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between'>
                     <div className='flex-1'>
diff --git a/frontendv2/src/components/admin/AllocationPickerSheet.tsx b/frontendv2/src/components/admin/AllocationPickerSheet.tsx
index 7eb255583..09c29c837 100644
--- a/frontendv2/src/components/admin/AllocationPickerSheet.tsx
+++ b/frontendv2/src/components/admin/AllocationPickerSheet.tsx
@@ -26,7 +26,15 @@ import { Plug, Search as SearchIcon, ChevronLeft, ChevronRight, Plus } from 'luc
 import { cn } from '@/lib/utils';
 import { toast } from 'sonner';
 import { AllocationCreateForm, type CreatedAllocationRow } from '@/components/admin/AllocationCreateForm';
-import type { Allocation } from '@/app/(app)/admin/servers/create/types';
+
+export interface PickerAllocation {
+    id: number;
+    ip: string;
+    port: number;
+    ip_alias?: string | null;
+    server_id: number | null;
+    node_id: number;
+}
 
 export interface AllocationPaginationState {
     current_page: number;
@@ -41,16 +49,16 @@ interface AllocationPickerSheetProps {
     open: boolean;
     onOpenChange: (open: boolean) => void;
     nodeId: number;
-    allocations: Allocation[];
+    allocations: PickerAllocation[];
     allocationSearch: string;
     setAllocationSearch: (v: string) => void;
     allocationPagination: AllocationPaginationState | null;
     setAllocationPagination: React.Dispatch<React.SetStateAction<AllocationPaginationState>>;
     fetchAllocations: () => void;
-    onSelectAllocation: (allocation: Allocation) => void;
+    onSelectAllocation: (allocation: PickerAllocation) => void | Promise<void>;
 }
 
-function mapCreatedToAllocation(row: CreatedAllocationRow, nodeId: number): Allocation {
+function mapCreatedToAllocation(row: CreatedAllocationRow, nodeId: number): PickerAllocation {
     return {
         id: row.id,
         ip: row.ip,
diff --git a/frontendv2/src/components/admin/MassTransferServersDialog.tsx b/frontendv2/src/components/admin/MassTransferServersDialog.tsx
new file mode 100644
index 000000000..1c42db711
--- /dev/null
+++ b/frontendv2/src/components/admin/MassTransferServersDialog.tsx
@@ -0,0 +1,446 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+'use client';
+
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import axios, { isAxiosError } from 'axios';
+import { useTranslation } from '@/contexts/TranslationContext';
+import { Button } from '@/components/featherui/Button';
+import { Input } from '@/components/featherui/Input';
+import { HeadlessModal } from '@/components/ui/headless-modal';
+import { Checkbox } from '@/components/ui/checkbox';
+import { toast } from 'sonner';
+import { ArrowLeftRight, ChevronRight, Loader2, Search } from 'lucide-react';
+import {
+    AlertDialog,
+    AlertDialogCancel,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+} from '@/components/ui/alert-dialog';
+
+interface ApiNode {
+    id: number;
+    name: string;
+    fqdn: string;
+}
+
+interface TransferableServer {
+    id: number;
+    name: string;
+    uuid: string;
+    status: string;
+    allocations_needed: number;
+}
+
+interface MassTransferPreview {
+    transferable_servers: TransferableServer[];
+    skipped_servers: { id: number; name: string; reason: string }[];
+    allocations_required: number;
+    free_allocations_on_destination: number;
+    has_enough_allocations: boolean;
+    max_per_request: number;
+    destination_node: { id: number; name: string };
+}
+
+interface MassTransferServersDialogProps {
+    sourceNodeId: number;
+    sourceNodeName: string;
+    open: boolean;
+    onOpenChange: (open: boolean) => void;
+    onCompleted?: () => void;
+}
+
+export function MassTransferServersDialog({
+    sourceNodeId,
+    sourceNodeName,
+    open,
+    onOpenChange,
+    onCompleted,
+}: MassTransferServersDialogProps) {
+    const { t } = useTranslation();
+    const [nodes, setNodes] = useState<ApiNode[]>([]);
+    const [nodeSearch, setNodeSearch] = useState('');
+    const [loadingNodes, setLoadingNodes] = useState(false);
+    const [nodeModalOpen, setNodeModalOpen] = useState(false);
+    const [selectedNode, setSelectedNode] = useState<ApiNode | null>(null);
+    const [preview, setPreview] = useState<MassTransferPreview | null>(null);
+    const [loadingPreview, setLoadingPreview] = useState(false);
+    const [selectedIds, setSelectedIds] = useState<Set<number>>(new Set());
+    const [moveAll, setMoveAll] = useState(false);
+    const [confirmOpen, setConfirmOpen] = useState(false);
+    const [submitting, setSubmitting] = useState(false);
+
+    const resetState = useCallback(() => {
+        setSelectedNode(null);
+        setPreview(null);
+        setSelectedIds(new Set());
+        setMoveAll(false);
+        setNodeSearch('');
+    }, []);
+
+    useEffect(() => {
+        if (!open) {
+            resetState();
+        }
+    }, [open, resetState]);
+
+    const fetchNodes = async (search = '') => {
+        setLoadingNodes(true);
+        try {
+            const { data } = await axios.get('/api/admin/nodes', {
+                params: { limit: 50, search: search || undefined },
+            });
+            const list = (data?.data?.nodes || []) as ApiNode[];
+            setNodes(list.filter((n) => n.id !== sourceNodeId));
+        } catch {
+            toast.error(t('admin.node.mass_transfer.fetch_nodes_failed'));
+        } finally {
+            setLoadingNodes(false);
+        }
+    };
+
+    const loadPreview = async (destinationNodeId: number) => {
+        setLoadingPreview(true);
+        try {
+            const { data } = await axios.get(`/api/admin/nodes/${sourceNodeId}/mass-transfer/preview`, {
+                params: { destination_node_id: destinationNodeId },
+            });
+            const payload = data?.data as MassTransferPreview;
+            setPreview(payload);
+            setSelectedIds(new Set(payload.transferable_servers.map((s) => s.id)));
+            setMoveAll(false);
+        } catch (error) {
+            console.error('Mass transfer preview failed:', error);
+            const message =
+                isAxiosError(error) && error.response?.data?.message
+                    ? String(error.response.data.message)
+                    : t('admin.node.mass_transfer.preview_failed');
+            toast.error(message);
+            setPreview(null);
+        } finally {
+            setLoadingPreview(false);
+        }
+    };
+
+    const handleSelectNode = (node: ApiNode) => {
+        setSelectedNode(node);
+        setNodeModalOpen(false);
+        loadPreview(node.id);
+    };
+
+    const transferable = useMemo(() => preview?.transferable_servers ?? [], [preview]);
+    const allSelected = transferable.length > 0 && selectedIds.size === transferable.length;
+
+    const selectedCount = moveAll ? transferable.length : selectedIds.size;
+    const selectedAllocNeeded = useMemo(() => {
+        if (!preview) return 0;
+        if (moveAll) return preview.allocations_required;
+        return transferable.filter((s) => selectedIds.has(s.id)).reduce((sum, s) => sum + s.allocations_needed, 0);
+    }, [preview, moveAll, transferable, selectedIds]);
+
+    const toggleServer = (id: number) => {
+        setMoveAll(false);
+        setSelectedIds((prev) => {
+            const next = new Set(prev);
+            if (next.has(id)) {
+                next.delete(id);
+            } else {
+                next.add(id);
+            }
+            return next;
+        });
+    };
+
+    const toggleSelectAll = () => {
+        setMoveAll(false);
+        if (allSelected) {
+            setSelectedIds(new Set());
+        } else {
+            setSelectedIds(new Set(transferable.map((s) => s.id)));
+        }
+    };
+
+    const handleMoveAllChange = (checked: boolean) => {
+        setMoveAll(checked);
+        if (checked) {
+            setSelectedIds(new Set(transferable.map((s) => s.id)));
+        }
+    };
+
+    const hasEnoughAllocations = preview !== null && preview.free_allocations_on_destination >= selectedAllocNeeded;
+
+    const canSubmit =
+        preview && selectedNode && selectedCount > 0 && (moveAll || selectedIds.size > 0) && hasEnoughAllocations;
+
+    const runMassTransfer = async () => {
+        if (!selectedNode || !preview) return;
+        setSubmitting(true);
+        try {
+            const { data } = await axios.post(`/api/admin/nodes/${sourceNodeId}/mass-transfer`, {
+                destination_node_id: selectedNode.id,
+                move_all: moveAll,
+                server_ids: moveAll ? undefined : Array.from(selectedIds),
+            });
+            const initiated = data?.data?.initiated_count ?? 0;
+            const failed = data?.data?.failed_count ?? 0;
+            const skipped = data?.data?.skipped_count ?? 0;
+            toast.success(
+                t('admin.node.mass_transfer.complete_summary', {
+                    initiated: String(initiated),
+                    failed: String(failed),
+                    skipped: String(skipped),
+                }),
+            );
+            setConfirmOpen(false);
+            onOpenChange(false);
+            onCompleted?.();
+        } catch (error) {
+            console.error('Mass transfer failed:', error);
+            const message =
+                isAxiosError(error) && error.response?.data?.message
+                    ? String(error.response.data.message)
+                    : t('admin.node.mass_transfer.failed');
+            toast.error(message);
+        } finally {
+            setSubmitting(false);
+        }
+    };
+
+    return (
+        <>
+            <HeadlessModal
+                isOpen={open}
+                onClose={() => onOpenChange(false)}
+                title={t('admin.node.mass_transfer.title')}
+                description={t('admin.node.mass_transfer.description', { node: sourceNodeName })}
+            >
+                <div className='space-y-6'>
+                    <div className='space-y-2'>
+                        <label className='text-sm font-bold'>{t('admin.node.mass_transfer.destination_node')}</label>
+                        <Button
+                            variant='outline'
+                            className='border-border bg-background/50 h-12 w-full justify-between rounded-xl border px-4'
+                            onClick={() => {
+                                fetchNodes();
+                                setNodeModalOpen(true);
+                            }}
+                        >
+                            <span className={selectedNode ? 'text-foreground font-medium' : 'text-muted-foreground'}>
+                                {selectedNode
+                                    ? `${selectedNode.name} (${selectedNode.fqdn})`
+                                    : t('admin.node.mass_transfer.select_destination')}
+                            </span>
+                            <ChevronRight className='text-muted-foreground h-4 w-4' />
+                        </Button>
+                    </div>
+
+                    {loadingPreview && (
+                        <div className='flex justify-center py-8'>
+                            <Loader2 className='text-primary h-8 w-8 animate-spin' />
+                        </div>
+                    )}
+
+                    {preview && !loadingPreview && (
+                        <>
+                            <div className='bg-muted/30 grid grid-cols-2 gap-3 rounded-xl border p-4 text-sm sm:grid-cols-4'>
+                                <div>
+                                    <p className='text-muted-foreground text-xs'>
+                                        {t('admin.node.mass_transfer.transferable')}
+                                    </p>
+                                    <p className='font-bold'>{transferable.length}</p>
+                                </div>
+                                <div>
+                                    <p className='text-muted-foreground text-xs'>
+                                        {t('admin.node.mass_transfer.allocations_needed')}
+                                    </p>
+                                    <p className='font-bold'>{selectedAllocNeeded}</p>
+                                </div>
+                                <div>
+                                    <p className='text-muted-foreground text-xs'>
+                                        {t('admin.node.mass_transfer.free_on_destination')}
+                                    </p>
+                                    <p className='font-bold'>{preview.free_allocations_on_destination}</p>
+                                </div>
+                                <div>
+                                    <p className='text-muted-foreground text-xs'>
+                                        {t('admin.node.mass_transfer.batch_limit')}
+                                    </p>
+                                    <p className='font-bold'>{preview.max_per_request}</p>
+                                </div>
+                            </div>
+
+                            {!hasEnoughAllocations && selectedCount > 0 && (
+                                <p className='rounded-xl border border-red-500/30 bg-red-500/10 p-3 text-sm text-red-600'>
+                                    {t('admin.node.mass_transfer.insufficient_allocations')}
+                                </p>
+                            )}
+
+                            <p className='text-muted-foreground text-xs'>
+                                {t('admin.node.mass_transfer.auto_allocate_note')}
+                            </p>
+
+                            <div className='flex flex-wrap items-center gap-4 border-b pb-3'>
+                                <label className='flex cursor-pointer items-center gap-2 text-sm font-medium'>
+                                    <Checkbox
+                                        checked={moveAll}
+                                        onCheckedChange={(v) => handleMoveAllChange(v === true)}
+                                    />
+                                    {t('admin.node.mass_transfer.move_all', { count: String(transferable.length) })}
+                                </label>
+                                {!moveAll && transferable.length > 0 && (
+                                    <Button variant='ghost' size='sm' type='button' onClick={toggleSelectAll}>
+                                        {allSelected
+                                            ? t('admin.node.mass_transfer.deselect_all')
+                                            : t('admin.node.mass_transfer.select_all')}
+                                    </Button>
+                                )}
+                            </div>
+
+                            <div className='custom-scrollbar max-h-64 space-y-2 overflow-y-auto pr-1'>
+                                {transferable.length === 0 ? (
+                                    <p className='text-muted-foreground py-6 text-center text-sm'>
+                                        {t('admin.node.mass_transfer.no_transferable')}
+                                    </p>
+                                ) : (
+                                    transferable.map((server) => (
+                                        <label
+                                            key={server.id}
+                                            className={`flex cursor-pointer items-center gap-3 rounded-xl border p-3 transition-colors ${
+                                                moveAll || selectedIds.has(server.id)
+                                                    ? 'border-primary/40 bg-primary/5'
+                                                    : 'border-border/50 hover:bg-muted/40'
+                                            }`}
+                                        >
+                                            <Checkbox
+                                                checked={moveAll || selectedIds.has(server.id)}
+                                                disabled={moveAll}
+                                                onCheckedChange={() => toggleServer(server.id)}
+                                            />
+                                            <div className='min-w-0 flex-1'>
+                                                <p className='truncate text-sm font-bold'>{server.name}</p>
+                                                <p className='text-muted-foreground text-xs'>
+                                                    {t('admin.node.mass_transfer.allocations_per_server', {
+                                                        count: String(server.allocations_needed),
+                                                    })}
+                                                </p>
+                                            </div>
+                                        </label>
+                                    ))
+                                )}
+                            </div>
+
+                            {preview.skipped_servers.length > 0 && (
+                                <p className='text-muted-foreground text-xs'>
+                                    {t('admin.node.mass_transfer.skipped_count', {
+                                        count: String(preview.skipped_servers.length),
+                                    })}
+                                </p>
+                            )}
+                        </>
+                    )}
+
+                    <div className='flex justify-end gap-2 border-t pt-4'>
+                        <Button variant='outline' onClick={() => onOpenChange(false)}>
+                            {t('common.cancel')}
+                        </Button>
+                        <Button
+                            disabled={!canSubmit}
+                            onClick={() => setConfirmOpen(true)}
+                            className='bg-amber-500 text-white hover:bg-amber-600'
+                        >
+                            <ArrowLeftRight className='mr-2 h-4 w-4' />
+                            {t('admin.node.mass_transfer.start', {
+                                count: String(Math.min(selectedCount, preview?.max_per_request ?? selectedCount)),
+                            })}
+                        </Button>
+                    </div>
+                </div>
+            </HeadlessModal>
+
+            <HeadlessModal
+                isOpen={nodeModalOpen}
+                onClose={() => setNodeModalOpen(false)}
+                title={t('admin.node.mass_transfer.destination_node')}
+            >
+                <div className='space-y-4'>
+                    <div className='relative'>
+                        <Search className='text-muted-foreground absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2' />
+                        <Input
+                            placeholder={t('admin.servers.transfer.search_nodes')}
+                            value={nodeSearch}
+                            onChange={(e) => {
+                                setNodeSearch(e.target.value);
+                                fetchNodes(e.target.value);
+                            }}
+                            className='h-11 pl-10'
+                        />
+                    </div>
+                    <div className='custom-scrollbar max-h-87.5 space-y-2 overflow-y-auto pr-1'>
+                        {loadingNodes ? (
+                            <div className='flex justify-center py-10'>
+                                <Loader2 className='text-primary h-6 w-6 animate-spin' />
+                            </div>
+                        ) : nodes.length === 0 ? (
+                            <div className='text-muted-foreground py-10 text-center'>{t('common.no_results')}</div>
+                        ) : (
+                            nodes.map((node) => (
+                                <button
+                                    key={node.id}
+                                    type='button'
+                                    onClick={() => handleSelectNode(node)}
+                                    className='border-border/50 hover:bg-muted/50 w-full rounded-xl border p-4 text-left transition-all'
+                                >
+                                    <p className='text-sm font-bold'>{node.name}</p>
+                                    <p className='text-muted-foreground text-xs'>{node.fqdn}</p>
+                                </button>
+                            ))
+                        )}
+                    </div>
+                </div>
+            </HeadlessModal>
+
+            <AlertDialog open={confirmOpen} onOpenChange={setConfirmOpen}>
+                <AlertDialogContent>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle>{t('admin.node.mass_transfer.confirm_title')}</AlertDialogTitle>
+                        <AlertDialogDescription>
+                            {t('admin.node.mass_transfer.confirm_description', {
+                                count: String(Math.min(selectedCount, preview?.max_per_request ?? selectedCount)),
+                                source: sourceNodeName,
+                                destination: selectedNode?.name ?? '',
+                            })}
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+                    <p className='text-xs text-amber-600'>{t('admin.servers.transfer.warning_text')}</p>
+                    <AlertDialogFooter>
+                        <AlertDialogCancel disabled={submitting}>{t('common.cancel')}</AlertDialogCancel>
+                        <Button
+                            onClick={runMassTransfer}
+                            disabled={submitting}
+                            loading={submitting}
+                            className='bg-amber-500 hover:bg-amber-600'
+                        >
+                            {t('admin.node.mass_transfer.confirm_submit')}
+                        </Button>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
+        </>
+    );
+}
diff --git a/frontendv2/src/components/admin/ModerationReasonFields.tsx b/frontendv2/src/components/admin/ModerationReasonFields.tsx
new file mode 100644
index 000000000..eb9009a4d
--- /dev/null
+++ b/frontendv2/src/components/admin/ModerationReasonFields.tsx
@@ -0,0 +1,96 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+'use client';
+
+import { useTranslation } from '@/contexts/TranslationContext';
+import { Select } from '@/components/ui/select-native';
+import { Textarea } from '@/components/featherui/Textarea';
+
+export const MODERATION_REASON_CATEGORIES = [
+    'payment_overdue',
+    'terms_violation',
+    'abuse_harassment',
+    'resource_abuse',
+    'security_threat',
+    'spam',
+    'chargeback',
+    'manual_review',
+    'other',
+] as const;
+
+export type ModerationReasonCategory = (typeof MODERATION_REASON_CATEGORIES)[number];
+
+export interface ModerationReasonValue {
+    reason_category: ModerationReasonCategory | '';
+    reason_details: string;
+}
+
+interface ModerationReasonFieldsProps {
+    value: ModerationReasonValue;
+    onChange: (value: ModerationReasonValue) => void;
+    disabled?: boolean;
+}
+
+export function ModerationReasonFields({ value, onChange, disabled = false }: ModerationReasonFieldsProps) {
+    const { t } = useTranslation();
+
+    return (
+        <div className='space-y-4'>
+            <div className='space-y-2'>
+                <label className='text-sm font-medium'>{t('admin.moderation.reason_category_label')}</label>
+                <Select
+                    disabled={disabled}
+                    value={value.reason_category}
+                    onChange={(e) =>
+                        onChange({
+                            ...value,
+                            reason_category: e.target.value as ModerationReasonCategory | '',
+                        })
+                    }
+                >
+                    <option value=''>{t('admin.moderation.reason_category_placeholder')}</option>
+                    {MODERATION_REASON_CATEGORIES.map((category) => (
+                        <option key={category} value={category}>
+                            {t(`admin.moderation.categories.${category}`)}
+                        </option>
+                    ))}
+                </Select>
+            </div>
+            <div className='space-y-2'>
+                <label className='text-sm font-medium'>{t('admin.moderation.reason_details_label')}</label>
+                <Textarea
+                    disabled={disabled}
+                    rows={4}
+                    value={value.reason_details}
+                    onChange={(e) => onChange({ ...value, reason_details: e.target.value })}
+                    placeholder={t('admin.moderation.reason_details_placeholder')}
+                />
+                <p className='text-muted-foreground text-xs'>{t('admin.moderation.reason_details_help')}</p>
+            </div>
+        </div>
+    );
+}
+
+export function isModerationReasonValid(value: ModerationReasonValue): boolean {
+    const details = value.reason_details.trim();
+    if (value.reason_category === '' && details.length < 3) {
+        return false;
+    }
+    if (value.reason_category !== '' && details === '') {
+        return true;
+    }
+    return details.length >= 3;
+}
diff --git a/frontendv2/src/components/admin/ModerationStatusCard.tsx b/frontendv2/src/components/admin/ModerationStatusCard.tsx
new file mode 100644
index 000000000..51065ba50
--- /dev/null
+++ b/frontendv2/src/components/admin/ModerationStatusCard.tsx
@@ -0,0 +1,83 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+'use client';
+
+import { useTranslation } from '@/contexts/TranslationContext';
+import { AlertTriangle } from 'lucide-react';
+
+export interface ModerationStaffActor {
+    uuid?: string | null;
+    username?: string | null;
+}
+
+interface ModerationStatusCardProps {
+    active: boolean;
+    reason?: string | null;
+    actedAt?: string | null;
+    actedBy?: ModerationStaffActor | null;
+    title: string;
+    inactiveLabel: string;
+}
+
+export function ModerationStatusCard({
+    active,
+    reason,
+    actedAt,
+    actedBy,
+    title,
+    inactiveLabel,
+}: ModerationStatusCardProps) {
+    const { t } = useTranslation();
+
+    if (!active) {
+        return <p className='text-muted-foreground text-sm'>{inactiveLabel}</p>;
+    }
+
+    return (
+        <div className='border-destructive/30 bg-destructive/5 space-y-3 rounded-xl border p-4'>
+            <div className='text-destructive flex items-center gap-2 text-sm font-semibold'>
+                <AlertTriangle className='h-4 w-4' />
+                {title}
+            </div>
+            <div className='space-y-2 text-sm'>
+                <div>
+                    <p className='text-muted-foreground text-xs font-semibold tracking-wide uppercase'>
+                        {t('admin.moderation.status_reason')}
+                    </p>
+                    <p className='mt-1 whitespace-pre-wrap'>
+                        {reason?.trim() || t('admin.moderation.no_reason_recorded')}
+                    </p>
+                </div>
+                <div className='grid gap-2 sm:grid-cols-2'>
+                    <div>
+                        <p className='text-muted-foreground text-xs font-semibold tracking-wide uppercase'>
+                            {t('admin.moderation.status_by')}
+                        </p>
+                        <p className='mt-1'>
+                            {actedBy?.username || actedBy?.uuid || t('admin.moderation.unknown_staff')}
+                        </p>
+                    </div>
+                    <div>
+                        <p className='text-muted-foreground text-xs font-semibold tracking-wide uppercase'>
+                            {t('admin.moderation.status_at')}
+                        </p>
+                        <p className='mt-1'>{actedAt || t('admin.moderation.unknown_time')}</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+}
diff --git a/frontendv2/src/components/admin/VmIpPickerSheet.tsx b/frontendv2/src/components/admin/VmIpPickerSheet.tsx
index 08bf1da0f..440edcbb1 100644
--- a/frontendv2/src/components/admin/VmIpPickerSheet.tsx
+++ b/frontendv2/src/components/admin/VmIpPickerSheet.tsx
@@ -143,12 +143,12 @@ export function VmIpPickerSheet({
         const ipRegex = /^(\d{1,3}\.){3}\d{1,3}$/;
         const entries = parseBulkIps(bulkIpsInput);
         if (entries.length === 0) {
-            toast.error('Add at least one IP (one per line, comma, or space separated).');
+            toast.error(t('admin.vdsNodes.ips.bulk_empty'));
             return;
         }
         const invalid = entries.find((ip) => !ipRegex.test(ip));
         if (invalid) {
-            toast.error(`Invalid IP in list: ${invalid}`);
+            toast.error(t('admin.vdsNodes.ips.bulk_invalid_ip', { ip: invalid }));
             return;
         }
         if (createForm.cidr !== '') {
@@ -298,7 +298,7 @@ export function VmIpPickerSheet({
                                     )}
                                     onClick={() => setCreateType('single')}
                                 >
-                                    Single
+                                    {t('admin.vdsNodes.ips.single')}
                                 </Button>
                                 <Button
                                     type='button'
@@ -309,21 +309,19 @@ export function VmIpPickerSheet({
                                     )}
                                     onClick={() => setCreateType('bulk')}
                                 >
-                                    Bulk
+                                    {t('admin.vdsNodes.ips.bulk')}
                                 </Button>
                             </div>
                             {createType === 'bulk' && (
                                 <div className='space-y-2'>
-                                    <Label className='text-sm font-semibold'>IP list</Label>
+                                    <Label className='text-sm font-semibold'>{t('admin.vdsNodes.ips.bulk_list')}</Label>
                                     <Textarea
                                         placeholder={'10.0.0.10\n10.0.0.11\n10.0.0.12'}
                                         value={bulkIpsInput}
                                         className='min-h-30 font-mono'
                                         onChange={(e) => setBulkIpsInput(e.target.value)}
                                     />
-                                    <p className='text-muted-foreground text-xs'>
-                                        One IP per line, or comma/space separated. CIDR/gateway/notes apply to all.
-                                    </p>
+                                    <p className='text-muted-foreground text-xs'>{t('admin.vdsNodes.ips.bulk_help')}</p>
                                 </div>
                             )}
                             {createType === 'single' && (
diff --git a/frontendv2/src/components/admin/VmTemplatePickerSheet.tsx b/frontendv2/src/components/admin/VmTemplatePickerSheet.tsx
index 264b46bae..68a03356e 100644
--- a/frontendv2/src/components/admin/VmTemplatePickerSheet.tsx
+++ b/frontendv2/src/components/admin/VmTemplatePickerSheet.tsx
@@ -316,9 +316,11 @@ export function VmTemplatePickerSheet({
                             {createForm.guest_type === 'lxc' && (
                                 <Alert variant='warning' className='px-3 py-2'>
                                     <ShieldAlert className='h-4 w-4' />
-                                    <AlertTitle className='text-xs'>Security Recommendation</AlertTitle>
+                                    <AlertTitle className='text-xs'>
+                                        {t('admin.vdsNodes.templates.security_recommendation')}
+                                    </AlertTitle>
                                     <AlertDescription className='text-[10px] leading-tight'>
-                                        LXC is not recommended for public hosting due to security risks.
+                                        {t('admin.vdsNodes.templates.lxc_security_warning')}
                                     </AlertDescription>
                                 </Alert>
                             )}
@@ -327,7 +329,7 @@ export function VmTemplatePickerSheet({
                                 <Input
                                     value={createForm.description}
                                     onChange={(e) => setCreateForm((f) => ({ ...f, description: e.target.value }))}
-                                    placeholder='Optional'
+                                    placeholder={t('common.optional')}
                                 />
                             </div>
                             {createForm.guest_type === 'lxc' && (
diff --git a/frontendv2/src/components/ai/ChatbotContainer.tsx b/frontendv2/src/components/ai/ChatbotContainer.tsx
index bb92ecb3e..847a16c46 100644
--- a/frontendv2/src/components/ai/ChatbotContainer.tsx
+++ b/frontendv2/src/components/ai/ChatbotContainer.tsx
@@ -15,7 +15,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 'use client';
 
-import { Fragment, useState, useEffect, useRef, useContext } from 'react';
+import { Fragment, memo, useState, useEffect, useRef, useContext, useMemo } from 'react';
 import { Dialog, Transition } from '@headlessui/react';
 import { usePathname, useRouter } from 'next/navigation';
 import Image from 'next/image';
@@ -23,10 +23,10 @@ import { Send, Loader2, X, Bot, MessageSquare, Clock, Trash2, Plus, AlertTriangl
 import { Button } from '@/components/ui/button';
 import { toast } from 'sonner';
 import ReactMarkdown from 'react-markdown';
+import remarkGfm from 'remark-gfm';
 import { useTranslation } from '@/contexts/TranslationContext';
 import {
-    sendChatMessage,
-    sendVdsChatMessage,
+    streamChatMessage,
     getConversations,
     getConversationMessages,
     deleteConversation,
@@ -34,6 +34,8 @@ import {
     getVdsConversationMessages,
     deleteVdsConversation,
     type Conversation,
+    type TokenUsage,
+    type ToolActivity,
     type PageContext,
 } from '@/lib/api/chatbotService';
 import {
@@ -46,12 +48,43 @@ import {
 import { ServerContext } from '@/contexts/ServerContext';
 import { useSession } from '@/contexts/SessionContext';
 import { type VmInstance } from '@/contexts/VmInstanceContext';
+import { useSettings } from '@/contexts/SettingsContext';
+import { useTheme } from '@/contexts/ThemeContext';
+
+const CHATBOT_COMMANDS = [
+    {
+        command: '/help',
+        titleKey: 'chatbot.commandHelpTitle',
+        descriptionKey: 'chatbot.commandHelpDescription',
+    },
+    {
+        command: '/context',
+        titleKey: 'chatbot.commandContextTitle',
+        descriptionKey: 'chatbot.commandContextDescription',
+    },
+    {
+        command: '/compact',
+        titleKey: 'chatbot.commandCompactTitle',
+        descriptionKey: 'chatbot.commandCompactDescription',
+    },
+    {
+        command: '/clear',
+        titleKey: 'chatbot.commandClearTitle',
+        descriptionKey: 'chatbot.commandClearDescription',
+    },
+];
 
 interface Message {
     id: string;
     role: 'user' | 'assistant';
     content: string;
+    fullContent?: string;
+    isTyping?: boolean;
     timestamp: Date;
+    model?: string | null;
+    usage?: TokenUsage | null;
+    toolActivity?: ToolActivity[] | null;
+    status?: string | null;
 }
 
 interface PendingAction {
@@ -72,10 +105,45 @@ interface ConfirmDialogState {
 interface ChatbotContainerProps {
     open: boolean;
     onClose: () => void;
-    mode?: 'server' | 'vds';
+    mode?: 'server' | 'vds' | 'dashboard';
     vdsInstance?: VmInstance | null;
 }
 
+interface UserAvatarProps {
+    avatar?: string | null;
+    username?: string | null;
+    firstName?: string | null;
+    size?: 'sm' | 'md';
+}
+
+const UserAvatar = memo(function UserAvatar({ avatar, username, firstName, size = 'md' }: UserAvatarProps) {
+    const sizeClasses = {
+        sm: 'h-8 w-8 text-xs',
+        md: 'h-9 w-9 text-sm',
+    };
+
+    if (avatar) {
+        return (
+            <Image
+                src={avatar}
+                alt={username || 'User'}
+                width={size === 'sm' ? 32 : 36}
+                height={size === 'sm' ? 32 : 36}
+                unoptimized
+                className={`${sizeClasses[size]} rounded-full object-cover`}
+            />
+        );
+    }
+
+    return (
+        <div
+            className={`${sizeClasses[size]} bg-primary text-primary-foreground flex items-center justify-center rounded-full font-semibold`}
+        >
+            {firstName?.charAt(0) || username?.charAt(0)}
+        </div>
+    );
+});
+
 export default function ChatbotContainer({ open, onClose, mode = 'server', vdsInstance }: ChatbotContainerProps) {
     const { t } = useTranslation();
     const [messages, setMessages] = useState<Message[]>([]);
@@ -85,6 +153,7 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
     const [currentConversationId, setCurrentConversationId] = useState<number | null>(null);
     const [loadingConversations, setLoadingConversations] = useState(false);
     const [showSidebar, setShowSidebar] = useState(false);
+    const [expandedActivityMessages, setExpandedActivityMessages] = useState<string[]>([]);
     const [chatModelName, setChatModelName] = useState('FeatherPanel AI');
     const [pendingActions, setPendingActions] = useState<PendingAction[]>([]);
     const [confirmDialog, setConfirmDialog] = useState<ConfirmDialogState>({
@@ -99,11 +168,22 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
 
     const messagesEndRef = useRef<HTMLDivElement>(null);
     const textareaRef = useRef<HTMLTextAreaElement>(null);
+    const localIdRef = useRef(0);
     const pathname = usePathname();
     const router = useRouter();
     const serverCtx = useContext(ServerContext);
     const server = serverCtx?.server ?? null;
     const { user } = useSession();
+    const { settings } = useSettings();
+    const { theme } = useTheme();
+    const lastConversationStorageKey = `featherpanel_chatbot_last_conversation_${mode}`;
+    const logoUrl = theme === 'dark' ? settings?.app_logo_dark || '/logo.png' : settings?.app_logo_white || '/logo.png';
+    const slashQuery = inputMessage.startsWith('/') ? inputMessage.trim().toLowerCase() : '';
+    const commandSuggestions = useMemo(() => {
+        if (!slashQuery) return [];
+
+        return CHATBOT_COMMANDS.filter((command) => command.command.startsWith(slashQuery));
+    }, [slashQuery]);
 
     const scrollToBottom = () => {
         setTimeout(() => {
@@ -111,24 +191,90 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
         }, 100);
     };
 
+    const nextLocalId = (prefix: string) => {
+        localIdRef.current += 1;
+        return `${prefix}-${localIdRef.current}`;
+    };
+
+    const selectCommandSuggestion = (command: string) => {
+        setInputMessage(command);
+        setTimeout(() => {
+            textareaRef.current?.focus();
+            const length = command.length;
+            textareaRef.current?.setSelectionRange(length, length);
+        }, 0);
+    };
+
+    const toggleActivityDetails = (messageId: string) => {
+        setExpandedActivityMessages((prev) =>
+            prev.includes(messageId) ? prev.filter((id) => id !== messageId) : [...prev, messageId],
+        );
+    };
+
     useEffect(() => {
         scrollToBottom();
     }, [messages]);
 
+    useEffect(() => {
+        const typingMessage = messages.find(
+            (message) =>
+                message.role === 'assistant' &&
+                message.isTyping &&
+                message.fullContent &&
+                message.content.length < message.fullContent.length,
+        );
+
+        if (!typingMessage?.fullContent) {
+            return;
+        }
+
+        const timeout = window.setTimeout(() => {
+            setMessages((prev) =>
+                prev.map((message) => {
+                    if (message.id !== typingMessage.id || !message.fullContent) {
+                        return message;
+                    }
+
+                    const nextContent = message.fullContent.slice(0, message.content.length + 8);
+                    return {
+                        ...message,
+                        content: nextContent,
+                        isTyping: nextContent.length < message.fullContent.length,
+                    };
+                }),
+            );
+        }, 18);
+
+        return () => window.clearTimeout(timeout);
+    }, [messages]);
+
     const getWelcomeMessage = (userName: string) => {
+        if (mode === 'dashboard') {
+            return t('chatbot.welcomeDashboard', { name: userName });
+        }
+
         if (mode === 'vds') {
-            return (
-                t('chatbot.welcomeVds', { name: userName }) ||
-                `Hi ${userName}! I'm FeatherPanel VDS AI. I can help you manage your virtual servers - check status, manage backups, control power, and more!`
-            );
+            return t('chatbot.welcomeVds', { name: userName });
         }
         return t('chatbot.welcome', { name: userName });
     };
 
     useEffect(() => {
         if (open) {
-            loadConversationsList();
-            if (!currentConversationId && messages.length === 0) {
+            loadConversationsList().then((convs) => {
+                if (currentConversationId || messages.length > 0) return;
+
+                const storedConversationId =
+                    typeof window !== 'undefined' ? window.localStorage.getItem(lastConversationStorageKey) : null;
+                const conversationToRestore =
+                    (storedConversationId && convs.find((conv) => conv.id === Number(storedConversationId))) ||
+                    convs[0];
+
+                if (conversationToRestore) {
+                    loadConversation(conversationToRestore.id);
+                    return;
+                }
+
                 const userName = user?.first_name || user?.username || 'there';
                 setMessages([
                     {
@@ -138,7 +284,7 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                         timestamp: new Date(),
                     },
                 ]);
-            }
+            });
             setTimeout(() => {
                 textareaRef.current?.focus();
             }, 100);
@@ -151,9 +297,11 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
         try {
             const convs = mode === 'vds' ? await getVdsConversations() : await getConversations();
             setConversations(convs);
+            return convs;
         } catch (error) {
             console.error('Failed to load conversations:', error);
             toast.error(t('chatbot.failedToLoadConversations'));
+            return [];
         } finally {
             setLoadingConversations(false);
         }
@@ -161,6 +309,9 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
 
     const createNewConversation = () => {
         setCurrentConversationId(null);
+        if (typeof window !== 'undefined') {
+            window.localStorage.removeItem(lastConversationStorageKey);
+        }
         const userName = user?.first_name || user?.username || 'there';
         setMessages([
             {
@@ -190,8 +341,19 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                     role: msg.role,
                     content: msg.content,
                     timestamp: new Date(msg.created_at),
+                    model: msg.model,
+                    usage: {
+                        input_tokens: msg.input_tokens,
+                        output_tokens: msg.output_tokens,
+                        total_tokens: msg.total_tokens,
+                        source: msg.token_source,
+                    },
+                    toolActivity: msg.tool_activity,
                 })),
             );
+            if (typeof window !== 'undefined') {
+                window.localStorage.setItem(lastConversationStorageKey, String(conversationId));
+            }
             if (data.messages.length > 0) {
                 const lastMessage = data.messages[data.messages.length - 1];
                 if (lastMessage?.model) {
@@ -218,6 +380,11 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
             }
             if (currentConversationId === conversationId) {
                 createNewConversation();
+            } else if (
+                typeof window !== 'undefined' &&
+                window.localStorage.getItem(lastConversationStorageKey) === String(conversationId)
+            ) {
+                window.localStorage.removeItem(lastConversationStorageKey);
             }
             await loadConversationsList();
             toast.success(t('chatbot.conversationDeleted'));
@@ -240,7 +407,7 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
     };
 
     const showActionNotification = (message: string, type: 'success' | 'error' | 'pending' = 'pending') => {
-        const actionId = `action-${Date.now()}-${Math.random()}`;
+        const actionId = nextLocalId('action');
 
         if (type === 'pending') {
             setPendingActions((prev) => [...prev, { id: actionId, message, type: 'pending' }]);
@@ -293,8 +460,32 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
         }
     };
 
-    const executeAIActions = async (responseText: string) => {
-        const commands = parseActionCommands(responseText);
+    const isPowerActionAllowedByLatestMessage = (
+        action: 'start' | 'stop' | 'restart' | 'kill',
+        latestMessage: string,
+    ) => {
+        const normalized = latestMessage.toLowerCase();
+        const patterns: Record<typeof action, RegExp> = {
+            start: /\b(start|boot|turn\s+on|power\s+on)\b/,
+            stop: /\b(stop|shut\s*down|shutdown|turn\s+off|power\s+off)\b/,
+            restart: /\b(restart|reboot)\b/,
+            kill: /\b(kill|force\s+stop|terminate)\b/,
+        };
+
+        return patterns[action].test(normalized);
+    };
+
+    const filterAuthorizedCommands = (commands: ReturnType<typeof parseActionCommands>, latestMessage: string) =>
+        commands.filter((command) => {
+            if (command.type === 'server_power' && command.action) {
+                return isPowerActionAllowedByLatestMessage(command.action, latestMessage);
+            }
+
+            return true;
+        });
+
+    const executeAIActions = async (responseText: string, latestMessage: string) => {
+        const commands = filterAuthorizedCommands(parseActionCommands(responseText), latestMessage);
 
         // --- VDS-specific action patterns ---
         // VDS power and backup actions are handled entirely by backend tools (TOOL_CALL).
@@ -484,15 +675,166 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
         }
     };
 
+    const estimateInputUsage = (text: string): TokenUsage => {
+        const inputTokens = Math.max(1, Math.ceil(text.trim().length / 4));
+        return {
+            input_tokens: inputTokens,
+            total_tokens: inputTokens,
+            source: 'estimated',
+        };
+    };
+
+    const formatUsageLabel = (usage?: TokenUsage | null, role?: Message['role']) => {
+        if (!usage) return null;
+        const input = usage.input_tokens ?? 0;
+        const output = usage.output_tokens ?? 0;
+        const total = usage.total_tokens ?? input + output;
+
+        if (!input && !output && !total) return null;
+
+        if (role === 'assistant') {
+            return t('chatbot.tokenUsageAssistant', {
+                input: String(input),
+                output: String(output),
+                total: String(total),
+            });
+        }
+
+        return t('chatbot.tokenUsageUser', { count: String(input || total) });
+    };
+
+    const formatUsageTitle = (usage?: TokenUsage | null, role?: Message['role']) => {
+        if (!usage) return undefined;
+        const input = usage.input_tokens ?? 0;
+        const output = usage.output_tokens ?? 0;
+        const total = usage.total_tokens ?? input + output;
+        if (!input && !output && !total) return undefined;
+
+        return role === 'assistant'
+            ? t('chatbot.tokenUsageAssistantDetails', {
+                  input: String(input),
+                  output: String(output),
+                  total: String(total),
+              })
+            : t('chatbot.tokenUsageUserDetails', { count: String(input || total) });
+    };
+
+    const getActionLabel = (command: ReturnType<typeof parseActionCommands>[number]) => {
+        if (command.type === 'server_power' && command.action) {
+            const actionKey = `chatbot.action${command.action.charAt(0).toUpperCase()}${command.action.slice(1)}Server`;
+            return t(actionKey);
+        }
+
+        if (command.type === 'server_command') {
+            return t('chatbot.actionSendCommand');
+        }
+
+        return t('chatbot.actionNavigate');
+    };
+
+    const getActionSummary = (command: ReturnType<typeof parseActionCommands>[number]) => {
+        if (command.type === 'server_power') {
+            return command.serverName || command.serverUuid || t('chatbot.plannedAction');
+        }
+
+        if (command.type === 'server_command') {
+            return command.command || t('chatbot.plannedAction');
+        }
+
+        return command.url || t('chatbot.plannedAction');
+    };
+
+    const cleanAssistantResponse = (responseText: string) =>
+        responseText
+            .replace(/ACTION:\s*[^\n]+/gi, '')
+            .replace(/TOOL_CALL:\s*[^\n]+/gi, '')
+            .split('\n')
+            .map((line) => line.trimEnd())
+            .filter((line) => !/^\s*(\*\*|__|\*|_)\s*$/.test(line))
+            .join('\n')
+            .replace(/\n{3,}/g, '\n\n')
+            .trim();
+
+    const buildActionActivity = (responseText: string, latestMessage: string): ToolActivity[] =>
+        filterAuthorizedCommands(parseActionCommands(responseText), latestMessage).map((command, index) => ({
+            tool: `${t('chatbot.plannedAction')}: ${getActionLabel(command)}`,
+            success: undefined,
+            summary: getActionSummary(command),
+            iteration: index + 1,
+        }));
+
     const sendMessage = async () => {
         const messageText = inputMessage.trim();
         if (!messageText || isLoading) return;
 
+        if (messageText.startsWith('/')) {
+            const command = messageText.toLowerCase();
+            setInputMessage('');
+
+            if (command === '/help' || command === '/commands') {
+                setMessages((prev) => [
+                    ...prev,
+                    {
+                        id: nextLocalId('command'),
+                        role: 'assistant',
+                        content: t('chatbot.availableCommands'),
+                        timestamp: new Date(),
+                    },
+                ]);
+                return;
+            }
+
+            if (command === '/context') {
+                setMessages((prev) => [
+                    ...prev,
+                    {
+                        id: nextLocalId('command'),
+                        role: 'assistant',
+                        content: t('chatbot.contextCommand', {
+                            mode,
+                            route: pathname || 'unknown',
+                        }),
+                        timestamp: new Date(),
+                    },
+                ]);
+                return;
+            }
+
+            if (command === '/compact') {
+                setMessages([
+                    {
+                        id: nextLocalId('compact'),
+                        role: 'assistant',
+                        content: t('chatbot.compactCommand'),
+                        timestamp: new Date(),
+                    },
+                ]);
+                return;
+            }
+
+            if (command === '/clear') {
+                createNewConversation();
+                return;
+            }
+
+            setMessages((prev) => [
+                ...prev,
+                {
+                    id: nextLocalId('command'),
+                    role: 'assistant',
+                    content: t('chatbot.unknownCommand', { command: messageText }),
+                    timestamp: new Date(),
+                },
+            ]);
+            return;
+        }
+
         const userMessage: Message = {
-            id: `user-${Date.now()}`,
+            id: nextLocalId('user'),
             role: 'user',
             content: messageText,
             timestamp: new Date(),
+            usage: estimateInputUsage(messageText),
         };
         setMessages((prev) => [...prev, userMessage]);
         setInputMessage('');
@@ -504,16 +846,19 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
 
         setIsLoading(true);
         const loadingMessage: Message = {
-            id: `loading-${Date.now()}`,
+            id: nextLocalId('loading'),
             role: 'assistant',
             content: '',
             timestamp: new Date(),
+            status: 'Preparing...',
+            toolActivity: [],
         };
         setMessages((prev) => [...prev, loadingMessage]);
         scrollToBottom();
 
         try {
             const pageContext: PageContext = {
+                mode,
                 route: pathname || '',
                 routeName: pathname || '',
                 page: pathname || '',
@@ -545,32 +890,116 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                 };
             }
 
-            const result =
-                mode === 'vds'
-                    ? await sendVdsChatMessage(
-                          messageText,
-                          messages.slice(0, -1),
-                          pageContext,
-                          currentConversationId || undefined,
-                      )
-                    : await sendChatMessage(
-                          messageText,
-                          messages.slice(0, -1),
-                          pageContext,
-                          currentConversationId || undefined,
-                      );
+            const result = await streamChatMessage(
+                mode,
+                messageText,
+                messages.slice(0, -1),
+                pageContext,
+                currentConversationId || undefined,
+                (event) => {
+                    if (event.type === 'conversation') {
+                        if (event.conversation_id && !currentConversationId) {
+                            setCurrentConversationId(event.conversation_id);
+                            if (typeof window !== 'undefined') {
+                                window.localStorage.setItem(lastConversationStorageKey, String(event.conversation_id));
+                            }
+                        }
+                        if (event.user_usage) {
+                            setMessages((prev) =>
+                                prev.map((message) =>
+                                    message.id === userMessage.id ? { ...message, usage: event.user_usage } : message,
+                                ),
+                            );
+                        }
+                    }
+
+                    if (event.type === 'status') {
+                        setMessages((prev) =>
+                            prev.map((message) =>
+                                message.id === loadingMessage.id ? { ...message, status: event.message } : message,
+                            ),
+                        );
+                    }
+
+                    if (event.type === 'tool_call') {
+                        const pendingActivity: ToolActivity = {
+                            tool: event.tool,
+                            params: event.params,
+                            success: undefined,
+                            summary: t('chatbot.toolRunningSummary'),
+                            iteration: event.iteration,
+                        };
+                        setMessages((prev) =>
+                            prev.map((message) =>
+                                message.id === loadingMessage.id
+                                    ? {
+                                          ...message,
+                                          status: t('chatbot.callingTool', { tool: event.tool }),
+                                          toolActivity: [...(message.toolActivity || []), pendingActivity],
+                                      }
+                                    : message,
+                            ),
+                        );
+                    }
+
+                    if (event.type === 'tool_result') {
+                        setMessages((prev) =>
+                            prev.map((message) => {
+                                if (message.id !== loadingMessage.id) return message;
+                                const current = [...(message.toolActivity || [])];
+                                const index = current.findIndex(
+                                    (activity) =>
+                                        activity.tool === event.tool &&
+                                        activity.iteration === event.iteration &&
+                                        activity.success === undefined,
+                                );
+                                if (index >= 0) {
+                                    current[index] = event;
+                                } else {
+                                    current.push(event);
+                                }
+
+                                return {
+                                    ...message,
+                                    status: event.success
+                                        ? t('chatbot.toolFinished', { tool: event.tool })
+                                        : t('chatbot.toolFailed', { tool: event.tool }),
+                                    toolActivity: current,
+                                };
+                            }),
+                        );
+                    }
+
+                    if (event.type === 'usage') {
+                        setMessages((prev) =>
+                            prev.map((message) =>
+                                message.id === loadingMessage.id ? { ...message, usage: event.usage } : message,
+                            ),
+                        );
+                    }
+                },
+            );
+
+            setMessages((prev) =>
+                prev.map((message) =>
+                    message.id === loadingMessage.id ? { ...message, status: t('chatbot.typing') } : message,
+                ),
+            );
 
             if (result.model) {
                 setChatModelName(result.model);
             }
 
-            if (result.conversationId && !currentConversationId) {
-                setCurrentConversationId(result.conversationId);
+            if (result.conversation_id && !currentConversationId) {
+                setCurrentConversationId(result.conversation_id);
+                if (typeof window !== 'undefined') {
+                    window.localStorage.setItem(lastConversationStorageKey, String(result.conversation_id));
+                }
                 await loadConversationsList();
             }
 
-            if (result.toolExecutions && result.toolExecutions.length > 0) {
-                for (const toolExec of result.toolExecutions) {
+            if (result.tool_executions && result.tool_executions.length > 0) {
+                for (const toolExec of result.tool_executions) {
                     if (toolExec.success) {
                         showActionNotification(
                             toolExec.message || t('chatbot.toolActionSuccess', { action: toolExec.action_type }),
@@ -585,49 +1014,67 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                 }
             }
 
-            setMessages((prev) => prev.filter((m) => m.id !== loadingMessage.id));
-
             const isErrorResponse =
                 result.model?.includes('(Error)') || result.response.toLowerCase().startsWith('error');
 
             if (isErrorResponse) {
                 toast.error(t('chatbot.connectionError'));
                 console.error('AI service error:', result.response);
-                setMessages((prev) => [
-                    ...prev,
-                    {
-                        id: `error-${Date.now()}`,
-                        role: 'assistant',
-                        content: t('chatbot.connectionError'),
-                        timestamp: new Date(),
-                    },
-                ]);
+                setMessages((prev) =>
+                    prev.map((message) =>
+                        message.id === loadingMessage.id
+                            ? { ...message, content: t('chatbot.connectionError'), status: null }
+                            : message,
+                    ),
+                );
                 return;
             }
 
-            const cleanedResponse = result.response
-                .replace(/ACTION:\s*[^\n]+/gi, '')
-                .replace(/\n\n+/g, '\n\n')
-                .trim();
+            setMessages((prev) =>
+                prev.map((message) =>
+                    message.id === loadingMessage.id ? { ...message, status: t('chatbot.checkingActions') } : message,
+                ),
+            );
+
+            const cleanedResponse = cleanAssistantResponse(result.response);
             const hasActions = /ACTION:\s*[^\n]+/gi.test(result.response);
             const messageContent =
                 cleanedResponse ||
                 (hasActions
                     ? t('chatbot.executingAction')
                     : t('chatbot.welcome', { name: user?.first_name || 'there' }));
-
-            setMessages((prev) => [
-                ...prev,
-                {
-                    id: `assistant-${Date.now()}`,
-                    role: 'assistant',
-                    content: messageContent,
-                    timestamp: new Date(),
-                },
-            ]);
+            const actionActivity = buildActionActivity(result.response, messageText);
+            const messageToolActivity =
+                result.tool_activity !== undefined && result.tool_activity !== null
+                    ? result.tool_activity
+                    : loadingMessage.toolActivity || [];
+
+            setMessages((prev) =>
+                prev.map((message) => {
+                    if (message.id !== loadingMessage.id) return message;
+
+                    const finalToolActivity =
+                        result.tool_activity !== undefined && result.tool_activity !== null
+                            ? messageToolActivity
+                            : message.toolActivity || [];
+
+                    return {
+                        ...message,
+                        id: result.message_id ? `msg-${result.message_id}` : nextLocalId('assistant'),
+                        content: '',
+                        fullContent: messageContent,
+                        isTyping: true,
+                        timestamp: new Date(),
+                        model: result.model,
+                        usage: result.usage,
+                        toolActivity: [...finalToolActivity, ...actionActivity],
+                        status: null,
+                    };
+                }),
+            );
             scrollToBottom();
 
-            await executeAIActions(result.response);
+            await executeAIActions(result.response, messageText);
         } catch (error) {
             setMessages((prev) => prev.filter((m) => m.id !== loadingMessage.id));
             toast.error(t('chatbot.connectionError'));
@@ -635,7 +1082,7 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
             setMessages((prev) => [
                 ...prev,
                 {
-                    id: `error-${Date.now()}`,
+                    id: nextLocalId('error'),
                     role: 'assistant',
                     content: t('chatbot.connectionError'),
                     timestamp: new Date(),
@@ -656,34 +1103,6 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
         }
     };
 
-    const UserAvatar = ({ size = 'md' }: { size?: 'sm' | 'md' }) => {
-        const sizeClasses = {
-            sm: 'h-8 w-8 text-xs',
-            md: 'h-9 w-9 text-sm',
-        };
-
-        if (user?.avatar) {
-            return (
-                <Image
-                    src={user.avatar}
-                    alt={user.username}
-                    width={size === 'sm' ? 32 : 36}
-                    height={size === 'sm' ? 32 : 36}
-                    unoptimized
-                    className={`${sizeClasses[size]} rounded-full object-cover`}
-                />
-            );
-        }
-
-        return (
-            <div
-                className={`${sizeClasses[size]} bg-primary text-primary-foreground flex items-center justify-center rounded-full font-semibold`}
-            >
-                {user?.first_name?.charAt(0) || user?.username?.charAt(0)}
-            </div>
-        );
-    };
-
     return (
         <>
             <Transition appear show={open} as={Fragment}>
@@ -713,8 +1132,8 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                                     leaveTo='translate-x-full'
                                 >
                                     <Dialog.Panel className='pointer-events-auto w-screen max-w-full md:max-w-2xl lg:max-w-3xl'>
-                                        <div className='bg-background flex h-full flex-col shadow-xl'>
-                                            <div className='border-border bg-background/95 supports-backdrop-filter:bg-background/60 flex items-center justify-between border-b px-4 py-3 backdrop-blur'>
+                                        <div className='bg-background/98 ring-border/70 dark:bg-background flex h-full flex-col shadow-2xl ring-1'>
+                                            <div className='border-border/70 bg-card/95 supports-backdrop-filter:bg-card/85 flex items-center justify-between border-b px-4 py-3 shadow-sm backdrop-blur'>
                                                 <div className='flex min-w-0 flex-1 items-center gap-3'>
                                                     <Button
                                                         variant='ghost'
@@ -725,16 +1144,31 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                                                         <Menu className='h-5 w-5' />
                                                         <span className='sr-only'>{t('chatbot.toggleSidebar')}</span>
                                                     </Button>
-                                                    <div className='from-primary to-primary/60 flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-linear-to-br'>
-                                                        <Bot className='text-primary-foreground h-5 w-5' />
+                                                    <div className='bg-background ring-primary/15 flex h-10 w-10 shrink-0 items-center justify-center rounded-2xl p-1.5 shadow-sm ring-1'>
+                                                        <Image
+                                                            src={logoUrl}
+                                                            alt={settings?.app_name || t('chatbot.title')}
+                                                            width={28}
+                                                            height={28}
+                                                            className='h-7 w-7 object-contain'
+                                                            unoptimized
+                                                        />
                                                     </div>
                                                     <div className='min-w-0 flex-1'>
                                                         <h2 className='text-foreground text-sm font-semibold'>
                                                             {t('chatbot.title')}
                                                         </h2>
-                                                        <p className='text-muted-foreground truncate text-xs'>
-                                                            {chatModelName}
-                                                        </p>
+                                                        {chatModelName && chatModelName !== t('chatbot.title') && (
+                                                            <p className='text-muted-foreground truncate text-xs'>
+                                                                {chatModelName}
+                                                            </p>
+                                                        )}
+                                                        <div className='mt-1 flex items-center gap-1.5'>
+                                                            <span className='h-1.5 w-1.5 rounded-full bg-emerald-500 shadow-[0_0_0_3px_rgba(16,185,129,0.14)]' />
+                                                            <span className='text-muted-foreground text-[11px]'>
+                                                                {t('chatbot.readyToHelp')}
+                                                            </span>
+                                                        </div>
                                                     </div>
                                                 </div>
                                                 <Button
@@ -756,8 +1190,8 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                                                             onClick={() => setShowSidebar(false)}
                                                         />
 
-                                                        <div className='border-border bg-background fixed inset-y-0 left-0 z-50 flex w-72 shrink-0 flex-col border-r md:relative md:z-0 md:w-64'>
-                                                            <div className='border-border flex items-center justify-between border-b px-3 py-3'>
+                                                        <div className='border-border/70 bg-card fixed inset-y-0 left-0 z-50 flex w-72 shrink-0 flex-col border-r shadow-xl md:relative md:z-0 md:w-64 md:shadow-none'>
+                                                            <div className='border-border/70 flex items-center justify-between border-b px-3 py-3'>
                                                                 <h3 className='text-sm font-semibold'>
                                                                     {t('chatbot.conversations')}
                                                                 </h3>
@@ -771,7 +1205,7 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                                                                 </Button>
                                                             </div>
 
-                                                            <div className='border-border border-b px-3 py-2'>
+                                                            <div className='border-border/70 bg-muted/20 border-b px-3 py-2'>
                                                                 <Button
                                                                     variant='default'
                                                                     size='sm'
@@ -808,10 +1242,10 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                                                                                 key={conv.id}
                                                                                 role='button'
                                                                                 tabIndex={0}
-                                                                                className={`group relative flex w-full cursor-pointer items-center gap-2.5 rounded-lg px-3 py-2.5 text-sm transition-colors ${
+                                                                                className={`group relative flex w-full cursor-pointer items-center gap-2.5 rounded-xl border px-3 py-2.5 text-sm transition-colors ${
                                                                                     currentConversationId === conv.id
-                                                                                        ? 'bg-primary/10 text-primary'
-                                                                                        : 'hover:bg-muted text-foreground'
+                                                                                        ? 'border-primary/25 bg-primary/10 text-primary shadow-sm'
+                                                                                        : 'text-foreground hover:border-border/70 hover:bg-muted/60 border-transparent'
                                                                                 }`}
                                                                                 onClick={() =>
                                                                                     loadConversation(conv.id)
@@ -838,7 +1272,7 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                                                                                         </span>
                                                                                         {conv.message_count &&
                                                                                             conv.message_count > 0 && (
-                                                                                                <span className='bg-muted ml-auto rounded px-1.5 py-0.5 text-[10px] font-medium'>
+                                                                                                <span className='bg-background text-muted-foreground ml-auto rounded-md px-1.5 py-0.5 text-[10px] font-medium shadow-sm'>
                                                                                                     {conv.message_count}
                                                                                                 </span>
                                                                                             )}
@@ -867,7 +1301,7 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                                                 )}
 
                                                 <div className='flex min-w-0 flex-1 flex-col'>
-                                                    <div className='flex-1 space-y-4 overflow-y-auto px-4 py-4'>
+                                                    <div className='bg-muted/20 flex-1 space-y-4 overflow-y-auto px-4 py-4 dark:bg-transparent'>
                                                         {pendingActions.length > 0 && (
                                                             <div className='space-y-2'>
                                                                 {pendingActions.map((action) => (
@@ -906,9 +1340,18 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
 
                                                         {messages.length === 0 && !isLoading ? (
                                                             <div className='flex h-full flex-col items-center justify-center py-12'>
-                                                                <div className='max-w-md px-4 text-center'>
-                                                                    <div className='from-primary to-primary/60 mx-auto mb-4 flex h-16 w-16 items-center justify-center rounded-full bg-linear-to-br'>
-                                                                        <Bot className='text-primary-foreground h-8 w-8' />
+                                                                <div className='border-border/70 bg-card/80 max-w-md rounded-3xl border px-6 py-8 text-center shadow-sm'>
+                                                                    <div className='bg-background ring-primary/15 mx-auto mb-4 flex h-16 w-16 items-center justify-center rounded-3xl p-3 shadow-sm ring-1'>
+                                                                        <Image
+                                                                            src={logoUrl}
+                                                                            alt={
+                                                                                settings?.app_name || t('chatbot.title')
+                                                                            }
+                                                                            width={40}
+                                                                            height={40}
+                                                                            className='h-10 w-10 object-contain'
+                                                                            unoptimized
+                                                                        />
                                                                     </div>
                                                                     <h3 className='text-foreground mb-2 text-lg font-semibold'>
                                                                         {t('chatbot.title')}
@@ -916,6 +1359,10 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                                                                     <p className='text-muted-foreground text-sm'>
                                                                         {t('chatbot.description')}
                                                                     </p>
+                                                                    <div className='border-border/70 bg-background/70 text-muted-foreground mt-4 inline-flex items-center gap-2 rounded-full border px-3 py-1 text-xs'>
+                                                                        <span className='h-1.5 w-1.5 rounded-full bg-emerald-500' />
+                                                                        {t('chatbot.online')}
+                                                                    </div>
                                                                 </div>
                                                             </div>
                                                         ) : (
@@ -926,45 +1373,326 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                                                                         className={`flex gap-3 ${message.role === 'user' ? 'flex-row-reverse' : 'flex-row'}`}
                                                                     >
                                                                         {message.role === 'assistant' ? (
-                                                                            <div className='from-primary to-primary/60 flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-linear-to-br'>
-                                                                                <Bot className='text-primary-foreground h-5 w-5' />
+                                                                            <div className='bg-background ring-primary/15 flex h-9 w-9 shrink-0 items-center justify-center rounded-2xl p-1.5 shadow-sm ring-1'>
+                                                                                <Image
+                                                                                    src={logoUrl}
+                                                                                    alt={
+                                                                                        settings?.app_name ||
+                                                                                        t('chatbot.title')
+                                                                                    }
+                                                                                    width={24}
+                                                                                    height={24}
+                                                                                    className='h-6 w-6 object-contain'
+                                                                                    unoptimized
+                                                                                />
                                                                             </div>
                                                                         ) : (
-                                                                            <UserAvatar size='md' />
+                                                                            <UserAvatar
+                                                                                avatar={user?.avatar}
+                                                                                username={user?.username}
+                                                                                firstName={user?.first_name}
+                                                                                size='md'
+                                                                            />
                                                                         )}
 
                                                                         <div className='max-w-[85%] min-w-0 flex-1 md:max-w-[75%]'>
                                                                             <div className='mb-1 flex items-center gap-2'>
                                                                                 <span className='text-foreground text-xs font-medium'>
                                                                                     {message.role === 'assistant'
-                                                                                        ? t('chatbot.title')
+                                                                                        ? t('chatbot.assistant')
                                                                                         : user?.first_name ||
                                                                                           user?.username ||
                                                                                           t('chatbot.you')}
                                                                                 </span>
                                                                             </div>
                                                                             <div
-                                                                                className={`rounded-2xl px-4 py-2.5 ${
+                                                                                className={`rounded-2xl px-4 py-2.5 shadow-sm ring-1 ${
                                                                                     message.role === 'user'
-                                                                                        ? 'bg-primary text-primary-foreground'
-                                                                                        : 'bg-muted text-foreground'
+                                                                                        ? 'bg-primary text-primary-foreground shadow-primary/20 ring-primary/20'
+                                                                                        : 'bg-card text-foreground ring-border/70 dark:bg-card/95'
                                                                                 }`}
                                                                             >
-                                                                                {message.content ? (
-                                                                                    <div className='prose prose-sm dark:prose-invert max-w-none text-sm leading-relaxed [&>*:first-child]:mt-0 [&>*:last-child]:mb-0'>
-                                                                                        <ReactMarkdown>
+                                                                                {message.content || message.isTyping ? (
+                                                                                    <div
+                                                                                        className={`prose prose-sm dark:prose-invert max-w-none text-sm leading-relaxed [&>*:first-child]:mt-0 [&>*:last-child]:mb-0 ${
+                                                                                            message.role === 'user'
+                                                                                                ? 'prose-p:text-primary-foreground prose-li:text-primary-foreground prose-strong:text-primary-foreground prose-a:text-primary-foreground prose-headings:text-primary-foreground'
+                                                                                                : 'prose-p:text-foreground prose-li:text-foreground prose-strong:text-foreground prose-a:text-primary prose-headings:text-foreground'
+                                                                                        }`}
+                                                                                    >
+                                                                                        <ReactMarkdown
+                                                                                            remarkPlugins={[remarkGfm]}
+                                                                                            components={{
+                                                                                                pre: ({ children }) => (
+                                                                                                    <pre className='my-3 overflow-x-auto rounded-xl border border-slate-800 bg-slate-950 p-4 text-sm text-slate-100 shadow-inner'>
+                                                                                                        {children}
+                                                                                                    </pre>
+                                                                                                ),
+                                                                                                code: ({
+                                                                                                    className,
+                                                                                                    children,
+                                                                                                    ...props
+                                                                                                }) => {
+                                                                                                    const isBlock =
+                                                                                                        className?.startsWith(
+                                                                                                            'language-',
+                                                                                                        );
+
+                                                                                                    return (
+                                                                                                        <code
+                                                                                                            className={
+                                                                                                                isBlock
+                                                                                                                    ? `font-mono text-slate-100 ${className ?? ''}`
+                                                                                                                    : `rounded-md px-1.5 py-0.5 font-mono text-[0.9em] ${
+                                                                                                                          message.role ===
+                                                                                                                          'user'
+                                                                                                                              ? 'text-primary-foreground bg-white/15'
+                                                                                                                              : 'bg-muted text-foreground'
+                                                                                                                      }`
+                                                                                                            }
+                                                                                                            {...props}
+                                                                                                        >
+                                                                                                            {children}
+                                                                                                        </code>
+                                                                                                    );
+                                                                                                },
+                                                                                                table: ({
+                                                                                                    children,
+                                                                                                }) => (
+                                                                                                    <div className='border-border/70 my-3 overflow-x-auto rounded-xl border'>
+                                                                                                        <table className='w-full border-collapse text-sm'>
+                                                                                                            {children}
+                                                                                                        </table>
+                                                                                                    </div>
+                                                                                                ),
+                                                                                                thead: ({
+                                                                                                    children,
+                                                                                                }) => (
+                                                                                                    <thead className='bg-muted/70'>
+                                                                                                        {children}
+                                                                                                    </thead>
+                                                                                                ),
+                                                                                                tbody: ({
+                                                                                                    children,
+                                                                                                }) => (
+                                                                                                    <tbody className='divide-border/70 divide-y'>
+                                                                                                        {children}
+                                                                                                    </tbody>
+                                                                                                ),
+                                                                                                th: ({ children }) => (
+                                                                                                    <th className='text-foreground px-3 py-2 text-left font-semibold'>
+                                                                                                        {children}
+                                                                                                    </th>
+                                                                                                ),
+                                                                                                td: ({ children }) => (
+                                                                                                    <td className='text-foreground px-3 py-2'>
+                                                                                                        {children}
+                                                                                                    </td>
+                                                                                                ),
+                                                                                            }}
+                                                                                        >
                                                                                             {message.content}
                                                                                         </ReactMarkdown>
+                                                                                        {message.isTyping && (
+                                                                                            <span className='bg-primary ml-0.5 inline-block h-4 w-1 animate-pulse rounded-full align-[-2px]' />
+                                                                                        )}
                                                                                     </div>
                                                                                 ) : (
-                                                                                    <div className='flex items-center gap-2'>
-                                                                                        <Loader2 className='h-4 w-4 animate-spin' />
-                                                                                        <span className='text-sm'>
-                                                                                            {t('chatbot.thinking')}
-                                                                                        </span>
+                                                                                    <div className='space-y-3'>
+                                                                                        <div className='flex items-center gap-2'>
+                                                                                            <Loader2 className='h-4 w-4 animate-spin' />
+                                                                                            <span className='text-sm'>
+                                                                                                {message.status ||
+                                                                                                    t(
+                                                                                                        'chatbot.thinking',
+                                                                                                    )}
+                                                                                            </span>
+                                                                                            <span className='flex gap-1'>
+                                                                                                <span className='bg-muted-foreground/60 h-1.5 w-1.5 animate-bounce rounded-full [animation-delay:-0.2s]' />
+                                                                                                <span className='bg-muted-foreground/60 h-1.5 w-1.5 animate-bounce rounded-full [animation-delay:-0.1s]' />
+                                                                                                <span className='bg-muted-foreground/60 h-1.5 w-1.5 animate-bounce rounded-full' />
+                                                                                            </span>
+                                                                                        </div>
+                                                                                        {(message.toolActivity
+                                                                                            ?.length || 0) > 0 && (
+                                                                                            <div className='space-y-2'>
+                                                                                                {message.toolActivity?.map(
+                                                                                                    (
+                                                                                                        activity,
+                                                                                                        index,
+                                                                                                    ) => (
+                                                                                                        <div
+                                                                                                            key={`${activity.tool}-${activity.iteration}-${index}`}
+                                                                                                            className='bg-muted/50 border-border/70 rounded-lg border px-3 py-2 text-xs'
+                                                                                                        >
+                                                                                                            <div className='flex items-center justify-between gap-2'>
+                                                                                                                <span className='font-medium'>
+                                                                                                                    {
+                                                                                                                        activity.tool
+                                                                                                                    }
+                                                                                                                </span>
+                                                                                                                <span
+                                                                                                                    className={
+                                                                                                                        activity.success ===
+                                                                                                                        false
+                                                                                                                            ? 'text-red-500'
+                                                                                                                            : activity.success
+                                                                                                                              ? 'text-green-600 dark:text-green-400'
+                                                                                                                              : 'text-muted-foreground'
+                                                                                                                    }
+                                                                                                                >
+                                                                                                                    {activity.success ===
+                                                                                                                    false
+                                                                                                                        ? t(
+                                                                                                                              'chatbot.toolFailedShort',
+                                                                                                                          )
+                                                                                                                        : activity.success
+                                                                                                                          ? t(
+                                                                                                                                'chatbot.toolDone',
+                                                                                                                            )
+                                                                                                                          : t(
+                                                                                                                                'chatbot.toolRunning',
+                                                                                                                            )}
+                                                                                                                </span>
+                                                                                                            </div>
+                                                                                                            {activity.summary && (
+                                                                                                                <p className='text-muted-foreground mt-1 line-clamp-2'>
+                                                                                                                    {
+                                                                                                                        activity.summary
+                                                                                                                    }
+                                                                                                                </p>
+                                                                                                            )}
+                                                                                                        </div>
+                                                                                                    ),
+                                                                                                )}
+                                                                                            </div>
+                                                                                        )}
                                                                                     </div>
                                                                                 )}
                                                                             </div>
+                                                                            {(message.toolActivity?.length || 0) > 0 &&
+                                                                                message.content && (
+                                                                                    <div className='border-border/70 bg-muted/20 mt-2 rounded-xl border text-xs'>
+                                                                                        <button
+                                                                                            type='button'
+                                                                                            className='flex w-full items-center justify-between gap-2 px-3 py-2 text-left'
+                                                                                            onClick={() =>
+                                                                                                toggleActivityDetails(
+                                                                                                    message.id,
+                                                                                                )
+                                                                                            }
+                                                                                        >
+                                                                                            <span className='text-foreground font-medium'>
+                                                                                                {t('chatbot.moreInfo')}
+                                                                                            </span>
+                                                                                            <span className='text-muted-foreground'>
+                                                                                                {expandedActivityMessages.includes(
+                                                                                                    message.id,
+                                                                                                )
+                                                                                                    ? t(
+                                                                                                          'chatbot.hideDetails',
+                                                                                                      )
+                                                                                                    : t(
+                                                                                                          'chatbot.showDetails',
+                                                                                                      )}
+                                                                                            </span>
+                                                                                        </button>
+                                                                                        {expandedActivityMessages.includes(
+                                                                                            message.id,
+                                                                                        ) && (
+                                                                                            <div className='border-border/70 border-t px-3 py-2'>
+                                                                                                <div className='text-muted-foreground mb-2 text-[11px] font-semibold tracking-wide uppercase'>
+                                                                                                    {t(
+                                                                                                        'chatbot.toolsUsed',
+                                                                                                    )}
+                                                                                                </div>
+                                                                                                <div className='space-y-1.5'>
+                                                                                                    {message.toolActivity?.map(
+                                                                                                        (
+                                                                                                            activity,
+                                                                                                            index,
+                                                                                                        ) => (
+                                                                                                            <div
+                                                                                                                key={`${activity.tool}-${activity.iteration}-${index}`}
+                                                                                                                className='bg-background/70 ring-border/60 rounded-lg px-3 py-2 ring-1'
+                                                                                                            >
+                                                                                                                <div className='flex items-center justify-between gap-2'>
+                                                                                                                    <span className='text-foreground font-medium'>
+                                                                                                                        {
+                                                                                                                            activity.tool
+                                                                                                                        }
+                                                                                                                    </span>
+                                                                                                                    <span
+                                                                                                                        className={
+                                                                                                                            activity.success ===
+                                                                                                                            false
+                                                                                                                                ? 'text-red-500'
+                                                                                                                                : activity.success
+                                                                                                                                  ? 'text-green-600 dark:text-green-400'
+                                                                                                                                  : 'text-muted-foreground'
+                                                                                                                        }
+                                                                                                                    >
+                                                                                                                        {activity.success ===
+                                                                                                                        false
+                                                                                                                            ? t(
+                                                                                                                                  'chatbot.toolFailedShort',
+                                                                                                                              )
+                                                                                                                            : activity.success
+                                                                                                                              ? t(
+                                                                                                                                    'chatbot.toolDone',
+                                                                                                                                )
+                                                                                                                              : t(
+                                                                                                                                    'chatbot.waitingForConfirmation',
+                                                                                                                                )}
+                                                                                                                    </span>
+                                                                                                                </div>
+                                                                                                                {activity.summary && (
+                                                                                                                    <p className='text-muted-foreground mt-1 line-clamp-2'>
+                                                                                                                        {
+                                                                                                                            activity.summary
+                                                                                                                        }
+                                                                                                                    </p>
+                                                                                                                )}
+                                                                                                            </div>
+                                                                                                        ),
+                                                                                                    )}
+                                                                                                </div>
+                                                                                            </div>
+                                                                                        )}
+                                                                                    </div>
+                                                                                )}
+                                                                            {formatUsageLabel(
+                                                                                message.usage,
+                                                                                message.role,
+                                                                            ) && (
+                                                                                <div
+                                                                                    className={`text-muted-foreground mt-1 flex flex-wrap items-center gap-1 text-[11px] ${
+                                                                                        message.role === 'user'
+                                                                                            ? 'justify-end'
+                                                                                            : 'justify-start'
+                                                                                    }`}
+                                                                                >
+                                                                                    <span
+                                                                                        className='bg-muted/70 rounded-full px-2 py-0.5'
+                                                                                        title={formatUsageTitle(
+                                                                                            message.usage,
+                                                                                            message.role,
+                                                                                        )}
+                                                                                    >
+                                                                                        {formatUsageLabel(
+                                                                                            message.usage,
+                                                                                            message.role,
+                                                                                        )}
+                                                                                    </span>
+                                                                                    {message.model &&
+                                                                                        message.model !==
+                                                                                            t('chatbot.title') && (
+                                                                                            <span className='bg-muted/70 rounded-full px-2 py-0.5'>
+                                                                                                {message.model}
+                                                                                            </span>
+                                                                                        )}
+                                                                                </div>
+                                                                            )}
                                                                         </div>
                                                                     </div>
                                                                 ))}
@@ -973,17 +1701,64 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                                                         <div ref={messagesEndRef} />
                                                     </div>
 
-                                                    <div className='border-border bg-background border-t p-4'>
+                                                    <div className='border-border/70 bg-card border-t p-4 shadow-[0_-8px_24px_-20px_rgba(0,0,0,0.35)]'>
+                                                        {inputMessage.startsWith('/') && (
+                                                            <div className='border-border/70 bg-popover/95 ring-primary/10 mx-auto mb-3 max-w-4xl overflow-hidden rounded-2xl border shadow-xl ring-1 backdrop-blur'>
+                                                                <div className='border-border/70 bg-muted/40 flex items-center justify-between border-b px-3 py-2'>
+                                                                    <span className='text-foreground text-xs font-semibold'>
+                                                                        {t('chatbot.slashCommands')}
+                                                                    </span>
+                                                                    <span className='text-muted-foreground text-[11px]'>
+                                                                        {t('chatbot.commandsHint')}
+                                                                    </span>
+                                                                </div>
+                                                                <div className='max-h-56 overflow-y-auto p-1.5'>
+                                                                    {commandSuggestions.length > 0 ? (
+                                                                        commandSuggestions.map((command) => (
+                                                                            <button
+                                                                                key={command.command}
+                                                                                type='button'
+                                                                                className='hover:bg-muted/70 focus:bg-muted/70 flex w-full items-start gap-3 rounded-xl px-3 py-2.5 text-left transition-colors focus:outline-none'
+                                                                                onMouseDown={(event) =>
+                                                                                    event.preventDefault()
+                                                                                }
+                                                                                onClick={() =>
+                                                                                    selectCommandSuggestion(
+                                                                                        command.command,
+                                                                                    )
+                                                                                }
+                                                                            >
+                                                                                <span className='bg-primary/10 text-primary ring-primary/15 mt-0.5 rounded-lg px-2 py-1 font-mono text-xs font-semibold ring-1'>
+                                                                                    {command.command}
+                                                                                </span>
+                                                                                <span className='min-w-0 flex-1'>
+                                                                                    <span className='text-foreground block text-sm font-medium'>
+                                                                                        {t(command.titleKey)}
+                                                                                    </span>
+                                                                                    <span className='text-muted-foreground block text-xs'>
+                                                                                        {t(command.descriptionKey)}
+                                                                                    </span>
+                                                                                </span>
+                                                                            </button>
+                                                                        ))
+                                                                    ) : (
+                                                                        <div className='text-muted-foreground px-3 py-4 text-center text-sm'>
+                                                                            {t('chatbot.commandNoMatches')}
+                                                                        </div>
+                                                                    )}
+                                                                </div>
+                                                            </div>
+                                                        )}
                                                         <div className='mx-auto flex max-w-4xl items-end gap-2'>
                                                             <textarea
                                                                 ref={textareaRef}
                                                                 value={inputMessage}
                                                                 onChange={(e) => setInputMessage(e.target.value)}
                                                                 onKeyDown={handleKeyDown}
-                                                                placeholder={t('chatbot.placeholder')}
+                                                                placeholder={`${t('chatbot.placeholder')} ${t('chatbot.commandsHint')}`}
                                                                 disabled={isLoading}
                                                                 rows={1}
-                                                                className='border-input bg-background text-foreground placeholder:text-muted-foreground focus-visible:ring-primary max-h-11 max-h-32 flex-1 resize-none rounded-2xl border px-4 py-3 text-sm focus-visible:ring-2 focus-visible:ring-offset-0 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50'
+                                                                className='border-border/70 bg-background text-foreground placeholder:text-muted-foreground focus-visible:ring-primary max-h-32 min-h-11 flex-1 resize-none overflow-y-hidden rounded-2xl border px-4 py-3 text-sm shadow-sm focus-visible:ring-2 focus-visible:ring-offset-0 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50'
                                                                 style={{
                                                                     height: 'auto',
                                                                     minHeight: '44px',
@@ -991,8 +1766,13 @@ export default function ChatbotContainer({ open, onClose, mode = 'server', vdsIn
                                                                 onInput={(e) => {
                                                                     const target = e.target as HTMLTextAreaElement;
                                                                     target.style.height = 'auto';
-                                                                    target.style.height =
-                                                                        Math.min(target.scrollHeight, 128) + 'px';
+                                                                    const nextHeight = Math.min(
+                                                                        target.scrollHeight,
+                                                                        128,
+                                                                    );
+                                                                    target.style.height = `${nextHeight}px`;
+                                                                    target.style.overflowY =
+                                                                        target.scrollHeight > 128 ? 'auto' : 'hidden';
                                                                 }}
                                                             />
 
diff --git a/frontendv2/src/components/ai/ChatbotInterface.tsx b/frontendv2/src/components/ai/ChatbotInterface.tsx
index 356416f8b..6c8b2947c 100644
--- a/frontendv2/src/components/ai/ChatbotInterface.tsx
+++ b/frontendv2/src/components/ai/ChatbotInterface.tsx
@@ -15,7 +15,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 'use client';
 
-import { useState, useEffect, useRef, useContext } from 'react';
+import { memo, useState, useEffect, useRef, useContext } from 'react';
 import { usePathname, useRouter } from 'next/navigation';
 import Image from 'next/image';
 import { Send, Loader2, X, Bot, MessageSquare, Clock, Trash2, Plus, AlertTriangle, Menu } from 'lucide-react';
@@ -31,6 +31,7 @@ import {
 } from '@/components/ui/dialog';
 import { toast } from 'sonner';
 import ReactMarkdown from 'react-markdown';
+import remarkGfm from 'remark-gfm';
 import { useTranslation } from '@/contexts/TranslationContext';
 import {
     sendChatMessage,
@@ -80,10 +81,46 @@ interface ChatbotInterfaceProps {
     open: boolean;
     onOpenChange: (open: boolean) => void;
     isDialog?: boolean;
-    mode?: 'server' | 'vds';
+    mode?: 'server' | 'vds' | 'dashboard';
     vdsInstance?: VmInstance | null;
 }
 
+interface UserAvatarProps {
+    avatar?: string | null;
+    username?: string | null;
+    firstName?: string | null;
+    size?: 'sm' | 'md' | 'lg';
+}
+
+const UserAvatar = memo(function UserAvatar({ avatar, username, firstName, size = 'md' }: UserAvatarProps) {
+    const sizeClasses = {
+        sm: 'h-8 w-8 text-xs',
+        md: 'h-10 w-10 text-sm',
+        lg: 'h-12 w-12 text-base',
+    };
+
+    if (avatar) {
+        return (
+            <Image
+                src={avatar}
+                alt={username || 'User'}
+                width={size === 'sm' ? 32 : size === 'md' ? 40 : 48}
+                height={size === 'sm' ? 32 : size === 'md' ? 40 : 48}
+                unoptimized
+                className={`${sizeClasses[size]} rounded-full object-cover`}
+            />
+        );
+    }
+
+    return (
+        <div
+            className={`${sizeClasses[size]} bg-primary text-primary-foreground flex items-center justify-center rounded-full font-semibold`}
+        >
+            {firstName?.charAt(0) || username?.charAt(0)}
+        </div>
+    );
+});
+
 export default function ChatbotInterface({
     open,
     onOpenChange,
@@ -118,6 +155,7 @@ export default function ChatbotInterface({
     const serverCtx = useContext(ServerContext);
     const server = serverCtx?.server ?? null;
     const { user } = useSession();
+    const lastConversationStorageKey = `featherpanel_chatbot_last_conversation_${mode}`;
 
     const scrollToBottom = () => {
         setTimeout(() => {
@@ -130,19 +168,32 @@ export default function ChatbotInterface({
     }, [messages]);
 
     const getWelcomeMessage = (userName: string) => {
+        if (mode === 'dashboard') {
+            return t('chatbot.welcomeDashboard', { name: userName });
+        }
+
         if (mode === 'vds') {
-            return (
-                t('chatbot.welcomeVds', { name: userName }) ||
-                `Hi ${userName}! I'm FeatherPanel VDS AI. I can help you manage your virtual servers - check status, manage backups, control power, and more!`
-            );
+            return t('chatbot.welcomeVds', { name: userName });
         }
         return t('chatbot.welcome', { name: userName });
     };
 
     useEffect(() => {
         if (open) {
-            loadConversationsList();
-            if (!currentConversationId && messages.length === 0) {
+            loadConversationsList().then((convs) => {
+                if (currentConversationId || messages.length > 0) return;
+
+                const storedConversationId =
+                    typeof window !== 'undefined' ? window.localStorage.getItem(lastConversationStorageKey) : null;
+                const conversationToRestore =
+                    (storedConversationId && convs.find((conv) => conv.id === Number(storedConversationId))) ||
+                    convs[0];
+
+                if (conversationToRestore) {
+                    loadConversation(conversationToRestore.id);
+                    return;
+                }
+
                 const userName = user?.first_name || user?.username || 'there';
                 setMessages([
                     {
@@ -152,7 +203,7 @@ export default function ChatbotInterface({
                         timestamp: new Date(),
                     },
                 ]);
-            }
+            });
             setTimeout(() => {
                 textareaRef.current?.focus();
             }, 100);
@@ -165,9 +216,11 @@ export default function ChatbotInterface({
         try {
             const convs = mode === 'vds' ? await getVdsConversations() : await getConversations();
             setConversations(convs);
+            return convs;
         } catch (error) {
             console.error('Failed to load conversations:', error);
             toast.error(t('chatbot.failedToLoadConversations'));
+            return [];
         } finally {
             setLoadingConversations(false);
         }
@@ -175,6 +228,9 @@ export default function ChatbotInterface({
 
     const createNewConversation = () => {
         setCurrentConversationId(null);
+        if (typeof window !== 'undefined') {
+            window.localStorage.removeItem(lastConversationStorageKey);
+        }
         const userName = user?.first_name || user?.username || 'there';
         setMessages([
             {
@@ -206,6 +262,9 @@ export default function ChatbotInterface({
                     timestamp: new Date(msg.created_at),
                 })),
             );
+            if (typeof window !== 'undefined') {
+                window.localStorage.setItem(lastConversationStorageKey, String(conversationId));
+            }
             if (data.messages.length > 0) {
                 const lastMessage = data.messages[data.messages.length - 1];
                 if (lastMessage?.model) {
@@ -232,6 +291,11 @@ export default function ChatbotInterface({
             }
             if (currentConversationId === conversationId) {
                 createNewConversation();
+            } else if (
+                typeof window !== 'undefined' &&
+                window.localStorage.getItem(lastConversationStorageKey) === String(conversationId)
+            ) {
+                window.localStorage.removeItem(lastConversationStorageKey);
             }
             await loadConversationsList();
             toast.success(t('chatbot.conversationDeleted'));
@@ -529,6 +593,7 @@ export default function ChatbotInterface({
 
         try {
             const pageContext: PageContext = {
+                mode,
                 route: pathname || '',
                 routeName: pathname || '',
                 page: pathname || '',
@@ -581,6 +646,9 @@ export default function ChatbotInterface({
 
             if (result.conversationId && !currentConversationId) {
                 setCurrentConversationId(result.conversationId);
+                if (typeof window !== 'undefined') {
+                    window.localStorage.setItem(lastConversationStorageKey, String(result.conversationId));
+                }
                 await loadConversationsList();
             }
 
@@ -671,35 +739,6 @@ export default function ChatbotInterface({
         }
     };
 
-    const UserAvatar = ({ size = 'md' }: { size?: 'sm' | 'md' | 'lg' }) => {
-        const sizeClasses = {
-            sm: 'h-8 w-8 text-xs',
-            md: 'h-10 w-10 text-sm',
-            lg: 'h-12 w-12 text-base',
-        };
-
-        if (user?.avatar) {
-            return (
-                <Image
-                    src={user.avatar}
-                    alt={user.username}
-                    width={size === 'sm' ? 32 : size === 'md' ? 40 : 48}
-                    height={size === 'sm' ? 32 : size === 'md' ? 40 : 48}
-                    unoptimized
-                    className={`${sizeClasses[size]} rounded-full object-cover`}
-                />
-            );
-        }
-
-        return (
-            <div
-                className={`${sizeClasses[size]} bg-primary text-primary-foreground flex items-center justify-center rounded-full font-semibold`}
-            >
-                {user?.first_name?.charAt(0) || user?.username?.charAt(0)}
-            </div>
-        );
-    };
-
     const content = (
         <div className='flex h-full flex-col md:flex-row'>
             {showConversationsSidebar && (
@@ -709,8 +748,8 @@ export default function ChatbotInterface({
                         onClick={() => setShowConversationsSidebar(false)}
                     />
 
-                    <div className='border-border bg-background fixed inset-y-0 left-0 z-50 flex w-72 shrink-0 flex-col border-r md:relative md:z-0 md:w-64'>
-                        <div className='border-border flex items-center justify-between border-b px-3 py-3'>
+                    <div className='border-border/70 bg-card fixed inset-y-0 left-0 z-50 flex w-72 shrink-0 flex-col border-r shadow-xl md:relative md:z-0 md:w-64 md:shadow-none'>
+                        <div className='border-border/70 flex items-center justify-between border-b px-3 py-3'>
                             <h3 className='text-sm font-semibold'>{t('chatbot.conversations')}</h3>
                             <Button
                                 variant='ghost'
@@ -722,7 +761,7 @@ export default function ChatbotInterface({
                             </Button>
                         </div>
 
-                        <div className='border-border border-b px-3 py-2'>
+                        <div className='border-border/70 bg-muted/20 border-b px-3 py-2'>
                             <Button variant='default' size='sm' className='w-full' onClick={createNewConversation}>
                                 <Plus className='mr-2 h-4 w-4' />
                                 {t('chatbot.newChat')}
@@ -752,10 +791,10 @@ export default function ChatbotInterface({
                                             key={conv.id}
                                             role='button'
                                             tabIndex={0}
-                                            className={`group relative flex w-full cursor-pointer items-center gap-2.5 rounded-lg px-3 py-2.5 text-sm transition-colors ${
+                                            className={`group relative flex w-full cursor-pointer items-center gap-2.5 rounded-xl border px-3 py-2.5 text-sm transition-colors ${
                                                 currentConversationId === conv.id
-                                                    ? 'bg-primary/10 text-primary'
-                                                    : 'hover:bg-muted text-foreground'
+                                                    ? 'border-primary/25 bg-primary/10 text-primary shadow-sm'
+                                                    : 'text-foreground hover:border-border/70 hover:bg-muted/60 border-transparent'
                                             }`}
                                             onClick={() => loadConversation(conv.id)}
                                             onKeyDown={(e) => e.key === 'Enter' && loadConversation(conv.id)}
@@ -769,7 +808,7 @@ export default function ChatbotInterface({
                                                     <Clock className='h-3 w-3 shrink-0' />
                                                     <span className='truncate'>{formatDate(conv.updated_at)}</span>
                                                     {conv.message_count && conv.message_count > 0 && (
-                                                        <span className='bg-muted ml-auto rounded px-1.5 py-0.5 text-[10px] font-medium'>
+                                                        <span className='bg-background text-muted-foreground ml-auto rounded-md px-1.5 py-0.5 text-[10px] font-medium shadow-sm'>
                                                             {conv.message_count}
                                                         </span>
                                                     )}
@@ -793,7 +832,7 @@ export default function ChatbotInterface({
             )}
 
             <div className='flex min-w-0 flex-1 flex-col'>
-                <div className='border-border bg-background/95 supports-backdrop-filter:bg-background/60 sticky top-0 z-10 flex items-center justify-between border-b px-4 py-3 backdrop-blur'>
+                <div className='border-border/70 bg-card/95 supports-backdrop-filter:bg-card/85 sticky top-0 z-10 flex items-center justify-between border-b px-4 py-3 shadow-sm backdrop-blur'>
                     <div className='flex min-w-0 flex-1 items-center gap-3'>
                         <Button
                             variant='ghost'
@@ -823,7 +862,7 @@ export default function ChatbotInterface({
                     )}
                 </div>
 
-                <div className='flex-1 space-y-4 overflow-y-auto px-4 py-4'>
+                <div className='bg-muted/20 flex-1 space-y-4 overflow-y-auto px-4 py-4 dark:bg-transparent'>
                     {pendingActions.length > 0 && (
                         <div className='space-y-2'>
                             {pendingActions.map((action) => (
@@ -872,7 +911,12 @@ export default function ChatbotInterface({
                                             <Bot className='text-primary-foreground h-4 w-4 md:h-5 md:w-5' />
                                         </div>
                                     ) : (
-                                        <UserAvatar size='md' />
+                                        <UserAvatar
+                                            avatar={user?.avatar}
+                                            username={user?.username}
+                                            firstName={user?.first_name}
+                                            size='md'
+                                        />
                                     )}
 
                                     <div className='max-w-[85%] min-w-0 flex-1 md:max-w-[75%]'>
@@ -884,15 +928,77 @@ export default function ChatbotInterface({
                                             </span>
                                         </div>
                                         <div
-                                            className={`rounded-2xl px-4 py-2.5 ${
+                                            className={`rounded-2xl px-4 py-2.5 shadow-sm ${
                                                 message.role === 'user'
-                                                    ? 'bg-primary text-primary-foreground'
-                                                    : 'bg-muted text-foreground'
+                                                    ? 'bg-primary text-primary-foreground shadow-primary/20'
+                                                    : 'border-border/70 bg-card text-foreground border'
                                             }`}
                                         >
                                             {message.content ? (
-                                                <div className='prose prose-sm dark:prose-invert max-w-none text-sm leading-relaxed [&>*:first-child]:mt-0 [&>*:last-child]:mb-0'>
-                                                    <ReactMarkdown>{message.content}</ReactMarkdown>
+                                                <div
+                                                    className={`prose prose-sm dark:prose-invert max-w-none text-sm leading-relaxed [&>*:first-child]:mt-0 [&>*:last-child]:mb-0 ${
+                                                        message.role === 'user'
+                                                            ? 'prose-p:text-primary-foreground prose-li:text-primary-foreground prose-strong:text-primary-foreground prose-a:text-primary-foreground prose-headings:text-primary-foreground'
+                                                            : 'prose-p:text-foreground prose-li:text-foreground prose-strong:text-foreground prose-a:text-primary prose-headings:text-foreground'
+                                                    }`}
+                                                >
+                                                    <ReactMarkdown
+                                                        remarkPlugins={[remarkGfm]}
+                                                        components={{
+                                                            pre: ({ children }) => (
+                                                                <pre className='my-3 overflow-x-auto rounded-xl border border-slate-800 bg-slate-950 p-4 text-sm text-slate-100 shadow-inner'>
+                                                                    {children}
+                                                                </pre>
+                                                            ),
+                                                            code: ({ className, children, ...props }) => {
+                                                                const isBlock = className?.startsWith('language-');
+
+                                                                return (
+                                                                    <code
+                                                                        className={
+                                                                            isBlock
+                                                                                ? `font-mono text-slate-100 ${className ?? ''}`
+                                                                                : `rounded-md px-1.5 py-0.5 font-mono text-[0.9em] ${
+                                                                                      message.role === 'user'
+                                                                                          ? 'text-primary-foreground bg-white/15'
+                                                                                          : 'bg-muted text-foreground'
+                                                                                  }`
+                                                                        }
+                                                                        {...props}
+                                                                    >
+                                                                        {children}
+                                                                    </code>
+                                                                );
+                                                            },
+                                                            table: ({ children }) => (
+                                                                <div className='border-border/70 my-3 overflow-x-auto rounded-xl border'>
+                                                                    <table className='w-full border-collapse text-sm'>
+                                                                        {children}
+                                                                    </table>
+                                                                </div>
+                                                            ),
+                                                            thead: ({ children }) => (
+                                                                <thead className='bg-muted/70'>{children}</thead>
+                                                            ),
+                                                            tbody: ({ children }) => (
+                                                                <tbody className='divide-border/70 divide-y'>
+                                                                    {children}
+                                                                </tbody>
+                                                            ),
+                                                            th: ({ children }) => (
+                                                                <th className='text-foreground px-3 py-2 text-left font-semibold'>
+                                                                    {children}
+                                                                </th>
+                                                            ),
+                                                            td: ({ children }) => (
+                                                                <td className='text-foreground px-3 py-2'>
+                                                                    {children}
+                                                                </td>
+                                                            ),
+                                                        }}
+                                                    >
+                                                        {message.content}
+                                                    </ReactMarkdown>
                                                 </div>
                                             ) : (
                                                 <div className='flex items-center gap-2'>
@@ -909,7 +1015,7 @@ export default function ChatbotInterface({
                     <div ref={messagesEndRef} />
                 </div>
 
-                <div className='border-border bg-background sticky bottom-0 border-t p-4'>
+                <div className='border-border/70 bg-card sticky bottom-0 border-t p-4 shadow-[0_-8px_24px_-20px_rgba(0,0,0,0.35)]'>
                     <div className='mx-auto flex max-w-4xl items-end gap-2'>
                         <textarea
                             ref={textareaRef}
@@ -919,7 +1025,7 @@ export default function ChatbotInterface({
                             placeholder={t('chatbot.placeholder')}
                             disabled={isLoading}
                             rows={1}
-                            className='border-input bg-background text-foreground placeholder:text-muted-foreground focus-visible:ring-primary max-h-11 max-h-32 flex-1 resize-none rounded-2xl border px-4 py-3 text-sm focus-visible:ring-2 focus-visible:ring-offset-0 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50'
+                            className='border-border/70 bg-background text-foreground placeholder:text-muted-foreground focus-visible:ring-primary max-h-11 max-h-32 flex-1 resize-none rounded-2xl border px-4 py-3 text-sm shadow-sm focus-visible:ring-2 focus-visible:ring-offset-0 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50'
                             style={{
                                 height: 'auto',
                                 minHeight: '44px',
diff --git a/frontendv2/src/components/ai/ChatbotWidget.tsx b/frontendv2/src/components/ai/ChatbotWidget.tsx
index b8ac4c5ee..b8f06f652 100644
--- a/frontendv2/src/components/ai/ChatbotWidget.tsx
+++ b/frontendv2/src/components/ai/ChatbotWidget.tsx
@@ -17,16 +17,42 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 import { useState, useEffect } from 'react';
 import { usePathname } from 'next/navigation';
-import { MessageSquare } from 'lucide-react';
+import Image from 'next/image';
 import { Button } from '@/components/ui/button';
 import ChatbotContainer from './ChatbotContainer';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { useSettings } from '@/contexts/SettingsContext';
 import { useVmInstance } from '@/contexts/VmInstanceContext';
+import { useTheme } from '@/contexts/ThemeContext';
+
+function ChatbotOpenButton({ onClick }: { onClick: () => void }) {
+    const { t } = useTranslation();
+    const { settings } = useSettings();
+    const { theme } = useTheme();
+    const logoUrl = theme === 'dark' ? settings?.app_logo_dark || '/logo.png' : settings?.app_logo_white || '/logo.png';
+
+    return (
+        <Button
+            className='bg-card hover:bg-card/95 border-border/70 ring-primary/15 dark:bg-card/90 relative h-14 w-14 rounded-2xl border shadow-2xl ring-1 transition-all duration-200 hover:-translate-y-0.5 hover:scale-105 md:h-16 md:w-16'
+            size='icon'
+            onClick={onClick}
+        >
+            <Image
+                src={logoUrl}
+                alt={settings?.app_name || t('chatbot.title')}
+                width={34}
+                height={34}
+                className='h-8 w-8 object-contain md:h-9 md:w-9'
+                unoptimized
+            />
+            <span className='sr-only'>{t('chatbot.openChat')}</span>
+            <span className='border-background absolute -top-0.5 -right-0.5 h-3 w-3 rounded-full border-2 bg-emerald-500' />
+        </Button>
+    );
+}
 
 function VdsChatbotWidget() {
     const [isOpen, setIsOpen] = useState(false);
-    const { t } = useTranslation();
     const { instance } = useVmInstance();
 
     useEffect(() => {
@@ -53,14 +79,7 @@ function VdsChatbotWidget() {
             {!isOpen && (
                 <div className='fixed right-6 bottom-6 z-50'>
                     <div className='relative'>
-                        <Button
-                            className='bg-primary hover:bg-primary/90 border-primary/20 relative h-14 w-14 rounded-full border transition-all duration-200 hover:scale-105 md:h-16 md:w-16'
-                            size='icon'
-                            onClick={() => setIsOpen(true)}
-                        >
-                            <MessageSquare className='text-primary-foreground h-6 w-6 md:h-7 md:w-7' />
-                            <span className='sr-only'>{t('chatbot.openChat')}</span>
-                        </Button>
+                        <ChatbotOpenButton onClick={() => setIsOpen(true)} />
                     </div>
                 </div>
             )}
@@ -73,7 +92,6 @@ function VdsChatbotWidget() {
 export default function ChatbotWidget() {
     const [isOpen, setIsOpen] = useState(false);
     const pathname = usePathname();
-    const { t } = useTranslation();
     const { settings } = useSettings();
 
     useEffect(() => {
@@ -99,7 +117,12 @@ export default function ChatbotWidget() {
     const isIDE = pathname?.includes('/files/ide');
     const isVds = pathname?.startsWith('/vds/');
     const isServer = pathname?.startsWith('/server/');
-    const shouldShow = (isServer || isVds) && !isIDE && chatbotEnabled;
+    const dashboardChatbotRoutes = ['/dashboard', '/dashboard/servers', '/dashboard/vms', '/dashboard/knowledgebase'];
+    const isDashboardChatbotRoute =
+        pathname === '/dashboard/knowledgebase' ||
+        pathname?.startsWith('/dashboard/knowledgebase/') ||
+        dashboardChatbotRoutes.includes(pathname || '');
+    const shouldShow = (isServer || isVds || isDashboardChatbotRoute) && !isIDE && chatbotEnabled;
 
     if (!shouldShow) return null;
 
@@ -108,20 +131,29 @@ export default function ChatbotWidget() {
         return <VdsChatbotWidget />;
     }
 
+    if (isDashboardChatbotRoute) {
+        return (
+            <>
+                {!isOpen && (
+                    <div className='fixed right-6 bottom-6 z-50'>
+                        <div className='relative'>
+                            <ChatbotOpenButton onClick={() => setIsOpen(true)} />
+                        </div>
+                    </div>
+                )}
+
+                <ChatbotContainer open={isOpen} onClose={() => setIsOpen(false)} mode='dashboard' />
+            </>
+        );
+    }
+
     // Server routes: existing behaviour
     return (
         <>
             {!isOpen && (
                 <div className='fixed right-6 bottom-6 z-50'>
                     <div className='relative'>
-                        <Button
-                            className='bg-primary hover:bg-primary/90 border-primary/20 relative h-14 w-14 rounded-full border transition-all duration-200 hover:scale-105 md:h-16 md:w-16'
-                            size='icon'
-                            onClick={() => setIsOpen(true)}
-                        >
-                            <MessageSquare className='text-primary-foreground h-6 w-6 md:h-7 md:w-7' />
-                            <span className='sr-only'>{t('chatbot.openChat')}</span>
-                        </Button>
+                        <ChatbotOpenButton onClick={() => setIsOpen(true)} />
                     </div>
                 </div>
             )}
diff --git a/frontendv2/src/components/branding/PanelBrandingFooter.tsx b/frontendv2/src/components/branding/PanelBrandingFooter.tsx
new file mode 100644
index 000000000..869962dc1
--- /dev/null
+++ b/frontendv2/src/components/branding/PanelBrandingFooter.tsx
@@ -0,0 +1,62 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+'use client';
+
+import { useSettings } from '@/contexts/SettingsContext';
+import { useTranslation } from '@/contexts/TranslationContext';
+import { FEATHERPANEL_MARKETING_URL, shouldShowPoweredBy } from '@/lib/branding';
+import { cn } from '@/lib/utils';
+import { PoweredByFeatherPanel } from '@/components/branding/PoweredByFeatherPanel';
+
+interface PanelBrandingFooterProps {
+    appName?: string;
+    className?: string;
+}
+
+export function PanelBrandingFooter({ appName, className }: PanelBrandingFooterProps) {
+    const { settings, core } = useSettings();
+    const { t } = useTranslation();
+
+    if (!shouldShowPoweredBy(settings)) {
+        return null;
+    }
+
+    const displayName = appName ?? settings?.app_name ?? 'FeatherPanel';
+    const version = core?.version?.replace(/^v/i, '') ?? '';
+
+    return (
+        <div className={cn('text-muted-foreground text-center text-xs transition-all duration-200', className)}>
+            <p className='mb-2 font-medium'>{t('branding.running_on', { name: displayName, version }).trim()}</p>
+            <PoweredByFeatherPanel variant='inline' className='mb-2' />
+            <a
+                href={FEATHERPANEL_MARKETING_URL}
+                target='_blank'
+                rel='noopener noreferrer'
+                className='text-primary hover:text-primary/80 inline-flex items-center gap-1.5 font-medium underline-offset-4 transition-all duration-200 hover:underline'
+            >
+                {t('branding.copyright', { company: 'MythicalSystems' })}
+                <svg className='h-3.5 w-3.5' fill='none' viewBox='0 0 24 24' stroke='currentColor' aria-hidden>
+                    <path
+                        strokeLinecap='round'
+                        strokeLinejoin='round'
+                        strokeWidth={2}
+                        d='M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14'
+                    />
+                </svg>
+            </a>
+        </div>
+    );
+}
diff --git a/frontendv2/src/components/branding/PoweredByFeatherPanel.tsx b/frontendv2/src/components/branding/PoweredByFeatherPanel.tsx
new file mode 100644
index 000000000..bcad74dc2
--- /dev/null
+++ b/frontendv2/src/components/branding/PoweredByFeatherPanel.tsx
@@ -0,0 +1,59 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+'use client';
+
+import { useTranslation } from '@/contexts/TranslationContext';
+import { useSettings } from '@/contexts/SettingsContext';
+import { FEATHERPANEL_MARKETING_URL, shouldShowPoweredBy } from '@/lib/branding';
+import { cn } from '@/lib/utils';
+
+type PoweredByVariant = 'menu' | 'footer' | 'inline' | 'sidebar' | 'badge';
+
+interface PoweredByFeatherPanelProps {
+    variant?: PoweredByVariant;
+    className?: string;
+}
+
+export function PoweredByFeatherPanel({ variant = 'footer', className }: PoweredByFeatherPanelProps) {
+    const { settings } = useSettings();
+    const { t } = useTranslation();
+
+    if (!shouldShowPoweredBy(settings)) {
+        return null;
+    }
+
+    const label = variant === 'menu' ? t('navbar.poweredBy') : t('branding.powered_by');
+
+    const linkClassName = cn(
+        'transition-colors hover:underline underline-offset-4',
+        variant === 'menu' &&
+            'text-muted-foreground/80 hover:text-primary text-[10px] font-normal tracking-wide lowercase underline-offset-2',
+        variant === 'footer' && 'text-muted-foreground hover:text-primary text-xs font-medium',
+        variant === 'inline' && 'text-muted-foreground/70 hover:text-primary text-[11px] font-medium',
+        variant === 'sidebar' &&
+            'text-muted-foreground/60 hover:text-primary mx-auto block text-center text-[10px] font-normal tracking-wide lowercase',
+        variant === 'badge' &&
+            'border-primary/20 bg-primary/10 text-primary inline-flex rounded-full border px-2.5 py-1 text-[10px] font-semibold tracking-wide uppercase hover:no-underline',
+    );
+
+    return (
+        <p className={cn(variant === 'menu' && 'text-center', className)}>
+            <a href={FEATHERPANEL_MARKETING_URL} target='_blank' rel='noopener noreferrer' className={linkClassName}>
+                {label}
+            </a>
+        </p>
+    );
+}
diff --git a/frontendv2/src/components/common/HackerEasterEgg.tsx b/frontendv2/src/components/common/HackerEasterEgg.tsx
index 9effa68bf..94550e63a 100644
--- a/frontendv2/src/components/common/HackerEasterEgg.tsx
+++ b/frontendv2/src/components/common/HackerEasterEgg.tsx
@@ -16,6 +16,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 'use client';
 
 import { useState, useEffect, useCallback, useRef } from 'react';
+import { useTranslation } from '@/contexts/TranslationContext';
 
 const SECRET_PHRASE = 'iamasecurityhacker';
 const FLAG_KEY = 'iamahacker';
@@ -59,17 +60,16 @@ function isHackerFlagSet(): boolean {
 }
 
 function LockScreen() {
+    const { t } = useTranslation();
+
     return (
         <div
             className='bg-background fixed inset-0 z-99999 flex flex-col items-center justify-center p-6 text-center'
             style={{ position: 'fixed', top: 0, left: 0, right: 0, bottom: 0 }}
         >
             <div className='max-w-md space-y-4'>
-                <p className='text-foreground text-xl font-medium'>Look what you have done script kiddy.</p>
-                <p className='text-muted-foreground'>
-                    Hahahah how funny you are you think you&apos;re a hacker or something? Okay then, let&apos;s see how
-                    you get rid of me.
-                </p>
+                <p className='text-foreground text-xl font-medium'>{t('common.hacker_easter_egg.title')}</p>
+                <p className='text-muted-foreground'>{t('common.hacker_easter_egg.description')}</p>
             </div>
         </div>
     );
diff --git a/frontendv2/src/components/common/NotFound.tsx b/frontendv2/src/components/common/NotFound.tsx
index f9eeb3f5d..510386a70 100644
--- a/frontendv2/src/components/common/NotFound.tsx
+++ b/frontendv2/src/components/common/NotFound.tsx
@@ -20,15 +20,14 @@ import { useRouter } from 'next/navigation';
 import { Button } from '@/components/ui/button';
 import { useTheme } from '@/contexts/ThemeContext';
 import { backgroundFitToCssSize } from '@/lib/backgroundImageFit';
-import { useSettings } from '@/contexts/SettingsContext';
 import { useTranslation } from '@/contexts/TranslationContext';
 import ThemeCustomizer from '@/components/layout/ThemeCustomizer';
+import { PanelBrandingFooter } from '@/components/branding/PanelBrandingFooter';
 import { Home, ArrowLeft } from 'lucide-react';
 
 export default function NotFound() {
     const router = useRouter();
     const { backgroundType, backgroundImage, backdropBlur, backdropDarken, backgroundImageFit } = useTheme();
-    const { core } = useSettings();
     const { t } = useTranslation();
 
     const themeGradient =
@@ -139,27 +138,7 @@ export default function NotFound() {
                 </div>
             </div>
 
-            <div className='text-muted-foreground relative z-10 mt-8 text-center text-xs'>
-                <p className='mb-2 font-medium'>
-                    {t('branding.running_on', { name: 'FeatherPanel', version: core?.version || '' }).trim()}
-                </p>
-                <a
-                    href='https://featherpanel.com'
-                    target='_blank'
-                    rel='noopener noreferrer'
-                    className='text-primary hover:text-primary/80 inline-flex items-center gap-1.5 font-medium underline-offset-4 transition-all duration-200 hover:underline'
-                >
-                    {t('branding.copyright', { company: 'MythicalSystems' })}
-                    <svg className='h-3.5 w-3.5' fill='none' viewBox='0 0 24 24' stroke='currentColor'>
-                        <path
-                            strokeLinecap='round'
-                            strokeLinejoin='round'
-                            strokeWidth={2}
-                            d='M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14'
-                        />
-                    </svg>
-                </a>
-            </div>
+            <PanelBrandingFooter className='relative z-10 mt-8' />
         </div>
     );
 }
diff --git a/frontendv2/src/components/dashboard/AnnouncementBanner.tsx b/frontendv2/src/components/dashboard/AnnouncementBanner.tsx
index 53d477f05..2fa97b060 100644
--- a/frontendv2/src/components/dashboard/AnnouncementBanner.tsx
+++ b/frontendv2/src/components/dashboard/AnnouncementBanner.tsx
@@ -13,14 +13,18 @@ by the Free Software Foundation, either version 3 of the License, or
 See the LICENSE file or <https://www.gnu.org/licenses/>.
 */
 
+'use client';
+
 import { X, Megaphone, CheckCircle, AlertTriangle, AlertOctagon } from 'lucide-react';
 import { useNotifications } from '@/contexts/NotificationContext';
+import { useTranslation } from '@/contexts/TranslationContext';
 import type { Notification } from '@/types/notification';
 import { cn } from '@/lib/utils';
 import ReactMarkdown from 'react-markdown';
 
 export function AnnouncementBanner() {
     const { notifications, dismissNotification } = useNotifications();
+    const { t } = useTranslation();
 
     if (notifications.length === 0) return null;
 
@@ -85,7 +89,7 @@ export function AnnouncementBanner() {
                                 <button
                                     onClick={() => dismissNotification(notification.id)}
                                     className='shrink-0 rounded-lg p-1 transition-colors hover:bg-black/5 dark:hover:bg-white/10'
-                                    aria-label='Dismiss'
+                                    aria-label={t('common.dismiss')}
                                 >
                                     <X className='h-4 w-4 opacity-70' />
                                 </button>
diff --git a/frontendv2/src/components/featherui/Button.tsx b/frontendv2/src/components/featherui/Button.tsx
index f577f8438..9801bf07e 100644
--- a/frontendv2/src/components/featherui/Button.tsx
+++ b/frontendv2/src/components/featherui/Button.tsx
@@ -28,7 +28,7 @@ const variants = {
     ghost: 'hover:bg-accent hover:text-accent-foreground',
     link: 'text-primary underline-offset-4 hover:underline',
     warning: 'bg-orange-500/10 text-orange-500 border border-orange-500/20 hover:bg-orange-500/20 active:scale-[0.98]',
-    glass: 'bg-background/50 backdrop-blur-md border border-border/40 hover:bg-background/80',
+    glass: 'border border-border/70 bg-background/70 text-foreground shadow-sm backdrop-blur-md hover:border-primary/40 hover:bg-background/90',
     plain: 'bg-transparent text-foreground hover:bg-accent hover:text-accent-foreground',
 };
 
diff --git a/frontendv2/src/components/featherui/FeatherIDE.tsx b/frontendv2/src/components/featherui/FeatherIDE.tsx
index 5ae30b33c..22dbac950 100644
--- a/frontendv2/src/components/featherui/FeatherIDE.tsx
+++ b/frontendv2/src/components/featherui/FeatherIDE.tsx
@@ -18,6 +18,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 import React, { useRef } from 'react';
 import { Editor, EditorProps, OnMount } from '@monaco-editor/react';
 import { useTheme } from '@/contexts/ThemeContext';
+import { useTranslation } from '@/contexts/TranslationContext';
 import { cn } from '@/lib/utils';
 import { Loader2, AlignLeft } from 'lucide-react';
 import { Button } from './Button';
@@ -30,6 +31,7 @@ interface FeatherIDEProps extends Omit<EditorProps, 'theme'> {
 
 export function FeatherIDE({ className, containerClassName, options, title, ...props }: FeatherIDEProps) {
     const { theme } = useTheme();
+    const { t } = useTranslation();
     const editorRef = useRef<any>(null); // eslint-disable-line @typescript-eslint/no-explicit-any
 
     const handleEditorDidMount: OnMount = (editor, monaco) => {
@@ -70,10 +72,10 @@ export function FeatherIDE({ className, containerClassName, options, title, ...p
                     size='sm'
                     onClick={formatDocument}
                     className='h-8 rounded-lg px-2 text-xs'
-                    title='Format Document'
+                    title={t('common.format_document')}
                 >
                     <AlignLeft className='mr-1.5 h-3.5 w-3.5' />
-                    Format
+                    {t('common.format')}
                 </Button>
             </div>
             <div className='relative flex-1'>
diff --git a/frontendv2/src/components/featherui/PageCard.tsx b/frontendv2/src/components/featherui/PageCard.tsx
index e0527b6c3..dbcfa69fe 100644
--- a/frontendv2/src/components/featherui/PageCard.tsx
+++ b/frontendv2/src/components/featherui/PageCard.tsx
@@ -87,8 +87,8 @@ export function PageCard({
                 className,
             )}
         >
-            <div className='border-border/10 relative z-10 flex items-center justify-between border-b pb-6'>
-                <div className='flex items-center gap-4'>
+            <div className='border-border/10 relative z-10 flex min-w-0 items-start justify-between gap-4 border-b pb-6'>
+                <div className='flex min-w-0 flex-1 items-center gap-4'>
                     {(Icon || iconSrc) && (
                         <div
                             className={cn(
@@ -116,13 +116,13 @@ export function PageCard({
                             {title}
                         </h2>
                         {description && (
-                            <p className='text-muted-foreground line-clamp-2 text-[9px] font-bold tracking-widest uppercase opacity-50'>
+                            <p className='text-muted-foreground line-clamp-3 text-[9px] leading-relaxed font-bold tracking-widest break-words uppercase opacity-50'>
                                 {description}
                             </p>
                         )}
                     </div>
                 </div>
-                {action && <div>{action}</div>}
+                {action && <div className='shrink-0'>{action}</div>}
             </div>
 
             <div className='relative z-10'>{children}</div>
diff --git a/frontendv2/src/components/layout/DashboardShell.tsx b/frontendv2/src/components/layout/DashboardShell.tsx
index e35429b1c..afd1d708e 100644
--- a/frontendv2/src/components/layout/DashboardShell.tsx
+++ b/frontendv2/src/components/layout/DashboardShell.tsx
@@ -77,6 +77,11 @@ export default function DashboardShell({ children }: { children: React.ReactNode
 
     const pathSegments = (pathname || '').split('/').filter(Boolean);
     const isServerConsoleHome = pathSegments.length === 2 && pathSegments[0] === 'server' && Boolean(pathSegments[1]);
+    const isTicketDetailPage =
+        pathSegments.length === 3 &&
+        (pathSegments[0] === 'admin' || pathSegments[0] === 'dashboard') &&
+        pathSegments[1] === 'tickets' &&
+        Boolean(pathSegments[2]);
 
     const { navbarHoverReveal } = useNavbarHoverReveal();
     const { chromeLayout } = useChromeLayout();
@@ -175,7 +180,9 @@ export default function DashboardShell({ children }: { children: React.ReactNode
                                 !isFullWidthMode &&
                                     (isServerConsoleHome
                                         ? 'mx-auto w-full max-w-[min(100rem,calc(100vw-1.5rem))] sm:max-w-[min(100rem,calc(100vw-2rem))]'
-                                        : 'mx-auto w-full max-w-7xl'),
+                                        : isTicketDetailPage
+                                          ? 'mx-auto w-full max-w-[min(112rem,calc(100vw-1.5rem))] sm:max-w-[min(112rem,calc(100vw-2rem))]'
+                                          : 'mx-auto w-full max-w-7xl'),
                             )}
                         >
                             {children}
diff --git a/frontendv2/src/components/layout/PublicSiteShell.tsx b/frontendv2/src/components/layout/PublicSiteShell.tsx
index 6b73fd90c..b0df776f9 100644
--- a/frontendv2/src/components/layout/PublicSiteShell.tsx
+++ b/frontendv2/src/components/layout/PublicSiteShell.tsx
@@ -21,6 +21,7 @@ import { usePathname } from 'next/navigation';
 import { useSettings } from '@/contexts/SettingsContext';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { cn } from '@/lib/utils';
+import { PoweredByFeatherPanel } from '@/components/branding/PoweredByFeatherPanel';
 
 interface PublicSiteShellProps {
     children: React.ReactNode;
@@ -133,6 +134,7 @@ export default function PublicSiteShell({ children }: PublicSiteShellProps) {
                             <p className='text-sm font-semibold'>{appName}</p>
                             <p className='text-muted-foreground mt-1 text-xs leading-5'>{appDescription}</p>
                         </div>
+                        <PoweredByFeatherPanel variant='footer' className='md:text-right' />
                     </div>
                 </div>
             </footer>
diff --git a/frontendv2/src/components/server/ServerHeader.tsx b/frontendv2/src/components/server/ServerHeader.tsx
index 6b4e1cdb2..0d2f7fb74 100644
--- a/frontendv2/src/components/server/ServerHeader.tsx
+++ b/frontendv2/src/components/server/ServerHeader.tsx
@@ -135,10 +135,10 @@ export default function ServerHeader({
 
     return (
         <div className='border-border/50 bg-card/50 rounded-xl border backdrop-blur-xl'>
-            <div className='p-6'>
+            <div className='p-4 sm:p-6'>
                 <div className='flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between'>
                     <div className='space-y-2'>
-                        <h1 className='text-2xl font-bold tracking-tight sm:text-3xl'>{serverName}</h1>
+                        <h1 className='text-xl font-bold tracking-tight sm:text-3xl'>{serverName}</h1>
                         <div className='text-muted-foreground flex flex-wrap items-center gap-3 text-sm'>
                             <Badge className={getStatusColor(serverStatus)}>{serverStatus.toUpperCase()}</Badge>
                             {serverUuidShort && (
@@ -177,7 +177,7 @@ export default function ServerHeader({
                         )}
                     </div>
 
-                    <div className='flex flex-wrap gap-2'>
+                    <div className='grid grid-cols-2 gap-2 sm:flex sm:flex-wrap'>
                         {canStart && (
                             <Button
                                 variant='outline'
diff --git a/frontendv2/src/components/server/ServerSwitcher.tsx b/frontendv2/src/components/server/ServerSwitcher.tsx
new file mode 100644
index 000000000..b2fd005fb
--- /dev/null
+++ b/frontendv2/src/components/server/ServerSwitcher.tsx
@@ -0,0 +1,428 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+'use client';
+
+import { Fragment, useContext, useEffect, useMemo, useState } from 'react';
+import { usePathname, useRouter } from 'next/navigation';
+import { Menu, MenuButton, MenuItem, MenuItems, Transition } from '@headlessui/react';
+import { Check, ChevronsUpDown, Clock, LayoutGrid, Loader2, Search, Server as ServerIcon, Star, X } from 'lucide-react';
+import Link from 'next/link';
+import { cn } from '@/lib/utils';
+import { useTranslation } from '@/contexts/TranslationContext';
+import { ServerContext } from '@/contexts/ServerContext';
+import { useFavoriteServerUuids } from '@/hooks/useFavoriteServerUuids';
+import { useUserServersList } from '@/hooks/useUserServersList';
+import {
+    buildServerSwitchUrl,
+    filterServersBySearch,
+    filterServersForSwitcherTab,
+    getCurrentServerUuidShort,
+    getRecentServerUuidShorts,
+    getServerRouteId,
+    sortServersForSwitcher,
+    sortServersWithFavoritesFirst,
+    type ServerSwitcherTab,
+} from '@/lib/server-switch';
+import { displayStatus, getStatusDotColor } from '@/lib/server-utils';
+import type { Server } from '@/types/server';
+
+const SWITCHER_TAB_KEY = 'featherpanel_server_switcher_tab';
+
+interface ServerSwitcherProps {
+    fallbackTitle?: string;
+}
+
+function ServerAvatar({ server, className }: { server: Server; className?: string }) {
+    const banner = server.spell?.banner;
+    const initial = (server.name?.trim()?.[0] || '?').toUpperCase();
+
+    if (banner) {
+        return (
+            <div
+                className={cn(
+                    'ring-border/40 shrink-0 overflow-hidden rounded-md bg-cover bg-center ring-1',
+                    className,
+                )}
+                style={{ backgroundImage: `url(${banner})` }}
+                role='img'
+                aria-label={server.name}
+            />
+        );
+    }
+
+    return (
+        <div
+            className={cn(
+                'bg-primary/15 text-primary ring-primary/20 flex shrink-0 items-center justify-center rounded-md text-xs font-bold ring-1',
+                className,
+            )}
+            aria-hidden='true'
+        >
+            {initial}
+        </div>
+    );
+}
+
+function preventMenuClose(e: React.MouseEvent | React.PointerEvent) {
+    e.preventDefault();
+    e.stopPropagation();
+}
+
+export function ServerSwitcher({ fallbackTitle }: ServerSwitcherProps) {
+    const pathname = usePathname();
+    const router = useRouter();
+    const { t } = useTranslation();
+    const serverContext = useContext(ServerContext);
+    const currentUuidShort = getCurrentServerUuidShort(pathname);
+    const enabled = Boolean(currentUuidShort);
+
+    const { servers, loading } = useUserServersList(enabled);
+    const { favoriteUuids, toggleFavorite } = useFavoriteServerUuids();
+
+    const [searchQuery, setSearchQuery] = useState('');
+    const [activeTab, setActiveTab] = useState<ServerSwitcherTab>('all');
+    const [recentUuidShorts, setRecentUuidShorts] = useState<string[]>([]);
+
+    useEffect(() => {
+        if (typeof window === 'undefined') return;
+        try {
+            const saved = sessionStorage.getItem(SWITCHER_TAB_KEY);
+            if (saved === 'all' || saved === 'favorites' || saved === 'recent') {
+                setActiveTab(saved);
+            }
+        } catch {
+            /* ignore */
+        }
+    }, []);
+
+    useEffect(() => {
+        setRecentUuidShorts(getRecentServerUuidShorts());
+    }, [pathname]);
+
+    const handleTabChange = (tab: ServerSwitcherTab) => {
+        setActiveTab(tab);
+        try {
+            sessionStorage.setItem(SWITCHER_TAB_KEY, tab);
+        } catch {
+            /* ignore */
+        }
+    };
+
+    const sortedServers = useMemo(() => sortServersForSwitcher(servers, currentUuidShort), [servers, currentUuidShort]);
+
+    const currentServer = useMemo(() => {
+        const fromList = sortedServers.find((s) => getServerRouteId(s) === currentUuidShort);
+        if (fromList) return fromList;
+        if (serverContext?.server && getServerRouteId(serverContext.server) === currentUuidShort) {
+            return serverContext.server;
+        }
+        return null;
+    }, [sortedServers, currentUuidShort, serverContext?.server]);
+
+    const filteredServers = useMemo(() => {
+        let list = filterServersForSwitcherTab(sortedServers, activeTab, favoriteUuids, recentUuidShorts);
+        list = filterServersBySearch(list, searchQuery);
+        if (activeTab === 'all' && !searchQuery.trim()) {
+            list = sortServersWithFavoritesFirst(list, favoriteUuids);
+        }
+        return list;
+    }, [sortedServers, activeTab, favoriteUuids, recentUuidShorts, searchQuery]);
+
+    const favoriteUuidSet = useMemo(() => new Set(favoriteUuids), [favoriteUuids]);
+
+    const favoriteCount = useMemo(
+        () => sortedServers.filter((s) => favoriteUuidSet.has(s.uuid)).length,
+        [sortedServers, favoriteUuidSet],
+    );
+
+    const recentCount = useMemo(() => {
+        const recentSet = new Set(recentUuidShorts);
+        return sortedServers.filter((s) => recentSet.has(getServerRouteId(s))).length;
+    }, [sortedServers, recentUuidShorts]);
+
+    if (!enabled) {
+        return null;
+    }
+
+    const handleSelect = (server: Server) => {
+        const targetId = getServerRouteId(server);
+        if (!targetId || targetId === currentUuidShort) return;
+        router.push(buildServerSwitchUrl(targetId, pathname));
+    };
+
+    const displayName = currentServer?.name ?? fallbackTitle ?? t('navbar.server_switcher.current');
+
+    const tabs: { id: ServerSwitcherTab; label: string; count?: number; icon?: typeof Star }[] = [
+        { id: 'all', label: t('navbar.server_switcher.tabs.all') },
+        { id: 'favorites', label: t('navbar.server_switcher.tabs.favorites'), count: favoriteCount, icon: Star },
+        { id: 'recent', label: t('navbar.server_switcher.tabs.recent'), count: recentCount, icon: Clock },
+    ];
+
+    const emptyMessage =
+        activeTab === 'favorites'
+            ? t('navbar.server_switcher.empty_favorites')
+            : activeTab === 'recent'
+              ? t('navbar.server_switcher.empty_recent')
+              : searchQuery.trim()
+                ? t('navbar.server_switcher.empty_search')
+                : t('navbar.server_switcher.empty');
+
+    return (
+        <Menu as='div' className='relative max-w-full min-w-0'>
+            <MenuButton
+                type='button'
+                className={cn(
+                    'group flex max-w-full min-w-0 cursor-pointer items-center gap-2 rounded-xl px-1 py-0.5 text-left transition-colors outline-none',
+                    'hover:bg-muted/40 focus-visible:ring-primary/40 focus-visible:ring-2',
+                )}
+                title={t('navbar.server_switcher.switch')}
+            >
+                {loading && !currentServer ? (
+                    <Loader2 className='text-muted-foreground h-4 w-4 shrink-0 animate-spin' aria-hidden />
+                ) : currentServer ? (
+                    <ServerAvatar server={currentServer} className='h-7 w-7 sm:h-8 sm:w-8' />
+                ) : (
+                    <div className='bg-muted/40 ring-border/40 flex h-7 w-7 shrink-0 items-center justify-center rounded-md ring-1 sm:h-8 sm:w-8'>
+                        <ServerIcon className='text-muted-foreground h-3.5 w-3.5 sm:h-4 sm:w-4' />
+                    </div>
+                )}
+                <span className='min-w-0 flex-1'>
+                    <span className='text-foreground block truncate text-sm font-semibold tracking-tight sm:text-[0.95rem]'>
+                        {displayName}
+                        {currentServer && favoriteUuidSet.has(currentServer.uuid) && (
+                            <Star className='text-primary ml-1 inline h-3 w-3 fill-current' aria-hidden />
+                        )}
+                    </span>
+                    {currentServer && (
+                        <span className='text-muted-foreground hidden items-center gap-1 text-[11px] sm:flex'>
+                            <span
+                                className={cn(
+                                    'h-1.5 w-1.5 shrink-0 rounded-full',
+                                    getStatusDotColor(displayStatus(currentServer)),
+                                )}
+                            />
+                            {t(`servers.status.${displayStatus(currentServer)}`, {
+                                defaultValue: displayStatus(currentServer),
+                            })}
+                        </span>
+                    )}
+                </span>
+                <ChevronsUpDown
+                    className='text-muted-foreground h-4 w-4 shrink-0 opacity-60 transition-opacity group-hover:opacity-100'
+                    aria-hidden
+                />
+            </MenuButton>
+
+            <Transition
+                as={Fragment}
+                enter='transition ease-out duration-100'
+                enterFrom='transform opacity-0 scale-95'
+                enterTo='transform opacity-100 scale-100'
+                leave='transition ease-in duration-75'
+                leaveFrom='transform opacity-100 scale-100'
+                leaveTo='transform opacity-0 scale-95'
+            >
+                <MenuItems
+                    anchor='bottom start'
+                    modal={false}
+                    className='border-border/40 bg-card/95 z-50 mt-1 flex max-h-[min(28rem,75vh)] w-[min(22rem,calc(100vw-2rem))] flex-col overflow-hidden rounded-xl border shadow-2xl backdrop-blur-xl focus:outline-none'
+                >
+                    <div className='border-border/40 shrink-0 border-b px-3 py-2.5'>
+                        <p className='text-muted-foreground mb-2 text-[11px] font-semibold tracking-wider uppercase'>
+                            {t('navbar.server_switcher.title')}
+                        </p>
+
+                        <div
+                            className='bg-muted/25 border-border/50 focus-within:ring-primary/30 flex items-center gap-2 rounded-lg border px-2.5 py-1.5 focus-within:ring-2'
+                            onMouseDown={preventMenuClose}
+                            onClick={preventMenuClose}
+                        >
+                            <Search className='text-muted-foreground h-3.5 w-3.5 shrink-0' aria-hidden />
+                            <input
+                                type='search'
+                                value={searchQuery}
+                                onChange={(e) => setSearchQuery(e.target.value)}
+                                placeholder={t('navbar.server_switcher.search_placeholder')}
+                                className='text-foreground placeholder:text-muted-foreground min-w-0 flex-1 bg-transparent text-sm outline-none'
+                                onKeyDown={(e) => e.stopPropagation()}
+                            />
+                            {searchQuery && (
+                                <button
+                                    type='button'
+                                    className='text-muted-foreground hover:text-foreground rounded p-0.5'
+                                    onMouseDown={preventMenuClose}
+                                    onClick={(e) => {
+                                        preventMenuClose(e);
+                                        setSearchQuery('');
+                                    }}
+                                    aria-label={t('navbar.server_switcher.clear_search')}
+                                >
+                                    <X className='h-3.5 w-3.5' />
+                                </button>
+                            )}
+                        </div>
+
+                        <div
+                            className='mt-2 flex gap-1'
+                            role='tablist'
+                            aria-label={t('navbar.server_switcher.tabs_label')}
+                            onMouseDown={preventMenuClose}
+                            onClick={preventMenuClose}
+                        >
+                            {tabs.map((tab) => {
+                                const Icon = tab.icon;
+                                const isActive = activeTab === tab.id;
+                                return (
+                                    <button
+                                        key={tab.id}
+                                        type='button'
+                                        role='tab'
+                                        aria-selected={isActive}
+                                        onClick={() => handleTabChange(tab.id)}
+                                        className={cn(
+                                            'inline-flex min-w-0 flex-1 items-center justify-center gap-1 rounded-lg px-2 py-1.5 text-[11px] font-semibold transition-colors',
+                                            isActive
+                                                ? 'bg-primary/15 text-primary ring-primary/25 ring-1'
+                                                : 'text-muted-foreground hover:bg-muted/50 hover:text-foreground',
+                                        )}
+                                    >
+                                        {Icon && (
+                                            <Icon className={cn('h-3 w-3 shrink-0', isActive && 'fill-current')} />
+                                        )}
+                                        <span className='truncate'>{tab.label}</span>
+                                        {tab.count !== undefined && tab.count > 0 && (
+                                            <span
+                                                className={cn(
+                                                    'rounded-full px-1 text-[10px] tabular-nums',
+                                                    isActive ? 'bg-primary/20' : 'bg-muted/60',
+                                                )}
+                                            >
+                                                {tab.count}
+                                            </span>
+                                        )}
+                                    </button>
+                                );
+                            })}
+                        </div>
+                    </div>
+
+                    <div className='custom-scrollbar min-h-0 flex-1 overflow-y-auto p-1'>
+                        {loading && sortedServers.length === 0 ? (
+                            <p className='text-muted-foreground flex items-center justify-center gap-2 px-3 py-6 text-xs'>
+                                <Loader2 className='h-3.5 w-3.5 animate-spin' />
+                                {t('navbar.server_switcher.loading')}
+                            </p>
+                        ) : filteredServers.length === 0 ? (
+                            <p className='text-muted-foreground px-3 py-6 text-center text-xs leading-relaxed'>
+                                {emptyMessage}
+                            </p>
+                        ) : (
+                            filteredServers.map((server) => {
+                                const id = getServerRouteId(server);
+                                const isCurrent = id === currentUuidShort;
+                                const status = displayStatus(server);
+                                const favorited = favoriteUuidSet.has(server.uuid);
+
+                                return (
+                                    <MenuItem key={server.uuid || id} disabled={isCurrent} as='div'>
+                                        {({ focus, disabled }) => (
+                                            <div
+                                                className={cn(
+                                                    'flex w-full items-center gap-1 rounded-lg pr-1 transition-colors',
+                                                    focus && 'bg-primary/10',
+                                                    disabled && 'opacity-100',
+                                                )}
+                                            >
+                                                <button
+                                                    type='button'
+                                                    disabled={disabled}
+                                                    onClick={() => handleSelect(server)}
+                                                    className={cn(
+                                                        'flex min-w-0 flex-1 items-center gap-2.5 rounded-lg px-2 py-2 text-left text-sm',
+                                                        !disabled && 'hover:bg-muted/40',
+                                                    )}
+                                                >
+                                                    <ServerAvatar server={server} className='h-7 w-7' />
+                                                    <span className='min-w-0 flex-1'>
+                                                        <span className='text-foreground flex items-center gap-1 truncate font-medium'>
+                                                            {server.name}
+                                                            {favorited && (
+                                                                <Star className='text-primary h-3 w-3 shrink-0 fill-current' />
+                                                            )}
+                                                        </span>
+                                                        <span className='text-muted-foreground flex items-center gap-1.5 text-[11px]'>
+                                                            <span
+                                                                className={cn(
+                                                                    'h-1.5 w-1.5 shrink-0 rounded-full',
+                                                                    getStatusDotColor(status),
+                                                                )}
+                                                            />
+                                                            {t(`servers.status.${status}`, { defaultValue: status })}
+                                                        </span>
+                                                    </span>
+                                                    {isCurrent && (
+                                                        <Check className='text-primary h-4 w-4 shrink-0' aria-hidden />
+                                                    )}
+                                                </button>
+                                                <button
+                                                    type='button'
+                                                    onMouseDown={preventMenuClose}
+                                                    onClick={(e) => {
+                                                        preventMenuClose(e);
+                                                        toggleFavorite(server.uuid);
+                                                    }}
+                                                    className={cn(
+                                                        'text-muted-foreground hover:text-primary shrink-0 rounded-lg p-2 transition-colors',
+                                                        favorited && 'text-primary',
+                                                    )}
+                                                    title={
+                                                        favorited
+                                                            ? t('servers.favorite_remove')
+                                                            : t('servers.favorite_add')
+                                                    }
+                                                    aria-label={
+                                                        favorited
+                                                            ? t('servers.favorite_remove')
+                                                            : t('servers.favorite_add')
+                                                    }
+                                                >
+                                                    <Star
+                                                        className={cn('h-4 w-4', favorited && 'fill-current')}
+                                                        aria-hidden
+                                                    />
+                                                </button>
+                                            </div>
+                                        )}
+                                    </MenuItem>
+                                );
+                            })
+                        )}
+                    </div>
+
+                    <div className='border-border/40 shrink-0 border-t p-1'>
+                        <Link
+                            href='/dashboard/servers'
+                            className='text-muted-foreground hover:bg-muted/50 hover:text-foreground flex w-full items-center gap-2 rounded-lg px-2.5 py-2 text-xs font-medium transition-colors'
+                        >
+                            <LayoutGrid className='h-3.5 w-3.5 shrink-0' />
+                            {t('navbar.server_switcher.view_all')}
+                        </Link>
+                    </div>
+                </MenuItems>
+            </Transition>
+        </Menu>
+    );
+}
diff --git a/frontendv2/src/components/server/ServerTerminal.tsx b/frontendv2/src/components/server/ServerTerminal.tsx
index 788c0fbc1..49d684e43 100644
--- a/frontendv2/src/components/server/ServerTerminal.tsx
+++ b/frontendv2/src/components/server/ServerTerminal.tsx
@@ -55,6 +55,7 @@ import {
     DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
 import { Card, CardContent, CardFooter, CardHeader } from '@/components/ui/card';
+import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle } from '@/components/ui/sheet';
 import { cn } from '@/lib/utils';
 
 const PRESET_MENU_SECTIONS: { group: ConsolePresetMenuGroup; presets: ConsolePresetTemplate[] }[] = [
@@ -62,6 +63,282 @@ const PRESET_MENU_SECTIONS: { group: ConsolePresetMenuGroup; presets: ConsolePre
     { group: 'highlight', presets: CONSOLE_PRESET_TEMPLATES.filter((p) => p.menuGroup === 'highlight') },
 ];
 
+interface QuickRulesListProps {
+    filters: ConsoleFilterRule[];
+    onAddPreset: (presetId: string) => void;
+    onSelect?: () => void;
+}
+
+function QuickRulesList({ filters, onAddPreset, onSelect }: QuickRulesListProps) {
+    const { t } = useTranslation();
+
+    return (
+        <div className='custom-scrollbar max-h-[min(24rem,60dvh)] overflow-y-auto p-1.5 sm:max-h-72'>
+            {PRESET_MENU_SECTIONS.map(({ group, presets }, sectionIdx) => (
+                <div key={group}>
+                    {sectionIdx > 0 && <div className='bg-border/60 my-1 h-px' role='separator' />}
+                    <p className='text-muted-foreground px-2 py-1 text-[10px] font-bold tracking-wide uppercase'>
+                        {t(`servers.console.terminal.preset_group_${group}`)}
+                    </p>
+                    {presets.map((preset) => {
+                        const taken = filters.some((r) => r.presetId === preset.presetId);
+                        return (
+                            <button
+                                key={preset.presetId}
+                                type='button'
+                                disabled={taken}
+                                title={t(`servers.console.terminal.presets.${preset.presetId}.desc`)}
+                                onClick={() => {
+                                    if (!taken) {
+                                        onAddPreset(preset.presetId);
+                                        onSelect?.();
+                                    }
+                                }}
+                                className={cn(
+                                    'flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm transition-colors',
+                                    taken
+                                        ? 'text-muted-foreground cursor-not-allowed opacity-60'
+                                        : 'text-foreground hover:bg-muted/80 active:bg-primary/10',
+                                )}
+                            >
+                                <span className='min-w-0 flex-1 truncate font-medium'>
+                                    {t(`servers.console.terminal.presets.${preset.presetId}.title`)}
+                                </span>
+                                {taken && (
+                                    <span className='text-primary shrink-0 text-[10px] font-bold uppercase'>
+                                        {t('servers.console.terminal.preset_active')}
+                                    </span>
+                                )}
+                            </button>
+                        );
+                    })}
+                </div>
+            ))}
+        </div>
+    );
+}
+
+interface CommandHistoryListProps {
+    commandHistory: string[];
+    onSelect: (cmd: string) => void;
+}
+
+function CommandHistoryList({ commandHistory, onSelect }: CommandHistoryListProps) {
+    const { t } = useTranslation();
+
+    if (commandHistory.length === 0) {
+        return (
+            <div className='text-muted-foreground px-3 py-8 text-center text-xs'>
+                {t('servers.console.terminal.no_history')}
+            </div>
+        );
+    }
+
+    return (
+        <div className='custom-scrollbar max-h-[min(20rem,50dvh)] overflow-y-auto p-1 sm:max-h-60'>
+            {commandHistory.map((cmd, idx) => (
+                <button
+                    key={idx}
+                    type='button'
+                    onClick={() => onSelect(cmd)}
+                    className='hover:bg-muted/80 active:bg-primary/10 flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm transition-colors'
+                >
+                    <Clock className='h-3 w-3 opacity-50' />
+                    <span className='truncate font-mono text-xs'>{cmd}</span>
+                </button>
+            ))}
+        </div>
+    );
+}
+
+interface FilterSettingsPanelProps {
+    filters: ConsoleFilterRule[];
+    onFiltersChange?: (rules: ConsoleFilterRule[]) => void;
+    onAddFilter: () => void;
+    onUpdateFilter: (id: string, partial: Partial<ConsoleFilterRule>) => void;
+    onDeleteFilter: (id: string) => void;
+}
+
+function FilterSettingsPanel({
+    filters,
+    onFiltersChange,
+    onAddFilter,
+    onUpdateFilter,
+    onDeleteFilter,
+}: FilterSettingsPanelProps) {
+    const { t } = useTranslation();
+
+    return (
+        <>
+            <div className='mb-3 flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between'>
+                <div>
+                    <p className='text-foreground text-xs font-semibold'>{t('servers.console.terminal.customize')}</p>
+                    <p className='text-muted-foreground mt-1 max-w-2xl text-[11px] leading-relaxed'>
+                        {t('servers.console.terminal.rules_intro')}
+                    </p>
+                </div>
+                <Button
+                    type='button'
+                    variant='outline'
+                    size='sm'
+                    className='shrink-0 rounded-xl font-bold'
+                    onClick={onAddFilter}
+                    disabled={!onFiltersChange}
+                >
+                    {t('servers.console.terminal.add_rule')}
+                </Button>
+            </div>
+            {filters.length === 0 ? (
+                <p className='text-muted-foreground text-xs'>{t('servers.console.terminal.no_rules')}</p>
+            ) : (
+                <div className='custom-scrollbar max-h-[min(24rem,55dvh)] space-y-3 overflow-y-auto pr-1 sm:max-h-72'>
+                    {filters.map((rule) => (
+                        <div
+                            key={rule.id}
+                            className='border-border/50 bg-card/50 space-y-2.5 rounded-xl border p-4 backdrop-blur-sm'
+                        >
+                            {rule.presetId && (
+                                <div className='flex flex-wrap items-center gap-2'>
+                                    <span className='bg-primary/12 text-primary inline-flex items-center rounded-md px-2 py-0.5 text-[10px] font-semibold tracking-wide uppercase'>
+                                        {t('servers.console.terminal.preset_badge')}
+                                    </span>
+                                    <span className='text-foreground text-xs font-medium'>
+                                        {t(`servers.console.terminal.presets.${rule.presetId}.title`)}
+                                    </span>
+                                </div>
+                            )}
+                            <div className='flex items-center justify-between gap-2'>
+                                <div className='flex flex-wrap items-center gap-2'>
+                                    <input
+                                        type='checkbox'
+                                        checked={rule.enabled}
+                                        onChange={(e) =>
+                                            onUpdateFilter(rule.id, {
+                                                enabled: e.target.checked,
+                                            })
+                                        }
+                                        className='border-input h-3.5 w-3.5 rounded'
+                                        disabled={!onFiltersChange}
+                                    />
+                                    <select
+                                        value={rule.type}
+                                        onChange={(e) =>
+                                            onUpdateFilter(rule.id, {
+                                                type: e.target.value as ConsoleFilterRule['type'],
+                                                presetId: undefined,
+                                            })
+                                        }
+                                        className='border-border bg-background rounded-md border px-2 py-1 text-xs'
+                                        disabled={!onFiltersChange}
+                                    >
+                                        <option value='replace'>
+                                            {t('servers.console.terminal.rule_type_replace')}
+                                        </option>
+                                        <option value='hide'>{t('servers.console.terminal.rule_type_hide')}</option>
+                                        <option value='color'>{t('servers.console.terminal.rule_type_color')}</option>
+                                    </select>
+                                </div>
+                                <button
+                                    onClick={() => onDeleteFilter(rule.id)}
+                                    type='button'
+                                    className='text-muted-foreground hover:text-destructive text-[11px]'
+                                    disabled={!onFiltersChange}
+                                >
+                                    {t('servers.console.terminal.delete_rule')}
+                                </button>
+                            </div>
+                            <div className='grid grid-cols-1 gap-2 sm:grid-cols-3'>
+                                <div className='space-y-1 sm:col-span-2'>
+                                    <label className='text-muted-foreground text-[11px]'>
+                                        {t('servers.console.terminal.pattern')}
+                                    </label>
+                                    <input
+                                        type='text'
+                                        value={rule.pattern}
+                                        onChange={(e) =>
+                                            onUpdateFilter(rule.id, {
+                                                pattern: e.target.value,
+                                                presetId: undefined,
+                                            })
+                                        }
+                                        className='border-border bg-background w-full rounded-md border px-2 py-1 font-mono text-xs'
+                                        placeholder='^\\[INFO\\]'
+                                        disabled={!onFiltersChange}
+                                    />
+                                </div>
+                                <div className='space-y-1'>
+                                    <label className='text-muted-foreground text-[11px]'>
+                                        {t('servers.console.terminal.flags')}
+                                    </label>
+                                    <input
+                                        type='text'
+                                        value={rule.flags || ''}
+                                        onChange={(e) =>
+                                            onUpdateFilter(rule.id, {
+                                                flags: e.target.value,
+                                                presetId: undefined,
+                                            })
+                                        }
+                                        className='border-border bg-background w-full rounded-md border px-2 py-1 text-xs'
+                                        placeholder='gmi'
+                                        disabled={!onFiltersChange}
+                                    />
+                                </div>
+                            </div>
+                            {rule.type === 'replace' && (
+                                <div className='space-y-1'>
+                                    <label className='text-muted-foreground text-[11px]'>
+                                        {t('servers.console.terminal.replacement')}
+                                    </label>
+                                    <input
+                                        type='text'
+                                        value={rule.replacement || ''}
+                                        onChange={(e) =>
+                                            onUpdateFilter(rule.id, {
+                                                replacement: e.target.value,
+                                                presetId: undefined,
+                                            })
+                                        }
+                                        className='border-border bg-background w-full rounded-md border px-2 py-1 text-xs'
+                                        placeholder='[RENAMED]'
+                                        disabled={!onFiltersChange}
+                                    />
+                                </div>
+                            )}
+                            {rule.type === 'color' && (
+                                <div className='space-y-1'>
+                                    <label className='text-muted-foreground text-[11px]'>
+                                        {t('servers.console.terminal.color')}
+                                    </label>
+                                    <select
+                                        value={rule.color || 'yellow'}
+                                        onChange={(e) =>
+                                            onUpdateFilter(rule.id, {
+                                                color: e.target.value as ConsoleFilterRule['color'],
+                                                presetId: undefined,
+                                            })
+                                        }
+                                        className='border-border bg-background rounded-md border px-2 py-1 text-xs'
+                                        disabled={!onFiltersChange}
+                                    >
+                                        <option value='red'>{t('servers.console.terminal.color_red')}</option>
+                                        <option value='yellow'>{t('servers.console.terminal.color_yellow')}</option>
+                                        <option value='green'>{t('servers.console.terminal.color_green')}</option>
+                                        <option value='blue'>{t('servers.console.terminal.color_blue')}</option>
+                                        <option value='magenta'>{t('servers.console.terminal.color_magenta')}</option>
+                                        <option value='cyan'>{t('servers.console.terminal.color_cyan')}</option>
+                                        <option value='gray'>{t('servers.console.terminal.color_gray')}</option>
+                                    </select>
+                                </div>
+                            )}
+                        </div>
+                    ))}
+                </div>
+            )}
+        </>
+    );
+}
+
 export interface ServerTerminalRef {
     write: (data: string) => void;
     writeln: (data: string) => void;
@@ -118,6 +395,8 @@ const ServerTerminal = React.forwardRef<ServerTerminalRef, ServerTerminalProps>(
         const [commandHistory, setCommandHistory] = useState<string[]>([]);
         const [historyIndex, setHistoryIndex] = useState(-1);
         const [showSettings, setShowSettings] = useState(false);
+        const [showQuickRules, setShowQuickRules] = useState(false);
+        const [showHistory, setShowHistory] = useState(false);
 
         const hslFromVar = useCallback((name: string, fallback: string) => {
             if (typeof window === 'undefined') return fallback;
@@ -319,6 +598,7 @@ const ServerTerminal = React.forwardRef<ServerTerminalRef, ServerTerminalProps>(
 
         const loadHistoryCommand = (cmd: string) => {
             setCommandInput(cmd);
+            setShowHistory(false);
         };
 
         const handleAddFilter = () => {
@@ -363,6 +643,7 @@ const ServerTerminal = React.forwardRef<ServerTerminalRef, ServerTerminalProps>(
             };
             onFiltersChange([newRule, ...filters]);
             setShowSettings(true);
+            setShowQuickRules(false);
         };
 
         const copyTerminalSelection = () => {
@@ -395,6 +676,10 @@ const ServerTerminal = React.forwardRef<ServerTerminalRef, ServerTerminalProps>(
             prevCanSendRef.current = canSend;
         }, [canSend]);
 
+        useEffect(() => {
+            fitAddonRef.current?.fit();
+        }, [showSettings, showQuickRules, showHistory]);
+
         return (
             <Card className='border-border/50 bg-card/50 w-full min-w-0 overflow-hidden shadow-sm backdrop-blur-xl'>
                 <CardHeader className='border-border/50 space-y-3 border-b p-3 sm:p-4'>
@@ -404,7 +689,7 @@ const ServerTerminal = React.forwardRef<ServerTerminalRef, ServerTerminalProps>(
                                 <TerminalIcon className='h-4 w-4 shrink-0' aria-hidden />
                                 {t('servers.console.terminal.title')}
                             </h3>
-                            <p className='text-muted-foreground mt-1 max-w-2xl text-xs leading-relaxed'>
+                            <p className='text-muted-foreground mt-1 hidden max-w-2xl text-xs leading-relaxed sm:block'>
                                 {t('servers.console.terminal.subtitle')}
                             </p>
                         </div>
@@ -436,98 +721,63 @@ const ServerTerminal = React.forwardRef<ServerTerminalRef, ServerTerminalProps>(
                                 <Settings2 className='h-3.5 w-3.5' />
                             </Button>
                             {onFiltersChange && (
-                                <Menu as='div' className='relative'>
-                                    <Menu.Button
-                                        as={Button}
+                                <>
+                                    <Button
+                                        type='button'
                                         variant='outline'
                                         size='sm'
-                                        className='h-8 gap-1.5 rounded-lg px-2.5 text-[11px]'
+                                        className='h-8 gap-1.5 rounded-lg px-2.5 text-[11px] sm:hidden'
                                         aria-label={t('servers.console.terminal.quick_rules')}
+                                        onClick={() => setShowQuickRules(true)}
                                     >
                                         <Sparkles className='text-primary h-3.5 w-3.5 shrink-0' />
-                                        <span className='hidden sm:inline'>
-                                            {t('servers.console.terminal.quick_rules')}
-                                        </span>
-                                    </Menu.Button>
-                                    <Transition
-                                        as={Fragment}
-                                        enter='transition ease-out duration-100'
-                                        enterFrom='transform opacity-0 scale-95'
-                                        enterTo='transform opacity-100 scale-100'
-                                        leave='transition ease-in duration-75'
-                                        leaveFrom='transform opacity-100 scale-100'
-                                        leaveTo='transform opacity-0 scale-95'
-                                    >
-                                        <Menu.Items className='bg-popover border-border/50 absolute right-0 z-30 mt-2 w-[min(22rem,calc(100vw-2rem))] origin-top-right overflow-hidden rounded-xl border shadow-lg focus:outline-none'>
-                                            <div className='border-border/50 bg-muted/30 border-b px-3 py-2'>
-                                                <p className='text-foreground text-xs font-semibold'>
-                                                    {t('servers.console.terminal.quick_rules')}
-                                                </p>
-                                                <p className='text-muted-foreground mt-0.5 text-[11px] leading-snug'>
-                                                    {t('servers.console.terminal.quick_rules_help')}
-                                                </p>
-                                            </div>
-                                            <div className='custom-scrollbar max-h-72 overflow-y-auto p-1.5'>
-                                                {PRESET_MENU_SECTIONS.map(({ group, presets }, sectionIdx) => (
-                                                    <div key={group}>
-                                                        {sectionIdx > 0 && (
-                                                            <div className='bg-border/60 my-1 h-px' role='separator' />
-                                                        )}
-                                                        <p className='text-muted-foreground px-2 py-1 text-[10px] font-bold tracking-wide uppercase'>
-                                                            {t(`servers.console.terminal.preset_group_${group}`)}
-                                                        </p>
-                                                        {presets.map((preset) => {
-                                                            const taken = filters.some(
-                                                                (r) => r.presetId === preset.presetId,
-                                                            );
-                                                            return (
-                                                                <Menu.Item key={preset.presetId}>
-                                                                    {({ active, close }) => (
-                                                                        <button
-                                                                            type='button'
-                                                                            disabled={taken}
-                                                                            title={t(
-                                                                                `servers.console.terminal.presets.${preset.presetId}.desc`,
-                                                                            )}
-                                                                            onClick={() => {
-                                                                                if (!taken) {
-                                                                                    handleAddPreset(preset.presetId);
-                                                                                    close();
-                                                                                }
-                                                                            }}
-                                                                            className={cn(
-                                                                                'flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm transition-colors',
-                                                                                active && !taken && 'bg-primary/10',
-                                                                                taken
-                                                                                    ? 'text-muted-foreground cursor-not-allowed opacity-60'
-                                                                                    : 'text-foreground hover:bg-muted/80',
-                                                                            )}
-                                                                        >
-                                                                            <span className='min-w-0 flex-1 truncate font-medium'>
-                                                                                {t(
-                                                                                    `servers.console.terminal.presets.${preset.presetId}.title`,
-                                                                                )}
-                                                                            </span>
-                                                                            {taken && (
-                                                                                <span className='text-primary shrink-0 text-[10px] font-bold uppercase'>
-                                                                                    {t(
-                                                                                        'servers.console.terminal.preset_active',
-                                                                                    )}
-                                                                                </span>
-                                                                            )}
-                                                                        </button>
-                                                                    )}
-                                                                </Menu.Item>
-                                                            );
-                                                        })}
-                                                    </div>
-                                                ))}
-                                            </div>
-                                        </Menu.Items>
-                                    </Transition>
-                                </Menu>
+                                    </Button>
+                                    <Menu as='div' className='relative hidden sm:block'>
+                                        <Menu.Button
+                                            as={Button}
+                                            variant='outline'
+                                            size='sm'
+                                            className='h-8 gap-1.5 rounded-lg px-2.5 text-[11px]'
+                                            aria-label={t('servers.console.terminal.quick_rules')}
+                                        >
+                                            <Sparkles className='text-primary h-3.5 w-3.5 shrink-0' />
+                                            <span>{t('servers.console.terminal.quick_rules')}</span>
+                                        </Menu.Button>
+                                        <Transition
+                                            as={Fragment}
+                                            enter='transition ease-out duration-100'
+                                            enterFrom='transform opacity-0 scale-95'
+                                            enterTo='transform opacity-100 scale-100'
+                                            leave='transition ease-in duration-75'
+                                            leaveFrom='transform opacity-100 scale-100'
+                                            leaveTo='transform opacity-0 scale-95'
+                                        >
+                                            <Menu.Items className='bg-popover border-border/50 absolute right-0 z-30 mt-2 w-[min(22rem,calc(100vw-2rem))] origin-top-right overflow-hidden rounded-xl border shadow-lg focus:outline-none'>
+                                                <div className='border-border/50 bg-muted/30 border-b px-3 py-2'>
+                                                    <p className='text-foreground text-xs font-semibold'>
+                                                        {t('servers.console.terminal.quick_rules')}
+                                                    </p>
+                                                    <p className='text-muted-foreground mt-0.5 text-[11px] leading-snug'>
+                                                        {t('servers.console.terminal.quick_rules_help')}
+                                                    </p>
+                                                </div>
+                                                <QuickRulesList filters={filters} onAddPreset={handleAddPreset} />
+                                            </Menu.Items>
+                                        </Transition>
+                                    </Menu>
+                                </>
                             )}
-                            <Menu as='div' className='relative'>
+                            <Button
+                                type='button'
+                                variant='outline'
+                                size='icon'
+                                className='h-8 w-8 shrink-0 rounded-lg sm:hidden'
+                                aria-label={t('servers.console.terminal.history_title')}
+                                onClick={() => setShowHistory(true)}
+                            >
+                                <History className='h-3.5 w-3.5' />
+                            </Button>
+                            <Menu as='div' className='relative hidden sm:block'>
                                 <Menu.Button
                                     as={Button}
                                     variant='outline'
@@ -552,35 +802,10 @@ const ServerTerminal = React.forwardRef<ServerTerminalRef, ServerTerminalProps>(
                                                 {t('servers.console.terminal.history_title')}
                                             </p>
                                         </div>
-                                        <div className='custom-scrollbar max-h-60 overflow-y-auto p-1'>
-                                            {commandHistory.length === 0 ? (
-                                                <div className='text-muted-foreground px-3 py-4 text-center text-xs'>
-                                                    {t('servers.console.terminal.no_history')}
-                                                </div>
-                                            ) : (
-                                                commandHistory.map((cmd, idx) => (
-                                                    <Menu.Item key={idx}>
-                                                        {({ active }) => (
-                                                            <button
-                                                                type='button'
-                                                                onClick={() => loadHistoryCommand(cmd)}
-                                                                className={cn(
-                                                                    'flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm transition-colors',
-                                                                    active
-                                                                        ? 'bg-primary/10 text-primary'
-                                                                        : 'hover:bg-muted/80',
-                                                                )}
-                                                            >
-                                                                <Clock className='h-3 w-3 opacity-50' />
-                                                                <span className='truncate font-mono text-xs'>
-                                                                    {cmd}
-                                                                </span>
-                                                            </button>
-                                                        )}
-                                                    </Menu.Item>
-                                                ))
-                                            )}
-                                        </div>
+                                        <CommandHistoryList
+                                            commandHistory={commandHistory}
+                                            onSelect={loadHistoryCommand}
+                                        />
                                     </Menu.Items>
                                 </Transition>
                             </Menu>
@@ -643,202 +868,24 @@ const ServerTerminal = React.forwardRef<ServerTerminalRef, ServerTerminalProps>(
                     </div>
                 </CardHeader>
                 {showSettings && (
-                    <div className='border-border/50 bg-muted/20 border-b px-4 py-4 sm:px-5 sm:py-5'>
-                        <div className='mb-3 flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between'>
-                            <div>
-                                <p className='text-foreground text-xs font-semibold'>
-                                    {t('servers.console.terminal.customize')}
-                                </p>
-                                <p className='text-muted-foreground mt-1 max-w-2xl text-[11px] leading-relaxed'>
-                                    {t('servers.console.terminal.rules_intro')}
-                                </p>
-                            </div>
-                            <Button
-                                type='button'
-                                variant='outline'
-                                size='sm'
-                                className='shrink-0 rounded-xl font-bold'
-                                onClick={handleAddFilter}
-                                disabled={!onFiltersChange}
-                            >
-                                {t('servers.console.terminal.add_rule')}
-                            </Button>
-                        </div>
-                        {filters.length === 0 ? (
-                            <p className='text-muted-foreground text-xs'>{t('servers.console.terminal.no_rules')}</p>
-                        ) : (
-                            <div className='custom-scrollbar max-h-72 space-y-3 overflow-y-auto pr-1'>
-                                {filters.map((rule) => (
-                                    <div
-                                        key={rule.id}
-                                        className='border-border/50 bg-card/50 space-y-2.5 rounded-xl border p-4 backdrop-blur-sm'
-                                    >
-                                        {rule.presetId && (
-                                            <div className='flex flex-wrap items-center gap-2'>
-                                                <span className='bg-primary/12 text-primary inline-flex items-center rounded-md px-2 py-0.5 text-[10px] font-semibold tracking-wide uppercase'>
-                                                    {t('servers.console.terminal.preset_badge')}
-                                                </span>
-                                                <span className='text-foreground text-xs font-medium'>
-                                                    {t(`servers.console.terminal.presets.${rule.presetId}.title`)}
-                                                </span>
-                                            </div>
-                                        )}
-                                        <div className='flex items-center justify-between gap-2'>
-                                            <div className='flex flex-wrap items-center gap-2'>
-                                                <input
-                                                    type='checkbox'
-                                                    checked={rule.enabled}
-                                                    onChange={(e) =>
-                                                        handleUpdateFilter(rule.id, {
-                                                            enabled: e.target.checked,
-                                                        })
-                                                    }
-                                                    className='border-input h-3.5 w-3.5 rounded'
-                                                    disabled={!onFiltersChange}
-                                                />
-                                                <select
-                                                    value={rule.type}
-                                                    onChange={(e) =>
-                                                        handleUpdateFilter(rule.id, {
-                                                            type: e.target.value as ConsoleFilterRule['type'],
-                                                            presetId: undefined,
-                                                        })
-                                                    }
-                                                    className='border-border bg-background rounded-md border px-2 py-1 text-xs'
-                                                    disabled={!onFiltersChange}
-                                                >
-                                                    <option value='replace'>
-                                                        {t('servers.console.terminal.rule_type_replace')}
-                                                    </option>
-                                                    <option value='hide'>
-                                                        {t('servers.console.terminal.rule_type_hide')}
-                                                    </option>
-                                                    <option value='color'>
-                                                        {t('servers.console.terminal.rule_type_color')}
-                                                    </option>
-                                                </select>
-                                            </div>
-                                            <button
-                                                onClick={() => handleDeleteFilter(rule.id)}
-                                                type='button'
-                                                className='text-muted-foreground hover:text-destructive text-[11px]'
-                                                disabled={!onFiltersChange}
-                                            >
-                                                {t('servers.console.terminal.delete_rule')}
-                                            </button>
-                                        </div>
-                                        <div className='grid grid-cols-1 gap-2 sm:grid-cols-3'>
-                                            <div className='space-y-1 sm:col-span-2'>
-                                                <label className='text-muted-foreground text-[11px]'>
-                                                    {t('servers.console.terminal.pattern')}
-                                                </label>
-                                                <input
-                                                    type='text'
-                                                    value={rule.pattern}
-                                                    onChange={(e) =>
-                                                        handleUpdateFilter(rule.id, {
-                                                            pattern: e.target.value,
-                                                            presetId: undefined,
-                                                        })
-                                                    }
-                                                    className='border-border bg-background w-full rounded-md border px-2 py-1 font-mono text-xs'
-                                                    placeholder='^\\[INFO\\]'
-                                                    disabled={!onFiltersChange}
-                                                />
-                                            </div>
-                                            <div className='space-y-1'>
-                                                <label className='text-muted-foreground text-[11px]'>
-                                                    {t('servers.console.terminal.flags')}
-                                                </label>
-                                                <input
-                                                    type='text'
-                                                    value={rule.flags || ''}
-                                                    onChange={(e) =>
-                                                        handleUpdateFilter(rule.id, {
-                                                            flags: e.target.value,
-                                                            presetId: undefined,
-                                                        })
-                                                    }
-                                                    className='border-border bg-background w-full rounded-md border px-2 py-1 text-xs'
-                                                    placeholder='gmi'
-                                                    disabled={!onFiltersChange}
-                                                />
-                                            </div>
-                                        </div>
-                                        {rule.type === 'replace' && (
-                                            <div className='space-y-1'>
-                                                <label className='text-muted-foreground text-[11px]'>
-                                                    {t('servers.console.terminal.replacement')}
-                                                </label>
-                                                <input
-                                                    type='text'
-                                                    value={rule.replacement || ''}
-                                                    onChange={(e) =>
-                                                        handleUpdateFilter(rule.id, {
-                                                            replacement: e.target.value,
-                                                            presetId: undefined,
-                                                        })
-                                                    }
-                                                    className='border-border bg-background w-full rounded-md border px-2 py-1 text-xs'
-                                                    placeholder='[RENAMED]'
-                                                    disabled={!onFiltersChange}
-                                                />
-                                            </div>
-                                        )}
-                                        {rule.type === 'color' && (
-                                            <div className='space-y-1'>
-                                                <label className='text-muted-foreground text-[11px]'>
-                                                    {t('servers.console.terminal.color')}
-                                                </label>
-                                                <select
-                                                    value={rule.color || 'yellow'}
-                                                    onChange={(e) =>
-                                                        handleUpdateFilter(rule.id, {
-                                                            color: e.target.value as ConsoleFilterRule['color'],
-                                                            presetId: undefined,
-                                                        })
-                                                    }
-                                                    className='border-border bg-background rounded-md border px-2 py-1 text-xs'
-                                                    disabled={!onFiltersChange}
-                                                >
-                                                    <option value='red'>
-                                                        {t('servers.console.terminal.color_red')}
-                                                    </option>
-                                                    <option value='yellow'>
-                                                        {t('servers.console.terminal.color_yellow')}
-                                                    </option>
-                                                    <option value='green'>
-                                                        {t('servers.console.terminal.color_green')}
-                                                    </option>
-                                                    <option value='blue'>
-                                                        {t('servers.console.terminal.color_blue')}
-                                                    </option>
-                                                    <option value='magenta'>
-                                                        {t('servers.console.terminal.color_magenta')}
-                                                    </option>
-                                                    <option value='cyan'>
-                                                        {t('servers.console.terminal.color_cyan')}
-                                                    </option>
-                                                    <option value='gray'>
-                                                        {t('servers.console.terminal.color_gray')}
-                                                    </option>
-                                                </select>
-                                            </div>
-                                        )}
-                                    </div>
-                                ))}
-                            </div>
-                        )}
+                    <div className='border-border/50 bg-muted/20 hidden border-b px-4 py-4 sm:block sm:px-5 sm:py-5'>
+                        <FilterSettingsPanel
+                            filters={filters}
+                            onFiltersChange={onFiltersChange}
+                            onAddFilter={handleAddFilter}
+                            onUpdateFilter={handleUpdateFilter}
+                            onDeleteFilter={handleDeleteFilter}
+                        />
                     </div>
                 )}
-                <CardContent className='p-0'>
-                    <div className='relative'>
+                <CardContent className='relative z-0 p-0'>
+                    <div className='relative isolate'>
                         <div
                             ref={terminalRef}
                             className={
                                 fullHeight
-                                    ? 'h-[calc(100vh-132px)] w-full sm:h-[calc(100vh-132px)]'
-                                    : 'h-[min(40rem,calc(100vh-10rem))] w-full sm:h-[min(48rem,68vh)] 2xl:h-[min(58rem,72vh)]'
+                                    ? 'h-[calc(100dvh-132px)] w-full'
+                                    : 'h-[min(22rem,calc(100dvh-12rem))] w-full sm:h-[min(48rem,68vh)] 2xl:h-[min(58rem,72vh)]'
                             }
                         />
                         {showScrollButton && (
@@ -927,6 +974,52 @@ const ServerTerminal = React.forwardRef<ServerTerminalRef, ServerTerminalProps>(
                         )}
                     </CardFooter>
                 )}
+
+                <div className='sm:hidden'>
+                    <Sheet open={showSettings} onOpenChange={setShowSettings} className='max-w-lg'>
+                        <SheetContent>
+                            <SheetHeader>
+                                <SheetTitle>{t('servers.console.terminal.customize')}</SheetTitle>
+                                <SheetDescription>{t('servers.console.terminal.rules_intro')}</SheetDescription>
+                            </SheetHeader>
+                            <FilterSettingsPanel
+                                filters={filters}
+                                onFiltersChange={onFiltersChange}
+                                onAddFilter={handleAddFilter}
+                                onUpdateFilter={handleUpdateFilter}
+                                onDeleteFilter={handleDeleteFilter}
+                            />
+                        </SheetContent>
+                    </Sheet>
+
+                    {onFiltersChange && (
+                        <Sheet open={showQuickRules} onOpenChange={setShowQuickRules} className='max-w-lg'>
+                            <SheetContent>
+                                <SheetHeader>
+                                    <SheetTitle>{t('servers.console.terminal.quick_rules')}</SheetTitle>
+                                    <SheetDescription>
+                                        {t('servers.console.terminal.quick_rules_help')}
+                                    </SheetDescription>
+                                </SheetHeader>
+                                <QuickRulesList
+                                    filters={filters}
+                                    onAddPreset={handleAddPreset}
+                                    onSelect={() => setShowQuickRules(false)}
+                                />
+                            </SheetContent>
+                        </Sheet>
+                    )}
+
+                    <Sheet open={showHistory} onOpenChange={setShowHistory} className='max-w-lg'>
+                        <SheetContent>
+                            <SheetHeader>
+                                <SheetTitle>{t('servers.console.terminal.history_title')}</SheetTitle>
+                            </SheetHeader>
+                            <CommandHistoryList commandHistory={commandHistory} onSelect={loadHistoryCommand} />
+                        </SheetContent>
+                    </Sheet>
+                </div>
+
                 <style jsx global>{`
                     .xterm-viewport::-webkit-scrollbar {
                         width: 8px;
diff --git a/frontendv2/src/components/server/files/editors/MinecraftServerPropertiesEditor.tsx b/frontendv2/src/components/server/files/editors/MinecraftServerPropertiesEditor.tsx
index a9bf7ce43..95e31fa50 100644
--- a/frontendv2/src/components/server/files/editors/MinecraftServerPropertiesEditor.tsx
+++ b/frontendv2/src/components/server/files/editors/MinecraftServerPropertiesEditor.tsx
@@ -15,7 +15,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 
 'use client';
 
-import { useState, useEffect, useMemo } from 'react';
+import { useState, useEffect, useMemo, type ComponentType } from 'react';
 import { useTranslation } from '@/contexts/TranslationContext';
 import { Button } from '@/components/featherui/Button';
 import { Card, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
@@ -37,47 +37,18 @@ import {
     Settings2,
     Gamepad2,
     Network,
+    Terminal,
+    Server,
+    Package,
 } from 'lucide-react';
-
-interface MinecraftServerPropertiesForm {
-    motd: string;
-    difficulty: string;
-    gamemode: string;
-    levelType: string;
-    maxPlayers: number;
-    whiteList: boolean;
-    enforceWhitelist: boolean;
-    onlineMode: boolean;
-    pvp: boolean;
-    enableCommandBlock: boolean;
-    allowFlight: boolean;
-    spawnMonsters: boolean;
-    allowNether: boolean;
-    forceGamemode: boolean;
-    broadcastConsoleToOps: boolean;
-    spawnProtection: number;
-    viewDistance: number;
-    simulationDistance: number;
-    levelName: string;
-    levelSeed: string;
-    generatorSettings: string;
-    generateStructures: boolean;
-    hardcore: boolean;
-    requireResourcePack: boolean;
-    hideOnlinePlayers: boolean;
-    enforceSecureProfile: boolean;
-    previewsChat: boolean;
-    useNativeTransport: boolean;
-    resourcePack: string;
-    resourcePackSha1: string;
-    resourcePackId: string;
-    resourcePackPrompt: string;
-    opPermissionLevel: number;
-    functionPermissionLevel: number;
-    entityBroadcastRangePercentage: number;
-    maxChainedNeighborUpdates: number;
-    maxWorldSize: number;
-}
+import {
+    type MinecraftServerPropertiesForm,
+    parseForm,
+    parseProperties,
+    serializeForm,
+    filterUpdatesForExistingKeys,
+    mergeProperties,
+} from './minecraftServerPropertiesModel';
 
 interface MinecraftServerPropertiesEditorProps {
     content: string;
@@ -87,209 +58,141 @@ interface MinecraftServerPropertiesEditorProps {
     onSwitchToRaw: () => void;
 }
 
-function parseProperties(content: string): Map<string, string> {
-    const map = new Map<string, string>();
-    content
-        .split(/\r?\n/)
-        .map((line) => line.trim())
-        .forEach((line) => {
-            if (!line || line.startsWith('#')) {
-                return;
-            }
-
-            const separatorIndex = line.indexOf('=');
-            if (separatorIndex === -1) {
-                return;
-            }
-
-            const key = line.slice(0, separatorIndex).trim();
-            const value = line.slice(separatorIndex + 1).trim();
-            if (key) {
-                map.set(key, value);
-            }
-        });
-
-    return map;
-}
-
-function getDefaultForm(): MinecraftServerPropertiesForm {
-    return {
-        motd: 'A Minecraft Server',
-        difficulty: 'easy',
-        gamemode: 'survival',
-        levelType: 'minecraft:normal',
-        maxPlayers: 20,
-        whiteList: false,
-        enforceWhitelist: false,
-        onlineMode: true,
-        pvp: true,
-        enableCommandBlock: false,
-        allowFlight: false,
-        spawnMonsters: true,
-        allowNether: true,
-        forceGamemode: false,
-        broadcastConsoleToOps: true,
-        spawnProtection: 16,
-        viewDistance: 10,
-        simulationDistance: 10,
-        levelName: 'world',
-        levelSeed: '',
-        generatorSettings: '',
-        generateStructures: true,
-        hardcore: false,
-        requireResourcePack: false,
-        hideOnlinePlayers: false,
-        enforceSecureProfile: true,
-        previewsChat: true,
-        useNativeTransport: true,
-        resourcePack: '',
-        resourcePackSha1: '',
-        resourcePackId: '',
-        resourcePackPrompt: '',
-        opPermissionLevel: 4,
-        functionPermissionLevel: 2,
-        entityBroadcastRangePercentage: 100,
-        maxChainedNeighborUpdates: 1000000,
-        maxWorldSize: 29999984,
-    };
-}
-
-function parseForm(content: string): MinecraftServerPropertiesForm {
-    const parsed = parseProperties(content);
-    const form = getDefaultForm();
-
-    return {
-        motd: parsed.get('motd') ?? form.motd,
-        difficulty: parsed.get('difficulty') ?? form.difficulty,
-        gamemode: parsed.get('gamemode') ?? form.gamemode,
-        levelType: parsed.get('level-type') ?? form.levelType,
-        maxPlayers: Number.parseInt(parsed.get('max-players') ?? String(form.maxPlayers), 10) || form.maxPlayers,
-        whiteList: (parsed.get('white-list') ?? 'false') === 'true',
-        enforceWhitelist: (parsed.get('enforce-whitelist') ?? 'false') === 'true',
-        onlineMode: (parsed.get('online-mode') ?? 'true') === 'true',
-        pvp: (parsed.get('pvp') ?? 'true') === 'true',
-        enableCommandBlock: (parsed.get('enable-command-block') ?? 'false') === 'true',
-        allowFlight: (parsed.get('allow-flight') ?? 'false') === 'true',
-        spawnMonsters: (parsed.get('spawn-monsters') ?? 'true') === 'true',
-        allowNether: (parsed.get('allow-nether') ?? 'true') === 'true',
-        forceGamemode: (parsed.get('force-gamemode') ?? 'false') === 'true',
-        broadcastConsoleToOps: (parsed.get('broadcast-console-to-ops') ?? 'true') === 'true',
-        spawnProtection:
-            Number.parseInt(parsed.get('spawn-protection') ?? String(form.spawnProtection), 10) || form.spawnProtection,
-        viewDistance:
-            Number.parseInt(parsed.get('view-distance') ?? String(form.viewDistance), 10) || form.viewDistance,
-        simulationDistance:
-            Number.parseInt(parsed.get('simulation-distance') ?? String(form.simulationDistance), 10) ||
-            form.simulationDistance,
-        levelName: parsed.get('level-name') ?? form.levelName,
-        levelSeed: parsed.get('level-seed') ?? form.levelSeed,
-        generatorSettings: parsed.get('generator-settings') ?? form.generatorSettings,
-        generateStructures: (parsed.get('generate-structures') ?? 'true') === 'true',
-        hardcore: (parsed.get('hardcore') ?? 'false') === 'true',
-        requireResourcePack: (parsed.get('require-resource-pack') ?? 'false') === 'true',
-        hideOnlinePlayers: (parsed.get('hide-online-players') ?? 'false') === 'true',
-        enforceSecureProfile: (parsed.get('enforce-secure-profile') ?? 'true') === 'true',
-        previewsChat: (parsed.get('previews-chat') ?? 'true') === 'true',
-        useNativeTransport: (parsed.get('use-native-transport') ?? 'true') === 'true',
-        resourcePack: parsed.get('resource-pack') ?? form.resourcePack,
-        resourcePackSha1: parsed.get('resource-pack-sha1') ?? form.resourcePackSha1,
-        resourcePackId: parsed.get('resource-pack-id') ?? form.resourcePackId,
-        resourcePackPrompt: parsed.get('resource-pack-prompt') ?? form.resourcePackPrompt,
-        opPermissionLevel:
-            Number.parseInt(parsed.get('op-permission-level') ?? String(form.opPermissionLevel), 10) ||
-            form.opPermissionLevel,
-        functionPermissionLevel:
-            Number.parseInt(parsed.get('function-permission-level') ?? String(form.functionPermissionLevel), 10) ||
-            form.functionPermissionLevel,
-        entityBroadcastRangePercentage:
-            Number.parseInt(
-                parsed.get('entity-broadcast-range-percentage') ?? String(form.entityBroadcastRangePercentage),
-                10,
-            ) || form.entityBroadcastRangePercentage,
-        maxChainedNeighborUpdates:
-            Number.parseInt(parsed.get('max-chained-neighbor-updates') ?? String(form.maxChainedNeighborUpdates), 10) ||
-            form.maxChainedNeighborUpdates,
-        maxWorldSize:
-            Number.parseInt(parsed.get('max-world-size') ?? String(form.maxWorldSize), 10) || form.maxWorldSize,
-    };
+function SectionHeader({
+    icon: Icon,
+    title,
+    description,
+}: {
+    icon: ComponentType<{ className?: string }>;
+    title: string;
+    description: string;
+}) {
+    return (
+        <div className='border-border/10 flex items-center gap-4 border-b pb-6'>
+            <div className='bg-primary/10 border-primary/20 flex h-10 w-10 items-center justify-center rounded-xl border'>
+                <Icon className='text-primary h-5 w-5' />
+            </div>
+            <div className='space-y-0.5'>
+                <h3 className='text-xl font-black tracking-tight uppercase italic'>{title}</h3>
+                <p className='text-muted-foreground text-[9px] font-bold tracking-widest uppercase opacity-50'>
+                    {description}
+                </p>
+            </div>
+        </div>
+    );
 }
 
-function formatBoolean(value: boolean): string {
-    return value ? 'true' : 'false';
+function CheckboxSetting({
+    label,
+    description,
+    checked,
+    onCheckedChange,
+    disabled,
+}: {
+    label: string;
+    description: string;
+    checked: boolean;
+    onCheckedChange: (checked: boolean) => void;
+    disabled?: boolean;
+}) {
+    return (
+        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
+            <div className='flex items-start justify-between gap-4'>
+                <div className='space-y-1'>
+                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
+                        {label}
+                    </label>
+                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
+                        {description}
+                    </p>
+                </div>
+                <Checkbox checked={checked} onCheckedChange={onCheckedChange} disabled={disabled} />
+            </div>
+        </div>
+    );
 }
 
-function serializeForm(form: MinecraftServerPropertiesForm): Record<string, string> {
-    return {
-        motd: form.motd,
-        difficulty: form.difficulty,
-        gamemode: form.gamemode,
-        'level-type': form.levelType,
-        'max-players': String(form.maxPlayers),
-        'white-list': formatBoolean(form.whiteList),
-        'enforce-whitelist': formatBoolean(form.enforceWhitelist),
-        'online-mode': formatBoolean(form.onlineMode),
-        pvp: formatBoolean(form.pvp),
-        'enable-command-block': formatBoolean(form.enableCommandBlock),
-        'allow-flight': formatBoolean(form.allowFlight),
-        'spawn-monsters': formatBoolean(form.spawnMonsters),
-        'allow-nether': formatBoolean(form.allowNether),
-        'force-gamemode': formatBoolean(form.forceGamemode),
-        'broadcast-console-to-ops': formatBoolean(form.broadcastConsoleToOps),
-        'spawn-protection': String(form.spawnProtection),
-        'view-distance': String(form.viewDistance),
-        'simulation-distance': String(form.simulationDistance),
-        'level-name': form.levelName,
-        'level-seed': form.levelSeed,
-        'generator-settings': form.generatorSettings,
-        'generate-structures': formatBoolean(form.generateStructures),
-        hardcore: formatBoolean(form.hardcore),
-        'require-resource-pack': formatBoolean(form.requireResourcePack),
-        'hide-online-players': formatBoolean(form.hideOnlinePlayers),
-        'enforce-secure-profile': formatBoolean(form.enforceSecureProfile),
-        'previews-chat': formatBoolean(form.previewsChat),
-        'use-native-transport': formatBoolean(form.useNativeTransport),
-        'resource-pack': form.resourcePack,
-        'resource-pack-sha1': form.resourcePackSha1,
-        'resource-pack-id': form.resourcePackId,
-        'resource-pack-prompt': form.resourcePackPrompt,
-        'op-permission-level': String(form.opPermissionLevel),
-        'function-permission-level': String(form.functionPermissionLevel),
-        'entity-broadcast-range-percentage': String(form.entityBroadcastRangePercentage),
-        'max-chained-neighbor-updates': String(form.maxChainedNeighborUpdates),
-        'max-world-size': String(form.maxWorldSize),
-    };
+function NumberSetting({
+    label,
+    description,
+    value,
+    onChange,
+    readOnly,
+    min,
+    max,
+    icon: Icon,
+}: {
+    label: string;
+    description: string;
+    value: number;
+    onChange: (value: number) => void;
+    readOnly?: boolean;
+    min?: number;
+    max?: number;
+    icon?: ComponentType<{ className?: string }>;
+}) {
+    return (
+        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
+            <label className='text-muted-foreground ml-1 flex items-center gap-2 text-[9px] font-black tracking-[0.2em] uppercase'>
+                {Icon ? <Icon className='text-primary h-3 w-3' /> : null}
+                {label}
+            </label>
+            <Input
+                type='number'
+                value={value}
+                onChange={(e) => onChange(Number.parseInt(e.target.value, 10) || 0)}
+                readOnly={readOnly}
+                min={min}
+                max={max}
+            />
+            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
+                {description}
+            </p>
+        </div>
+    );
 }
 
-function mergeProperties(original: string, updates: Record<string, string>): string {
-    const lines = original.split(/\r?\n/);
-    const handled = new Set<string>();
-
-    const updatedLines = lines.map((line) => {
-        if (!line || line.trim().startsWith('#')) {
-            return line;
-        }
-
-        const separatorIndex = line.indexOf('=');
-        if (separatorIndex === -1) {
-            return line;
-        }
-
-        const rawKey = line.slice(0, separatorIndex).trim();
-        if (rawKey && updates[rawKey] !== undefined) {
-            handled.add(rawKey);
-            return `${rawKey}=${updates[rawKey]}`;
-        }
-
-        return line;
-    });
-
-    const appended = Object.entries(updates)
-        .filter(([key]) => !handled.has(key))
-        .map(([key, value]) => `${key}=${value}`);
-
-    return [...updatedLines, ...appended]
-        .filter((line, index, array) => !(line === '' && index === array.length - 1))
-        .join('\n');
+function TextSetting({
+    label,
+    description,
+    value,
+    onChange,
+    readOnly,
+    placeholder,
+    icon: Icon,
+    multiline = false,
+}: {
+    label: string;
+    description: string;
+    value: string;
+    onChange: (value: string) => void;
+    readOnly?: boolean;
+    placeholder?: string;
+    icon?: ComponentType<{ className?: string }>;
+    multiline?: boolean;
+}) {
+    return (
+        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
+            <label className='text-muted-foreground ml-1 flex items-center gap-2 text-[9px] font-black tracking-[0.2em] uppercase'>
+                {Icon ? <Icon className='text-primary h-3 w-3' /> : null}
+                {label}
+            </label>
+            {multiline ? (
+                <Textarea value={value} onChange={(e) => onChange(e.target.value)} readOnly={readOnly} rows={2} />
+            ) : (
+                <Input
+                    type='text'
+                    value={value}
+                    onChange={(e) => onChange(e.target.value)}
+                    readOnly={readOnly}
+                    placeholder={placeholder}
+                />
+            )}
+            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
+                {description}
+            </p>
+        </div>
+    );
 }
 
 export function MinecraftServerPropertiesEditor({
@@ -300,10 +203,11 @@ export function MinecraftServerPropertiesEditor({
     onSwitchToRaw,
 }: MinecraftServerPropertiesEditorProps) {
     const { t } = useTranslation();
+    const tr = (key: string, fallback: string) => t(key) || fallback;
 
-    const form = useMemo(() => {
-        return parseForm(content);
-    }, [content]);
+    const form = useMemo(() => parseForm(content), [content]);
+    const existingKeys = useMemo(() => new Set(parseProperties(content).keys()), [content]);
+    const hasKey = (key: string) => existingKeys.has(key);
 
     const [localForm, setLocalForm] = useState<MinecraftServerPropertiesForm>(form);
 
@@ -313,12 +217,14 @@ export function MinecraftServerPropertiesEditor({
     }, [content]);
 
     const handleSave = () => {
-        const updates = serializeForm(localForm);
-        const newContent = mergeProperties(content, updates);
-        onSave(newContent);
+        const updates = filterUpdatesForExistingKeys(serializeForm(localForm), existingKeys);
+        onSave(mergeProperties(content, updates));
     };
 
-    const updateForm = (field: keyof MinecraftServerPropertiesForm, value: unknown) => {
+    const updateForm = <K extends keyof MinecraftServerPropertiesForm>(
+        field: K,
+        value: MinecraftServerPropertiesForm[K],
+    ) => {
         setLocalForm((prev) => ({ ...prev, [field]: value }));
     };
 
@@ -328,82 +234,76 @@ export function MinecraftServerPropertiesEditor({
                 <div className='flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between'>
                     <div className='space-y-2'>
                         <CardTitle className='text-2xl font-bold'>
-                            {t('files.editors.minecraftProperties.title')}
+                            {tr('files.editors.minecraftProperties.title', 'Minecraft Server Properties')}
                         </CardTitle>
                         <CardDescription className='text-muted-foreground text-sm'>
-                            {t('files.editors.minecraftProperties.description') ||
-                                'Configure your Minecraft server properties visually'}
+                            {tr(
+                                'files.editors.minecraftProperties.description',
+                                'Configure your Minecraft server properties visually',
+                            )}
                         </CardDescription>
                     </div>
                     <div className='flex items-center gap-2'>
                         <Button variant='ghost' size='sm' onClick={onSwitchToRaw}>
                             <ArrowLeft className='mr-2 h-4 w-4' />
-                            {t('files.editors.minecraftProperties.actions.switchToRaw')}
+                            {tr('files.editors.minecraftProperties.actions.switchToRaw', 'Switch to Raw Editor')}
                         </Button>
                         <Button size='sm' disabled={readonly || saving} onClick={handleSave}>
                             <Save className='mr-2 h-4 w-4' />
                             {saving
-                                ? t('files.editors.minecraftProperties.actions.saving')
-                                : t('files.editors.minecraftProperties.actions.save')}
+                                ? tr('files.editors.minecraftProperties.actions.saving', 'Saving...')
+                                : tr('files.editors.minecraftProperties.actions.save', 'Save')}
                         </Button>
                     </div>
                 </div>
             </CardHeader>
             <div className='flex-1 space-y-10 overflow-y-auto p-8'>
                 <section className='space-y-6'>
-                    <div className='border-border/10 flex items-center gap-4 border-b pb-6'>
-                        <div className='bg-primary/10 border-primary/20 flex h-10 w-10 items-center justify-center rounded-xl border'>
-                            <Settings2 className='text-primary h-5 w-5' />
-                        </div>
-                        <div className='space-y-0.5'>
-                            <h3 className='text-xl font-black tracking-tight uppercase italic'>
-                                {t('files.editors.minecraftProperties.sections.serverInfo') || 'Server Information'}
-                            </h3>
-                            <p className='text-muted-foreground text-[9px] font-bold tracking-widest uppercase opacity-50'>
-                                {t('files.editors.minecraftProperties.sectionsDescriptions.serverInfo') ||
-                                    'Basic server configuration'}
-                            </p>
-                        </div>
-                    </div>
+                    <SectionHeader
+                        icon={Settings2}
+                        title={tr('files.editors.minecraftProperties.sections.serverInfo', 'Server Information')}
+                        description={tr(
+                            'files.editors.minecraftProperties.sectionsDescriptions.serverInfo',
+                            'Basic server configuration',
+                        )}
+                    />
                     <div className='grid grid-cols-1 gap-6 xl:grid-cols-2'>
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6 xl:col-span-2'>
-                            <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                {t('files.editors.minecraftProperties.fields.motd.label') || 'Message of the Day'}
-                            </label>
-                            <Textarea
-                                value={localForm.motd}
-                                onChange={(e) => updateForm('motd', e.target.value)}
-                                readOnly={readonly}
-                                rows={3}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.motd.description') ||
-                                    'The message shown to players when they join'}
-                            </p>
-                        </div>
-
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 flex items-center gap-2 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                <Users className='text-primary h-3 w-3' />
-                                {t('files.editors.minecraftProperties.fields.maxPlayers.label') || 'Max Players'}
-                            </label>
-                            <Input
-                                type='number'
-                                value={localForm.maxPlayers}
-                                onChange={(e) => updateForm('maxPlayers', Number.parseInt(e.target.value, 10) || 0)}
-                                readOnly={readonly}
-                                min={1}
-                                max={2147483647}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.maxPlayers.description') ||
-                                    'Maximum number of players allowed on the server'}
-                            </p>
-                        </div>
-
+                        <TextSetting
+                            label={tr('files.editors.minecraftProperties.fields.motd.label', 'Message of the Day')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.motd.description',
+                                'The message shown to players when they join',
+                            )}
+                            value={localForm.motd}
+                            onChange={(value) => updateForm('motd', value)}
+                            readOnly={readonly}
+                            multiline
+                        />
+                        <TextSetting
+                            label={tr('files.editors.minecraftProperties.fields.serverName.label', 'Server Name')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.serverName.description',
+                                'Internal server name used for logging',
+                            )}
+                            value={localForm.serverName}
+                            onChange={(value) => updateForm('serverName', value)}
+                            readOnly={readonly}
+                        />
+                        <NumberSetting
+                            icon={Users}
+                            label={tr('files.editors.minecraftProperties.fields.maxPlayers.label', 'Max Players')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.maxPlayers.description',
+                                'Maximum number of players allowed on the server',
+                            )}
+                            value={localForm.maxPlayers}
+                            onChange={(value) => updateForm('maxPlayers', value)}
+                            readOnly={readonly}
+                            min={1}
+                        />
                         <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
                             <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                {t('files.editors.minecraftProperties.fields.gamemode.label') || 'Default Gamemode'}
+                                {tr('files.editors.minecraftProperties.fields.gamemode.label', 'Default Gamemode')}
                             </label>
                             <Select
                                 disabled={readonly}
@@ -411,27 +311,22 @@ export function MinecraftServerPropertiesEditor({
                                 onChange={(e) => updateForm('gamemode', e.target.value)}
                             >
                                 <option value='survival'>
-                                    {t('files.editors.minecraftProperties.options.gamemode.survival') || 'Survival'}
+                                    {tr('files.editors.minecraftProperties.options.gamemode.survival', 'Survival')}
                                 </option>
                                 <option value='creative'>
-                                    {t('files.editors.minecraftProperties.options.gamemode.creative') || 'Creative'}
+                                    {tr('files.editors.minecraftProperties.options.gamemode.creative', 'Creative')}
                                 </option>
                                 <option value='adventure'>
-                                    {t('files.editors.minecraftProperties.options.gamemode.adventure') || 'Adventure'}
+                                    {tr('files.editors.minecraftProperties.options.gamemode.adventure', 'Adventure')}
                                 </option>
                                 <option value='spectator'>
-                                    {t('files.editors.minecraftProperties.options.gamemode.spectator') || 'Spectator'}
+                                    {tr('files.editors.minecraftProperties.options.gamemode.spectator', 'Spectator')}
                                 </option>
                             </Select>
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.gamemode.description') ||
-                                    'Default gamemode for new players'}
-                            </p>
                         </div>
-
                         <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
                             <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                {t('files.editors.minecraftProperties.fields.difficulty.label') || 'Difficulty'}
+                                {tr('files.editors.minecraftProperties.fields.difficulty.label', 'Difficulty')}
                             </label>
                             <Select
                                 disabled={readonly}
@@ -439,80 +334,58 @@ export function MinecraftServerPropertiesEditor({
                                 onChange={(e) => updateForm('difficulty', e.target.value)}
                             >
                                 <option value='peaceful'>
-                                    {t('files.editors.minecraftProperties.options.difficulty.peaceful') || 'Peaceful'}
+                                    {tr('files.editors.minecraftProperties.options.difficulty.peaceful', 'Peaceful')}
                                 </option>
                                 <option value='easy'>
-                                    {t('files.editors.minecraftProperties.options.difficulty.easy') || 'Easy'}
+                                    {tr('files.editors.minecraftProperties.options.difficulty.easy', 'Easy')}
                                 </option>
                                 <option value='normal'>
-                                    {t('files.editors.minecraftProperties.options.difficulty.normal') || 'Normal'}
+                                    {tr('files.editors.minecraftProperties.options.difficulty.normal', 'Normal')}
                                 </option>
                                 <option value='hard'>
-                                    {t('files.editors.minecraftProperties.options.difficulty.hard') || 'Hard'}
+                                    {tr('files.editors.minecraftProperties.options.difficulty.hard', 'Hard')}
                                 </option>
                             </Select>
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.difficulty.description') ||
-                                    'Server difficulty level'}
-                            </p>
                         </div>
                     </div>
                 </section>
 
                 <section className='space-y-6'>
-                    <div className='border-border/10 flex items-center gap-4 border-b pb-6'>
-                        <div className='bg-primary/10 border-primary/20 flex h-10 w-10 items-center justify-center rounded-xl border'>
-                            <Globe className='text-primary h-5 w-5' />
-                        </div>
-                        <div className='space-y-0.5'>
-                            <h3 className='text-xl font-black tracking-tight uppercase italic'>
-                                {t('files.editors.minecraftProperties.sections.worldSettings') || 'World Settings'}
-                            </h3>
-                            <p className='text-muted-foreground text-[9px] font-bold tracking-widest uppercase opacity-50'>
-                                {t('files.editors.minecraftProperties.sectionsDescriptions.worldSettings') ||
-                                    'World generation and configuration'}
-                            </p>
-                        </div>
-                    </div>
+                    <SectionHeader
+                        icon={Globe}
+                        title={tr('files.editors.minecraftProperties.sections.worldSettings', 'World Settings')}
+                        description={tr(
+                            'files.editors.minecraftProperties.sectionsDescriptions.worldSettings',
+                            'World generation and configuration',
+                        )}
+                    />
                     <div className='grid grid-cols-1 gap-6 xl:grid-cols-2'>
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6 xl:col-span-2'>
-                            <label className='text-muted-foreground ml-1 flex items-center gap-2 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                <Globe className='text-primary h-3 w-3' />
-                                {t('files.editors.minecraftProperties.fields.levelName.label') || 'Level Name'}
-                            </label>
-                            <Input
-                                type='text'
-                                value={localForm.levelName}
-                                onChange={(e) => updateForm('levelName', e.target.value)}
-                                readOnly={readonly}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.levelName.description') ||
-                                    'Name of the world folder'}
-                            </p>
-                        </div>
-
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6 xl:col-span-2'>
-                            <label className='text-muted-foreground ml-1 flex items-center gap-2 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                <MountainSnow className='text-primary h-3 w-3' />
-                                {t('files.editors.minecraftProperties.fields.levelSeed.label') || 'Level Seed'}
-                            </label>
-                            <Input
-                                type='text'
-                                value={localForm.levelSeed}
-                                onChange={(e) => updateForm('levelSeed', e.target.value)}
-                                readOnly={readonly}
-                                placeholder='Random'
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.levelSeed.description') ||
-                                    'Seed for world generation (leave empty for random)'}
-                            </p>
-                        </div>
-
+                        <TextSetting
+                            icon={Globe}
+                            label={tr('files.editors.minecraftProperties.fields.levelName.label', 'Level Name')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.levelName.description',
+                                'Name of the world folder',
+                            )}
+                            value={localForm.levelName}
+                            onChange={(value) => updateForm('levelName', value)}
+                            readOnly={readonly}
+                        />
+                        <TextSetting
+                            icon={MountainSnow}
+                            label={tr('files.editors.minecraftProperties.fields.levelSeed.label', 'Level Seed')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.levelSeed.description',
+                                'Seed for world generation (leave empty for random)',
+                            )}
+                            value={localForm.levelSeed}
+                            onChange={(value) => updateForm('levelSeed', value)}
+                            readOnly={readonly}
+                            placeholder='Random'
+                        />
                         <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
                             <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                {t('files.editors.minecraftProperties.fields.levelType.label') || 'Level Type'}
+                                {tr('files.editors.minecraftProperties.fields.levelType.label', 'Level Type')}
                             </label>
                             <Select
                                 disabled={readonly}
@@ -520,719 +393,988 @@ export function MinecraftServerPropertiesEditor({
                                 onChange={(e) => updateForm('levelType', e.target.value)}
                             >
                                 <option value='minecraft:normal'>
-                                    {t('files.editors.minecraftProperties.options.levelType.default') || 'Default'}
+                                    {tr('files.editors.minecraftProperties.options.levelType.default', 'Default')}
                                 </option>
                                 <option value='minecraft:flat'>
-                                    {t('files.editors.minecraftProperties.options.levelType.flat') || 'Flat'}
+                                    {tr('files.editors.minecraftProperties.options.levelType.flat', 'Flat')}
                                 </option>
                                 <option value='minecraft:amplified'>
-                                    {t('files.editors.minecraftProperties.options.levelType.amplified') || 'Amplified'}
+                                    {tr('files.editors.minecraftProperties.options.levelType.amplified', 'Amplified')}
                                 </option>
                                 <option value='minecraft:large_biomes'>
-                                    {t('files.editors.minecraftProperties.options.levelType.largeBiomes') ||
-                                        'Large Biomes'}
+                                    {tr(
+                                        'files.editors.minecraftProperties.options.levelType.largeBiomes',
+                                        'Large Biomes',
+                                    )}
                                 </option>
                                 <option value='minecraft:single_biome_surface'>
-                                    {t('files.editors.minecraftProperties.options.levelType.singleBiome') ||
-                                        'Single Biome'}
+                                    {tr(
+                                        'files.editors.minecraftProperties.options.levelType.singleBiome',
+                                        'Single Biome',
+                                    )}
                                 </option>
                             </Select>
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.levelType.description') ||
-                                    'World generation type'}
-                            </p>
-                        </div>
-
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 flex items-center gap-2 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                <Sliders className='text-primary h-3 w-3' />
-                                {t('files.editors.minecraftProperties.fields.generatorSettings.label') ||
-                                    'Generator Settings'}
-                            </label>
-                            <Input
-                                type='text'
-                                value={localForm.generatorSettings}
-                                onChange={(e) => updateForm('generatorSettings', e.target.value)}
-                                readOnly={readonly}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.generatorSettings.description') ||
-                                    'Custom generator settings (JSON format)'}
-                            </p>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.generateStructures.label') ||
-                                            'Generate Structures'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.generateStructures.description') ||
-                                            'Generate structures like villages and temples'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.generateStructures}
-                                    onCheckedChange={(checked) => updateForm('generateStructures', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.hardcore.label') ||
-                                            'Hardcore Mode'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.hardcore.description') ||
-                                            'Enable hardcore mode (permanent death)'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.hardcore}
-                                    onCheckedChange={(checked) => updateForm('hardcore', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
                         </div>
+                        <TextSetting
+                            icon={Sliders}
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.generatorSettings.label',
+                                'Generator Settings',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.generatorSettings.description',
+                                'Custom generator settings (JSON format)',
+                            )}
+                            value={localForm.generatorSettings}
+                            onChange={(value) => updateForm('generatorSettings', value)}
+                            readOnly={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.generateStructures.label',
+                                'Generate Structures',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.generateStructures.description',
+                                'Generate structures like villages and temples',
+                            )}
+                            checked={localForm.generateStructures}
+                            onCheckedChange={(checked) => updateForm('generateStructures', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr('files.editors.minecraftProperties.fields.hardcore.label', 'Hardcore Mode')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.hardcore.description',
+                                'Enable hardcore mode (permanent death)',
+                            )}
+                            checked={localForm.hardcore}
+                            onCheckedChange={(checked) => updateForm('hardcore', checked === true)}
+                            disabled={readonly}
+                        />
                     </div>
                 </section>
 
                 <section className='space-y-6'>
-                    <div className='border-border/10 flex items-center gap-4 border-b pb-6'>
-                        <div className='bg-primary/10 border-primary/20 flex h-10 w-10 items-center justify-center rounded-xl border'>
-                            <Gamepad2 className='text-primary h-5 w-5' />
-                        </div>
-                        <div className='space-y-0.5'>
-                            <h3 className='text-xl font-black tracking-tight uppercase italic'>
-                                {t('files.editors.minecraftProperties.sections.gameplay') || 'Gameplay Settings'}
-                            </h3>
-                            <p className='text-muted-foreground text-[9px] font-bold tracking-widest uppercase opacity-50'>
-                                {t('files.editors.minecraftProperties.sectionsDescriptions.gameplay') ||
-                                    'Gameplay and player behavior settings'}
-                            </p>
-                        </div>
+                    <SectionHeader
+                        icon={Package}
+                        title={tr('files.editors.minecraftProperties.sections.dataPacks', 'Data Packs')}
+                        description={tr(
+                            'files.editors.minecraftProperties.sectionsDescriptions.dataPacks',
+                            'Initial data pack configuration',
+                        )}
+                    />
+                    <div className='grid grid-cols-1 gap-6 xl:grid-cols-2'>
+                        <TextSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.initialEnabledPacks.label',
+                                'Initial Enabled Packs',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.initialEnabledPacks.description',
+                                'Comma-separated list of data packs enabled on world creation',
+                            )}
+                            value={localForm.initialEnabledPacks}
+                            onChange={(value) => updateForm('initialEnabledPacks', value)}
+                            readOnly={readonly}
+                            placeholder='vanilla'
+                        />
+                        <TextSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.initialDisabledPacks.label',
+                                'Initial Disabled Packs',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.initialDisabledPacks.description',
+                                'Comma-separated list of data packs disabled on world creation',
+                            )}
+                            value={localForm.initialDisabledPacks}
+                            onChange={(value) => updateForm('initialDisabledPacks', value)}
+                            readOnly={readonly}
+                        />
                     </div>
-                    <div className='grid grid-cols-1 gap-6 md:grid-cols-2 xl:grid-cols-3'>
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.pvp.label') || 'PvP'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.pvp.description') ||
-                                            'Allow player vs player combat'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.pvp}
-                                    onCheckedChange={(checked) => updateForm('pvp', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.allowFlight.label') ||
-                                            'Allow Flight'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.allowFlight.description') ||
-                                            'Allow players to fly'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.allowFlight}
-                                    onCheckedChange={(checked) => updateForm('allowFlight', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.spawnMonsters.label') ||
-                                            'Spawn Monsters'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.spawnMonsters.description') ||
-                                            'Allow monsters to spawn'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.spawnMonsters}
-                                    onCheckedChange={(checked) => updateForm('spawnMonsters', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.allowNether.label') ||
-                                            'Allow Nether'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.allowNether.description') ||
-                                            'Allow players to travel to the Nether'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.allowNether}
-                                    onCheckedChange={(checked) => updateForm('allowNether', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.forceGamemode.label') ||
-                                            'Force Gamemode'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.forceGamemode.description') ||
-                                            'Force players to default gamemode'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.forceGamemode}
-                                    onCheckedChange={(checked) => updateForm('forceGamemode', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
+                </section>
 
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.enableCommandBlock.label') ||
-                                            'Enable Command Blocks'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.enableCommandBlock.description') ||
-                                            'Enable command blocks in the world'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.enableCommandBlock}
-                                    onCheckedChange={(checked) => updateForm('enableCommandBlock', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
+                <section className='space-y-6'>
+                    <SectionHeader
+                        icon={Gamepad2}
+                        title={tr('files.editors.minecraftProperties.sections.gameplay', 'Gameplay Settings')}
+                        description={tr(
+                            'files.editors.minecraftProperties.sectionsDescriptions.gameplay',
+                            'Gameplay and player behavior settings',
+                        )}
+                    />
+                    <div className='grid grid-cols-1 gap-6 md:grid-cols-2 xl:grid-cols-3'>
+                        <CheckboxSetting
+                            label={tr('files.editors.minecraftProperties.fields.allowFlight.label', 'Allow Flight')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.allowFlight.description',
+                                'Allow players to fly',
+                            )}
+                            checked={localForm.allowFlight}
+                            onCheckedChange={(checked) => updateForm('allowFlight', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr('files.editors.minecraftProperties.fields.forceGamemode.label', 'Force Gamemode')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.forceGamemode.description',
+                                'Force players to default gamemode',
+                            )}
+                            checked={localForm.forceGamemode}
+                            onCheckedChange={(checked) => updateForm('forceGamemode', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.acceptsTransfers.label',
+                                'Accepts Transfers',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.acceptsTransfers.description',
+                                'Allow players to transfer to this server from another server',
+                            )}
+                            checked={localForm.acceptsTransfers}
+                            onCheckedChange={(checked) => updateForm('acceptsTransfers', checked === true)}
+                            disabled={readonly}
+                        />
+                        {hasKey('pvp') && (
+                            <CheckboxSetting
+                                label={tr('files.editors.minecraftProperties.fields.pvp.label', 'PvP')}
+                                description={tr(
+                                    'files.editors.minecraftProperties.fields.pvp.description',
+                                    'Allow player vs player combat',
+                                )}
+                                checked={localForm.pvp}
+                                onCheckedChange={(checked) => updateForm('pvp', checked === true)}
+                                disabled={readonly}
+                            />
+                        )}
+                        {hasKey('spawn-monsters') && (
+                            <CheckboxSetting
+                                label={tr(
+                                    'files.editors.minecraftProperties.fields.spawnMonsters.label',
+                                    'Spawn Monsters',
+                                )}
+                                description={tr(
+                                    'files.editors.minecraftProperties.fields.spawnMonsters.description',
+                                    'Allow monsters to spawn',
+                                )}
+                                checked={localForm.spawnMonsters}
+                                onCheckedChange={(checked) => updateForm('spawnMonsters', checked === true)}
+                                disabled={readonly}
+                            />
+                        )}
+                        {hasKey('allow-nether') && (
+                            <CheckboxSetting
+                                label={tr('files.editors.minecraftProperties.fields.allowNether.label', 'Allow Nether')}
+                                description={tr(
+                                    'files.editors.minecraftProperties.fields.allowNether.description',
+                                    'Allow players to travel to the Nether',
+                                )}
+                                checked={localForm.allowNether}
+                                onCheckedChange={(checked) => updateForm('allowNether', checked === true)}
+                                disabled={readonly}
+                            />
+                        )}
+                        {hasKey('enable-command-block') && (
+                            <CheckboxSetting
+                                label={tr(
+                                    'files.editors.minecraftProperties.fields.enableCommandBlock.label',
+                                    'Enable Command Blocks',
+                                )}
+                                description={tr(
+                                    'files.editors.minecraftProperties.fields.enableCommandBlock.description',
+                                    'Enable command blocks in the world',
+                                )}
+                                checked={localForm.enableCommandBlock}
+                                onCheckedChange={(checked) => updateForm('enableCommandBlock', checked === true)}
+                                disabled={readonly}
+                            />
+                        )}
                     </div>
                 </section>
 
                 <section className='space-y-6'>
-                    <div className='border-border/10 flex items-center gap-4 border-b pb-6'>
-                        <div className='bg-primary/10 border-primary/20 flex h-10 w-10 items-center justify-center rounded-xl border'>
-                            <Network className='text-primary h-5 w-5' />
-                        </div>
-                        <div className='space-y-0.5'>
-                            <h3 className='text-xl font-black tracking-tight uppercase italic'>
-                                {t('files.editors.minecraftProperties.sections.network') || 'Network & Security'}
-                            </h3>
-                            <p className='text-muted-foreground text-[9px] font-bold tracking-widest uppercase opacity-50'>
-                                {t('files.editors.minecraftProperties.sectionsDescriptions.network') ||
-                                    'Network and security settings'}
-                            </p>
-                        </div>
-                    </div>
+                    <SectionHeader
+                        icon={Network}
+                        title={tr('files.editors.minecraftProperties.sections.network', 'Network & Security')}
+                        description={tr(
+                            'files.editors.minecraftProperties.sectionsDescriptions.network',
+                            'Network and security settings',
+                        )}
+                    />
                     <div className='grid grid-cols-1 gap-6 md:grid-cols-2 xl:grid-cols-3'>
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.onlineMode.label') ||
-                                            'Online Mode'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.onlineMode.description') ||
-                                            'Verify players with Mojang (set to false for cracked servers)'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.onlineMode}
-                                    onCheckedChange={(checked) => updateForm('onlineMode', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.whiteList.label') || 'Whitelist'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.whiteList.description') ||
-                                            'Enable whitelist to restrict access'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.whiteList}
-                                    onCheckedChange={(checked) => updateForm('whiteList', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.enforceWhitelist.label') ||
-                                            'Enforce Whitelist'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.enforceWhitelist.description') ||
-                                            'Automatically kick non-whitelisted players'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.enforceWhitelist}
-                                    onCheckedChange={(checked) => updateForm('enforceWhitelist', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.enforceSecureProfile.label') ||
-                                            'Enforce Secure Profile'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t(
-                                            'files.editors.minecraftProperties.fields.enforceSecureProfile.description',
-                                        ) || 'Require secure profile signatures'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.enforceSecureProfile}
-                                    onCheckedChange={(checked) => updateForm('enforceSecureProfile', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.hideOnlinePlayers.label') ||
-                                            'Hide Online Players'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.hideOnlinePlayers.description') ||
-                                            'Hide player count from server list'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.hideOnlinePlayers}
-                                    onCheckedChange={(checked) => updateForm('hideOnlinePlayers', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.useNativeTransport.label') ||
-                                            'Use Native Transport'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.useNativeTransport.description') ||
-                                            'Use native network transport for better performance'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.useNativeTransport}
-                                    onCheckedChange={(checked) => updateForm('useNativeTransport', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
+                        <TextSetting
+                            label={tr('files.editors.minecraftProperties.fields.serverIp.label', 'Server IP')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.serverIp.description',
+                                'Bind address (leave empty for all interfaces)',
+                            )}
+                            value={localForm.serverIp}
+                            onChange={(value) => updateForm('serverIp', value)}
+                            readOnly={readonly}
+                        />
+                        <NumberSetting
+                            label={tr('files.editors.minecraftProperties.fields.serverPort.label', 'Server Port')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.serverPort.description',
+                                'Port the Minecraft server listens on',
+                            )}
+                            value={localForm.serverPort}
+                            onChange={(value) => updateForm('serverPort', value)}
+                            readOnly={readonly}
+                            min={1}
+                            max={65535}
+                        />
+                        <NumberSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.networkCompressionThreshold.label',
+                                'Network Compression Threshold',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.networkCompressionThreshold.description',
+                                'Packet size threshold for compression (-1 to disable)',
+                            )}
+                            value={localForm.networkCompressionThreshold}
+                            onChange={(value) => updateForm('networkCompressionThreshold', value)}
+                            readOnly={readonly}
+                            min={-1}
+                        />
+                        <NumberSetting
+                            label={tr('files.editors.minecraftProperties.fields.rateLimit.label', 'Rate Limit')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.rateLimit.description',
+                                'Maximum packets per second (0 to disable)',
+                            )}
+                            value={localForm.rateLimit}
+                            onChange={(value) => updateForm('rateLimit', value)}
+                            readOnly={readonly}
+                            min={0}
+                        />
+                        <NumberSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.playerIdleTimeout.label',
+                                'Player Idle Timeout',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.playerIdleTimeout.description',
+                                'Minutes before idle players are kicked (0 to disable)',
+                            )}
+                            value={localForm.playerIdleTimeout}
+                            onChange={(value) => updateForm('playerIdleTimeout', value)}
+                            readOnly={readonly}
+                            min={0}
+                        />
+                        <NumberSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.pauseWhenEmptySeconds.label',
+                                'Pause When Empty (seconds)',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.pauseWhenEmptySeconds.description',
+                                'Seconds after last player leaves before pausing (-1 to disable)',
+                            )}
+                            value={localForm.pauseWhenEmptySeconds}
+                            onChange={(value) => updateForm('pauseWhenEmptySeconds', value)}
+                            readOnly={readonly}
+                            min={-1}
+                        />
+                        <CheckboxSetting
+                            label={tr('files.editors.minecraftProperties.fields.onlineMode.label', 'Online Mode')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.onlineMode.description',
+                                'Verify players with Mojang (set to false for cracked servers)',
+                            )}
+                            checked={localForm.onlineMode}
+                            onCheckedChange={(checked) => updateForm('onlineMode', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr('files.editors.minecraftProperties.fields.whiteList.label', 'Whitelist')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.whiteList.description',
+                                'Enable whitelist to restrict access',
+                            )}
+                            checked={localForm.whiteList}
+                            onCheckedChange={(checked) => updateForm('whiteList', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.enforceWhitelist.label',
+                                'Enforce Whitelist',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.enforceWhitelist.description',
+                                'Automatically kick non-whitelisted players',
+                            )}
+                            checked={localForm.enforceWhitelist}
+                            onCheckedChange={(checked) => updateForm('enforceWhitelist', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.enforceSecureProfile.label',
+                                'Enforce Secure Profile',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.enforceSecureProfile.description',
+                                'Require secure profile signatures',
+                            )}
+                            checked={localForm.enforceSecureProfile}
+                            onCheckedChange={(checked) => updateForm('enforceSecureProfile', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.hideOnlinePlayers.label',
+                                'Hide Online Players',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.hideOnlinePlayers.description',
+                                'Hide player count from server list',
+                            )}
+                            checked={localForm.hideOnlinePlayers}
+                            onCheckedChange={(checked) => updateForm('hideOnlinePlayers', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.useNativeTransport.label',
+                                'Use Native Transport',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.useNativeTransport.description',
+                                'Use native network transport for better performance',
+                            )}
+                            checked={localForm.useNativeTransport}
+                            onCheckedChange={(checked) => updateForm('useNativeTransport', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr('files.editors.minecraftProperties.fields.enableStatus.label', 'Enable Status')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.enableStatus.description',
+                                'Respond to server list ping requests',
+                            )}
+                            checked={localForm.enableStatus}
+                            onCheckedChange={(checked) => updateForm('enableStatus', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.preventProxyConnections.label',
+                                'Prevent Proxy Connections',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.preventProxyConnections.description',
+                                'Block players if ISP differs from the one used to join',
+                            )}
+                            checked={localForm.preventProxyConnections}
+                            onCheckedChange={(checked) => updateForm('preventProxyConnections', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr('files.editors.minecraftProperties.fields.logIps.label', 'Log IPs')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.logIps.description',
+                                'Log player IP addresses in the server log',
+                            )}
+                            checked={localForm.logIps}
+                            onCheckedChange={(checked) => updateForm('logIps', checked === true)}
+                            disabled={readonly}
+                        />
                     </div>
                 </section>
 
                 <section className='space-y-6'>
-                    <div className='border-border/10 flex items-center gap-4 border-b pb-6'>
-                        <div className='bg-primary/10 border-primary/20 flex h-10 w-10 items-center justify-center rounded-xl border'>
-                            <Eye className='text-primary h-5 w-5' />
-                        </div>
-                        <div className='space-y-0.5'>
-                            <h3 className='text-xl font-black tracking-tight uppercase italic'>
-                                {t('files.editors.minecraftProperties.sections.performance') || 'Performance Settings'}
-                            </h3>
-                            <p className='text-muted-foreground text-[9px] font-bold tracking-widest uppercase opacity-50'>
-                                {t('files.editors.minecraftProperties.sectionsDescriptions.performance') ||
-                                    'Server performance and rendering settings'}
-                            </p>
-                        </div>
-                    </div>
+                    <SectionHeader
+                        icon={Terminal}
+                        title={tr('files.editors.minecraftProperties.sections.rconQuery', 'RCON & Query')}
+                        description={tr(
+                            'files.editors.minecraftProperties.sectionsDescriptions.rconQuery',
+                            'Remote console and query protocol settings',
+                        )}
+                    />
                     <div className='grid grid-cols-1 gap-6 md:grid-cols-2 xl:grid-cols-3'>
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 flex items-center gap-2 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                <Shield className='text-primary h-3 w-3' />
-                                {t('files.editors.minecraftProperties.fields.spawnProtection.label') ||
-                                    'Spawn Protection'}
-                            </label>
-                            <Input
-                                type='number'
-                                value={localForm.spawnProtection}
-                                onChange={(e) =>
-                                    updateForm('spawnProtection', Number.parseInt(e.target.value, 10) || 0)
-                                }
-                                readOnly={readonly}
-                                min={0}
-                                max={30000000}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.spawnProtection.description') ||
-                                    'Radius of spawn protection (0 to disable)'}
-                            </p>
-                        </div>
-
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 flex items-center gap-2 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                <Eye className='text-primary h-3 w-3' />
-                                {t('files.editors.minecraftProperties.fields.viewDistance.label') || 'View Distance'}
-                            </label>
-                            <Input
-                                type='number'
-                                value={localForm.viewDistance}
-                                onChange={(e) => updateForm('viewDistance', Number.parseInt(e.target.value, 10) || 0)}
-                                readOnly={readonly}
-                                min={3}
-                                max={32}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.viewDistance.description') ||
-                                    'Maximum chunk render distance (3-32)'}
-                            </p>
-                        </div>
-
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                {t('files.editors.minecraftProperties.fields.simulationDistance.label') ||
-                                    'Simulation Distance'}
-                            </label>
-                            <Input
-                                type='number'
-                                value={localForm.simulationDistance}
-                                onChange={(e) =>
-                                    updateForm('simulationDistance', Number.parseInt(e.target.value, 10) || 0)
-                                }
-                                readOnly={readonly}
-                                min={3}
-                                max={32}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.simulationDistance.description') ||
-                                    'Maximum chunk simulation distance (3-32)'}
-                            </p>
-                        </div>
-
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                {t('files.editors.minecraftProperties.fields.maxWorldSize.label') || 'Max World Size'}
-                            </label>
-                            <Input
-                                type='number'
-                                value={localForm.maxWorldSize}
-                                onChange={(e) => updateForm('maxWorldSize', Number.parseInt(e.target.value, 10) || 0)}
-                                readOnly={readonly}
-                                min={1}
-                                max={29999984}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.maxWorldSize.description') ||
-                                    'Maximum world size in blocks'}
-                            </p>
-                        </div>
-
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                {t('files.editors.minecraftProperties.fields.maxChainedNeighborUpdates.label') ||
-                                    'Max Chained Neighbor Updates'}
-                            </label>
-                            <Input
-                                type='number'
-                                value={localForm.maxChainedNeighborUpdates}
-                                onChange={(e) =>
-                                    updateForm('maxChainedNeighborUpdates', Number.parseInt(e.target.value, 10) || 0)
-                                }
-                                readOnly={readonly}
-                                min={-1}
-                                max={16777215}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.maxChainedNeighborUpdates.description') ||
-                                    'Maximum chained block updates (-1 for unlimited)'}
-                            </p>
-                        </div>
-
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                {t('files.editors.minecraftProperties.fields.entityBroadcastRangePercentage.label') ||
-                                    'Entity Broadcast Range %'}
-                            </label>
-                            <Input
-                                type='number'
-                                value={localForm.entityBroadcastRangePercentage}
-                                onChange={(e) =>
-                                    updateForm(
-                                        'entityBroadcastRangePercentage',
-                                        Number.parseInt(e.target.value, 10) || 0,
-                                    )
-                                }
-                                readOnly={readonly}
-                                min={0}
-                                max={500}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t(
-                                    'files.editors.minecraftProperties.fields.entityBroadcastRangePercentage.description',
-                                ) || 'Entity broadcast range percentage (0-500)'}
-                            </p>
-                        </div>
+                        <CheckboxSetting
+                            label={tr('files.editors.minecraftProperties.fields.enableRcon.label', 'Enable RCON')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.enableRcon.description',
+                                'Enable remote console access',
+                            )}
+                            checked={localForm.enableRcon}
+                            onCheckedChange={(checked) => updateForm('enableRcon', checked === true)}
+                            disabled={readonly}
+                        />
+                        <NumberSetting
+                            label={tr('files.editors.minecraftProperties.fields.rconPort.label', 'RCON Port')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.rconPort.description',
+                                'Port used for RCON connections',
+                            )}
+                            value={localForm.rconPort}
+                            onChange={(value) => updateForm('rconPort', value)}
+                            readOnly={readonly}
+                            min={1}
+                            max={65535}
+                        />
+                        <TextSetting
+                            label={tr('files.editors.minecraftProperties.fields.rconPassword.label', 'RCON Password')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.rconPassword.description',
+                                'Password required for RCON access',
+                            )}
+                            value={localForm.rconPassword}
+                            onChange={(value) => updateForm('rconPassword', value)}
+                            readOnly={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.broadcastRconToOps.label',
+                                'Broadcast RCON to OPs',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.broadcastRconToOps.description',
+                                'Send RCON command output to online operators',
+                            )}
+                            checked={localForm.broadcastRconToOps}
+                            onCheckedChange={(checked) => updateForm('broadcastRconToOps', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr('files.editors.minecraftProperties.fields.enableQuery.label', 'Enable Query')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.enableQuery.description',
+                                'Enable GameSpy4 query protocol',
+                            )}
+                            checked={localForm.enableQuery}
+                            onCheckedChange={(checked) => updateForm('enableQuery', checked === true)}
+                            disabled={readonly}
+                        />
+                        <NumberSetting
+                            label={tr('files.editors.minecraftProperties.fields.queryPort.label', 'Query Port')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.queryPort.description',
+                                'Port used for query protocol responses',
+                            )}
+                            value={localForm.queryPort}
+                            onChange={(value) => updateForm('queryPort', value)}
+                            readOnly={readonly}
+                            min={1}
+                            max={65535}
+                        />
                     </div>
                 </section>
 
                 <section className='space-y-6'>
-                    <div className='border-border/10 flex items-center gap-4 border-b pb-6'>
-                        <div className='bg-primary/10 border-primary/20 flex h-10 w-10 items-center justify-center rounded-xl border'>
-                            <FileArchive className='text-primary h-5 w-5' />
-                        </div>
-                        <div className='space-y-0.5'>
-                            <h3 className='text-xl font-black tracking-tight uppercase italic'>
-                                {t('files.editors.minecraftProperties.sections.resourcePack') || 'Resource Pack'}
-                            </h3>
-                            <p className='text-muted-foreground text-[9px] font-bold tracking-widest uppercase opacity-50'>
-                                {t('files.editors.minecraftProperties.sectionsDescriptions.resourcePack') ||
-                                    'Resource pack configuration'}
-                            </p>
-                        </div>
+                    <SectionHeader
+                        icon={Server}
+                        title={tr('files.editors.minecraftProperties.sections.managementServer', 'Management Server')}
+                        description={tr(
+                            'files.editors.minecraftProperties.sectionsDescriptions.managementServer',
+                            'Built-in management API settings',
+                        )}
+                    />
+                    <div className='grid grid-cols-1 gap-6 md:grid-cols-2 xl:grid-cols-3'>
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.managementServerEnabled.label',
+                                'Enable Management Server',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.managementServerEnabled.description',
+                                'Enable the built-in management server API',
+                            )}
+                            checked={localForm.managementServerEnabled}
+                            onCheckedChange={(checked) => updateForm('managementServerEnabled', checked === true)}
+                            disabled={readonly}
+                        />
+                        <TextSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.managementServerHost.label',
+                                'Management Server Host',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.managementServerHost.description',
+                                'Host address for the management server',
+                            )}
+                            value={localForm.managementServerHost}
+                            onChange={(value) => updateForm('managementServerHost', value)}
+                            readOnly={readonly}
+                        />
+                        <NumberSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.managementServerPort.label',
+                                'Management Server Port',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.managementServerPort.description',
+                                'Port for the management server (0 for automatic)',
+                            )}
+                            value={localForm.managementServerPort}
+                            onChange={(value) => updateForm('managementServerPort', value)}
+                            readOnly={readonly}
+                            min={0}
+                            max={65535}
+                        />
+                        <TextSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.managementServerSecret.label',
+                                'Management Server Secret',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.managementServerSecret.description',
+                                'Shared secret for management server authentication',
+                            )}
+                            value={localForm.managementServerSecret}
+                            onChange={(value) => updateForm('managementServerSecret', value)}
+                            readOnly={readonly}
+                        />
+                        <TextSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.managementServerAllowedOrigins.label',
+                                'Allowed Origins',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.managementServerAllowedOrigins.description',
+                                'Comma-separated list of allowed CORS origins',
+                            )}
+                            value={localForm.managementServerAllowedOrigins}
+                            onChange={(value) => updateForm('managementServerAllowedOrigins', value)}
+                            readOnly={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.managementServerTlsEnabled.label',
+                                'Management TLS Enabled',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.managementServerTlsEnabled.description',
+                                'Use TLS for management server connections',
+                            )}
+                            checked={localForm.managementServerTlsEnabled}
+                            onCheckedChange={(checked) => updateForm('managementServerTlsEnabled', checked === true)}
+                            disabled={readonly}
+                        />
+                        <TextSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.managementServerTlsKeystore.label',
+                                'TLS Keystore Path',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.managementServerTlsKeystore.description',
+                                'Path to the TLS keystore file',
+                            )}
+                            value={localForm.managementServerTlsKeystore}
+                            onChange={(value) => updateForm('managementServerTlsKeystore', value)}
+                            readOnly={readonly}
+                        />
+                        <TextSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.managementServerTlsKeystorePassword.label',
+                                'TLS Keystore Password',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.managementServerTlsKeystorePassword.description',
+                                'Password for the TLS keystore',
+                            )}
+                            value={localForm.managementServerTlsKeystorePassword}
+                            onChange={(value) => updateForm('managementServerTlsKeystorePassword', value)}
+                            readOnly={readonly}
+                        />
                     </div>
-                    <div className='grid grid-cols-1 gap-6 xl:grid-cols-2'>
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.requireResourcePack.label') ||
-                                            'Require Resource Pack'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t(
-                                            'files.editors.minecraftProperties.fields.requireResourcePack.description',
-                                        ) || 'Force players to use the resource pack'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.requireResourcePack}
-                                    onCheckedChange={(checked) => updateForm('requireResourcePack', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6 xl:col-span-2'>
-                            <label className='text-muted-foreground ml-1 flex items-center gap-2 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                <FileArchive className='text-primary h-3 w-3' />
-                                {t('files.editors.minecraftProperties.fields.resourcePack.label') ||
-                                    'Resource Pack URL'}
-                            </label>
-                            <Input
-                                type='text'
-                                value={localForm.resourcePack}
-                                onChange={(e) => updateForm('resourcePack', e.target.value)}
-                                readOnly={readonly}
-                                placeholder='https://example.com/resource-pack.zip'
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.resourcePack.description') ||
-                                    'URL to the resource pack file'}
-                            </p>
-                        </div>
-
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 flex items-center gap-2 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                <Hash className='text-primary h-3 w-3' />
-                                {t('files.editors.minecraftProperties.fields.resourcePackSha1.label') ||
-                                    'Resource Pack SHA1'}
-                            </label>
-                            <Input
-                                type='text'
-                                value={localForm.resourcePackSha1}
-                                onChange={(e) => updateForm('resourcePackSha1', e.target.value)}
-                                readOnly={readonly}
-                                placeholder='0f1412443d23a48f1a74d661c45bc9a904269db2'
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.resourcePackSha1.description') ||
-                                    'SHA1 hash of the resource pack'}
-                            </p>
-                        </div>
+                </section>
 
+                <section className='space-y-6'>
+                    <SectionHeader
+                        icon={Eye}
+                        title={tr('files.editors.minecraftProperties.sections.performance', 'Performance Settings')}
+                        description={tr(
+                            'files.editors.minecraftProperties.sectionsDescriptions.performance',
+                            'Server performance and rendering settings',
+                        )}
+                    />
+                    <div className='grid grid-cols-1 gap-6 md:grid-cols-2 xl:grid-cols-3'>
+                        <NumberSetting
+                            icon={Shield}
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.spawnProtection.label',
+                                'Spawn Protection',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.spawnProtection.description',
+                                'Radius of spawn protection (0 to disable)',
+                            )}
+                            value={localForm.spawnProtection}
+                            onChange={(value) => updateForm('spawnProtection', value)}
+                            readOnly={readonly}
+                            min={0}
+                        />
+                        <NumberSetting
+                            icon={Eye}
+                            label={tr('files.editors.minecraftProperties.fields.viewDistance.label', 'View Distance')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.viewDistance.description',
+                                'Maximum chunk render distance (3-32)',
+                            )}
+                            value={localForm.viewDistance}
+                            onChange={(value) => updateForm('viewDistance', value)}
+                            readOnly={readonly}
+                            min={3}
+                            max={32}
+                        />
+                        <NumberSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.simulationDistance.label',
+                                'Simulation Distance',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.simulationDistance.description',
+                                'Maximum chunk simulation distance (3-32)',
+                            )}
+                            value={localForm.simulationDistance}
+                            onChange={(value) => updateForm('simulationDistance', value)}
+                            readOnly={readonly}
+                            min={3}
+                            max={32}
+                        />
+                        <NumberSetting
+                            label={tr('files.editors.minecraftProperties.fields.maxWorldSize.label', 'Max World Size')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.maxWorldSize.description',
+                                'Maximum world size in blocks',
+                            )}
+                            value={localForm.maxWorldSize}
+                            onChange={(value) => updateForm('maxWorldSize', value)}
+                            readOnly={readonly}
+                            min={1}
+                            max={29999984}
+                        />
+                        <NumberSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.maxChainedNeighborUpdates.label',
+                                'Max Chained Neighbor Updates',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.maxChainedNeighborUpdates.description',
+                                'Maximum chained block updates',
+                            )}
+                            value={localForm.maxChainedNeighborUpdates}
+                            onChange={(value) => updateForm('maxChainedNeighborUpdates', value)}
+                            readOnly={readonly}
+                            min={0}
+                        />
+                        <NumberSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.entityBroadcastRangePercentage.label',
+                                'Entity Broadcast Range %',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.entityBroadcastRangePercentage.description',
+                                'Entity broadcast range percentage (0-500)',
+                            )}
+                            value={localForm.entityBroadcastRangePercentage}
+                            onChange={(value) => updateForm('entityBroadcastRangePercentage', value)}
+                            readOnly={readonly}
+                            min={0}
+                            max={500}
+                        />
+                        <NumberSetting
+                            label={tr('files.editors.minecraftProperties.fields.maxTickTime.label', 'Max Tick Time')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.maxTickTime.description',
+                                'Maximum milliseconds per tick before watchdog stops the server',
+                            )}
+                            value={localForm.maxTickTime}
+                            onChange={(value) => updateForm('maxTickTime', value)}
+                            readOnly={readonly}
+                            min={0}
+                        />
+                        <NumberSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.statusHeartbeatInterval.label',
+                                'Status Heartbeat Interval',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.statusHeartbeatInterval.description',
+                                'Interval in seconds for status heartbeats (0 to disable)',
+                            )}
+                            value={localForm.statusHeartbeatInterval}
+                            onChange={(value) => updateForm('statusHeartbeatInterval', value)}
+                            readOnly={readonly}
+                            min={0}
+                        />
                         <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 flex items-center gap-2 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                <Hash className='text-primary h-3 w-3' />
-                                {t('files.editors.minecraftProperties.fields.resourcePackId.label') ||
-                                    'Resource Pack ID'}
-                            </label>
-                            <Input
-                                type='text'
-                                value={localForm.resourcePackId}
-                                onChange={(e) => updateForm('resourcePackId', e.target.value)}
-                                readOnly={readonly}
-                                placeholder='119e9b1e-d244-5ba3-e070-bb226e6753d1'
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.resourcePackId.description') ||
-                                    'Unique identifier for the resource pack'}
-                            </p>
-                        </div>
-
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6 xl:col-span-2'>
                             <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                {t('files.editors.minecraftProperties.fields.resourcePackPrompt.label') ||
-                                    'Resource Pack Prompt'}
+                                {tr(
+                                    'files.editors.minecraftProperties.fields.regionFileCompression.label',
+                                    'Region File Compression',
+                                )}
                             </label>
-                            <Textarea
-                                value={localForm.resourcePackPrompt}
-                                onChange={(e) => updateForm('resourcePackPrompt', e.target.value)}
-                                readOnly={readonly}
-                                rows={2}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.resourcePackPrompt.description') ||
-                                    'Message shown when prompting players to download the resource pack'}
-                            </p>
+                            <Select
+                                disabled={readonly}
+                                value={localForm.regionFileCompression}
+                                onChange={(e) => updateForm('regionFileCompression', e.target.value)}
+                            >
+                                <option value='deflate'>
+                                    {tr(
+                                        'files.editors.minecraftProperties.options.regionFileCompression.deflate',
+                                        'Deflate',
+                                    )}
+                                </option>
+                                <option value='none'>
+                                    {tr('files.editors.minecraftProperties.options.regionFileCompression.none', 'None')}
+                                </option>
+                                <option value='lz4'>
+                                    {tr('files.editors.minecraftProperties.options.regionFileCompression.lz4', 'LZ4')}
+                                </option>
+                            </Select>
                         </div>
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.syncChunkWrites.label',
+                                'Sync Chunk Writes',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.syncChunkWrites.description',
+                                'Synchronously write chunk data to disk',
+                            )}
+                            checked={localForm.syncChunkWrites}
+                            onCheckedChange={(checked) => updateForm('syncChunkWrites', checked === true)}
+                            disabled={readonly}
+                        />
                     </div>
                 </section>
 
                 <section className='space-y-6'>
-                    <div className='border-border/10 flex items-center gap-4 border-b pb-6'>
-                        <div className='bg-primary/10 border-primary/20 flex h-10 w-10 items-center justify-center rounded-xl border'>
-                            <Sliders className='text-primary h-5 w-5' />
-                        </div>
-                        <div className='space-y-0.5'>
-                            <h3 className='text-xl font-black tracking-tight uppercase italic'>
-                                {t('files.editors.minecraftProperties.sections.advanced') || 'Advanced Settings'}
-                            </h3>
-                            <p className='text-muted-foreground text-[9px] font-bold tracking-widest uppercase opacity-50'>
-                                {t('files.editors.minecraftProperties.sectionsDescriptions.advanced') ||
-                                    'Advanced server configuration'}
-                            </p>
-                        </div>
+                    <SectionHeader
+                        icon={FileArchive}
+                        title={tr('files.editors.minecraftProperties.sections.resourcePack', 'Resource Pack')}
+                        description={tr(
+                            'files.editors.minecraftProperties.sectionsDescriptions.resourcePack',
+                            'Resource pack configuration',
+                        )}
+                    />
+                    <div className='grid grid-cols-1 gap-6 xl:grid-cols-2'>
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.requireResourcePack.label',
+                                'Require Resource Pack',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.requireResourcePack.description',
+                                'Force players to use the resource pack',
+                            )}
+                            checked={localForm.requireResourcePack}
+                            onCheckedChange={(checked) => updateForm('requireResourcePack', checked === true)}
+                            disabled={readonly}
+                        />
+                        <TextSetting
+                            icon={FileArchive}
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.resourcePack.label',
+                                'Resource Pack URL',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.resourcePack.description',
+                                'URL to the resource pack file',
+                            )}
+                            value={localForm.resourcePack}
+                            onChange={(value) => updateForm('resourcePack', value)}
+                            readOnly={readonly}
+                            placeholder='https://example.com/resource-pack.zip'
+                        />
+                        <TextSetting
+                            icon={Hash}
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.resourcePackSha1.label',
+                                'Resource Pack SHA1',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.resourcePackSha1.description',
+                                'SHA1 hash of the resource pack',
+                            )}
+                            value={localForm.resourcePackSha1}
+                            onChange={(value) => updateForm('resourcePackSha1', value)}
+                            readOnly={readonly}
+                        />
+                        <TextSetting
+                            icon={Hash}
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.resourcePackId.label',
+                                'Resource Pack ID',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.resourcePackId.description',
+                                'Unique identifier for the resource pack',
+                            )}
+                            value={localForm.resourcePackId}
+                            onChange={(value) => updateForm('resourcePackId', value)}
+                            readOnly={readonly}
+                        />
+                        <TextSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.resourcePackPrompt.label',
+                                'Resource Pack Prompt',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.resourcePackPrompt.description',
+                                'Message shown when prompting players to download the resource pack',
+                            )}
+                            value={localForm.resourcePackPrompt}
+                            onChange={(value) => updateForm('resourcePackPrompt', value)}
+                            readOnly={readonly}
+                            multiline
+                        />
                     </div>
-                    <div className='grid grid-cols-1 gap-6 md:grid-cols-2 xl:grid-cols-3'>
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                {t('files.editors.minecraftProperties.fields.opPermissionLevel.label') ||
-                                    'OP Permission Level'}
-                            </label>
-                            <Input
-                                type='number'
-                                value={localForm.opPermissionLevel}
-                                onChange={(e) =>
-                                    updateForm('opPermissionLevel', Number.parseInt(e.target.value, 10) || 0)
-                                }
-                                readOnly={readonly}
-                                min={1}
-                                max={4}
-                            />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.opPermissionLevel.description') ||
-                                    'Permission level for server operators (1-4)'}
-                            </p>
-                        </div>
+                </section>
 
-                        <div className='bg-card/30 border-border/30 space-y-3 rounded-xl border p-6'>
-                            <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                {t('files.editors.minecraftProperties.fields.functionPermissionLevel.label') ||
-                                    'Function Permission Level'}
-                            </label>
-                            <Input
-                                type='number'
-                                value={localForm.functionPermissionLevel}
-                                onChange={(e) =>
-                                    updateForm('functionPermissionLevel', Number.parseInt(e.target.value, 10) || 0)
-                                }
-                                readOnly={readonly}
-                                min={1}
-                                max={4}
+                <section className='space-y-6'>
+                    <SectionHeader
+                        icon={Sliders}
+                        title={tr('files.editors.minecraftProperties.sections.advanced', 'Advanced Settings')}
+                        description={tr(
+                            'files.editors.minecraftProperties.sectionsDescriptions.advanced',
+                            'Advanced server configuration',
+                        )}
+                    />
+                    <div className='grid grid-cols-1 gap-6 md:grid-cols-2 xl:grid-cols-3'>
+                        <NumberSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.opPermissionLevel.label',
+                                'OP Permission Level',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.opPermissionLevel.description',
+                                'Permission level for server operators (1-4)',
+                            )}
+                            value={localForm.opPermissionLevel}
+                            onChange={(value) => updateForm('opPermissionLevel', value)}
+                            readOnly={readonly}
+                            min={1}
+                            max={4}
+                        />
+                        <NumberSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.functionPermissionLevel.label',
+                                'Function Permission Level',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.functionPermissionLevel.description',
+                                'Permission level required to use functions (1-4)',
+                            )}
+                            value={localForm.functionPermissionLevel}
+                            onChange={(value) => updateForm('functionPermissionLevel', value)}
+                            readOnly={readonly}
+                            min={1}
+                            max={4}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.broadcastConsoleToOps.label',
+                                'Broadcast Console to OPs',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.broadcastConsoleToOps.description',
+                                'Send console messages to operators',
+                            )}
+                            checked={localForm.broadcastConsoleToOps}
+                            onCheckedChange={(checked) => updateForm('broadcastConsoleToOps', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr('files.editors.minecraftProperties.fields.debug.label', 'Debug Mode')}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.debug.description',
+                                'Enable debug logging',
+                            )}
+                            checked={localForm.debug}
+                            onCheckedChange={(checked) => updateForm('debug', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.enableJmxMonitoring.label',
+                                'Enable JMX Monitoring',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.enableJmxMonitoring.description',
+                                'Expose JMX monitoring beans',
+                            )}
+                            checked={localForm.enableJmxMonitoring}
+                            onCheckedChange={(checked) => updateForm('enableJmxMonitoring', checked === true)}
+                            disabled={readonly}
+                        />
+                        <CheckboxSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.enableCodeOfConduct.label',
+                                'Enable Code of Conduct',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.enableCodeOfConduct.description',
+                                'Enable the Minecraft code of conduct system',
+                            )}
+                            checked={localForm.enableCodeOfConduct}
+                            onCheckedChange={(checked) => updateForm('enableCodeOfConduct', checked === true)}
+                            disabled={readonly}
+                        />
+                        <TextSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.bugReportLink.label',
+                                'Bug Report Link',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.bugReportLink.description',
+                                'URL shown to players for reporting bugs',
+                            )}
+                            value={localForm.bugReportLink}
+                            onChange={(value) => updateForm('bugReportLink', value)}
+                            readOnly={readonly}
+                        />
+                        <TextSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.textFilteringConfig.label',
+                                'Text Filtering Config',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.textFilteringConfig.description',
+                                'Path or configuration for chat text filtering',
+                            )}
+                            value={localForm.textFilteringConfig}
+                            onChange={(value) => updateForm('textFilteringConfig', value)}
+                            readOnly={readonly}
+                        />
+                        <NumberSetting
+                            label={tr(
+                                'files.editors.minecraftProperties.fields.textFilteringVersion.label',
+                                'Text Filtering Version',
+                            )}
+                            description={tr(
+                                'files.editors.minecraftProperties.fields.textFilteringVersion.description',
+                                'Text filtering configuration version',
+                            )}
+                            value={localForm.textFilteringVersion}
+                            onChange={(value) => updateForm('textFilteringVersion', value)}
+                            readOnly={readonly}
+                            min={0}
+                        />
+                        {hasKey('previews-chat') && (
+                            <CheckboxSetting
+                                label={tr(
+                                    'files.editors.minecraftProperties.fields.previewsChat.label',
+                                    'Previews Chat',
+                                )}
+                                description={tr(
+                                    'files.editors.minecraftProperties.fields.previewsChat.description',
+                                    'Enable chat message previews',
+                                )}
+                                checked={localForm.previewsChat}
+                                onCheckedChange={(checked) => updateForm('previewsChat', checked === true)}
+                                disabled={readonly}
                             />
-                            <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                {t('files.editors.minecraftProperties.fields.functionPermissionLevel.description') ||
-                                    'Permission level required to use functions (1-4)'}
-                            </p>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.broadcastConsoleToOps.label') ||
-                                            'Broadcast Console to OPs'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t(
-                                            'files.editors.minecraftProperties.fields.broadcastConsoleToOps.description',
-                                        ) || 'Send console messages to operators'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.broadcastConsoleToOps}
-                                    onCheckedChange={(checked) => updateForm('broadcastConsoleToOps', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='bg-muted/10 border-border/20 hover:border-border/40 space-y-3 rounded-xl border p-5 transition-all'>
-                            <div className='flex items-start justify-between gap-4'>
-                                <div className='space-y-1'>
-                                    <label className='text-muted-foreground ml-1 text-[9px] font-black tracking-[0.2em] uppercase'>
-                                        {t('files.editors.minecraftProperties.fields.previewsChat.label') ||
-                                            'Previews Chat'}
-                                    </label>
-                                    <p className='text-muted-foreground ml-1 text-[9px] font-black tracking-widest uppercase opacity-60'>
-                                        {t('files.editors.minecraftProperties.fields.previewsChat.description') ||
-                                            'Enable chat message previews'}
-                                    </p>
-                                </div>
-                                <Checkbox
-                                    checked={localForm.previewsChat}
-                                    onCheckedChange={(checked) => updateForm('previewsChat', checked)}
-                                    disabled={readonly}
-                                />
-                            </div>
-                        </div>
+                        )}
                     </div>
                 </section>
             </div>
diff --git a/frontendv2/src/components/server/files/editors/minecraftServerPropertiesModel.ts b/frontendv2/src/components/server/files/editors/minecraftServerPropertiesModel.ts
new file mode 100644
index 000000000..a7e2ee42a
--- /dev/null
+++ b/frontendv2/src/components/server/files/editors/minecraftServerPropertiesModel.ts
@@ -0,0 +1,466 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+export interface MinecraftServerPropertiesForm {
+    motd: string;
+    serverName: string;
+    difficulty: string;
+    gamemode: string;
+    levelType: string;
+    maxPlayers: number;
+    whiteList: boolean;
+    enforceWhitelist: boolean;
+    onlineMode: boolean;
+    pvp: boolean;
+    enableCommandBlock: boolean;
+    allowFlight: boolean;
+    spawnMonsters: boolean;
+    allowNether: boolean;
+    forceGamemode: boolean;
+    broadcastConsoleToOps: boolean;
+    broadcastRconToOps: boolean;
+    spawnProtection: number;
+    viewDistance: number;
+    simulationDistance: number;
+    levelName: string;
+    levelSeed: string;
+    generatorSettings: string;
+    generateStructures: boolean;
+    hardcore: boolean;
+    requireResourcePack: boolean;
+    hideOnlinePlayers: boolean;
+    enforceSecureProfile: boolean;
+    previewsChat: boolean;
+    useNativeTransport: boolean;
+    resourcePack: string;
+    resourcePackSha1: string;
+    resourcePackId: string;
+    resourcePackPrompt: string;
+    opPermissionLevel: number;
+    functionPermissionLevel: number;
+    entityBroadcastRangePercentage: number;
+    maxChainedNeighborUpdates: number;
+    maxWorldSize: number;
+    acceptsTransfers: boolean;
+    bugReportLink: string;
+    debug: boolean;
+    enableCodeOfConduct: boolean;
+    enableJmxMonitoring: boolean;
+    enableQuery: boolean;
+    enableRcon: boolean;
+    enableStatus: boolean;
+    initialDisabledPacks: string;
+    initialEnabledPacks: string;
+    logIps: boolean;
+    managementServerAllowedOrigins: string;
+    managementServerEnabled: boolean;
+    managementServerHost: string;
+    managementServerPort: number;
+    managementServerSecret: string;
+    managementServerTlsEnabled: boolean;
+    managementServerTlsKeystore: string;
+    managementServerTlsKeystorePassword: string;
+    maxTickTime: number;
+    networkCompressionThreshold: number;
+    pauseWhenEmptySeconds: number;
+    playerIdleTimeout: number;
+    preventProxyConnections: boolean;
+    queryPort: number;
+    rateLimit: number;
+    rconPassword: string;
+    rconPort: number;
+    regionFileCompression: string;
+    serverIp: string;
+    serverPort: number;
+    statusHeartbeatInterval: number;
+    syncChunkWrites: boolean;
+    textFilteringConfig: string;
+    textFilteringVersion: number;
+}
+
+export function parseProperties(content: string): Map<string, string> {
+    const map = new Map<string, string>();
+    content
+        .split(/\r?\n/)
+        .map((line) => line.trim())
+        .forEach((line) => {
+            if (!line || line.startsWith('#')) {
+                return;
+            }
+
+            const separatorIndex = line.indexOf('=');
+            if (separatorIndex === -1) {
+                return;
+            }
+
+            const key = line.slice(0, separatorIndex).trim();
+            const value = unescapePropertyValue(line.slice(separatorIndex + 1).trim());
+            if (key) {
+                map.set(key, value);
+            }
+        });
+
+    return map;
+}
+
+export function unescapePropertyValue(value: string): string {
+    let result = '';
+    for (let i = 0; i < value.length; i += 1) {
+        if (value[i] === '\\' && i + 1 < value.length) {
+            result += value[i + 1];
+            i += 1;
+        } else {
+            result += value[i];
+        }
+    }
+    return result;
+}
+
+export function escapePropertyValue(value: string): string {
+    return value.replace(/\\/g, '\\\\').replace(/:/g, '\\:').replace(/=/g, '\\=');
+}
+
+export function getDefaultForm(): MinecraftServerPropertiesForm {
+    return {
+        motd: 'A Minecraft Server',
+        serverName: 'Unknown Server',
+        difficulty: 'easy',
+        gamemode: 'survival',
+        levelType: 'minecraft:normal',
+        maxPlayers: 20,
+        whiteList: false,
+        enforceWhitelist: false,
+        onlineMode: true,
+        pvp: true,
+        enableCommandBlock: false,
+        allowFlight: false,
+        spawnMonsters: true,
+        allowNether: true,
+        forceGamemode: false,
+        broadcastConsoleToOps: true,
+        broadcastRconToOps: true,
+        spawnProtection: 16,
+        viewDistance: 10,
+        simulationDistance: 10,
+        levelName: 'world',
+        levelSeed: '',
+        generatorSettings: '{}',
+        generateStructures: true,
+        hardcore: false,
+        requireResourcePack: false,
+        hideOnlinePlayers: false,
+        enforceSecureProfile: true,
+        previewsChat: true,
+        useNativeTransport: true,
+        resourcePack: '',
+        resourcePackSha1: '',
+        resourcePackId: '',
+        resourcePackPrompt: '',
+        opPermissionLevel: 4,
+        functionPermissionLevel: 2,
+        entityBroadcastRangePercentage: 100,
+        maxChainedNeighborUpdates: 1000000,
+        maxWorldSize: 29999984,
+        acceptsTransfers: false,
+        bugReportLink: '',
+        debug: false,
+        enableCodeOfConduct: false,
+        enableJmxMonitoring: false,
+        enableQuery: false,
+        enableRcon: false,
+        enableStatus: true,
+        initialDisabledPacks: '',
+        initialEnabledPacks: 'vanilla',
+        logIps: true,
+        managementServerAllowedOrigins: '',
+        managementServerEnabled: false,
+        managementServerHost: 'localhost',
+        managementServerPort: 0,
+        managementServerSecret: '',
+        managementServerTlsEnabled: true,
+        managementServerTlsKeystore: '',
+        managementServerTlsKeystorePassword: '',
+        maxTickTime: 60000,
+        networkCompressionThreshold: 256,
+        pauseWhenEmptySeconds: -1,
+        playerIdleTimeout: 0,
+        preventProxyConnections: false,
+        queryPort: 25565,
+        rateLimit: 0,
+        rconPassword: '',
+        rconPort: 25575,
+        regionFileCompression: 'deflate',
+        serverIp: '',
+        serverPort: 25565,
+        statusHeartbeatInterval: 0,
+        syncChunkWrites: true,
+        textFilteringConfig: '',
+        textFilteringVersion: 0,
+    };
+}
+
+function parseBoolean(parsed: Map<string, string>, key: string, fallback: boolean): boolean {
+    const value = parsed.get(key);
+    if (value === undefined) {
+        return fallback;
+    }
+    return value === 'true';
+}
+
+function parseIntValue(parsed: Map<string, string>, key: string, fallback: number): number {
+    const value = parsed.get(key);
+    if (value === undefined || value === '') {
+        return fallback;
+    }
+    const parsedValue = Number.parseInt(value, 10);
+    return Number.isNaN(parsedValue) ? fallback : parsedValue;
+}
+
+function parseString(parsed: Map<string, string>, key: string, fallback: string): string {
+    return parsed.get(key) ?? fallback;
+}
+
+export function parseForm(content: string): MinecraftServerPropertiesForm {
+    const parsed = parseProperties(content);
+    const form = getDefaultForm();
+
+    return {
+        motd: parseString(parsed, 'motd', form.motd),
+        serverName: parseString(parsed, 'server-name', form.serverName),
+        difficulty: parseString(parsed, 'difficulty', form.difficulty),
+        gamemode: parseString(parsed, 'gamemode', form.gamemode),
+        levelType: parseString(parsed, 'level-type', form.levelType),
+        maxPlayers: parseIntValue(parsed, 'max-players', form.maxPlayers),
+        whiteList: parseBoolean(parsed, 'white-list', form.whiteList),
+        enforceWhitelist: parseBoolean(parsed, 'enforce-whitelist', form.enforceWhitelist),
+        onlineMode: parseBoolean(parsed, 'online-mode', form.onlineMode),
+        pvp: parseBoolean(parsed, 'pvp', form.pvp),
+        enableCommandBlock: parseBoolean(parsed, 'enable-command-block', form.enableCommandBlock),
+        allowFlight: parseBoolean(parsed, 'allow-flight', form.allowFlight),
+        spawnMonsters: parseBoolean(parsed, 'spawn-monsters', form.spawnMonsters),
+        allowNether: parseBoolean(parsed, 'allow-nether', form.allowNether),
+        forceGamemode: parseBoolean(parsed, 'force-gamemode', form.forceGamemode),
+        broadcastConsoleToOps: parseBoolean(parsed, 'broadcast-console-to-ops', form.broadcastConsoleToOps),
+        broadcastRconToOps: parseBoolean(parsed, 'broadcast-rcon-to-ops', form.broadcastRconToOps),
+        spawnProtection: parseIntValue(parsed, 'spawn-protection', form.spawnProtection),
+        viewDistance: parseIntValue(parsed, 'view-distance', form.viewDistance),
+        simulationDistance: parseIntValue(parsed, 'simulation-distance', form.simulationDistance),
+        levelName: parseString(parsed, 'level-name', form.levelName),
+        levelSeed: parseString(parsed, 'level-seed', form.levelSeed),
+        generatorSettings: parseString(parsed, 'generator-settings', form.generatorSettings),
+        generateStructures: parseBoolean(parsed, 'generate-structures', form.generateStructures),
+        hardcore: parseBoolean(parsed, 'hardcore', form.hardcore),
+        requireResourcePack: parseBoolean(parsed, 'require-resource-pack', form.requireResourcePack),
+        hideOnlinePlayers: parseBoolean(parsed, 'hide-online-players', form.hideOnlinePlayers),
+        enforceSecureProfile: parseBoolean(parsed, 'enforce-secure-profile', form.enforceSecureProfile),
+        previewsChat: parseBoolean(parsed, 'previews-chat', form.previewsChat),
+        useNativeTransport: parseBoolean(parsed, 'use-native-transport', form.useNativeTransport),
+        resourcePack: parseString(parsed, 'resource-pack', form.resourcePack),
+        resourcePackSha1: parseString(parsed, 'resource-pack-sha1', form.resourcePackSha1),
+        resourcePackId: parseString(parsed, 'resource-pack-id', form.resourcePackId),
+        resourcePackPrompt: parseString(parsed, 'resource-pack-prompt', form.resourcePackPrompt),
+        opPermissionLevel: parseIntValue(parsed, 'op-permission-level', form.opPermissionLevel),
+        functionPermissionLevel: parseIntValue(parsed, 'function-permission-level', form.functionPermissionLevel),
+        entityBroadcastRangePercentage: parseIntValue(
+            parsed,
+            'entity-broadcast-range-percentage',
+            form.entityBroadcastRangePercentage,
+        ),
+        maxChainedNeighborUpdates: parseIntValue(
+            parsed,
+            'max-chained-neighbor-updates',
+            form.maxChainedNeighborUpdates,
+        ),
+        maxWorldSize: parseIntValue(parsed, 'max-world-size', form.maxWorldSize),
+        acceptsTransfers: parseBoolean(parsed, 'accepts-transfers', form.acceptsTransfers),
+        bugReportLink: parseString(parsed, 'bug-report-link', form.bugReportLink),
+        debug: parseBoolean(parsed, 'debug', form.debug),
+        enableCodeOfConduct: parseBoolean(parsed, 'enable-code-of-conduct', form.enableCodeOfConduct),
+        enableJmxMonitoring: parseBoolean(parsed, 'enable-jmx-monitoring', form.enableJmxMonitoring),
+        enableQuery: parseBoolean(parsed, 'enable-query', form.enableQuery),
+        enableRcon: parseBoolean(parsed, 'enable-rcon', form.enableRcon),
+        enableStatus: parseBoolean(parsed, 'enable-status', form.enableStatus),
+        initialDisabledPacks: parseString(parsed, 'initial-disabled-packs', form.initialDisabledPacks),
+        initialEnabledPacks: parseString(parsed, 'initial-enabled-packs', form.initialEnabledPacks),
+        logIps: parseBoolean(parsed, 'log-ips', form.logIps),
+        managementServerAllowedOrigins: parseString(
+            parsed,
+            'management-server-allowed-origins',
+            form.managementServerAllowedOrigins,
+        ),
+        managementServerEnabled: parseBoolean(parsed, 'management-server-enabled', form.managementServerEnabled),
+        managementServerHost: parseString(parsed, 'management-server-host', form.managementServerHost),
+        managementServerPort: parseIntValue(parsed, 'management-server-port', form.managementServerPort),
+        managementServerSecret: parseString(parsed, 'management-server-secret', form.managementServerSecret),
+        managementServerTlsEnabled: parseBoolean(
+            parsed,
+            'management-server-tls-enabled',
+            form.managementServerTlsEnabled,
+        ),
+        managementServerTlsKeystore: parseString(
+            parsed,
+            'management-server-tls-keystore',
+            form.managementServerTlsKeystore,
+        ),
+        managementServerTlsKeystorePassword: parseString(
+            parsed,
+            'management-server-tls-keystore-password',
+            form.managementServerTlsKeystorePassword,
+        ),
+        maxTickTime: parseIntValue(parsed, 'max-tick-time', form.maxTickTime),
+        networkCompressionThreshold: parseIntValue(
+            parsed,
+            'network-compression-threshold',
+            form.networkCompressionThreshold,
+        ),
+        pauseWhenEmptySeconds: parseIntValue(parsed, 'pause-when-empty-seconds', form.pauseWhenEmptySeconds),
+        playerIdleTimeout: parseIntValue(parsed, 'player-idle-timeout', form.playerIdleTimeout),
+        preventProxyConnections: parseBoolean(parsed, 'prevent-proxy-connections', form.preventProxyConnections),
+        queryPort: parseIntValue(parsed, 'query.port', form.queryPort),
+        rateLimit: parseIntValue(parsed, 'rate-limit', form.rateLimit),
+        rconPassword: parseString(parsed, 'rcon.password', form.rconPassword),
+        rconPort: parseIntValue(parsed, 'rcon.port', form.rconPort),
+        regionFileCompression: parseString(parsed, 'region-file-compression', form.regionFileCompression),
+        serverIp: parseString(parsed, 'server-ip', form.serverIp),
+        serverPort: parseIntValue(parsed, 'server-port', form.serverPort),
+        statusHeartbeatInterval: parseIntValue(parsed, 'status-heartbeat-interval', form.statusHeartbeatInterval),
+        syncChunkWrites: parseBoolean(parsed, 'sync-chunk-writes', form.syncChunkWrites),
+        textFilteringConfig: parseString(parsed, 'text-filtering-config', form.textFilteringConfig),
+        textFilteringVersion: parseIntValue(parsed, 'text-filtering-version', form.textFilteringVersion),
+    };
+}
+
+function formatBoolean(value: boolean): string {
+    return value ? 'true' : 'false';
+}
+
+export function serializeForm(form: MinecraftServerPropertiesForm): Record<string, string> {
+    return {
+        motd: form.motd,
+        'server-name': form.serverName,
+        difficulty: form.difficulty,
+        gamemode: form.gamemode,
+        'level-type': form.levelType,
+        'max-players': String(form.maxPlayers),
+        'white-list': formatBoolean(form.whiteList),
+        'enforce-whitelist': formatBoolean(form.enforceWhitelist),
+        'online-mode': formatBoolean(form.onlineMode),
+        pvp: formatBoolean(form.pvp),
+        'enable-command-block': formatBoolean(form.enableCommandBlock),
+        'allow-flight': formatBoolean(form.allowFlight),
+        'spawn-monsters': formatBoolean(form.spawnMonsters),
+        'allow-nether': formatBoolean(form.allowNether),
+        'force-gamemode': formatBoolean(form.forceGamemode),
+        'broadcast-console-to-ops': formatBoolean(form.broadcastConsoleToOps),
+        'broadcast-rcon-to-ops': formatBoolean(form.broadcastRconToOps),
+        'spawn-protection': String(form.spawnProtection),
+        'view-distance': String(form.viewDistance),
+        'simulation-distance': String(form.simulationDistance),
+        'level-name': form.levelName,
+        'level-seed': form.levelSeed,
+        'generator-settings': form.generatorSettings,
+        'generate-structures': formatBoolean(form.generateStructures),
+        hardcore: formatBoolean(form.hardcore),
+        'require-resource-pack': formatBoolean(form.requireResourcePack),
+        'hide-online-players': formatBoolean(form.hideOnlinePlayers),
+        'enforce-secure-profile': formatBoolean(form.enforceSecureProfile),
+        'previews-chat': formatBoolean(form.previewsChat),
+        'use-native-transport': formatBoolean(form.useNativeTransport),
+        'resource-pack': form.resourcePack,
+        'resource-pack-sha1': form.resourcePackSha1,
+        'resource-pack-id': form.resourcePackId,
+        'resource-pack-prompt': form.resourcePackPrompt,
+        'op-permission-level': String(form.opPermissionLevel),
+        'function-permission-level': String(form.functionPermissionLevel),
+        'entity-broadcast-range-percentage': String(form.entityBroadcastRangePercentage),
+        'max-chained-neighbor-updates': String(form.maxChainedNeighborUpdates),
+        'max-world-size': String(form.maxWorldSize),
+        'accepts-transfers': formatBoolean(form.acceptsTransfers),
+        'bug-report-link': form.bugReportLink,
+        debug: formatBoolean(form.debug),
+        'enable-code-of-conduct': formatBoolean(form.enableCodeOfConduct),
+        'enable-jmx-monitoring': formatBoolean(form.enableJmxMonitoring),
+        'enable-query': formatBoolean(form.enableQuery),
+        'enable-rcon': formatBoolean(form.enableRcon),
+        'enable-status': formatBoolean(form.enableStatus),
+        'initial-disabled-packs': form.initialDisabledPacks,
+        'initial-enabled-packs': form.initialEnabledPacks,
+        'log-ips': formatBoolean(form.logIps),
+        'management-server-allowed-origins': form.managementServerAllowedOrigins,
+        'management-server-enabled': formatBoolean(form.managementServerEnabled),
+        'management-server-host': form.managementServerHost,
+        'management-server-port': String(form.managementServerPort),
+        'management-server-secret': form.managementServerSecret,
+        'management-server-tls-enabled': formatBoolean(form.managementServerTlsEnabled),
+        'management-server-tls-keystore': form.managementServerTlsKeystore,
+        'management-server-tls-keystore-password': form.managementServerTlsKeystorePassword,
+        'max-tick-time': String(form.maxTickTime),
+        'network-compression-threshold': String(form.networkCompressionThreshold),
+        'pause-when-empty-seconds': String(form.pauseWhenEmptySeconds),
+        'player-idle-timeout': String(form.playerIdleTimeout),
+        'prevent-proxy-connections': formatBoolean(form.preventProxyConnections),
+        'query.port': String(form.queryPort),
+        'rate-limit': String(form.rateLimit),
+        'rcon.password': form.rconPassword,
+        'rcon.port': String(form.rconPort),
+        'region-file-compression': form.regionFileCompression,
+        'server-ip': form.serverIp,
+        'server-port': String(form.serverPort),
+        'status-heartbeat-interval': String(form.statusHeartbeatInterval),
+        'sync-chunk-writes': formatBoolean(form.syncChunkWrites),
+        'text-filtering-config': form.textFilteringConfig,
+        'text-filtering-version': String(form.textFilteringVersion),
+    };
+}
+
+/** Only write keys that already exist in the file, so legacy keys are not injected into modern templates. */
+export function filterUpdatesForExistingKeys(
+    updates: Record<string, string>,
+    existingKeys: Set<string>,
+): Record<string, string> {
+    return Object.fromEntries(Object.entries(updates).filter(([key]) => existingKeys.has(key)));
+}
+
+export function mergeProperties(original: string, updates: Record<string, string>): string {
+    const lines = original.split(/\r?\n/);
+    const handled = new Set<string>();
+
+    const updatedLines = lines.map((line) => {
+        if (!line || line.trim().startsWith('#')) {
+            return line;
+        }
+
+        const separatorIndex = line.indexOf('=');
+        if (separatorIndex === -1) {
+            return line;
+        }
+
+        const rawKey = line.slice(0, separatorIndex).trim();
+        if (rawKey && updates[rawKey] !== undefined) {
+            handled.add(rawKey);
+            return `${rawKey}=${escapePropertyValue(updates[rawKey])}`;
+        }
+
+        return line;
+    });
+
+    const appended = Object.entries(updates)
+        .filter(([key]) => !handled.has(key))
+        .map(([key, value]) => `${key}=${escapePropertyValue(value)}`);
+
+    return [...updatedLines, ...appended]
+        .filter((line, index, array) => !(line === '' && index === array.length - 1))
+        .join('\n');
+}
diff --git a/frontendv2/src/components/ui/sheet.tsx b/frontendv2/src/components/ui/sheet.tsx
index 7d3c8fec1..223d2d917 100644
--- a/frontendv2/src/components/ui/sheet.tsx
+++ b/frontendv2/src/components/ui/sheet.tsx
@@ -19,6 +19,7 @@ import * as React from 'react';
 import { Dialog as HeadlessDialog, DialogPanel, Transition, TransitionChild } from '@headlessui/react';
 import { cn } from '@/lib/utils';
 import { X } from 'lucide-react';
+import { useTranslation } from '@/contexts/TranslationContext';
 
 interface SheetProps {
     open: boolean;
@@ -28,6 +29,8 @@ interface SheetProps {
 }
 
 export function Sheet({ open, onOpenChange, children, className }: SheetProps) {
+    const { t } = useTranslation();
+
     return (
         <Transition show={open} as={React.Fragment}>
             <HeadlessDialog as='div' className='relative z-50' onClose={() => onOpenChange(false)}>
@@ -71,7 +74,7 @@ export function Sheet({ open, onOpenChange, children, className }: SheetProps) {
                                                         onClick={() => onOpenChange(false)}
                                                     >
                                                         <span className='absolute -inset-2.5' />
-                                                        <span className='sr-only'>Close panel</span>
+                                                        <span className='sr-only'>{t('common.closePanel')}</span>
                                                         <X className='h-5 w-5' aria-hidden='true' />
                                                     </button>
                                                 </div>
diff --git a/frontendv2/src/config/navigation.tsx b/frontendv2/src/config/navigation.tsx
index ad7a2048b..8cfaf2f03 100644
--- a/frontendv2/src/config/navigation.tsx
+++ b/frontendv2/src/config/navigation.tsx
@@ -678,6 +678,7 @@ export const getServerNavigationItems = (
             category: 'server',
             group: 'files',
             permission: 'file.read',
+            priority: 100,
         },
         {
             id: 'server-databases',
@@ -689,6 +690,7 @@ export const getServerNavigationItems = (
             category: 'server',
             group: 'files',
             permission: 'database.read',
+            priority: 200,
         },
         {
             id: 'server-backups',
@@ -700,6 +702,7 @@ export const getServerNavigationItems = (
             category: 'server',
             group: 'files',
             permission: 'backup.read',
+            priority: 300,
         },
     ];
 
@@ -714,6 +717,7 @@ export const getServerNavigationItems = (
             category: 'server',
             group: 'files',
             permission: 'import.read',
+            priority: 400,
         });
     }
 
diff --git a/frontendv2/src/contexts/PreferencesContext.tsx b/frontendv2/src/contexts/PreferencesContext.tsx
new file mode 100644
index 000000000..e63bacd2b
--- /dev/null
+++ b/frontendv2/src/contexts/PreferencesContext.tsx
@@ -0,0 +1,191 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+'use client';
+
+import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, type ReactNode } from 'react';
+import axios from 'axios';
+import { getEffectiveTimezone, type FormatDateOptions } from '@/lib/dateUtils';
+import { useSession } from '@/contexts/SessionContext';
+import { useTranslation } from '@/contexts/TranslationContext';
+
+interface UserPreferences {
+    timezone?: string | null;
+    [key: string]: unknown;
+}
+
+interface PreferencesContextValue {
+    preferences: UserPreferences;
+    /**
+     * The timezone the UI should use for display: the user's explicit
+     * preference, falling back to the browser-detected zone (which is also
+     * persisted to the server on first visit so the choice survives across
+     * devices).
+     */
+    timezone: string;
+    /** Whether the initial fetch + auto-detect cycle has finished. */
+    ready: boolean;
+    setTimezone: (tz: string | null) => Promise<boolean>;
+}
+
+const PreferencesContext = createContext<PreferencesContextValue | undefined>(undefined);
+
+function detectBrowserTimezone(): string {
+    return getEffectiveTimezone(null);
+}
+
+export function PreferencesProvider({ children }: { children: ReactNode }) {
+    const { user, isSessionChecked } = useSession();
+    const [preferences, setPreferences] = useState<UserPreferences>({});
+    const [ready, setReady] = useState(false);
+    // Local fallback so date helpers do not flash UTC on first paint while
+    // we are still fetching the user's stored preference from the server.
+    const [browserTimezone] = useState<string>(() => detectBrowserTimezone());
+    const autoPersistedForUuid = useRef<string | null>(null);
+
+    const reset = useCallback(() => {
+        setPreferences({});
+        setReady(false);
+        autoPersistedForUuid.current = null;
+    }, []);
+
+    useEffect(() => {
+        if (!isSessionChecked) return;
+        if (!user?.uuid) {
+            reset();
+            // Mark ready so consumers do not block on a logged-out session.
+            setReady(true);
+            return;
+        }
+
+        let cancelled = false;
+        (async () => {
+            try {
+                const { data } = await axios.get('/api/user/preferences');
+                if (cancelled) return;
+                const fetched: UserPreferences =
+                    data?.success && data.data?.preferences && typeof data.data.preferences === 'object'
+                        ? (data.data.preferences as UserPreferences)
+                        : {};
+                setPreferences(fetched);
+
+                // Auto-detect & persist the browser timezone on the very first
+                // session, so subsequent visits from other browsers still show
+                // dates in the user's home timezone. Once a value (or an
+                // explicit empty string) is stored we never overwrite it.
+                if (
+                    !fetched ||
+                    (typeof fetched.timezone === 'undefined' && autoPersistedForUuid.current !== user.uuid)
+                ) {
+                    const detected = detectBrowserTimezone();
+                    if (detected && detected !== 'UTC') {
+                        autoPersistedForUuid.current = user.uuid;
+                        try {
+                            await axios.patch('/api/user/preferences', { timezone: detected });
+                            if (!cancelled) {
+                                setPreferences((prev) => ({ ...prev, timezone: detected }));
+                            }
+                        } catch {
+                            // Non-critical: the user can still set it manually.
+                        }
+                    }
+                }
+            } catch {
+                // Non-critical — fall back to browser detection.
+            } finally {
+                if (!cancelled) setReady(true);
+            }
+        })();
+
+        return () => {
+            cancelled = true;
+        };
+    }, [user?.uuid, isSessionChecked, reset]);
+
+    const setTimezone = useCallback(async (tz: string | null): Promise<boolean> => {
+        try {
+            const { data } = await axios.patch('/api/user/preferences', { timezone: tz });
+            if (data?.success) {
+                const updated: UserPreferences | null =
+                    data.data?.preferences && typeof data.data.preferences === 'object'
+                        ? (data.data.preferences as UserPreferences)
+                        : null;
+                if (updated) {
+                    setPreferences(updated);
+                } else {
+                    setPreferences((prev) => ({ ...prev, timezone: tz }));
+                }
+                return true;
+            }
+            return false;
+        } catch {
+            return false;
+        }
+    }, []);
+
+    const value = useMemo<PreferencesContextValue>(() => {
+        const explicit =
+            typeof preferences.timezone === 'string' && preferences.timezone.trim() !== ''
+                ? preferences.timezone
+                : null;
+        return {
+            preferences,
+            timezone: explicit ?? browserTimezone,
+            ready,
+            setTimezone,
+        };
+    }, [preferences, browserTimezone, ready, setTimezone]);
+
+    return <PreferencesContext.Provider value={value}>{children}</PreferencesContext.Provider>;
+}
+
+export function usePreferences(): PreferencesContextValue {
+    const ctx = useContext(PreferencesContext);
+    if (!ctx) {
+        throw new Error('usePreferences must be used within PreferencesProvider');
+    }
+    return ctx;
+}
+
+/**
+ * Convenience hook returning only the effective timezone string.
+ * Safe to call outside `PreferencesProvider` — falls back to the
+ * browser-detected zone in that case rather than throwing, so date helpers
+ * embedded in plugin code keep working.
+ */
+export function useUserTimezone(): string {
+    const ctx = useContext(PreferencesContext);
+    if (ctx) return ctx.timezone;
+    return detectBrowserTimezone();
+}
+
+/**
+ * Returns the `{ timeZone, locale }` options bundle every helper in
+ * `@/lib/dateUtils` accepts, populated from the user's preferences and the
+ * active translation locale.
+ *
+ * Use this in components so you don't have to wire up timezone + locale
+ * separately every time you format a date.
+ *
+ * @example
+ * const dateOpts = useDateFormatOptions();
+ * return <span>{formatRelativeTime(item.created_at, dateOpts)}</span>;
+ */
+export function useDateFormatOptions(): Required<Pick<FormatDateOptions, 'timeZone' | 'locale'>> {
+    const ctx = useContext(PreferencesContext);
+    const translation = useTranslation();
+    const timeZone = ctx ? ctx.timezone : detectBrowserTimezone();
+    return useMemo(() => ({ timeZone, locale: translation.locale }), [timeZone, translation.locale]);
+}
diff --git a/frontendv2/src/contexts/SessionContext.tsx b/frontendv2/src/contexts/SessionContext.tsx
index 3dbbcd795..a53b7074a 100644
--- a/frontendv2/src/contexts/SessionContext.tsx
+++ b/frontendv2/src/contexts/SessionContext.tsx
@@ -41,6 +41,11 @@ export interface UserInfo {
     ticket_signature?: string;
     discord_oauth2_linked?: string;
     discord_oauth2_name?: string;
+    oidc_provider?: string | null;
+    oidc_subject?: string | null;
+    oidc_email?: string | null;
+    ldap_provider_uuid?: string | null;
+    ldap_dn?: string | null;
 }
 
 export type PermissionsList = string[];
diff --git a/frontendv2/src/contexts/SettingsContext.tsx b/frontendv2/src/contexts/SettingsContext.tsx
index 532d7d4f3..2979defd8 100644
--- a/frontendv2/src/contexts/SettingsContext.tsx
+++ b/frontendv2/src/contexts/SettingsContext.tsx
@@ -30,7 +30,7 @@ interface SettingsContextType {
 const SettingsContext = createContext<SettingsContextType | undefined>(undefined);
 
 const CACHE_KEY = 'app_settings';
-const CACHE_VERSION = '1.2';
+const CACHE_VERSION = '1.3';
 
 export function SettingsProvider({ children }: { children: ReactNode }) {
     const [settings, setSettings] = useState<AppSettings | null>(null);
diff --git a/frontendv2/src/contexts/ThemeContext.tsx b/frontendv2/src/contexts/ThemeContext.tsx
index f8e3898d2..a16292197 100644
--- a/frontendv2/src/contexts/ThemeContext.tsx
+++ b/frontendv2/src/contexts/ThemeContext.tsx
@@ -88,6 +88,28 @@ const ACCENT_COLORS = {
     slate: '215 20% 45%',
 };
 
+const ACCENT_FOREGROUNDS: Partial<Record<keyof typeof ACCENT_COLORS, string>> = {
+    orange: '0 0% 9%',
+    teal: '0 0% 9%',
+    yellow: '0 0% 9%',
+    cyan: '0 0% 9%',
+    lime: '0 0% 9%',
+    amber: '0 0% 9%',
+};
+
+const USER_OVERRIDE_KEYS = {
+    theme: 'themeUserOverride',
+    accentColor: 'accentColorUserOverride',
+    backgroundType: 'backgroundTypeUserOverride',
+    backdropBlur: 'backdropBlurUserOverride',
+    backdropDarken: 'backdropDarkenUserOverride',
+    backgroundImageFit: 'backgroundImageFitUserOverride',
+};
+
+function hasUserOverride(key: keyof typeof USER_OVERRIDE_KEYS): boolean {
+    return localStorage.getItem(USER_OVERRIDE_KEYS[key]) === 'true';
+}
+
 export function ThemeProvider({ children }: { children: ReactNode }) {
     const [mounted, setMounted] = useState(false);
     const [theme, setThemeState] = useState<Theme>('dark');
@@ -120,7 +142,7 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
         const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
         const prefersReducedMotion = window.matchMedia('(prefers-reduced-motion: reduce)').matches;
 
-        // Load initial values from localStorage (will be overridden by admin settings if locked)
+        // Load initial values from localStorage until public admin settings are available.
         setThemeState(saved || (prefersDark ? 'dark' : 'light'));
         setAccentColorState(savedAccent && savedAccent in ACCENT_COLORS ? savedAccent : 'purple');
         setBackgroundTypeState(
@@ -162,7 +184,7 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
         localStorage.setItem('fontFamily', initialFont);
     }, []);
 
-    // Enforce admin settings on load and when settings change
+    // Apply admin defaults on load and when settings change.
     useEffect(() => {
         if (!mounted || !settings) return;
 
@@ -176,30 +198,38 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
         const rawFit = (settings.app_background_image_fit_default ?? 'cover').toLowerCase();
         const forcedFit: BackgroundImageFit =
             rawFit === 'contain' || rawFit === 'fill' ? (rawFit as BackgroundImageFit) : 'cover';
+        const validThemes: Theme[] = ['light', 'dark'];
+        const validBgTypes: BackgroundType[] = ['aurora', 'gradient', 'solid', 'image', 'pattern'];
 
-        // Enforce theme lock - use admin's default theme
-        if (settings.app_theme_lock === 'true' && forcedTheme && theme !== forcedTheme) {
+        // Locked settings always win; unlocked settings use admin defaults until the user chooses otherwise.
+        const shouldUseThemeDefault = settings.app_theme_lock === 'true' || !hasUserOverride('theme');
+        const shouldUseAccentDefault = settings.app_accent_color_lock === 'true' || !hasUserOverride('accentColor');
+        const shouldUseBackgroundTypeDefault =
+            settings.app_background_type_lock === 'true' || !hasUserOverride('backgroundType');
+        const shouldUseBlurDefault = settings.app_backdrop_blur_lock === 'true' || !hasUserOverride('backdropBlur');
+        const shouldUseDarkenDefault =
+            settings.app_backdrop_darken_lock === 'true' || !hasUserOverride('backdropDarken');
+        const shouldUseFitDefault =
+            settings.app_background_image_fit_lock === 'true' || !hasUserOverride('backgroundImageFit');
+
+        if (shouldUseThemeDefault && forcedTheme && validThemes.includes(forcedTheme) && theme !== forcedTheme) {
             setThemeState(forcedTheme);
             localStorage.setItem('theme', forcedTheme);
         }
 
-        // Enforce accent color lock - use admin's default accent color
-        if (settings.app_accent_color_lock === 'true' && forcedAccent && forcedAccent in ACCENT_COLORS) {
-            if (accentColor !== forcedAccent) {
-                setAccentColorState(forcedAccent);
-                localStorage.setItem('accentColor', forcedAccent);
-            }
+        if (shouldUseAccentDefault && forcedAccent && forcedAccent in ACCENT_COLORS && accentColor !== forcedAccent) {
+            setAccentColorState(forcedAccent);
+            localStorage.setItem('accentColor', forcedAccent);
         }
 
-        // Enforce background type: light mode limits, admin lock, forced image when background URL is locked
-        const validBgTypes: BackgroundType[] = ['aurora', 'gradient', 'solid', 'image', 'pattern'];
+        // Enforce background type: light mode limits and forced image when background URL is locked.
         const mustUseImageForLockedBg = imageLock && adminBgUrl !== '';
         if (theme === 'light') {
             if (backgroundType !== 'pattern' && backgroundType !== 'solid') {
                 setBackgroundTypeState('pattern');
                 localStorage.setItem('backgroundType', 'pattern');
             }
-        } else if (settings.app_background_type_lock === 'true' || mustUseImageForLockedBg) {
+        } else if (shouldUseBackgroundTypeDefault || mustUseImageForLockedBg) {
             const targetType: BackgroundType | null = mustUseImageForLockedBg
                 ? 'image'
                 : forcedBgType && validBgTypes.includes(forcedBgType)
@@ -209,42 +239,19 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
                 setBackgroundTypeState(targetType);
                 localStorage.setItem('backgroundType', targetType);
             }
-        } else if (localStorage.getItem('backgroundType') === null) {
-            if (forcedBgType && validBgTypes.includes(forcedBgType) && backgroundType !== forcedBgType) {
-                setBackgroundTypeState(forcedBgType);
-                localStorage.setItem('backgroundType', forcedBgType);
-            }
         }
 
-        // Blur: locked always uses admin default; otherwise seed from admin default when user has not stored a value
-        if (settings.app_backdrop_blur_lock === 'true') {
-            if (backdropBlur !== forcedBlur) {
-                setBackdropBlurState(forcedBlur);
-                localStorage.setItem('backdropBlur', String(forcedBlur));
-            }
-        } else if (localStorage.getItem('backdropBlur') === null && backdropBlur !== forcedBlur) {
+        if (shouldUseBlurDefault && backdropBlur !== forcedBlur) {
             setBackdropBlurState(forcedBlur);
             localStorage.setItem('backdropBlur', String(forcedBlur));
         }
 
-        // Darken: same pattern as blur
-        if (settings.app_backdrop_darken_lock === 'true') {
-            if (backdropDarken !== forcedDarken) {
-                setBackdropDarkenState(forcedDarken);
-                localStorage.setItem('backdropDarken', String(forcedDarken));
-            }
-        } else if (localStorage.getItem('backdropDarken') === null && backdropDarken !== forcedDarken) {
+        if (shouldUseDarkenDefault && backdropDarken !== forcedDarken) {
             setBackdropDarkenState(forcedDarken);
             localStorage.setItem('backdropDarken', String(forcedDarken));
         }
 
-        // Background image fit: locked or first-time default from admin
-        if (settings.app_background_image_fit_lock === 'true') {
-            if (backgroundImageFit !== forcedFit) {
-                setBackgroundImageFitState(forcedFit);
-                localStorage.setItem('backgroundImageFit', forcedFit);
-            }
-        } else if (localStorage.getItem('backgroundImageFit') === null && backgroundImageFit !== forcedFit) {
+        if (shouldUseFitDefault && backgroundImageFit !== forcedFit) {
             setBackgroundImageFitState(forcedFit);
             localStorage.setItem('backgroundImageFit', forcedFit);
         }
@@ -259,8 +266,11 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
         localStorage.setItem('theme', theme);
 
         const accentHSL = ACCENT_COLORS[accentColor as keyof typeof ACCENT_COLORS] || ACCENT_COLORS.purple;
+        const primaryForeground = ACCENT_FOREGROUNDS[accentColor as keyof typeof ACCENT_FOREGROUNDS] || '0 0% 98%';
         root.style.setProperty('--color-primary', `hsl(${accentHSL})`);
         root.style.setProperty('--primary', accentHSL);
+        root.style.setProperty('--color-primary-foreground', `hsl(${primaryForeground})`);
+        root.style.setProperty('--primary-foreground', primaryForeground);
         localStorage.setItem('accentColor', accentColor);
 
         const fontStacks: Record<FontFamily, string> = {
@@ -273,9 +283,8 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
         localStorage.setItem('fontFamily', fontFamily);
     }, [theme, accentColor, fontFamily, mounted]);
 
-    // Apply admin-enforced defaults/locks from public settings (if present).
-    // Note: we now enforce locks inside setter functions and initial state;
-    // this effect only ensures settings are loaded before user interaction.
+    // Locks are still enforced inside setter functions so user controls cannot
+    // move away from admin-restricted values between settings refreshes.
 
     useEffect(() => {
         if (!mounted || typeof document === 'undefined') return;
@@ -287,6 +296,7 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
         if (settings?.app_theme_lock === 'true') return;
         setThemeState(newTheme);
         localStorage.setItem('theme', newTheme);
+        localStorage.setItem(USER_OVERRIDE_KEYS.theme, 'true');
     };
 
     const setAccentColor = (color: string) => {
@@ -294,6 +304,7 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
         if (settings?.app_accent_color_lock === 'true') return;
         setAccentColorState(color);
         localStorage.setItem('accentColor', color);
+        localStorage.setItem(USER_OVERRIDE_KEYS.accentColor, 'true');
     };
 
     const setBackgroundType = (type: BackgroundType) => {
@@ -314,6 +325,7 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
         }
         setBackgroundTypeState(type);
         localStorage.setItem('backgroundType', type);
+        localStorage.setItem(USER_OVERRIDE_KEYS.backgroundType, 'true');
     };
 
     const setBackgroundAnimatedVariant = (variant: BackgroundAnimatedVariant) => {
@@ -345,6 +357,7 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
         const value = Math.min(24, Math.max(0, px));
         setBackdropBlurState(value);
         localStorage.setItem('backdropBlur', String(value));
+        localStorage.setItem(USER_OVERRIDE_KEYS.backdropBlur, 'true');
     };
 
     const setBackdropDarken = (percent: number) => {
@@ -353,6 +366,7 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
         const value = Math.min(100, Math.max(0, percent));
         setBackdropDarkenState(value);
         localStorage.setItem('backdropDarken', String(value));
+        localStorage.setItem(USER_OVERRIDE_KEYS.backdropDarken, 'true');
     };
 
     const setBackgroundImageFit = (fit: BackgroundImageFit) => {
@@ -364,6 +378,7 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
         }
         setBackgroundImageFitState(fit);
         localStorage.setItem('backgroundImageFit', fit);
+        localStorage.setItem(USER_OVERRIDE_KEYS.backgroundImageFit, 'true');
     };
 
     const setMotionLevel = (level: MotionLevel) => {
diff --git a/frontendv2/src/contexts/TranslationContext.tsx b/frontendv2/src/contexts/TranslationContext.tsx
index 98df38b1e..fd59fa303 100644
--- a/frontendv2/src/contexts/TranslationContext.tsx
+++ b/frontendv2/src/contexts/TranslationContext.tsx
@@ -38,7 +38,7 @@ const TranslationContext = createContext<TranslationContextType | undefined>(und
 
 const DEFAULT_LOCALE = 'en';
 const PRIMARY_LOCALE = 'en';
-const CACHE_VERSION = '1.2';
+const CACHE_VERSION = '1.3';
 
 export function TranslationProvider({ children }: { children: ReactNode }) {
     const [locale, setLocaleState] = useState(() => {
diff --git a/frontendv2/src/hooks/useFileManager.ts b/frontendv2/src/hooks/useFileManager.ts
index 61158af76..0a00e96f3 100644
--- a/frontendv2/src/hooks/useFileManager.ts
+++ b/frontendv2/src/hooks/useFileManager.ts
@@ -18,6 +18,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 import { useState, useEffect, useCallback, useMemo } from 'react';
 import { useSearchParams, useRouter } from 'next/navigation';
 import { filesApi } from '@/lib/files-api';
+import { filterFeatherTrashFiles, isFeatherTrashEntry } from '@/lib/feather-trash';
 import { FileObject } from '@/types/server';
 import { toast } from 'sonner';
 import { useTranslation } from '@/contexts/TranslationContext';
@@ -26,33 +27,7 @@ function sanitizeDirectoryPath(path: string | null): string | null {
     if (!path) return null;
 
     const normalized = ('/' + path).replace(/\/+/g, '/').replace(/\/+$/, '') || '/';
-    const segments = normalized.split('/').filter(Boolean);
-
-    // Collapse duplicated leading path chunks:
-    // /a/b/c/a/b/c/d -> /a/b/c/d
-    let collapsed = segments;
-    let changed = true;
-    while (changed) {
-        changed = false;
-        const n = collapsed.length;
-        for (let size = Math.floor(n / 2); size >= 1; size--) {
-            let matches = true;
-            for (let i = 0; i < size; i++) {
-                if (collapsed[i] !== collapsed[i + size]) {
-                    matches = false;
-                    break;
-                }
-            }
-            if (matches) {
-                collapsed = collapsed.slice(size);
-                changed = true;
-                break;
-            }
-        }
-    }
-
-    if (collapsed.length === 0) return '/';
-    return '/' + collapsed.join('/');
+    return normalized === '' ? '/' : normalized;
 }
 
 export function useFileManager(serverUuid: string) {
@@ -128,8 +103,8 @@ export function useFileManager(serverUuid: string) {
             }
 
             if (err instanceof Error && err.message === 'Request timeout') {
-                setError('Request timed out');
-                toast.error('File loading timed out. Please try again.');
+                setError(t('files.messages.request_timed_out'));
+                toast.error(t('files.messages.load_timeout_retry'));
             } else {
                 setError(apiMessage || t('files.messages.load_error'));
                 toast.error(apiMessage || t('files.messages.load_error'));
@@ -147,7 +122,7 @@ export function useFileManager(serverUuid: string) {
 
     // Filtering logic
     const filteredFiles = useMemo(() => {
-        let result = files;
+        let result = filterFeatherTrashFiles(files);
 
         // Apply ignored patterns
         if (ignoredPatterns.length > 0) {
@@ -168,6 +143,10 @@ export function useFileManager(serverUuid: string) {
     const navigate = (path: string) => {
         const params = new URLSearchParams(searchParams?.toString() ?? '');
         const sanitizedPath = sanitizeDirectoryPath(path) || '/';
+        const segment = sanitizedPath.split('/').filter(Boolean).pop() ?? '';
+        if (isFeatherTrashEntry(segment) || isFeatherTrashEntry(sanitizedPath.replace(/^\//, ''))) {
+            return;
+        }
         if (sanitizedPath === '/') {
             params.delete('path');
         } else {
@@ -216,10 +195,10 @@ export function useFileManager(serverUuid: string) {
     const cancelPull = async (id: string) => {
         try {
             await filesApi.deletePullFile(serverUuid, id);
-            toast.success('Download cancelled');
+            toast.success(t('files.messages.download_cancelled'));
             refreshPulls();
         } catch {
-            toast.error('Failed to cancel download');
+            toast.error(t('files.messages.cancel_download_failed'));
         }
     };
 
diff --git a/frontendv2/src/hooks/useNavigation.ts b/frontendv2/src/hooks/useNavigation.ts
index fd1791794..aaa8ee40e 100644
--- a/frontendv2/src/hooks/useNavigation.ts
+++ b/frontendv2/src/hooks/useNavigation.ts
@@ -173,6 +173,8 @@ export function useNavigation() {
                         }
                     }
 
+                    const sidebarPriority = Number.isFinite(item.priority) ? item.priority : undefined;
+
                     return {
                         id: `plugin-${item.plugin}-${url}`,
                         name: item.name,
@@ -190,6 +192,7 @@ export function useNavigation() {
                         description: item.description,
                         permission: item.permission,
                         group: normalizedGroup,
+                        priority: sidebarPriority,
                     };
                 });
         },
diff --git a/frontendv2/src/hooks/useUserServersList.ts b/frontendv2/src/hooks/useUserServersList.ts
new file mode 100644
index 000000000..bdeba387a
--- /dev/null
+++ b/frontendv2/src/hooks/useUserServersList.ts
@@ -0,0 +1,62 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+'use client';
+
+import { useCallback, useEffect, useState } from 'react';
+import type { Server } from '@/types/server';
+import { serversApi } from '@/lib/servers-api';
+
+type CacheEntry = {
+    servers: Server[];
+    fetchedAt: number;
+};
+
+let serversCache: CacheEntry | null = null;
+const CACHE_TTL_MS = 60_000;
+
+export function useUserServersList(enabled: boolean) {
+    const [servers, setServers] = useState<Server[]>([]);
+    const [loading, setLoading] = useState(false);
+    const [error, setError] = useState<Error | null>(null);
+
+    const fetchServers = useCallback(async (force = false) => {
+        const now = Date.now();
+        if (!force && serversCache && now - serversCache.fetchedAt < CACHE_TTL_MS) {
+            setServers(serversCache.servers);
+            return;
+        }
+
+        setLoading(true);
+        try {
+            const response = await serversApi.getServers(false, 1, 100, '');
+            const list = Array.isArray(response.servers) ? response.servers : [];
+            serversCache = { servers: list, fetchedAt: Date.now() };
+            setServers(list);
+            setError(null);
+        } catch (err) {
+            setError(err as Error);
+        } finally {
+            setLoading(false);
+        }
+    }, []);
+
+    useEffect(() => {
+        if (!enabled) return;
+        void fetchServers();
+    }, [enabled, fetchServers]);
+
+    return { servers, loading, error, refresh: () => fetchServers(true) };
+}
diff --git a/frontendv2/src/lib/api/auth.ts b/frontendv2/src/lib/api/auth.ts
index ff02d0375..155b71ba5 100644
--- a/frontendv2/src/lib/api/auth.ts
+++ b/frontendv2/src/lib/api/auth.ts
@@ -58,6 +58,11 @@ export const authApi = {
         return response.data;
     },
 
+    resendVerificationEmail: async (data: { username_or_email: string }) => {
+        const response = await api.post('/user/auth/verify-email/resend', data);
+        return response.data;
+    },
+
     linkDiscord: async (data: { token: string; username_or_email: string; password: string }) => {
         const response = await api.put('/user/auth/discord/link', data);
         return response.data;
diff --git a/frontendv2/src/lib/api/chatbotService.ts b/frontendv2/src/lib/api/chatbotService.ts
index f7c1cb4bc..1b4d794fe 100644
--- a/frontendv2/src/lib/api/chatbotService.ts
+++ b/frontendv2/src/lib/api/chatbotService.ts
@@ -18,9 +18,11 @@ import axios from 'axios';
 export interface ChatMessage {
     role: 'user' | 'assistant';
     content: string;
+    toolActivity?: ToolActivity[] | null;
 }
 
 export interface PageContext {
+    mode?: 'server' | 'vds' | 'dashboard';
     route?: string;
     routeName?: string;
     page?: string;
@@ -59,13 +61,78 @@ export interface ToolExecution {
     [key: string]: unknown;
 }
 
+export interface TokenUsage {
+    input_tokens?: number | null;
+    output_tokens?: number | null;
+    total_tokens?: number | null;
+    source?: 'provider' | 'estimated' | 'unknown' | string | null;
+}
+
+export interface ToolActivity {
+    tool: string;
+    params?: unknown;
+    success?: boolean;
+    error?: string | null;
+    summary?: string;
+    iteration?: number;
+}
+
+function serializeChatHistoryMessage(msg: ChatMessage): ChatMessage {
+    if (!msg.toolActivity?.length) {
+        return {
+            role: msg.role,
+            content: msg.content,
+        };
+    }
+
+    const toolSummary = msg.toolActivity
+        .map((activity) => {
+            const status = activity.success === false ? 'failed' : activity.success ? 'completed' : 'planned';
+            const summary = activity.summary ? ` - ${activity.summary}` : '';
+            return `${activity.tool}: ${status}${summary}`;
+        })
+        .join('\n');
+
+    return {
+        role: msg.role,
+        content: `${msg.content}\n\n[Tool/activity results from this assistant turn]\n${toolSummary}`,
+    };
+}
+
+export type ChatStreamEvent =
+    | { type: 'conversation'; conversation_id: number; user_message_id?: number; user_usage?: TokenUsage }
+    | { type: 'status'; message: string; iteration?: number }
+    | { type: 'tool_call'; tool: string; params?: unknown; iteration?: number }
+    | ({ type: 'tool_result' } & ToolActivity)
+    | { type: 'usage'; usage: TokenUsage }
+    | ChatStreamFinalEvent
+    | { type: 'error'; message: string };
+
+export interface ChatStreamFinalEvent {
+    type: 'final';
+    response: string;
+    model?: string;
+    conversation_id?: number;
+    message_id?: number;
+    user_message_id?: number;
+    usage?: TokenUsage;
+    user_usage?: TokenUsage;
+    tool_executions?: ToolExecution[];
+    tool_activity?: ToolActivity[];
+}
+
 export interface ChatResponse {
     success: boolean;
     data?: {
         response: string;
         model?: string;
         conversation_id?: number;
+        message_id?: number;
+        user_message_id?: number;
+        usage?: TokenUsage;
+        user_usage?: TokenUsage;
         tool_executions?: ToolExecution[];
+        tool_activity?: ToolActivity[];
     };
     error?: boolean;
     error_message?: string;
@@ -87,6 +154,12 @@ export interface ConversationMessage {
     role: 'user' | 'assistant';
     content: string;
     model: string | null;
+    input_tokens?: number | null;
+    output_tokens?: number | null;
+    total_tokens?: number | null;
+    token_source?: string | null;
+    tool_activity?: ToolActivity[] | null;
+    usage_json?: TokenUsage | null;
     created_at: string;
 }
 
@@ -98,14 +171,21 @@ export async function sendChatMessage(
     history: ChatMessage[] = [],
     pageContext?: PageContext,
     conversationId?: number,
-): Promise<{ response: string; model?: string; conversationId?: number; toolExecutions?: ToolExecution[] }> {
+): Promise<{
+    response: string;
+    model?: string;
+    conversationId?: number;
+    messageId?: number;
+    userMessageId?: number;
+    usage?: TokenUsage;
+    userUsage?: TokenUsage;
+    toolExecutions?: ToolExecution[];
+    toolActivity?: ToolActivity[];
+}> {
     try {
         const response = await axios.post<ChatResponse>('/api/user/chatbot/chat', {
             message,
-            history: history.map((msg) => ({
-                role: msg.role,
-                content: msg.content,
-            })),
+            history: history.map(serializeChatHistoryMessage),
             pageContext: pageContext || undefined,
             conversation_id: conversationId || undefined,
         });
@@ -115,7 +195,12 @@ export async function sendChatMessage(
                 response: response.data.data.response,
                 model: response.data.data.model,
                 conversationId: response.data.data.conversation_id,
+                messageId: response.data.data.message_id,
+                userMessageId: response.data.data.user_message_id,
+                usage: response.data.data.usage,
+                userUsage: response.data.data.user_usage,
                 toolExecutions: response.data.data.tool_executions,
+                toolActivity: response.data.data.tool_activity,
             };
         }
 
@@ -204,14 +289,21 @@ export async function sendVdsChatMessage(
     history: ChatMessage[] = [],
     pageContext?: PageContext,
     conversationId?: number,
-): Promise<{ response: string; model?: string; conversationId?: number; toolExecutions?: ToolExecution[] }> {
+): Promise<{
+    response: string;
+    model?: string;
+    conversationId?: number;
+    messageId?: number;
+    userMessageId?: number;
+    usage?: TokenUsage;
+    userUsage?: TokenUsage;
+    toolExecutions?: ToolExecution[];
+    toolActivity?: ToolActivity[];
+}> {
     try {
         const response = await axios.post<ChatResponse>('/api/user/vds-chatbot/chat', {
             message,
-            history: history.map((msg) => ({
-                role: msg.role,
-                content: msg.content,
-            })),
+            history: history.map(serializeChatHistoryMessage),
             pageContext: pageContext || undefined,
             conversation_id: conversationId || undefined,
         });
@@ -221,7 +313,12 @@ export async function sendVdsChatMessage(
                 response: response.data.data.response,
                 model: response.data.data.model,
                 conversationId: response.data.data.conversation_id,
+                messageId: response.data.data.message_id,
+                userMessageId: response.data.data.user_message_id,
+                usage: response.data.data.usage,
+                userUsage: response.data.data.user_usage,
                 toolExecutions: response.data.data.tool_executions,
+                toolActivity: response.data.data.tool_activity,
             };
         }
 
@@ -297,3 +394,89 @@ export async function deleteVdsConversation(conversationId: number): Promise<voi
         throw error;
     }
 }
+
+export async function streamChatMessage(
+    mode: 'server' | 'vds' | 'dashboard',
+    message: string,
+    history: ChatMessage[] = [],
+    pageContext?: PageContext,
+    conversationId?: number,
+    onEvent?: (event: ChatStreamEvent) => void,
+): Promise<ChatStreamFinalEvent> {
+    const endpoint = mode === 'vds' ? '/api/user/vds-chatbot/chat/stream' : '/api/user/chatbot/chat/stream';
+    const response = await fetch(endpoint, {
+        method: 'POST',
+        credentials: 'same-origin',
+        headers: {
+            'Content-Type': 'application/json',
+            Accept: 'text/event-stream',
+        },
+        body: JSON.stringify({
+            message,
+            history: history.map(serializeChatHistoryMessage),
+            pageContext: pageContext || undefined,
+            conversation_id: conversationId || undefined,
+        }),
+    });
+
+    if (!response.ok || !response.body) {
+        throw new Error(`Failed to stream chat response (${response.status})`);
+    }
+
+    const reader = response.body.getReader();
+    const decoder = new TextDecoder();
+    let buffer = '';
+    let finalEvent: ChatStreamFinalEvent | null = null;
+
+    const processBlock = (block: string) => {
+        const lines = block.split(/\r?\n/);
+        const eventType =
+            lines
+                .find((line) => line.startsWith('event:'))
+                ?.slice(6)
+                .trim() || 'message';
+        const dataLines = lines
+            .filter((line) => line.startsWith('data:'))
+            .map((line) => line.slice(5).trim())
+            .join('\n');
+
+        if (!dataLines) return;
+
+        const payload = JSON.parse(dataLines) as Record<string, unknown>;
+        const event = { ...payload, type: eventType } as ChatStreamEvent;
+        onEvent?.(event);
+
+        if (event.type === 'error') {
+            throw new Error(event.message);
+        }
+
+        if (event.type === 'final') {
+            finalEvent = event;
+        }
+    };
+
+    while (true) {
+        const { value, done } = await reader.read();
+        buffer += decoder.decode(value || new Uint8Array(), { stream: !done });
+
+        let separatorIndex = buffer.indexOf('\n\n');
+        while (separatorIndex !== -1) {
+            const block = buffer.slice(0, separatorIndex).trim();
+            buffer = buffer.slice(separatorIndex + 2);
+            if (block) processBlock(block);
+            separatorIndex = buffer.indexOf('\n\n');
+        }
+
+        if (done) break;
+    }
+
+    if (buffer.trim()) {
+        processBlock(buffer.trim());
+    }
+
+    if (!finalEvent) {
+        throw new Error('Chat stream ended before a final response was received');
+    }
+
+    return finalEvent;
+}
diff --git a/frontendv2/src/lib/binary-like-file-names.ts b/frontendv2/src/lib/binary-like-file-names.ts
index 8c8ed2ece..ccdc4312c 100644
--- a/frontendv2/src/lib/binary-like-file-names.ts
+++ b/frontendv2/src/lib/binary-like-file-names.ts
@@ -89,7 +89,7 @@ export function isBinaryLikeFileName(fileName: string): boolean {
     return BINARY_LIKE_EXTENSIONS.has(ext);
 }
 
-/** Archives that the panel may offer to extract (zip-like and common bundles). */
+/** Archives that the panel may offer to extract or browse (zip-like and common bundles). */
 export function isDecompressibleArchiveFileName(fileName: string): boolean {
-    return /\.(zip|jar|war|ear|7z|tar|tar\.gz|tgz|rar)$/i.test(fileName.trim());
+    return /\.(zip|jar|war|ear|7z|tar|tar\.gz|tgz|tar\.bz2|tbz2|tar\.xz|txz|rar)$/i.test(fileName.trim());
 }
diff --git a/frontendv2/src/lib/branding.ts b/frontendv2/src/lib/branding.ts
new file mode 100644
index 000000000..a2a133823
--- /dev/null
+++ b/frontendv2/src/lib/branding.ts
@@ -0,0 +1,22 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+import type { AppSettings } from '@/types/settings';
+
+export const FEATHERPANEL_MARKETING_URL = 'https://featherpanel.com';
+
+export function shouldShowPoweredBy(settings: AppSettings | null | undefined): boolean {
+    return (settings?.branding_show_powered_by ?? 'true') === 'true';
+}
diff --git a/frontendv2/src/lib/cloudPackageMatch.ts b/frontendv2/src/lib/cloudPackageMatch.ts
new file mode 100644
index 000000000..fa61600a3
--- /dev/null
+++ b/frontendv2/src/lib/cloudPackageMatch.ts
@@ -0,0 +1,178 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+type UnknownRecord = Record<string, unknown>;
+
+const asRecord = (value: unknown): UnknownRecord | null =>
+    value !== null && typeof value === 'object' && !Array.isArray(value) ? (value as UnknownRecord) : null;
+
+export const normalizeCloudPackageId = (value: string) => value.trim().toLowerCase();
+
+export const compactCloudPackageId = (value: string) => normalizeCloudPackageId(value).replace(/[^a-z0-9]/g, '');
+
+/** Last path segment from MythicalCloud / FeatherPanel marketplace URLs. */
+export const extractStoreSlugFromUrl = (url: string): string | null => {
+    const trimmed = url.trim();
+    if (trimmed === '') {
+        return null;
+    }
+    try {
+        const pathname = new URL(trimmed).pathname;
+        const segments = pathname.split('/').filter((segment) => segment.length > 0);
+        return segments.length > 0 ? segments[segments.length - 1] : null;
+    } catch {
+        const withoutQuery = trimmed.split('?')[0]?.split('#')[0] ?? trimmed;
+        const segments = withoutQuery.split('/').filter((segment) => segment.length > 0);
+        return segments.length > 0 ? segments[segments.length - 1] : null;
+    }
+};
+
+const addMatchKey = (keys: Set<string>, value: unknown) => {
+    if (typeof value !== 'string') {
+        return;
+    }
+    const normalized = normalizeCloudPackageId(value);
+    if (normalized !== '') {
+        keys.add(normalized);
+    }
+    if (!value.includes('://') && !value.startsWith('//')) {
+        return;
+    }
+    const slug = extractStoreSlugFromUrl(value);
+    if (!slug) {
+        return;
+    }
+    const slugNorm = normalizeCloudPackageId(slug);
+    if (slugNorm !== '' && slugNorm !== normalized) {
+        keys.add(slugNorm);
+    }
+};
+
+const compactIdsFuzzyMatch = (a: string, b: string): boolean => {
+    if (a === b) {
+        return true;
+    }
+    const minLen = 10;
+    if (a.length < minLen || b.length < minLen) {
+        return false;
+    }
+    const maxLenDiff = 1;
+    if (Math.abs(a.length - b.length) > maxLenDiff) {
+        return false;
+    }
+    let i = 0;
+    let j = 0;
+    let edits = 0;
+    while (i < a.length && j < b.length) {
+        if (a[i] === b[j]) {
+            i += 1;
+            j += 1;
+            continue;
+        }
+        edits += 1;
+        if (edits > 1) {
+            return false;
+        }
+        if (a.length > b.length) {
+            i += 1;
+        } else if (b.length > a.length) {
+            j += 1;
+        } else {
+            i += 1;
+            j += 1;
+        }
+    }
+    edits += a.length - i + (b.length - j);
+    return edits <= 1;
+};
+
+/** Whether a FeatherCloud purchase id matches a panel addon id / store slug. */
+export const cloudPackageIdsMatch = (ownedId: string, addonId: string): boolean => {
+    const ownedNorm = normalizeCloudPackageId(ownedId);
+    const addonNorm = normalizeCloudPackageId(addonId);
+    if (ownedNorm === addonNorm) {
+        return true;
+    }
+    const ownedCompact = compactCloudPackageId(ownedId);
+    const addonCompact = compactCloudPackageId(addonId);
+    if (ownedCompact === '' || addonCompact === '') {
+        return false;
+    }
+    if (ownedCompact === addonCompact) {
+        return true;
+    }
+    return compactIdsFuzzyMatch(ownedCompact, addonCompact);
+};
+
+/** Keys used to match an online addon row against owned cloud product ids. */
+export const collectAddonMatchKeys = (
+    identifier: string,
+    options?: { premiumLink?: string | null; storeSlug?: string | null; displayName?: string | null },
+): string[] => {
+    const keys = new Set<string>();
+    addMatchKey(keys, identifier);
+    addMatchKey(keys, options?.storeSlug);
+    addMatchKey(keys, options?.premiumLink);
+    addMatchKey(keys, options?.displayName);
+    return [...keys];
+};
+
+export const isCloudPackageOwned = (
+    ownedIds: readonly string[],
+    identifier: string,
+    options?: { premiumLink?: string | null; storeSlug?: string | null; displayName?: string | null },
+): boolean => {
+    const addonKeys = collectAddonMatchKeys(identifier, options);
+    if (addonKeys.length === 0 || ownedIds.length === 0) {
+        return false;
+    }
+    return ownedIds.some((ownedId) => addonKeys.some((addonKey) => cloudPackageIdsMatch(ownedId, addonKey)));
+};
+
+const PURCHASE_STRING_FIELDS = [
+    'identifier',
+    'package_identifier',
+    'product_identifier',
+    'package_name',
+    'product_name',
+    'name',
+    'slug',
+    'url',
+    'link',
+    'product_url',
+    'marketplace_url',
+    'premium_link',
+    'store_url',
+] as const;
+
+const collectFromRecord = (keys: Set<string>, source: UnknownRecord | null) => {
+    if (!source) {
+        return;
+    }
+    for (const field of PURCHASE_STRING_FIELDS) {
+        addMatchKey(keys, source[field]);
+    }
+};
+
+/** Extract all matchable ids from a FeatherCloud purchase payload. */
+export const collectOwnedCloudPackageIds = (purchase: unknown): string[] => {
+    const keys = new Set<string>();
+    const root = asRecord(purchase);
+    collectFromRecord(keys, root);
+    for (const field of ['product', 'package', 'addon', 'item']) {
+        collectFromRecord(keys, asRecord(root?.[field]));
+    }
+    return [...keys];
+};
diff --git a/frontendv2/src/lib/dateUtils.ts b/frontendv2/src/lib/dateUtils.ts
new file mode 100644
index 000000000..fec0721ef
--- /dev/null
+++ b/frontendv2/src/lib/dateUtils.ts
@@ -0,0 +1,737 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+import { format, formatDistanceToNowStrict, parseISO, type Locale } from 'date-fns';
+import {
+    ar,
+    cs,
+    de,
+    el,
+    enGB,
+    enUS,
+    es,
+    fi,
+    fr,
+    he,
+    hi,
+    hu,
+    id,
+    it,
+    ja,
+    ko,
+    nb,
+    nl,
+    pl,
+    pt,
+    ptBR,
+    ro,
+    ru,
+    sv,
+    th,
+    tr,
+    uk,
+    vi,
+    zhCN,
+} from 'date-fns/locale';
+import { formatInTimeZone, toZonedTime } from 'date-fns-tz';
+
+const NAIVE_MYSQL_DATETIME = /^(\d{4}-\d{2}-\d{2})[ T](\d{2}:\d{2}:\d{2})(\.\d+)?$/;
+
+/**
+ * Parse a datetime value returned by the API into a `Date`.
+ *
+ * - ISO-8601 strings with an offset or `Z` are parsed via `parseISO`.
+ * - Naive `Y-m-d H:i:s` strings are rewritten to ISO-8601 with a `Z` suffix
+ *   (i.e. **assumed UTC**) before parsing. This matches the backend storage
+ *   contract (MySQL session is pinned to `+00:00`).
+ * - Numbers are treated as Unix timestamps in **seconds** when < 1e12,
+ *   otherwise milliseconds.
+ * - Returns `null` for null/undefined/empty/invalid input.
+ */
+export function parseApiDate(value: string | number | Date | null | undefined): Date | null {
+    if (value === null || value === undefined) return null;
+    if (value instanceof Date) {
+        return Number.isFinite(value.getTime()) ? value : null;
+    }
+    if (typeof value === 'number') {
+        if (!Number.isFinite(value)) return null;
+        const ms = value < 1e12 ? value * 1000 : value;
+        const d = new Date(ms);
+        return Number.isFinite(d.getTime()) ? d : null;
+    }
+    const trimmed = value.trim();
+    if (trimmed === '' || trimmed === '0000-00-00 00:00:00') return null;
+
+    let candidate: string = trimmed;
+    const m = trimmed.match(NAIVE_MYSQL_DATETIME);
+    if (m) {
+        candidate = `${m[1]}T${m[2]}${m[3] ?? ''}Z`;
+    }
+
+    const d = parseISO(candidate);
+    return Number.isFinite(d.getTime()) ? d : null;
+}
+
+/**
+ * Map a TranslationContext locale code (e.g. `en`, `pt-BR`, `pt_BR`) to a
+ * `date-fns` locale object. Falls back to `enUS` for unknown values.
+ *
+ * Keep the table small but representative — extra locales can be added on
+ * demand once they are introduced in the translation system.
+ */
+const DATE_FNS_LOCALES: Record<string, Locale> = {
+    en: enUS,
+    'en-US': enUS,
+    'en-GB': enGB,
+    de: de,
+    fr: fr,
+    es: es,
+    it: it,
+    pt: pt,
+    'pt-BR': ptBR,
+    nl: nl,
+    pl: pl,
+    ru: ru,
+    uk: uk,
+    cs: cs,
+    hu: hu,
+    ro: ro,
+    el: el,
+    sv: sv,
+    nb: nb,
+    fi: fi,
+    tr: tr,
+    ar: ar,
+    he: he,
+    hi: hi,
+    th: th,
+    vi: vi,
+    id: id,
+    ja: ja,
+    ko: ko,
+    'zh-CN': zhCN,
+    zh: zhCN,
+};
+
+export function resolveDateFnsLocale(code: string | null | undefined): Locale {
+    if (!code) return enUS;
+    const normalised = code.replace('_', '-');
+    if (DATE_FNS_LOCALES[normalised]) return DATE_FNS_LOCALES[normalised];
+    // Fall back to the language-only prefix (e.g. `pt-PT` → `pt`).
+    const prefix = normalised.split('-')[0];
+    if (DATE_FNS_LOCALES[prefix]) return DATE_FNS_LOCALES[prefix];
+    return enUS;
+}
+
+/**
+ * Get the user's effective IANA timezone identifier.
+ *
+ * Priority: explicit preference > browser detection > `'UTC'` as a last resort.
+ */
+export function getEffectiveTimezone(preference?: string | null): string {
+    if (preference && preference.trim() !== '') return preference;
+    try {
+        const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+        if (tz) return tz;
+    } catch {
+        // Intl may be unavailable in very old environments; fall through.
+    }
+    return 'UTC';
+}
+
+export interface FormatDateOptions {
+    /** IANA timezone identifier. Defaults to the user's effective timezone. */
+    timeZone?: string;
+    /** Translation locale code from TranslationContext (e.g. `en`, `pt-BR`). */
+    locale?: string;
+    /** Override the "now" anchor (mostly useful in tests). */
+    now?: Date;
+    /**
+     * Only used by {@link formatRelativeTime}. `short` (default) uses `Intl.RelativeTimeFormat`
+     * with `style: 'narrow'` (~`30 min ago`). `long` uses full `date-fns` distance strings.
+     */
+    relativeStyle?: 'long' | 'short';
+}
+
+/**
+ * Compact relative labels (e.g. narrow `30 min ago`) via Intl — locale-aware where the
+ * runtime supports it; falls back to {@link formatDistanceToNowStrict} on failure.
+ */
+function formatRelativeTimeIntlNarrow(date: Date, now: Date, localeCode: string | null | undefined): string {
+    const diffSecTotal = Math.round((date.getTime() - now.getTime()) / 1000);
+    const absSec = Math.abs(diffSecTotal);
+
+    let value: number;
+    let unit: Intl.RelativeTimeFormatUnit;
+
+    if (absSec < 60) {
+        value = diffSecTotal;
+        unit = 'second';
+    } else if (absSec < 3600) {
+        value = Math.round(diffSecTotal / 60);
+        unit = 'minute';
+    } else if (absSec < 86_400) {
+        value = Math.round(diffSecTotal / 3600);
+        unit = 'hour';
+    } else {
+        value = Math.round(diffSecTotal / 86_400);
+        unit = 'day';
+    }
+
+    const tag = (localeCode || 'en').trim().replace('_', '-') || 'en';
+    try {
+        const rtf = new Intl.RelativeTimeFormat(tag, { numeric: 'always', style: 'narrow' });
+
+        return rtf.format(value, unit);
+    } catch {
+        return formatDistanceToNowStrict(date, { addSuffix: true, locale: resolveDateFnsLocale(localeCode) });
+    }
+}
+
+/**
+ * Format a date relative to "now" using `date-fns`'s
+ * `formatDistanceToNowStrict`. Examples (en-US):
+ *   - `"5 seconds ago"`, `"3 minutes ago"`, `"2 hours ago"`
+ *   - `"in 1 day"`, `"in 4 months"`
+ *
+ * With `relativeStyle: 'long'`, uses full `date-fns` distance strings instead of narrow Intl labels.
+ *
+ * Defaults to `short` (~`30 min ago`) for list-style UIs across the panel.
+ * Falls back to an absolute, timezone-aware label once the delta exceeds
+ * ~30 days, since "in 3 months" is rarely useful in operational UIs.
+ */
+export function formatRelativeTime(
+    value: string | number | Date | null | undefined,
+    options: FormatDateOptions = {},
+): string {
+    const date = parseApiDate(value);
+    if (!date) return '-';
+
+    const now = options.now ?? new Date();
+    const diffMs = now.getTime() - date.getTime();
+    const absDays = Math.abs(diffMs) / 86_400_000;
+
+    if (absDays > 30) {
+        return formatDateTimeInTz(date, { ...options, now });
+    }
+
+    const style = options.relativeStyle ?? 'short';
+    if (style === 'long') {
+        return formatDistanceToNowStrict(date, { addSuffix: true, locale: resolveDateFnsLocale(options.locale) });
+    }
+
+    return formatRelativeTimeIntlNarrow(date, now, options.locale);
+}
+
+/**
+ * Format an absolute date+time in the user's timezone, using the active
+ * locale's localised short date + time format.
+ */
+export function formatDateTimeInTz(
+    value: string | number | Date | null | undefined,
+    options: FormatDateOptions = {},
+): string {
+    const date = parseApiDate(value);
+    if (!date) return '-';
+    const tz = getEffectiveTimezone(options.timeZone);
+    const locale = resolveDateFnsLocale(options.locale);
+    try {
+        return formatInTimeZone(date, tz, 'PPp', { locale });
+    } catch {
+        // Invalid timezone — fall back to the browser's local zone.
+        return format(date, 'PPp', { locale });
+    }
+}
+
+/**
+ * Format an absolute date (no time component) in the user's timezone.
+ */
+export function formatDateInTz(
+    value: string | number | Date | null | undefined,
+    options: FormatDateOptions = {},
+): string {
+    const date = parseApiDate(value);
+    if (!date) return '-';
+    const tz = getEffectiveTimezone(options.timeZone);
+    const locale = resolveDateFnsLocale(options.locale);
+    try {
+        return formatInTimeZone(date, tz, 'PP', { locale });
+    } catch {
+        return format(date, 'PP', { locale });
+    }
+}
+
+/**
+ * Convert a UTC `Date` into a "wall-clock" `Date` representing the same
+ * instant in the given timezone. Useful when feeding date-fns helpers that
+ * don't accept a `timeZone` option (e.g. `differenceInBusinessDays`).
+ */
+export function dateInUserTz(value: string | number | Date | null | undefined, timeZone?: string): Date | null {
+    const date = parseApiDate(value);
+    if (!date) return null;
+    try {
+        return toZonedTime(date, getEffectiveTimezone(timeZone));
+    } catch {
+        return date;
+    }
+}
+
+/**
+ * Return the list of IANA timezone identifiers supported by the current
+ * environment. Falls back to a hand-maintained list of common zones if
+ * `Intl.supportedValuesOf` is unavailable.
+ */
+export function listSupportedTimezones(): string[] {
+    type IntlWithSupportedValuesOf = typeof Intl & {
+        supportedValuesOf?: (key: 'timeZone') => string[];
+    };
+    const intl = Intl as IntlWithSupportedValuesOf;
+    if (typeof intl.supportedValuesOf === 'function') {
+        try {
+            const zones = intl.supportedValuesOf('timeZone');
+            if (Array.isArray(zones) && zones.length > 0) return zones;
+        } catch {
+            // ignored
+        }
+    }
+    return FALLBACK_TIMEZONES;
+}
+
+const FALLBACK_TIMEZONES: string[] = [
+    'Africa/Abidjan',
+    'Africa/Accra',
+    'Africa/Addis_Ababa',
+    'Africa/Algiers',
+    'Africa/Asmara',
+    'Africa/Bamako',
+    'Africa/Bangui',
+    'Africa/Banjul',
+    'Africa/Bissau',
+    'Africa/Blantyre',
+    'Africa/Brazzaville',
+    'Africa/Bujumbura',
+    'Africa/Cairo',
+    'Africa/Casablanca',
+    'Africa/Ceuta',
+    'Africa/Conakry',
+    'Africa/Dakar',
+    'Africa/Dar_es_Salaam',
+    'Africa/Djibouti',
+    'Africa/Douala',
+    'Africa/El_Aaiun',
+    'Africa/Freetown',
+    'Africa/Gaborone',
+    'Africa/Harare',
+    'Africa/Johannesburg',
+    'Africa/Juba',
+    'Africa/Kampala',
+    'Africa/Khartoum',
+    'Africa/Kigali',
+    'Africa/Kinshasa',
+    'Africa/Lagos',
+    'Africa/Libreville',
+    'Africa/Lome',
+    'Africa/Luanda',
+    'Africa/Lubumbashi',
+    'Africa/Lusaka',
+    'Africa/Malabo',
+    'Africa/Maputo',
+    'Africa/Maseru',
+    'Africa/Mbabane',
+    'Africa/Mogadishu',
+    'Africa/Monrovia',
+    'Africa/Nairobi',
+    'Africa/Ndjamena',
+    'Africa/Niamey',
+    'Africa/Nouakchott',
+    'Africa/Ouagadougou',
+    'Africa/Porto-Novo',
+    'Africa/Sao_Tome',
+    'Africa/Tripoli',
+    'Africa/Tunis',
+    'Africa/Windhoek',
+
+    'America/Adak',
+    'America/Anchorage',
+    'America/Anguilla',
+    'America/Antigua',
+    'America/Araguaina',
+    'America/Argentina/Buenos_Aires',
+    'America/Argentina/Catamarca',
+    'America/Argentina/Cordoba',
+    'America/Argentina/Jujuy',
+    'America/Argentina/La_Rioja',
+    'America/Argentina/Mendoza',
+    'America/Argentina/Rio_Gallegos',
+    'America/Argentina/Salta',
+    'America/Argentina/San_Juan',
+    'America/Argentina/San_Luis',
+    'America/Argentina/Tucuman',
+    'America/Argentina/Ushuaia',
+    'America/Aruba',
+    'America/Asuncion',
+    'America/Bahia',
+    'America/Bahia_Banderas',
+    'America/Barbados',
+    'America/Belem',
+    'America/Belize',
+    'America/Blanc-Sablon',
+    'America/Boa_Vista',
+    'America/Bogota',
+    'America/Boise',
+    'America/Cambridge_Bay',
+    'America/Campo_Grande',
+    'America/Cancun',
+    'America/Caracas',
+    'America/Cayenne',
+    'America/Cayman',
+    'America/Chicago',
+    'America/Chihuahua',
+    'America/Costa_Rica',
+    'America/Creston',
+    'America/Cuiaba',
+    'America/Curacao',
+    'America/Danmarkshavn',
+    'America/Dawson',
+    'America/Dawson_Creek',
+    'America/Denver',
+    'America/Detroit',
+    'America/Dominica',
+    'America/Edmonton',
+    'America/Eirunepe',
+    'America/El_Salvador',
+    'America/Fort_Nelson',
+    'America/Fortaleza',
+    'America/Glace_Bay',
+    'America/Goose_Bay',
+    'America/Grand_Turk',
+    'America/Grenada',
+    'America/Guadeloupe',
+    'America/Guatemala',
+    'America/Guayaquil',
+    'America/Guyana',
+    'America/Halifax',
+    'America/Havana',
+    'America/Hermosillo',
+    'America/Indiana/Indianapolis',
+    'America/Indiana/Knox',
+    'America/Indiana/Marengo',
+    'America/Indiana/Petersburg',
+    'America/Indiana/Tell_City',
+    'America/Indiana/Vevay',
+    'America/Indiana/Vincennes',
+    'America/Indiana/Winamac',
+    'America/Inuvik',
+    'America/Iqaluit',
+    'America/Jamaica',
+    'America/Juneau',
+    'America/Kentucky/Louisville',
+    'America/Kentucky/Monticello',
+    'America/Kralendijk',
+    'America/La_Paz',
+    'America/Lima',
+    'America/Los_Angeles',
+    'America/Lower_Princes',
+    'America/Maceio',
+    'America/Managua',
+    'America/Manaus',
+    'America/Marigot',
+    'America/Martinique',
+    'America/Matamoros',
+    'America/Mazatlan',
+    'America/Menominee',
+    'America/Merida',
+    'America/Metlakatla',
+    'America/Mexico_City',
+    'America/Miquelon',
+    'America/Moncton',
+    'America/Monterrey',
+    'America/Montevideo',
+    'America/Montserrat',
+    'America/Nassau',
+    'America/New_York',
+    'America/Nome',
+    'America/Noronha',
+    'America/North_Dakota/Beulah',
+    'America/North_Dakota/Center',
+    'America/North_Dakota/New_Salem',
+    'America/Nuuk',
+    'America/Ojinaga',
+    'America/Panama',
+    'America/Paramaribo',
+    'America/Phoenix',
+    'America/Port-au-Prince',
+    'America/Port_of_Spain',
+    'America/Porto_Velho',
+    'America/Puerto_Rico',
+    'America/Punta_Arenas',
+    'America/Rankin_Inlet',
+    'America/Recife',
+    'America/Regina',
+    'America/Resolute',
+    'America/Rio_Branco',
+    'America/Santarem',
+    'America/Santiago',
+    'America/Santo_Domingo',
+    'America/Sao_Paulo',
+    'America/Scoresbysund',
+    'America/Sitka',
+    'America/St_Barthelemy',
+    'America/St_Johns',
+    'America/St_Kitts',
+    'America/St_Lucia',
+    'America/St_Thomas',
+    'America/St_Vincent',
+    'America/Swift_Current',
+    'America/Tegucigalpa',
+    'America/Thule',
+    'America/Tijuana',
+    'America/Toronto',
+    'America/Tortola',
+    'America/Vancouver',
+    'America/Whitehorse',
+    'America/Winnipeg',
+    'America/Yakutat',
+    'America/Yellowknife',
+
+    'Antarctica/Casey',
+    'Antarctica/Davis',
+    'Antarctica/DumontDUrville',
+    'Antarctica/Macquarie',
+    'Antarctica/Mawson',
+    'Antarctica/Palmer',
+    'Antarctica/Rothera',
+    'Antarctica/Syowa',
+    'Antarctica/Troll',
+    'Antarctica/Vostok',
+
+    'Asia/Aden',
+    'Asia/Almaty',
+    'Asia/Amman',
+    'Asia/Anadyr',
+    'Asia/Aqtau',
+    'Asia/Aqtobe',
+    'Asia/Ashgabat',
+    'Asia/Atyrau',
+    'Asia/Baghdad',
+    'Asia/Bahrain',
+    'Asia/Baku',
+    'Asia/Bangkok',
+    'Asia/Barnaul',
+    'Asia/Beirut',
+    'Asia/Bishkek',
+    'Asia/Brunei',
+    'Asia/Chita',
+    'Asia/Colombo',
+    'Asia/Damascus',
+    'Asia/Dhaka',
+    'Asia/Dili',
+    'Asia/Dubai',
+    'Asia/Dushanbe',
+    'Asia/Famagusta',
+    'Asia/Gaza',
+    'Asia/Hebron',
+    'Asia/Ho_Chi_Minh',
+    'Asia/Hong_Kong',
+    'Asia/Hovd',
+    'Asia/Irkutsk',
+    'Asia/Jakarta',
+    'Asia/Jayapura',
+    'Asia/Jerusalem',
+    'Asia/Kabul',
+    'Asia/Kamchatka',
+    'Asia/Karachi',
+    'Asia/Kathmandu',
+    'Asia/Kolkata',
+    'Asia/Krasnoyarsk',
+    'Asia/Kuala_Lumpur',
+    'Asia/Kuching',
+    'Asia/Kuwait',
+    'Asia/Macau',
+    'Asia/Magadan',
+    'Asia/Makassar',
+    'Asia/Manila',
+    'Asia/Muscat',
+    'Asia/Nicosia',
+    'Asia/Novokuznetsk',
+    'Asia/Novosibirsk',
+    'Asia/Omsk',
+    'Asia/Oral',
+    'Asia/Phnom_Penh',
+    'Asia/Pontianak',
+    'Asia/Pyongyang',
+    'Asia/Qatar',
+    'Asia/Qostanay',
+    'Asia/Qyzylorda',
+    'Asia/Riyadh',
+    'Asia/Sakhalin',
+    'Asia/Samarkand',
+    'Asia/Seoul',
+    'Asia/Shanghai',
+    'Asia/Singapore',
+    'Asia/Srednekolymsk',
+    'Asia/Taipei',
+    'Asia/Tashkent',
+    'Asia/Tbilisi',
+    'Asia/Tehran',
+    'Asia/Thimphu',
+    'Asia/Tokyo',
+    'Asia/Tomsk',
+    'Asia/Ulaanbaatar',
+    'Asia/Urumqi',
+    'Asia/Ust-Nera',
+    'Asia/Vientiane',
+    'Asia/Vladivostok',
+    'Asia/Yakutsk',
+    'Asia/Yangon',
+    'Asia/Yekaterinburg',
+    'Asia/Yerevan',
+
+    'Atlantic/Azores',
+    'Atlantic/Bermuda',
+    'Atlantic/Canary',
+    'Atlantic/Cape_Verde',
+    'Atlantic/Faroe',
+    'Atlantic/Madeira',
+    'Atlantic/Reykjavik',
+    'Atlantic/South_Georgia',
+    'Atlantic/St_Helena',
+    'Atlantic/Stanley',
+
+    'Australia/Adelaide',
+    'Australia/Brisbane',
+    'Australia/Broken_Hill',
+    'Australia/Darwin',
+    'Australia/Eucla',
+    'Australia/Hobart',
+    'Australia/Lindeman',
+    'Australia/Lord_Howe',
+    'Australia/Melbourne',
+    'Australia/Perth',
+    'Australia/Sydney',
+
+    'Europe/Amsterdam',
+    'Europe/Andorra',
+    'Europe/Astrakhan',
+    'Europe/Athens',
+    'Europe/Belgrade',
+    'Europe/Berlin',
+    'Europe/Bratislava',
+    'Europe/Brussels',
+    'Europe/Bucharest',
+    'Europe/Budapest',
+    'Europe/Busingen',
+    'Europe/Chisinau',
+    'Europe/Copenhagen',
+    'Europe/Dublin',
+    'Europe/Gibraltar',
+    'Europe/Guernsey',
+    'Europe/Helsinki',
+    'Europe/Isle_of_Man',
+    'Europe/Istanbul',
+    'Europe/Jersey',
+    'Europe/Kaliningrad',
+    'Europe/Kiev',
+    'Europe/Kirov',
+    'Europe/Lisbon',
+    'Europe/Ljubljana',
+    'Europe/London',
+    'Europe/Luxembourg',
+    'Europe/Madrid',
+    'Europe/Malta',
+    'Europe/Mariehamn',
+    'Europe/Minsk',
+    'Europe/Monaco',
+    'Europe/Moscow',
+    'Europe/Oslo',
+    'Europe/Paris',
+    'Europe/Podgorica',
+    'Europe/Prague',
+    'Europe/Riga',
+    'Europe/Rome',
+    'Europe/Samara',
+    'Europe/San_Marino',
+    'Europe/Sarajevo',
+    'Europe/Saratov',
+    'Europe/Simferopol',
+    'Europe/Skopje',
+    'Europe/Sofia',
+    'Europe/Stockholm',
+    'Europe/Tallinn',
+    'Europe/Tirane',
+    'Europe/Ulyanovsk',
+    'Europe/Uzhgorod',
+    'Europe/Vaduz',
+    'Europe/Vatican',
+    'Europe/Vienna',
+    'Europe/Vilnius',
+    'Europe/Volgograd',
+    'Europe/Warsaw',
+    'Europe/Zagreb',
+    'Europe/Zaporozhye',
+    'Europe/Zurich',
+
+    'Indian/Antananarivo',
+    'Indian/Chagos',
+    'Indian/Christmas',
+    'Indian/Cocos',
+    'Indian/Comoro',
+    'Indian/Kerguelen',
+    'Indian/Mahe',
+    'Indian/Maldives',
+    'Indian/Mauritius',
+    'Indian/Mayotte',
+    'Indian/Reunion',
+
+    'Pacific/Apia',
+    'Pacific/Auckland',
+    'Pacific/Bougainville',
+    'Pacific/Chatham',
+    'Pacific/Easter',
+    'Pacific/Efate',
+    'Pacific/Fakaofo',
+    'Pacific/Fiji',
+    'Pacific/Funafuti',
+    'Pacific/Galapagos',
+    'Pacific/Gambier',
+    'Pacific/Guadalcanal',
+    'Pacific/Guam',
+    'Pacific/Honolulu',
+    'Pacific/Kanton',
+    'Pacific/Kiritimati',
+    'Pacific/Kosrae',
+    'Pacific/Kwajalein',
+    'Pacific/Majuro',
+    'Pacific/Marquesas',
+    'Pacific/Midway',
+    'Pacific/Nauru',
+    'Pacific/Niue',
+    'Pacific/Norfolk',
+    'Pacific/Noumea',
+    'Pacific/Pago_Pago',
+    'Pacific/Palau',
+    'Pacific/Pitcairn',
+    'Pacific/Pohnpei',
+    'Pacific/Port_Moresby',
+    'Pacific/Rarotonga',
+    'Pacific/Saipan',
+    'Pacific/Tahiti',
+    'Pacific/Tarawa',
+    'Pacific/Tongatapu',
+    'Pacific/Wake',
+    'Pacific/Wallis',
+
+    'UTC',
+];
diff --git a/frontendv2/src/lib/feather-trash.ts b/frontendv2/src/lib/feather-trash.ts
new file mode 100644
index 000000000..9e9aa77d0
--- /dev/null
+++ b/frontendv2/src/lib/feather-trash.ts
@@ -0,0 +1,84 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+import type { TrashEntry } from '@/lib/files-api';
+import type { FileObject } from '@/types/server';
+
+/** Internal trash folder on the server (hidden from file manager listings). */
+export const FEATHER_TRASH_DIR = '.featherpanel-trash';
+
+export type TrashFolderStats = {
+    totalSize: number;
+    lastModified: string | null;
+    itemCount: number;
+};
+
+export function isTrashShortcut(file: Pick<FileObject, 'isTrashShortcut'>): boolean {
+    return file.isTrashShortcut === true;
+}
+
+export function trashStatsFromList(data: { entries: TrashEntry[]; total_size: number }): TrashFolderStats {
+    let lastModified: string | null = null;
+    for (const entry of data.entries) {
+        if (!entry.deleted_at) continue;
+        if (!lastModified || entry.deleted_at > lastModified) {
+            lastModified = entry.deleted_at;
+        }
+    }
+    return {
+        totalSize: data.total_size ?? 0,
+        lastModified,
+        itemCount: data.entries?.length ?? 0,
+    };
+}
+
+/** Synthetic folder row shown at the top of the file list when trash is enabled. */
+export function createTrashFolderEntry(stats?: TrashFolderStats): FileObject {
+    const modified = stats?.lastModified ?? '';
+    const totalSize = stats?.totalSize ?? 0;
+    return {
+        name: FEATHER_TRASH_DIR,
+        mode: 'drwxr-xr-x',
+        mode_bits: '755',
+        size: totalSize,
+        directory_size: totalSize,
+        isFile: false,
+        symlink: false,
+        mimetype: 'inode/directory',
+        created_at: modified,
+        modified_at: modified,
+        directory: true,
+        file: false,
+        isTrashShortcut: true,
+        trashItemCount: stats?.itemCount ?? 0,
+    };
+}
+
+export function isFeatherTrashEntry(name: string): boolean {
+    const n = name.replace(/\\/g, '/').replace(/^\/+/, '');
+    return n === FEATHER_TRASH_DIR || n.startsWith(`${FEATHER_TRASH_DIR}/`);
+}
+
+export function filterFeatherTrashFiles<T extends { name: string }>(files: T[]): T[] {
+    return files.filter((f) => !isFeatherTrashEntry(f.name));
+}
+
+export function filterFeatherTrashNames(names: string[]): string[] {
+    return names.filter((n) => !isFeatherTrashEntry(n));
+}
+
+export function filterSelectableFiles<T extends Pick<FileObject, 'isTrashShortcut'>>(files: T[]): T[] {
+    return files.filter((f) => !isTrashShortcut(f));
+}
diff --git a/frontendv2/src/lib/files-api.ts b/frontendv2/src/lib/files-api.ts
index 03deca41e..44381be4e 100644
--- a/frontendv2/src/lib/files-api.ts
+++ b/frontendv2/src/lib/files-api.ts
@@ -14,6 +14,7 @@ See the LICENSE file or <https://www.gnu.org/licenses/>.
 */
 
 import api from './api';
+import { filterFeatherTrashFiles } from '@/lib/feather-trash';
 import { FileObject, FilesResponse } from '@/types/server';
 
 interface ApiResponse<T> {
@@ -31,6 +32,40 @@ export interface FileHashesResponse {
     path: string;
 }
 
+export interface ArchiveListEntry {
+    name: string;
+    path: string;
+    size: number;
+    directory: boolean;
+    modified?: string;
+}
+
+export interface ArchiveListData {
+    contents: ArchiveListEntry[];
+    truncated: boolean;
+}
+
+export interface TrashEntry {
+    id: string;
+    original_root: string;
+    original_name: string;
+    deleted_at: string;
+    size: number;
+    is_directory: boolean;
+}
+
+/** DataTransfer type for dragging paths out of the archive browser into the file list. */
+export const ARCHIVE_EXTRACT_DRAG_MIME = 'application/x-featherpanel-archive-extract' as const;
+
+export interface ArchiveExtractDragPayload {
+    /** Server directory that contains the archive (same as decompress `root`). */
+    root: string;
+    /** Archive file name only. */
+    file: string;
+    /** Paths inside the archive (files and/or directories). */
+    entries: string[];
+}
+
 export interface AdvancedFileSearchFilters {
     directory?: string;
     pattern?: string;
@@ -113,8 +148,8 @@ export const filesApi = {
             params: { path: directory },
         });
 
-        // Map fields for UI consistency
-        return response.data.data.contents.map((f) => {
+        // Map fields for UI consistency; never expose the internal trash directory in the UI
+        const mapped = response.data.data.contents.map((f) => {
             const isFile = f.file !== undefined ? f.file : f.isFile !== undefined ? f.isFile : !f.directory;
             return {
                 ...f,
@@ -124,6 +159,7 @@ export const filesApi = {
                 mimetype: f.mime || f.mimetype,
             };
         });
+        return filterFeatherTrashFiles(mapped);
     },
 
     searchFiles: async (uuid: string, filters: AdvancedFileSearchFilters): Promise<FileObject[]> => {
@@ -131,7 +167,7 @@ export const filesApi = {
             params: filters,
         });
 
-        return response.data.data.map((f) => {
+        const mapped = response.data.data.map((f) => {
             const isFile = f.file !== undefined ? f.file : f.isFile !== undefined ? f.isFile : !f.directory;
             return {
                 ...f,
@@ -141,6 +177,27 @@ export const filesApi = {
                 mimetype: f.mime || f.mimetype,
             };
         });
+        return filterFeatherTrashFiles(mapped);
+    },
+
+    listArchiveDirectory: async (
+        uuid: string,
+        serverDirectory: string,
+        archiveFileName: string,
+        archiveInnerPath = '',
+    ): Promise<ArchiveListData> => {
+        const response = await api.get<ApiResponse<ArchiveListData>>(`/user/servers/${uuid}/archive-list`, {
+            params: {
+                path: serverDirectory,
+                file: archiveFileName,
+                archive_path: archiveInnerPath,
+            },
+        });
+        const d = response.data.data;
+        if (!d.contents) {
+            return { contents: [], truncated: Boolean(d.truncated) };
+        }
+        return d;
     },
 
     getFileContent: async (uuid: string, path: string): Promise<string> => {
@@ -250,15 +307,35 @@ export const filesApi = {
         });
     },
 
-    deleteFiles: async (uuid: string, root: string, files: string[]): Promise<void> => {
+    deleteFiles: async (uuid: string, root: string, files: string[], permanent = false): Promise<void> => {
         await api.delete(`/user/servers/${uuid}/delete-files`, {
             data: {
                 root,
                 files,
+                ...(permanent ? { permanent: true } : {}),
             },
         });
     },
 
+    listTrash: async (uuid: string): Promise<{ entries: TrashEntry[]; total_size: number }> => {
+        const res = await api.get<ApiResponse<{ entries: TrashEntry[]; total_size: number }>>(
+            `/user/servers/${uuid}/trash`,
+        );
+        return res.data.data;
+    },
+
+    restoreTrash: async (uuid: string, ids: string[], overwrite = false): Promise<void> => {
+        await api.post(`/user/servers/${uuid}/trash/restore`, { ids, overwrite });
+    },
+
+    deleteTrashEntries: async (uuid: string, ids: string[]): Promise<void> => {
+        await api.post(`/user/servers/${uuid}/trash/delete`, { ids });
+    },
+
+    emptyTrash: async (uuid: string): Promise<void> => {
+        await api.post(`/user/servers/${uuid}/trash/empty`);
+    },
+
     wipeAllFiles: async (uuid: string): Promise<void> => {
         await api.post(`/user/servers/${uuid}/wipe-all-files`);
     },
@@ -288,6 +365,21 @@ export const filesApi = {
         });
     },
 
+    extractArchiveSelection: async (
+        uuid: string,
+        root: string,
+        file: string,
+        destination: string,
+        entries: string[],
+    ): Promise<void> => {
+        await api.post(`/user/servers/${uuid}/extract-archive-selection`, {
+            root,
+            file,
+            destination,
+            entries,
+        });
+    },
+
     changePermissions: async (uuid: string, root: string, files: { file: string; mode: string }[]): Promise<void> => {
         await api.post(`/user/servers/${uuid}/change-permissions`, {
             root,
diff --git a/frontendv2/src/lib/server-switch.ts b/frontendv2/src/lib/server-switch.ts
new file mode 100644
index 000000000..7a3f83c6c
--- /dev/null
+++ b/frontendv2/src/lib/server-switch.ts
@@ -0,0 +1,140 @@
+/*
+This file is part of FeatherPanel.
+
+Copyright (C) 2025 MythicalSystems Studios
+Copyright (C) 2025 FeatherPanel Contributors
+Copyright (C) 2025 Cassian Gherman (aka NaysKutzu)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+See the LICENSE file or <https://www.gnu.org/licenses/>.
+*/
+
+import type { Server } from '@/types/server';
+
+const RECENT_SERVERS_KEY = 'featherpanel_recent_servers_v1';
+
+export type ServerSwitcherTab = 'all' | 'favorites' | 'recent';
+
+type RecentEntry = {
+    uuidShort: string;
+    lastViewedAt: string;
+};
+
+export function getRecentServerUuidShorts(): string[] {
+    if (typeof window === 'undefined') return [];
+
+    try {
+        const raw = window.localStorage.getItem(RECENT_SERVERS_KEY);
+        if (!raw) return [];
+        const recent = JSON.parse(raw) as RecentEntry[];
+        if (!Array.isArray(recent)) return [];
+        return recent.map((e) => e.uuidShort).filter(Boolean);
+    } catch {
+        return [];
+    }
+}
+
+export function filterServersForSwitcherTab(
+    servers: Server[],
+    tab: ServerSwitcherTab,
+    favoriteUuids: string[],
+    recentUuidShorts: string[],
+): Server[] {
+    if (tab === 'favorites') {
+        const favSet = new Set(favoriteUuids);
+        return servers.filter((s) => favSet.has(s.uuid));
+    }
+
+    if (tab === 'recent') {
+        const recentSet = new Set(recentUuidShorts);
+        const byRecent = servers.filter((s) => recentSet.has(getServerRouteId(s)));
+        return byRecent.sort((a, b) => {
+            const aId = getServerRouteId(a);
+            const bId = getServerRouteId(b);
+            return recentUuidShorts.indexOf(aId) - recentUuidShorts.indexOf(bId);
+        });
+    }
+
+    return servers;
+}
+
+export function filterServersBySearch(servers: Server[], query: string): Server[] {
+    const q = query.trim().toLowerCase();
+    if (!q) return servers;
+
+    return servers.filter((server) => {
+        const name = server.name?.toLowerCase() ?? '';
+        const description = server.description?.toLowerCase() ?? '';
+        const routeId = getServerRouteId(server).toLowerCase();
+        const spellName = server.spell?.name?.toLowerCase() ?? '';
+        return name.includes(q) || description.includes(q) || routeId.includes(q) || spellName.includes(q);
+    });
+}
+
+export function sortServersWithFavoritesFirst(servers: Server[], favoriteUuids: string[]): Server[] {
+    const favSet = new Set(favoriteUuids);
+    return [...servers].sort((a, b) => {
+        const aFav = favSet.has(a.uuid) ? 0 : 1;
+        const bFav = favSet.has(b.uuid) ? 0 : 1;
+        if (aFav !== bFav) return aFav - bFav;
+        return a.name.localeCompare(b.name, undefined, { sensitivity: 'base' });
+    });
+}
+
+/** Preserve the current server sub-route when switching (e.g. /files → /files). */
+export function buildServerSwitchUrl(targetUuidShort: string, pathname: string): string {
+    const match = pathname.match(/^\/server\/[^/]+(\/.*)?$/);
+    const subpath = match?.[1] ?? '';
+    return `/server/${targetUuidShort}${subpath}`;
+}
+
+export function getCurrentServerUuidShort(pathname: string): string | null {
+    if (!pathname.startsWith('/server/')) return null;
+    const segment = pathname.split('/')[2];
+    return segment || null;
+}
+
+/** Route segment used in `/server/{id}/…` (API may use camelCase or snake_case). */
+export function getServerRouteId(server: Server): string {
+    const raw = server as Server & { uuid_short?: string };
+    return raw.uuidShort || raw.uuid_short || raw.identifier || '';
+}
+
+export function sortServersForSwitcher(servers: Server[], currentUuidShort: string | null): Server[] {
+    const recentOrder: string[] = [];
+
+    if (typeof window !== 'undefined') {
+        try {
+            const raw = window.localStorage.getItem(RECENT_SERVERS_KEY);
+            if (raw) {
+                const recent = JSON.parse(raw) as RecentEntry[];
+                if (Array.isArray(recent)) {
+                    for (const entry of recent) {
+                        if (entry?.uuidShort) recentOrder.push(entry.uuidShort);
+                    }
+                }
+            }
+        } catch {
+            // ignore
+        }
+    }
+
+    const score = (server: Server): number => {
+        const id = getServerRouteId(server);
+        if (currentUuidShort && id === currentUuidShort) return -1;
+        const recentIndex = recentOrder.indexOf(id);
+        if (recentIndex >= 0) return recentIndex;
+        return 1000;
+    };
+
+    return [...servers].sort((a, b) => {
+        const scoreA = score(a);
+        const scoreB = score(b);
+        if (scoreA !== scoreB) return scoreA - scoreB;
+        return a.name.localeCompare(b.name, undefined, { sensitivity: 'base' });
+    });
+}
diff --git a/frontendv2/src/types/adminServerTypes.ts b/frontendv2/src/types/adminServerTypes.ts
index a7439c424..2c0060dff 100644
--- a/frontendv2/src/types/adminServerTypes.ts
+++ b/frontendv2/src/types/adminServerTypes.ts
@@ -48,6 +48,8 @@ export interface ApiServer {
         username: string;
         email: string;
         avatar?: string;
+        last_seen?: string | null;
+        first_seen?: string | null;
     };
     node?: {
         id: number;
diff --git a/frontendv2/src/types/navigation.ts b/frontendv2/src/types/navigation.ts
index baa26d9c5..ad5c30add 100644
--- a/frontendv2/src/types/navigation.ts
+++ b/frontendv2/src/types/navigation.ts
@@ -33,6 +33,7 @@ export interface NavigationItem {
     showBadge?: boolean;
     description?: string;
     group?: string;
+    priority?: number;
     badge?: string;
     children?: NavigationItem[]; // Optional submenu items
 }
@@ -56,6 +57,7 @@ export interface PluginSidebarItem {
     permission?: string;
     showBadge?: boolean;
     group?: string;
+    priority?: number; // Lower numbers render first within the same sidebar group
     allowedOnlyOnSpells?: number[] | null; // Array of spell IDs if restricted, null if no restrictions
 }
 
diff --git a/frontendv2/src/types/server.ts b/frontendv2/src/types/server.ts
index 4f78cbe14..71420a832 100644
--- a/frontendv2/src/types/server.ts
+++ b/frontendv2/src/types/server.ts
@@ -93,6 +93,18 @@ export interface Variable {
     field_type: string;
 }
 
+export interface CustomVariable {
+    id: number;
+    server_id: number;
+    user_id: number;
+    name: string;
+    env_variable: string;
+    variable_value: string;
+    is_encrypted: number;
+    created_at?: string;
+    updated_at?: string;
+}
+
 export interface ServerStats {
     memory_bytes: number;
     memory_limit_bytes: number;
@@ -491,6 +503,7 @@ export interface Schedule {
     cron_day_of_month: string;
     cron_hour: string;
     cron_minute: string;
+    timezone: string;
     is_active: number;
     is_processing: number;
     only_when_online: number;
@@ -507,6 +520,7 @@ export interface ScheduleCreateRequest {
     cron_day_of_month: string;
     cron_month: string;
     cron_day_of_week: string;
+    timezone: string;
     only_when_online: number;
     is_active: number;
 }
@@ -645,6 +659,12 @@ export interface FileObject {
     mimetype: string;
     created_at: string;
     modified_at: string;
+    /** Recursive byte size of directory contents (FeatherWings when directory_sizes is enabled). */
+    directory_size?: number;
+    /** Virtual row in the file manager that opens the trash UI instead of the real folder. */
+    isTrashShortcut?: boolean;
+    /** Item count in trash (virtual folder row only). */
+    trashItemCount?: number;
     // API Response raw fields
     created?: string;
     modified?: string;
diff --git a/frontendv2/src/types/settings.ts b/frontendv2/src/types/settings.ts
index 637bc1f25..d810d8268 100644
--- a/frontendv2/src/types/settings.ts
+++ b/frontendv2/src/types/settings.ts
@@ -58,6 +58,7 @@ export interface AppSettings {
     reforge_captcha_lang?: string;
     reforge_captcha_min_score?: string;
     app_url: string;
+    branding_show_powered_by?: string;
     app_logo_white: string;
     app_logo_dark: string;
     app_support_url: string;
@@ -86,6 +87,9 @@ export interface AppSettings {
     server_allow_schedules: string;
     /** Admin-only: gates lifecycle hooks UI + execution (sidebar entry hidden when false). */
     server_lifecycle_hooks_enabled: string;
+    file_trash_enabled: string;
+    file_trash_max_size_mb: string;
+    file_trash_retention_days: string;
     server_proxy_max_per_server: string;
     server_allow_cross_realm_spell_change: string;
     user_allow_avatar_change: string;
diff --git a/runner/Cargo.lock b/runner/Cargo.lock
index 62907b229..1dd3cce37 100644
--- a/runner/Cargo.lock
+++ b/runner/Cargo.lock
@@ -74,7 +74,7 @@ dependencies = [
 
 [[package]]
 name = "async-runner"
-version = "1.3.7+2"
+version = "1.3.7+3"
 dependencies = [
  "anyhow",
  "base64",
diff --git a/runner/Cargo.toml b/runner/Cargo.toml
index a6b5595dd..368d9f531 100644
--- a/runner/Cargo.toml
+++ b/runner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "async-runner"
-version = "1.3.7+2"
+version = "1.3.7+3"
 edition = "2021"
 
 [dependencies]