diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 41cd94774..7d693d23c 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -9,5 +9,9 @@
     ],
     "deny": [],
     "ask": []
-  }
+  },
+  "enabledMcpjsonServers": [
+    "nx-mcp"
+  ],
+  "enableAllProjectMcpServers": true
 }
diff --git a/.mcp.json b/.mcp.json
new file mode 100644
index 000000000..ae5a82ef5
--- /dev/null
+++ b/.mcp.json
@@ -0,0 +1,9 @@
+{
+    "mcpServers": {
+        "nx-mcp": {
+            "type": "stdio",
+            "command": "npx",
+            "args": ["nx", "mcp"]
+        }
+    }
+}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..3583c4314
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+    "recommendations": ["ms-playwright.playwright", "esbenp.prettier-vscode"]
+}
diff --git a/CLAUDE.md b/CLAUDE.md
index c42097d00..9420b3598 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -94,23 +94,25 @@ This is an Nx monorepo with the following structure:
 - **apps/electron-backend** - Electron main process
 - **apps/web-e2e** - Playwright end-to-end tests
 - **libs/** - Shared libraries:
-  - **m3u-state** - NgRx state management for playlists
-  - **services** - Abstract DataService and implementations
-  - **shared/interfaces** - TypeScript interfaces and types
-  - **shared/m3u-utils** - M3U playlist utilities
-  - **ui/components** - Reusable UI components
-  - **ui/pipes** - Angular pipes
-  - **ui/shared-portals** - Portal-related UI components
+    - **m3u-state** - NgRx state management for playlists
+    - **services** - Abstract DataService and implementations
+    - **shared/interfaces** - TypeScript interfaces and types
+    - **shared/m3u-utils** - M3U playlist utilities
+    - **ui/components** - Reusable UI components
+    - **ui/pipes** - Angular pipes
+    - **ui/shared-portals** - Portal-related UI components
 
 ### Frontend Architecture (Angular)
 
 **State Management**: Uses NgRx for playlist state management:
+
 - Store configuration in `apps/web/src/app/app.config.ts`
 - Playlist state, actions, effects, and reducers in `libs/m3u-state/`
 - Entity adapter pattern for managing playlists collection
 - Router store integration for route-based state
 
 **Routing**: Lazy-loaded routes in `apps/web/src/app/app.routes.ts`
+
 - Home/playlists overview: `/`
 - Video player: `/playlists/:id` or `/iptv`
 - Xtream Codes: `/xtreams/:id` (different routes for Electron vs web)
@@ -118,85 +120,96 @@ This is an Nx monorepo with the following structure:
 - Settings: `/settings`
 
 **Service Architecture** (Factory Pattern):
+
 - Abstract `DataService` class in `libs/services/src/lib/data.service.ts` defines the contract
 - Two environment-specific implementations:
-  - `ElectronService` (`apps/web/src/app/services/electron.service.ts`) - Uses IPC to communicate with Electron backend
-  - `PwaService` (`apps/web/src/app/services/pwa.service.ts`) - Uses HTTP API and IndexedDB for standalone web version
+    - `ElectronService` (`apps/web/src/app/services/electron.service.ts`) - Uses IPC to communicate with Electron backend
+    - `PwaService` (`apps/web/src/app/services/pwa.service.ts`) - Uses HTTP API and IndexedDB for standalone web version
 - Factory function `DataFactory()` in `apps/web/src/app/app.config.ts` determines which implementation to inject:
-  ```typescript
-  if (window.electron) {
-      return new ElectronService();
-  }
-  return new PwaService();
-  ```
+    ```typescript
+    if (window.electron) {
+        return new ElectronService();
+    }
+    return new PwaService();
+    ```
 
 **Data Storage (Environment-Specific)**:
+
 - **Electron**: libSQL/SQLite database via Drizzle ORM
-  - Location: `~/.iptvnator/databases/iptvnator.db`
-  - Full-featured relational database with foreign keys and indexes
-  - Supports local file or remote Turso instance via env vars
+    - Location: `~/.iptvnator/databases/iptvnator.db`
+    - Full-featured relational database with foreign keys and indexes
+    - Supports local file or remote Turso instance via env vars
 - **PWA (Web)**: IndexedDB via `ngx-indexed-db`
-  - Browser-based NoSQL storage
-  - Same schema structure but implemented in IndexedDB
-  - Limited by browser storage quotas
+    - Browser-based NoSQL storage
+    - Same schema structure but implemented in IndexedDB
+    - Limited by browser storage quotas
 
 ### Backend Architecture (Electron)
 
 **Main Entry**: `apps/electron-backend/src/main.ts`
+
 - Bootstraps Electron app and initializes database
 - Registers event handlers for IPC communication
 
 **Database**:
+
 - **ORM**: Drizzle ORM with libSQL (local SQLite file or remote Turso)
 - **Location**: `~/.iptvnator/databases/iptvnator.db` (avoids spaces in path)
 - **Schema** (`apps/electron-backend/src/app/database/schema.ts`):
-  - `playlists` - Playlist metadata (M3U, Xtream, Stalker)
-  - `categories` - Content categories (live, movies, series)
-  - `content` - Streams/VOD/series items
-  - `favorites` - User favorites
-  - `recentlyViewed` - Watch history
+    - `playlists` - Playlist metadata (M3U, Xtream, Stalker)
+    - `categories` - Content categories (live, movies, series)
+    - `content` - Streams/VOD/series items
+    - `favorites` - User favorites
+    - `recentlyViewed` - Watch history
 - **Connection**: `apps/electron-backend/src/app/database/connection.ts`
-  - Auto-creates tables on init
-  - Supports local file or remote via env vars (`LIBSQL_URL`, `LIBSQL_AUTH_TOKEN`)
+    - Auto-creates tables on init
+    - Supports local file or remote via env vars (`LIBSQL_URL`, `LIBSQL_AUTH_TOKEN`)
 
 **IPC Communication**:
+
 - **Preload script**: `apps/electron-backend/src/app/api/main.preload.ts`
-  - Exposes `window.electron` API via `contextBridge`
-  - All IPC channels defined here (playlist operations, EPG, database CRUD, external players, etc.)
+    - Exposes `window.electron` API via `contextBridge`
+    - All IPC channels defined here (playlist operations, EPG, database CRUD, external players, etc.)
 - **Event handlers**: `apps/electron-backend/src/app/events/`
-  - `database.events.ts` - Database CRUD operations
-  - `playlist.events.ts` - Playlist import/update
-  - `epg.events.ts` - EPG fetch and parsing (uses worker)
-  - `xtream.events.ts` - Xtream Codes API
-  - `stalker.events.ts` - Stalker portal API
-  - `player.events.ts` - External player (MPV, VLC) integration
-  - `settings.events.ts` - App settings
-  - `electron.events.ts` - App version, etc.
+    - `database.events.ts` - Database CRUD operations
+    - `playlist.events.ts` - Playlist import/update
+    - `epg.events.ts` - EPG fetch and parsing (uses worker)
+    - `xtream.events.ts` - Xtream Codes API
+    - `stalker.events.ts` - Stalker portal API
+    - `player.events.ts` - External player (MPV, VLC) integration
+    - `settings.events.ts` - App settings
+    - `electron.events.ts` - App version, etc.
 
 **Workers**:
+
 - EPG parsing runs in worker thread: `apps/electron-backend/src/app/workers/epg-parser.worker.ts`
 
 ### Key Features
 
 **Playlist Support**:
+
 - M3U/M3U8 files (local or URL)
 - Xtream Codes API (`username`, `password`, `serverUrl`)
 - Stalker portal (`macAddress`, `url`)
 
 **Video Players**:
+
 - Built-in HTML5 player with HLS.js or Video.js
 - External players: MPV, VLC (via IPC to Electron backend)
 
 **EPG (Electronic Program Guide)**:
+
 - XMLTV format support
 - Background parsing in worker thread
 - Stored in database for quick lookup
 
 **Favorites and Recently Viewed**:
+
 - Per-playlist favorites and global favorites
 - Recently viewed tracks watch history
 
 **Internationalization**:
+
 - Uses `@ngx-translate` with 16 language files in `apps/web/src/assets/i18n/`
 
 ## Development Notes
@@ -204,34 +217,39 @@ This is an Nx monorepo with the following structure:
 ### Environment Detection and Dual-Mode Architecture
 
 The app determines whether it's running in Electron or as a PWA by checking:
+
 ```typescript
-window.electron  // truthy in Electron, undefined in browser
+window.electron; // truthy in Electron, undefined in browser
 ```
 
 **Why Dual Mode?**
 IPTVnator supports both Electron (desktop app) and PWA (web browser) to provide flexibility:
+
 - **Electron**: Full-featured desktop experience with local database, external player support (MPV/VLC), and native file system access
 - **PWA**: Lightweight web version that runs in any browser without installation
 
 **Environment-Specific Behavior**:
+
 - `app.config.ts` - `DataFactory()` selects DataService implementation based on environment
 - `app.routes.ts` - Different routes for Xtream portals (Electron uses Tauri-based routes, PWA uses standard routes)
 - Storage layer switches automatically:
-  - Electron → libSQL/Drizzle ORM → `~/.iptvnator/databases/iptvnator.db`
-  - PWA → IndexedDB → Browser storage
+    - Electron → libSQL/Drizzle ORM → `~/.iptvnator/databases/iptvnator.db`
+    - PWA → IndexedDB → Browser storage
 - External player support (MPV/VLC) only available in Electron
 - File system operations only available in Electron (uploading playlists from disk)
 
 **Base Href Configuration**:
 The app uses different base href values depending on the build target:
+
 - **Development & PWA**: `baseHref="/"` (from `index.html`)
-  - Used by: `npm run serve:frontend`, `npm run build:frontend:pwa`
-  - For web servers with proper routing
+    - Used by: `npm run serve:frontend`, `npm run build:frontend:pwa`
+    - For web servers with proper routing
 - **Electron Production**: `baseHref="./"` (overridden in build config)
-  - Used by: `npm run build:backend`, `npm run make:app`
-  - Required for `file://` protocol in Electron
+    - Used by: `npm run build:backend`, `npm run make:app`
+    - Required for `file://` protocol in Electron
 
 Build configurations in `apps/web/project.json`:
+
 - `production`: Electron build with `baseHref="./"`
 - `pwa`: Web deployment with `baseHref="/"`
 - `development`: Dev mode with `baseHref="/"` from index.html
@@ -248,6 +266,7 @@ The factory pattern ensures a single codebase works in both environments without
 ### Nx Commands
 
 Use `nx` CLI for better performance:
+
 ```bash
 nx run <project>:<target>
 # Example: nx run web:build
@@ -255,6 +274,7 @@ nx run <project>:<target>
 ```
 
 To run multiple projects:
+
 ```bash
 nx run-many --target=test --all
 ```
@@ -262,6 +282,7 @@ nx run-many --target=test --all
 ### Electron Build Process
 
 The Electron backend depends on the web app being built first:
+
 - `electron-backend:build` depends on `web:build`
 - Output goes to `dist/apps/electron-backend` (backend) and `dist/apps/web` (frontend)
 - Packaging combines both into distributable
@@ -273,18 +294,35 @@ No formal migration system yet. Schema changes are applied via raw SQL in `conne
 ### Common Patterns
 
 **IPC Communication**:
+
 1. Define handler in appropriate events file (e.g., `database.events.ts`)
 2. Register with `ipcMain.handle()` in the event bootstrap function
 3. Expose in preload script via `contextBridge.exposeInMainWorld()`
 4. Call from Angular via `window.electron.<methodName>()`
 
 **Adding New Playlist Source**:
+
 1. Add type to `libs/shared/interfaces/src/lib/playlist.interface.ts`
 2. Create event handler in `apps/electron-backend/src/app/events/`
 3. Add UI in `apps/web/src/app/home/`
 4. Update database schema if needed
 
 **State Management**:
+
 - Use NgRx for global application state (playlists)
 - Use component stores (`@ngrx/component-store`) for feature-specific state
 - Use NgRx signals for reactive data streams
+
+<!-- nx configuration start-->
+<!-- Leave the start & end comments to automatically receive updates. -->
+
+# General Guidelines for working with Nx
+
+- When running tasks (for example build, lint, test, e2e, etc.), always prefer running the task through `nx` (i.e. `nx run`, `nx run-many`, `nx affected`) instead of using the underlying tooling directly
+- You have access to the Nx MCP server and its tools, use them to help the user
+- When answering questions about the repository, use the `nx_workspace` tool first to gain an understanding of the workspace architecture where applicable.
+- When working in individual projects, use the `nx_project_details` mcp tool to analyze and understand the specific project structure and dependencies
+- For questions around nx configuration, best practices or if you're unsure, use the `nx_docs` tool to get relevant, up-to-date docs. Always use this instead of assuming things about nx configuration
+- If the user needs help with an Nx configuration or project graph error, use the `nx_workspace` tool to get any errors
+
+<!-- nx configuration end-->