diff --git a/.github/agents/architect.agent.md b/.github/agents/architect.agent.md
new file mode 100644
index 00000000..633f0f28
--- /dev/null
+++ b/.github/agents/architect.agent.md
@@ -0,0 +1,44 @@
+# Architect Agent
+
+## Role
+You are a senior software architect performing system-level evaluation.
+
+## Focus
+- Layered architecture correctness
+- Module boundaries
+- Dependency direction
+- Coupling and cohesion
+- Violation of SOLID principles
+- Single responsibility violations
+- Separation of concerns
+- Extensibility
+- Testability
+- Scalability risks
+- Hidden architectural assumptions
+
+## Do NOT
+- Comment on minor style issues
+- Discuss formatting
+- Perform detailed security checks
+- Discuss micro-optimizations
+
+## XC_VM Architectural Concerns
+
+Evaluate:
+
+- Separation between web layer and system layer
+- Privilege boundaries
+- Service orchestration isolation
+- License logic isolation from business logic
+- Avoidance of god classes
+- Explicit dependency direction
+- Module replaceability
+
+## Required Output
+- Identify architectural weaknesses
+- Identify structural risks
+- Explain long-term maintenance impact
+- Suggest stronger structural alternatives
+- Highlight systemic design flaws
+
+Be strict. Avoid generic praise.
\ No newline at end of file
diff --git a/.github/agents/performance.agent.md b/.github/agents/performance.agent.md
new file mode 100644
index 00000000..aee879f1
--- /dev/null
+++ b/.github/agents/performance.agent.md
@@ -0,0 +1,40 @@
+# Performance Analyst Agent
+
+## Role
+You are a performance engineer analyzing runtime and scalability behavior.
+
+## Focus
+- Algorithmic complexity (Big-O)
+- N+1 problems
+- Blocking I/O
+- Memory allocations
+- Redundant copying
+- Concurrency risks
+- Deadlocks
+- CPU bottlenecks
+- Resource contention
+- Scaling limits
+
+## Do NOT
+- Discuss naming or formatting
+- Discuss security unless it impacts performance
+
+## XC_VM Performance Risks
+
+Evaluate:
+
+- Stream processing scalability
+- Batch operations behavior
+- Memory growth during large stream operations
+- Blocking I/O impact
+- Service restart cascades
+- CPU spikes during mass updates
+
+## Required Output
+- Identify bottlenecks
+- Provide complexity analysis
+- Explain scaling risks
+- Suggest optimized alternatives
+- Identify potential future degradation points
+
+Be precise. Avoid vague statements.
\ No newline at end of file
diff --git a/.github/agents/reviewer.agent.md b/.github/agents/reviewer.agent.md
new file mode 100644
index 00000000..eedb9547
--- /dev/null
+++ b/.github/agents/reviewer.agent.md
@@ -0,0 +1,37 @@
+# Code Reviewer Agent
+
+## Role
+You are a strict senior engineer reviewing implementation quality.
+
+## Focus
+- Readability
+- Naming clarity
+- Error handling robustness
+- Fail-fast principles
+- DRY violations
+- Magic numbers
+- Maintainability
+- Testability
+- Logging quality
+- Edge case handling
+
+## Do NOT
+- Repeat architectural or security findings
+- Discuss performance unless implementation-specific
+
+## XC_VM Code Smells
+
+Flag:
+
+- Direct superglobal usage ($_GET, $_POST)
+- Hidden side effects
+- Silent catch blocks
+- Suppressed errors
+- Mixed concerns in controllers
+- Lack of strict typing
+
+## Required Output
+- Identify concrete code smells
+- Explain why they matter
+- Suggest refactoring
+- Highlight maintainability risks
\ No newline at end of file
diff --git a/.github/agents/security.agent.md b/.github/agents/security.agent.md
new file mode 100644
index 00000000..f5e8f8a6
--- /dev/null
+++ b/.github/agents/security.agent.md
@@ -0,0 +1,47 @@
+# Security Auditor Agent
+
+## Role
+You are a security engineer performing a defensive code audit.
+
+## Focus
+- Input validation
+- Injection risks (SQL, command, template, path)
+- RCE vectors
+- Authentication flaws
+- Authorization issues
+- Privilege escalation
+- Deserialization vulnerabilities
+- Unsafe crypto usage
+- Race conditions
+- Insecure defaults
+- Data leakage
+- Error handling exposing internals
+
+## Do NOT
+- Comment on architecture unless it directly affects security
+- Discuss performance unless it creates a security risk
+
+## XC_VM Specific Risks
+
+You MUST additionally evaluate:
+
+- Shell execution safety (escapeshellarg, command injection)
+- Unsafe file operations
+- Permission handling
+- License verification bypass vectors
+- Cryptographic signature validation correctness
+- Insecure temporary file usage
+- Service restart abuse
+- Log injection
+- Unsafe stream handling
+- Remote configuration manipulation risks
+
+Assume attackers actively attempt bypassing licensing and gaining root-level execution.
+
+## Required Output
+- Explicitly describe attack scenario
+- Identify impact severity (Low/Medium/High/Critical)
+- Suggest mitigation strategy
+- Identify assumptions the code makes about trust
+
+Avoid speculation without justification.
\ No newline at end of file
diff --git a/.github/instructions/code-review-extensions.md b/.github/instructions/code-review-extensions.md
new file mode 100644
index 00000000..66b8a782
--- /dev/null
+++ b/.github/instructions/code-review-extensions.md
@@ -0,0 +1,61 @@
+# Code Review — Extensions and Templates
+
+This companion document provides concrete templates and rules to extend the base `.github/instructions/code-review.md` process.
+
+## Example finding template (required)
+- **Title:** Short descriptive title
+- **Files (path:line):** repo/path/file.php#L123
+- **Severity:** Critical / High / Medium / Low
+- **Confidence:** High / Medium / Low
+- **Description:** One-paragraph clear description of the issue
+- **Reproduction / PoC:** Steps or minimal input to reproduce (if applicable)
+- **Impact:** What happens and why it matters
+- **Suggested mitigation / patch:** Short actionable mitigation or code snippet
+- **Suggested owner:** team or role responsible
+
+Provide at least one concrete `suggested_patch` snippet (diff or commands) for every High or Critical severity finding.
+
+## Severity matrix (guidance)
+- **Critical:** Remote, unauthenticated exploit leading to full system compromise or license bypass; trivial to reproduce. (Use sparingly)
+- **High:** Authenticated or easily reachable vulnerability allowing data exfiltration, RCE, privilege escalation, or financial/license bypass.
+- **Medium:** Localized data exposure, logic flaws with constrained impact, or costly remediation but no immediate compromise.
+- **Low:** Maintainability, style, minor misconfigurations, or unlikely edge-cases.
+
+When assigning severity, include brief justification mapping to the matrix.
+
+## Deduplication / ownership rules
+- Agents must not repeat identical findings. If an agent finds the same issue another agent reported, it must cite the canonical finding using the "Files (path:line)" and add complementary context (e.g., exploit scenario, perf numbers, or architectural rationale).
+- The first agent that reports a finding should be considered the canonical source; downstream agents must reference it like: "See finding: repo/path/file.php#L123 (Architect)" and then add only non-duplicate information.
+- If two agents produce conflicting severities, the conflict must be recorded in the Final Verdict with both opinions and a recommended reconciled severity.
+
+## Metadata to include in every finding (machine-parsable)
+- title: string
+- file: string (path#L)
+- severity: Critical|High|Medium|Low
+- confidence: High|Medium|Low
+- owner: string
+- suggested_patch: (optional) small diff or commands
+
+Recommended format: include the above as a JSON code block at the end of each finding to aid automation. Example:
+
+```
+{
+  "title": "SQL injection in getUser()",
+  "file": "src/auth/User.php#L210",
+  "severity": "High",
+  "confidence": "High",
+  "owner": "backend-team",
+  "suggested_patch": "patch.diff"
+}
+```
+
+## Tools and artifacts (optional)
+- Agents are encouraged to attach or reference automated artifacts when relevant: SAST output, linter snippets, benchmark graphs, flamegraphs, heap dumps, or small testcases.
+- If external scanning tools are used, note the tool name and version and attach the raw output or a short excerpt.
+
+## Examples and expectations
+- Include one worked example (one High severity finding) in reviews produced by the system during onboarding runs to demonstrate the required level of detail and patch quality.
+
+---
+
+If you prefer, I can re-run and attempt to patch the original `code-review.md` to integrate these extensions in-place; currently I created this companion file to avoid modifying the original file directly.
\ No newline at end of file
diff --git a/.github/instructions/code-review.md b/.github/instructions/code-review.md
new file mode 100644
index 00000000..e9cd8fc6
--- /dev/null
+++ b/.github/instructions/code-review.md
@@ -0,0 +1,106 @@
+# XC_VM Structured Code Review (Pragmatic Mode)
+
+This repository uses a structured multi-agent review process.
+
+Execution order is mandatory:
+
+1. Architect
+2. Security Auditor
+3. Performance Analyst
+4. Code Reviewer
+5. Final Verdict
+
+The system must:
+- Assume untrusted input.
+- Assume internet exposure.
+- Assume production deployment.
+- Avoid unrealistic theoretical attacks.
+- Focus on practical, real-world risk.
+
+Agents must:
+- Avoid repeating findings.
+- Clearly label severity: Low / Medium / High.
+- Provide realistic mitigation steps.
+- Avoid exaggerated conclusions.
+- Avoid generic praise.
+
+Output format is mandatory:
+
+---
+
+## 1. Architectural Analysis
+...
+
+## 2. Security Analysis
+...
+
+## 3. Performance Analysis
+...
+
+## 4. Code Quality Review
+...
+
+## 5. Final Verdict
+- Overall Risk Level:
+- Production Ready:
+- Refactor Priority:
+- Blocking Issues:
+```
+
+---
+
+## Example finding template (required)
+- **Title:** Short descriptive title
+- **Files (path:line):** repo/path/file.php#L123
+- **Severity:** Critical / High / Medium / Low
+- **Confidence:** High / Medium / Low
+- **Description:** One-paragraph clear description of the issue
+- **Reproduction / PoC:** Steps or minimal input to reproduce (if applicable)
+- **Impact:** What happens and why it matters
+- **Suggested mitigation / patch:** Short actionable mitigation or code snippet
+- **Suggested owner:** team or role responsible
+
+Provide at least one concrete `suggested_patch` snippet (diff or commands) for every High or Critical severity finding.
+
+## Severity matrix (guidance)
+- **Critical:** Remote, unauthenticated exploit leading to full system compromise or license bypass; trivial to reproduce. (Use sparingly)
+- **High:** Authenticated or easily reachable vulnerability allowing data exfiltration, RCE, privilege escalation, or financial/license bypass.
+- **Medium:** Localized data exposure, logic flaws with constrained impact, or costly remediation but no immediate compromise.
+- **Low:** Maintainability, style, minor misconfigurations, or unlikely edge-cases.
+
+When assigning severity, include brief justification mapping to the matrix.
+
+## Deduplication / ownership rules
+- Agents must not repeat identical findings. If an agent finds the same issue another agent reported, it must cite the canonical finding using the "Files (path:line)" and add complementary context (e.g., exploit scenario, perf numbers, or architectural rationale).
+- The first agent that reports a finding should be considered the canonical source; downstream agents must reference it like: "See finding: repo/path/file.php#L123 (Architect)" and then add only non-duplicate information.
+- If two agents produce conflicting severities, the conflict must be recorded in the Final Verdict with both opinions and a recommended reconciled severity.
+
+## Metadata to include in every finding (machine-parsable)
+- title: string
+- file: string (path#L)
+- severity: Critical|High|Medium|Low
+- confidence: High|Medium|Low
+- owner: string
+- suggested_patch: (optional) small diff or commands
+
+Recommended format: include the above as a JSON code block at the end of each finding to aid automation. Example:
+
+```
+{
+  "title": "SQL injection in getUser()",
+  "file": "src/auth/User.php#L210",
+  "severity": "High",
+  "confidence": "High",
+  "owner": "backend-team",
+  "suggested_patch": "patch.diff"
+}
+```
+
+## Tools and artifacts (optional)
+- Agents are encouraged to attach or reference automated artifacts when relevant: SAST output, linter snippets, benchmark graphs, flamegraphs, heap dumps, or small testcases.
+- If external scanning tools are used, note the tool name and version and attach the raw output or a short excerpt.
+
+## Examples and expectations
+- Include one worked example (one High severity finding) in reviews produced by the system during onboarding runs to demonstrate the required level of detail and patch quality.
+
+---
diff --git a/.github/prompts/full-review.prompt.md b/.github/prompts/full-review.prompt.md
new file mode 100644
index 00000000..e6aa690f
--- /dev/null
+++ b/.github/prompts/full-review.prompt.md
@@ -0,0 +1,17 @@
+# Full Structured Code Review
+
+You must execute the complete structured review pipeline defined in:
+.github/instructions/code-review.md
+
+Strictly follow the required output format.
+
+Review the provided code using:
+
+1. Architect Agent
+2. Security Auditor Agent
+3. Performance Analyst Agent
+4. Code Reviewer Agent
+
+No summarization shortcuts.
+No skipping sections.
+No generic praise.
\ No newline at end of file
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index 41c791f0..3b0fe78d 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -319,7 +319,8 @@ src/
 │   ├── ministra/                    # Ministra/Stalker middleware (текущий ministra/)
 │   │   ├── module.json              # Manifest: name, version, dependencies
 │   │   ├── MinistraModule.php       # Точка входа модуля (implements ModuleInterface)
-│   │   ├── PortalHandler.php
+│   │   ├── PortalHandler.php        # Диспетчер type+action (15 обработчиков)
+│   │   ├── PortalHelpers.php        # Хелперы портала (19 статических методов)
 │   │   └── assets/
 │   │
 │   ├── plex/                        # Plex integration (текущий settings_plex, plex_add)
@@ -328,16 +329,33 @@ src/
 │   │   ├── PlexService.php
 │   │   └── config/
 │   │
-│   ├── tmdb/                        # TMDb metadata (текущий libs/TMDb, crons/tmdb)
+│   ├── tmdb/                        # TMDB Integration
 │   │   ├── module.json
 │   │   ├── TmdbModule.php
 │   │   ├── TmdbService.php
-│   │   └── TmdbCron.php
+│   │   ├── TmdbCron.php
+│   │   ├── TmdbPopularCron.php
+│   │   └── lib.php                  # proxy → includes/libs/tmdb.php
 │   │
 │   ├── watch/                       # Watch/Recording (текущие watch, record файлы)
 │   │   ├── module.json
 │   │   ├── WatchModule.php
-│   │   └── ...
+│   │   ├── WatchService.php
+│   │   ├── RecordingService.php
+│   │   ├── WatchController.php
+│   │   ├── WatchCron.php
+│   │   ├── WatchItem.php
+│   │   └── views/
+│   │       ├── watch.php
+│   │       ├── watch_scripts.php
+│   │       ├── watch_add.php
+│   │       ├── watch_add_scripts.php
+│   │       ├── settings_watch.php
+│   │       ├── settings_watch_scripts.php
+│   │       ├── watch_output.php
+│   │       ├── watch_output_scripts.php
+│   │       ├── record.php
+│   │       └── record_scripts.php
 │   │
 │   ├── fingerprint/                 # Fingerprint watermarking
 │   │   ├── module.json
@@ -1054,11 +1072,6 @@ lb_copy_files:
 **Из `CoreUtilities.php` (4847 строк) → новые классы:**
 
 #### Шаг 1.7.1 — Логирование ✅
-```
-CoreUtilities::saveLog()           → core/Logging/FileLogger.php
-StreamingUtilities::clientLog()    → core/Logging/DatabaseLogger.php
-Контракт                          → core/Logging/LoggerInterface.php
-```
 - ✅ Извлечь `saveLog()` (стр. 489–504) → `FileLogger::log()`
 - ✅ Извлечь `clientLog()` (StUtil стр. 1169–1177) → `DatabaseLogger::log()`
 - ✅ Написать `LoggerInterface` с методом `log($type, $message, $extra)`
@@ -1066,584 +1079,169 @@ StreamingUtilities::clientLog()    → core/Logging/DatabaseLogger.php
 - ✅ Proxy: `StreamingUtilities::clientLog()` → `DatabaseLogger::log()`
 
 #### Шаг 1.7.2 — Системная информация ✅
-```
-CoreUtilities::getStats()              → core/Util/SystemInfo.php
-CoreUtilities::getTotalCPU()           →
-CoreUtilities::getMemory()             →
-CoreUtilities::getUptime()             →
-CoreUtilities::getNetworkInterfaces()  →
-CoreUtilities::getVideoDevices()       →
-CoreUtilities::getAudioDevices()       →
-CoreUtilities::getIO()                 →
-CoreUtilities::getGPUInfo()            →
-```
 - ✅ Извлечь 9 методов (стр. 534–671, 827–852, 1338–1344, 4621–4665) → `SystemInfo`
 - ✅ Proxy: каждый вызов `CoreUtilities::getStats()` → `SystemInfo::getStats()`
 
 #### Шаг 1.7.3 — Защита от брутфорса (Flood/Bruteforce) ✅
-```
-CoreUtilities::checkFlood()            → core/Auth/BruteforceGuard.php
-CoreUtilities::checkBruteforce()       →
-CoreUtilities::checkAuthFlood()        →
-CoreUtilities::truncateAttempts()      →
-StreamingUtilities::checkFlood()       → делегирует туда же
-StreamingUtilities::checkBruteforce()  →
-StreamingUtilities::checkAuthFlood()   →
-StreamingUtilities::truncateAttempts() →
-```
 - ✅ Извлечь 4 метода из CoreUtilities (стр. 709–826) → `BruteforceGuard`
 - ✅ 4 дублированных метода в StreamingUtilities (стр. 215–394) → proxy на тот же `BruteforceGuard`
 - ✅ Первая дедупликация CoreUtilities ↔ StreamingUtilities
 
 #### Шаг 1.7.4 — HTTP-клиент (cURL) ✅
-```
-CoreUtilities::getMultiCURL()  → core/Http/CurlClient.php
-CoreUtilities::getURL()        →
-CoreUtilities::serverRequest() →
-```
 - ✅ Извлечь 3 метода (стр. 373–428, 1408–1442, 3568–3578) → `CurlClient`
 
 #### Шаг 1.7.5 — Событийная система ✅
-```
-Новый файл → core/Events/EventDispatcher.php
-Новый файл → core/Events/EventInterface.php
-```
 - ✅ Написать простой EventDispatcher (publish/subscribe)
 - ✅ Пока без подписчиков — подготовка к модульной системе
 
 #### Шаг 1.7.6 — RBAC / Авторизация ✅
-```
-admin.php::hasPermissions()         → core/Auth/Authorization.php
-admin.php::hasResellerPermissions() →
-$rAdvPermissions (из admin.php)     → resources/data/permissions.php
-```
 - ✅ Извлечь `hasPermissions()` (стр. 582–619) и `hasResellerPermissions()` (стр. 575–581)
 - ✅ Массив `$rAdvPermissions` → `resources/data/permissions.php`
 - ✅ Proxy: глобальные функции в `admin.php` → `Authorization::check()`
 
 #### Шаг 1.7.7 — Аутентификация ✅
-```
-API::processLogin()            → core/Auth/Authenticator.php
-ResellerAPI::processLogin()    →
-```
 - ✅ Извлечь `processLogin()` из `admin_api.php` (стр. 1399–1478) → `Authenticator::login()`
 - ✅ Извлечь `processLogin()` из `reseller_api.php` → `Authenticator::resellerLogin()`
 - ✅ Proxy: `API::processLogin()` → `Authenticator::login()`
 
 #### Шаг 1.7.8 — Утилиты изображений ✅
-```
-CoreUtilities → core/Util/ImageUtils.php
-admin.php::getAdminImage() →
-```
 - ✅ Извлечь методы работы с изображениями (resize, thumbnail, URL-валидация)
 - ✅ `StreamingUtilities::validateImage()` (стр. 1355) → `ImageUtils::validateURL()`
 - ✅ `admin.php::getAdminImage()` (стр. 871–883) → `ImageUtils::resize()`
 
 ---
 
-### Фаза 2: Дедупликация CoreUtilities ↔ StreamingUtilities
+### Фаза 2: Дедупликация CoreUtilities ↔ StreamingUtilities ✅
 
-Перед извлечением domain/ нужно устранить форк. 60+ методов дублированы.
+Форк устранён. 53 дублированных метода дедуплицированы.
 
-#### Шаг 2.1 — Инвентаризация дубликатов
+#### Шаг 2.1 — Инвентаризация дубликатов ✅
 
-Актуальная инвентаризация (20.02.2026): **53 общих метода**.
-
-| Метод | CoreUtilities (стр.) | StreamingUtilities (стр.) | Целевой шаг |
-|-------|---------------------|--------------------------|-------------|
-| `addToQueue()` | 3419 | 1437 | 2.3 |
-| `base64url_decode()` | 4089 | 1794 | 2.4 |
-| `base64url_encode()` | 4077 | 1782 | 2.4 |
-| `checkAuthFlood()` | 3200 | 224 | 2.4 |
-| `checkBlockedUAs()` | 2718 | 1015 | 2.4 |
-| `checkBruteforce()` | 507 | 220 | 2.4 |
-| `checkFlood()` | 503 | 216 | 2.4 |
-| `checkISP()` | 2972 | 1164 | 2.4 |
-| `checkServer()` | 2980 | 1173 | 2.4 |
-| `cleanGlobals()` | 376 | 155 | 2.4 |
-| `closeConnection()` | 2567 | 711 | 2.3 |
-| `connectRedis()` | 3508 | 1546 | 2.2 |
-| `decryptData()` | 4113 | 1818 | 2.4 |
-| `encryptData()` | 4101 | 1806 | 2.4 |
-| `formatTitle()` | 3454 | 1480 | 2.4 |
-| `generateString()` | 436 | 1469 | 2.4 |
-| `getAdultCategories()` | 2490 | 1536 | 2.4 |
-| `getBouquetMap()` | 3355 | 1402 | 2.4 |
-| `getCache()` | 296 | 133 | 2.5 |
-| `getCapacity()` | 3203 | 240 | 2.3 |
-| `getCategories()` | 514 | 1248 | 2.4 |
-| `getConnections()` | 3297 | 1650 | 2.3 |
-| `getDiffTimezone()` | 115 | 1531 | 2.4 |
-| `getDomainName()` | 3764 | 1683 | 2.2 |
-| `getIPInfo()` | 2983 | 1176 | 2.4 |
-| `getISP()` | 2957 | 1147 | 2.4 |
-| `getMainID()` | 3411 | 1429 | 2.3 |
-| `getNearest()` | 3844 | 1673 | 2.4 |
-| `getPlaylistSegments()` | 2682 | 1305 | 2.4 |
-| `getProxies()` | 4059 | 1729 | 2.3 |
-| `getPublicURL()` | 3097 | 1207 | 2.2 |
-| `getUserIP()` | 2915 | 1144 | 2.4 |
-| `getUserInfo()` | 2320 | 816 | 2.4 |
-| `init()` | 23 | 22 | 2.5 |
-| `isMonitorRunning()` | 2745 | 1032 | 2.4 |
-| `isProcessRunning()` | 2841 | 1100 | 2.4 |
-| `isProxy()` | 174 | 230 | 2.4 |
-| `isRunning()` | 2998 | 1195 | 2.4 |
-| `isStreamRunning()` | 2812 | 1055 | 2.4 |
-| `parseCleanKey()` | 414 | 193 | 2.4 |
-| `parseCleanValue()` | 423 | 203 | 2.4 |
-| `parseIncomingRecursively()` | 394 | 173 | 2.4 |
-| `redisSignal()` | 3578 | 1664 | 2.3 |
-| `removeFromQueue()` | 3437 | 1455 | 2.3 |
-| `setSignal()` | 3505 | 986 | 2.2 |
-| `sortChannels()` | 3467 | 1493 | 2.4 |
-| `sortSeries()` | 3486 | 1512 | 2.4 |
-| `startMonitor()` | 1320 | 1119 | 2.4 |
-| `startProxy()` | 1324 | 1123 | 2.4 |
-| `truncateAttempts()` | 511 | 237 | 2.4 |
-| `updateConnection()` | 3522 | 1595 | 2.3 |
-| `validateImage()` | 3094 | 1192 | 2.4 |
-| `writeOfflineActivity()` | 2663 | 779 | 2.4 |
-
-Инвентаризация выше — рабочий baseline для декомпозиции в шагах 2.2–2.5.
+Инвентаризация выполнена: **53 общих метода** между CoreUtilities и StreamingUtilities.
+Все методы распределены по шагам 2.2–2.5 и успешно дедуплицированы.
 
 #### Шаг 2.2 — Redis и сигналы ✅
-```
-CoreUtilities::connectRedis()  → infrastructure/redis/RedisManager.php
-CoreUtilities::setSignal()     →
-CoreUtilities::getDomainName() → core/Config/DomainResolver.php
-StreamingUtilities::closeRedis() →
-```
 - ✅ Извлечь Redis-подключение в `RedisManager` (единый для обоих)
 - ✅ Proxy: оба класса вызывают `RedisManager::connect()`
 - ✅ `getDomainName()` → `DomainResolver::resolve()` (чистая утилита конфигурации)
 
-#### Шаг 2.3 — Трекинг подключений (Redis)
-```
-CoreUtilities::updateConnection()      → domain/Stream/ConnectionTracker.php
-CoreUtilities::redisSignal()           →
-CoreUtilities::getUserConnections()    →
-CoreUtilities::getServerConnections()  →
-CoreUtilities::getStreamConnections()  →
-CoreUtilities::getRedisConnections()   →
-CoreUtilities::getFirstConnection()    →
-CoreUtilities::getConnections()        →
-CoreUtilities::getMainID()             →
-CoreUtilities::addToQueue()            →
-CoreUtilities::removeFromQueue()       →
-CoreUtilities::getProxies()            →
-CoreUtilities::getCapacity()           →
-StreamingUtilities::getConnection()    →
-StreamingUtilities::createConnection() →
-StreamingUtilities::updateConnection() →
-StreamingUtilities::getConnections()   →
-```
+#### Шаг 2.3 — Трекинг подключений (Redis) ✅
 - ✅ ~17 методов вынесены в `ConnectionTracker` (работа с Redis-ключами подключений)
 - ✅ Proxy: оба god-объекта делегируют в `ConnectionTracker`
 
-#### Шаг 2.4 — Справочные данные и сортировки
-```
-CoreUtilities::sortChannels()    → domain/Stream/StreamSorter.php
-CoreUtilities::sortSeries()      →
-CoreUtilities::formatTitle()     →
-CoreUtilities::getNearest()      →
-CoreUtilities::getBouquetMap()   → domain/Bouquet/BouquetMapper.php
-CoreUtilities::getCategories()   → domain/Stream/CategoryRepository.php
-CoreUtilities::getBouquets()     → domain/Bouquet/BouquetRepository.php
-CoreUtilities::getServers()      → domain/Server/ServerRepository.php
-CoreUtilities::getSettings()     → вынести кэширование настроек
-```
+#### Шаг 2.4 — Справочные данные и сортировки ✅
 - ✅ Сортировки и форматирование вынесены в `StreamSorter`
 - ✅ Данные-справочники вынесены в `BouquetMapper` / `CategoryRepository` / `BouquetRepository` / `ServerRepository` / `SettingsRepository`
 
-#### Шаг 2.5 — Дедупликация init()
-```
-CoreUtilities::init()            → упрощение, делегирование в ServiceContainer
-StreamingUtilities::init()       → упрощение, делегирование в ServiceContainer
-```
+#### Шаг 2.5 — Дедупликация init() ✅
 - ✅ Оба `init()` стали тонкими обёртками
 - ✅ Общая логика вынесена в `core/Init/LegacyInitializer.php`
 - ✅ Состояние init синхронизируется через `ServiceContainer`
 
 ---
 
-### Фаза 3: Извлечение domain/ — бизнес-логика
+### Фаза 3: Извлечение domain/ — бизнес-логика ✅
 
-Теперь god-объекты уже частично разгружены. Извлекаем entity/repository/service по доменам.
+Все entity/repository/service извлечены из god-объектов. Proxy-методы оставлены в исходных файлах.
 
-#### Шаг 3.1 — domain/Stream/ (самый крупный домен)
+#### Шаг 3.1 — domain/Stream/ ✅
+- `StreamService.php` — processStream, massEdit, massDelete, move, replaceDNS ← admin_api.php
+- `ChannelService.php` — processChannel, massEdit, setOrder ← admin_api.php
+- `CategoryService.php` — processCategory, orderCategories ← admin_api.php
+- `StreamRepository.php` — getStream, getStreamStats, getStreamErrors, getStreamPIDs, getStreamOptions, getStreamSys, getNextOrder ← admin.php
+- `CategoryRepository.php` — getCategories ← admin.php
+- `M3UParser.php` — parseM3U ← admin.php
+- `StreamProcess.php` — startMonitor, stopStream, startProxy, startThumbnail, queueChannel, createChannel, updateStream(s), createChannelItem, startMovie, stopMovie, startLoopback, queueMovie(s), refreshMovies, startStream, startLLOD ← CoreUtilities
 
-**Из `admin_api.php`:**
-```
-API::processStream()     (стр. 5468–5933, 466 строк) → domain/Stream/StreamService.php
-API::processChannel()    (стр. 522–730, 209 строк)   → domain/Stream/ChannelService.php
-API::massEditStreams()    (стр. 4935–5234, 300 строк) → StreamService::massEdit()
-API::massEditChannels()  (стр. 5235–5467, 233 строки) → ChannelService::massEdit()
-API::processCategory()   (стр. 5965–5997, 33 строки) → domain/Stream/CategoryService.php
-API::orderCategories()   (стр. 5934–5949)             → CategoryService::reorder()
-API::setChannelOrder()   (стр. 499–521)               → ChannelService::setOrder()
-API::moveStreams()        (стр. 5998–6045)             → StreamService::move()
-API::replaceDNS()         (стр. 6046–6059)             → StreamService::replaceDNS()
-API::massDeleteStreams()  (стр. 1479–1496)             → StreamService::massDelete()
-```
-- ✅ `API::processChannel()` вынесен в `domain/Stream/ChannelService.php` (proxy в `admin_api.php`)
-- ✅ `API::processStream()` вынесен в `domain/Stream/StreamService.php` (proxy в `admin_api.php`)
-- ✅ `API::massEditStreams()` вынесен в `domain/Stream/StreamService::massEdit()` (proxy в `admin_api.php`)
-- ✅ `API::massEditChannels()` вынесен в `domain/Stream/ChannelService::massEdit()` (proxy в `admin_api.php`)
-- ✅ `API::processCategory()` и `API::orderCategories()` вынесены в `domain/Stream/CategoryService.php` (proxy в `admin_api.php`)
-- ✅ `API::moveStreams()` и `API::replaceDNS()` вынесены в `domain/Stream/StreamService.php` (proxy в `admin_api.php`)
-- ✅ `API::setChannelOrder()` вынесен в `domain/Stream/ChannelService::setOrder()` (proxy в `admin_api.php`)
-- ✅ `API::massDeleteStreams()` вынесен в `domain/Stream/StreamService::massDelete()` (proxy в `admin_api.php`)
-- ✅ Из `admin.php` вынесены `getStream()/getStreamStats()/getStreamErrors()/getStreamPIDs()/getStreamOptions()/getStreamSys()/getNextOrder()` в `domain/Stream/StreamRepository.php`
-- ✅ Из `admin.php` `parseM3U()` вынесен в `domain/Stream/M3UParser.php`
-- ✅ Из `admin.php` `getCategories()` переключён на `domain/Stream/CategoryRepository.php`
-- ✅ Из `CoreUtilities` вынесены в `domain/Stream/StreamProcess.php`: `deleteCache()`, `queueChannel()`, `createChannel()`, `startMonitor()`, `startProxy()`, `startThumbnail()`, `updateStream()`, `updateStreams()` (proxy в `CoreUtilities`)
-- ✅ Из `CoreUtilities` вынесены в `domain/Stream/StreamProcess.php`: `createChannelItem()`, `stopStream()` (proxy в `CoreUtilities`)
-- ✅ Дополнительно из `CoreUtilities` вынесены в `domain/Stream/StreamProcess.php`: `startMovie()`, `stopMovie()` (proxy в `CoreUtilities`)
-- ✅ Дополнительно из `CoreUtilities` вынесен в `domain/Stream/StreamProcess.php`: `startLoopback()` (proxy в `CoreUtilities`)
-- ✅ Дополнительно из `CoreUtilities` вынесены в `domain/Stream/StreamProcess.php`: `queueMovie()`, `queueMovies()`, `refreshMovies()` (proxy в `CoreUtilities`)
-- ✅ Дополнительно из `CoreUtilities` вынесен в `domain/Stream/StreamProcess.php`: `startStream()` (proxy в `CoreUtilities`)
-- ✅ Дополнительно из `CoreUtilities` вынесен в `domain/Stream/StreamProcess.php`: `startLLOD()` (proxy в `CoreUtilities`)
+#### Шаг 3.2 — domain/Vod/ ✅
+- `MovieService.php` — process, massEdit, massDelete, import ← admin_api.php
+- `SeriesService.php` — process, massEdit, massDelete, import ← admin_api.php
+- `EpisodeService.php` — process, massEdit, massDelete ← admin_api.php
+- `SeriesRepository.php` — getList, updateFromTMDB, queueRefresh, getSimilar, generatePlaylist ← admin.php
+- `MovieRepository.php` — getSimilar, deleteFile ← admin.php
 
-**Из `admin.php`:**
-```
-getStream()              (стр. 4014) → domain/Stream/StreamRepository.php
-getStreamStats()         (стр. 4082) →
-getStreamErrors()        (стр. 884)  →
-getStreamPIDs()          (стр. 3810) →
-getStreamOptions()       (стр. 4210) →
-getStreamSys()           (стр. 4228) →
-getCategories()          (стр. 3505) → domain/Stream/CategoryRepository.php
-getNextOrder()           (стр. 4356) →
-parseM3U()               (стр. 968)  → domain/Stream/M3UParser.php
-```
+#### Шаг 3.3 — domain/Line/ ✅
+- `LineService.php` — process, massEdit, massDelete, delete, update (одиночные и массовые) ← admin_api.php + CoreUtilities
+- `LineRepository.php` — deleteMany ← admin.php
 
-**Из `CoreUtilities`:**
-```
-CoreUtilities::startMonitor()    (стр. 1697) → domain/Stream/StreamProcess.php
-CoreUtilities::stopStream()      (стр. 1640) →
-CoreUtilities::startProxy()      (стр. 1701) →
-CoreUtilities::startThumbnail()  (стр. 1705) →
-CoreUtilities::queueChannel()    (стр. 1455) →
-CoreUtilities::createChannel()   (стр. 1466) →
-CoreUtilities::createChannelItem() (стр. 1470) →
-CoreUtilities::updateStream()    (стр. 3833) →
-CoreUtilities::updateStreams()   (стр. 3844) →
-CoreUtilities::deleteCache()     (стр. 1443) →
-```
+#### Шаг 3.4 — domain/User/ ✅
+- `UserService.php` — process, massEdit, massDelete ← admin_api.php
+- `GroupService.php` — process ← admin_api.php
+- `ProfileService.php` — editAdminProfile ← admin_api.php
+- `UserRepository.php` — getUserInfo, getUser, getRegisteredUser(s), getResellers, getDirectReports, getSubUsers, getParent, getStreamingUserInfo ← admin.php + StreamingUtilities
+- `GroupRepository.php` — getAll, getById, deleteById ← admin.php
 
-**Паттерн:** По 3–5 методов за шаг. Proxy в старых файлах.
+#### Шаг 3.5 — domain/Device/ ✅
+- `MagService.php` — process, massEdit, massDelete ← admin_api.php
+- `EnigmaService.php` — process, massEdit, massDelete ← admin_api.php
+- `DeviceSync.php` — syncLineDevices ← admin.php
 
-#### Шаг 3.2 — domain/Vod/ (фильмы + сериалы + эпизоды)
+#### Шаг 3.6 — domain/Server/ ✅
+- `ServerService.php` — process, processProxy, install, reorder ← admin_api.php
+- `ServerRepository.php` — getAllSimple, getStreamingSimple, getProxySimple, getFreeSpace, getStreamsRamdisk, killPID, getRTMPStats, deleteById, probeSource, getSSLLog, checkSource, freeTemp, freeStreams ← admin.php
 
-**Из `admin_api.php`:**
-```
-API::processMovie()      (стр. 1643–2110, 468 строк) → domain/Vod/MovieService.php
-API::massEditMovies()    (стр. 2111–2369, 259 строк) → MovieService::massEdit()
-API::massDeleteMovies()  (стр. 1497–1514)             → MovieService::massDelete()
-API::importMovies()      (стр. 3903–4105, 203 строки) → MovieService::import()
+#### Шаг 3.7 — domain/Bouquet/ ✅
+- `BouquetService.php` — process, reorder, sort, scan, scanOne ← admin_api.php + admin.php
+- `BouquetRepository.php` — getAllSimple, getOrder, getUserBouquets ← admin.php
 
-API::processSeries()     (стр. 4106–4225, 120 строк) → domain/Vod/SeriesService.php
-API::massEditSeries()    (стр. 4226–4347, 122 строки) → SeriesService::massEdit()
-API::massDeleteSeries()  (стр. 1605–1622)             → SeriesService::massDelete()
-API::importSeries()      (стр. 3719–3902, 184 строки) → SeriesService::import()
+#### Шаг 3.8 — domain/Epg/ ✅
+- `EpgService.php` — process, getChannelEpg ← admin_api.php + admin.php
+- `EpgRepository.php` — getById, findByName, getStreamEpg, getStreamsEpg, getProgramme, search ← admin.php + CoreUtilities
 
-API::processEpisode()    (стр. 821–1074, 254 строки) → domain/Vod/EpisodeService.php
-API::massEditEpisodes()  (стр. 1075–1259, 185 строк) → EpisodeService::massEdit()
-API::massDeleteEpisodes()(стр. 1623–1642)             → EpisodeService::massDelete()
-```
-- ✅ `API::massDeleteMovies()` вынесен в `domain/Vod/MovieService::massDelete()` (proxy в `admin_api.php`)
-- ✅ `API::massDeleteSeries()` вынесен в `domain/Vod/SeriesService::massDelete()` (proxy в `admin_api.php`)
-- ✅ `API::massDeleteEpisodes()` вынесен в `domain/Vod/EpisodeService::massDelete()` (proxy в `admin_api.php`)
-- ✅ `API::massEditMovies()` вынесен в `domain/Vod/MovieService::massEdit()` (proxy в `admin_api.php`)
-- ✅ `API::massEditSeries()` вынесен в `domain/Vod/SeriesService::massEdit()` (proxy в `admin_api.php`)
-- ✅ `API::massEditEpisodes()` вынесен в `domain/Vod/EpisodeService::massEdit()` (proxy в `admin_api.php`)
-- ✅ `API::processEpisode()` вынесен в `domain/Vod/EpisodeService::process()` (proxy в `admin_api.php`)
-- ✅ `API::processMovie()` вынесен в `domain/Vod/MovieService::process()` (proxy в `admin_api.php`)
-- ✅ `API::processSeries()` вынесен в `domain/Vod/SeriesService::process()` (proxy в `admin_api.php`)
-- ✅ `API::importMovies()` вынесен в `domain/Vod/MovieService::import()` (proxy в `admin_api.php`)
-- ✅ `API::importSeries()` вынесен в `domain/Vod/SeriesService::import()` (proxy в `admin_api.php`)
+#### Шаг 3.9 — domain/Settings/ + domain/Ticket/ ✅
+- `SettingsService.php` — edit, editBackup, editCacheCron ← admin_api.php
+- `TicketService.php` — submit ← admin_api.php
 
-**Из `admin.php`:**
-```
-getSeriesList()          (стр. 135) → domain/Vod/SeriesRepository.php
-updateSeries()           (стр. 164) →
-updateSeriesAsync()      (стр. 207) →
-getSimilarMovies()       (стр. 4104) → domain/Vod/MovieRepository.php
-getSimilarSeries()       (стр. 4116) → domain/Vod/SeriesRepository.php
-deleteMovieFile()        (стр. 3717) → MovieRepository::deleteFile()
-generateSeriesPlaylist() (стр. 4367) → SeriesRepository::generatePlaylist()
-```
-- ✅ `getSeriesList()` вынесен в `domain/Vod/SeriesRepository::getList()` (proxy в `admin.php`)
-- ✅ `updateSeries()` вынесен в `domain/Vod/SeriesRepository::updateFromTMDB()` (proxy в `admin.php`)
-- ✅ `updateSeriesAsync()` вынесен в `domain/Vod/SeriesRepository::queueRefresh()` (proxy в `admin.php`)
-- ✅ `getSimilarMovies()` вынесен в `domain/Vod/MovieRepository::getSimilar()` (proxy в `admin.php`)
-- ✅ `getSimilarSeries()` вынесен в `domain/Vod/SeriesRepository::getSimilar()` (proxy в `admin.php`)
-- ✅ `deleteMovieFile()` вынесен в `domain/Vod/MovieRepository::deleteFile()` (proxy в `admin.php`)
-- ✅ `generateSeriesPlaylist()` вынесен в `domain/Vod/SeriesRepository::generatePlaylist()` (proxy в `admin.php`)
+#### Шаг 3.10 — domain/Security/ ✅
+- `BlocklistService.php` — processISP, processUA, blockIP, processRTMPIP, checkBlockedUAs, checkISP, checkServer ← admin_api.php + StreamingUtilities
+- `BlocklistRepository.php` — getBlockedIPsSimple, getRTMPIPsSimple, getBlockedUA, getBlockedIPs, getBlockedISP, getBlockedServers, getProxyIPs ← admin.php + CoreUtilities
 
-**Из `CoreUtilities`:**
-```
-CoreUtilities::stopMovie()     (стр. 1709) → domain/Vod/MovieProcess.php
-CoreUtilities::queueMovie()    (стр. 1719) →
-CoreUtilities::queueMovies()   (стр. 1727) →
-```
+#### Шаг 3.11 — domain/Auth/ ✅
+- `CodeService.php` — process ← admin_api.php
+- `HMACService.php` — process ← admin_api.php
+- `PackageService.php` — process ← admin_api.php (в domain/Line/)
+- `CodeRepository.php` — getActiveCodes, updateCodes, getCurrentCode ← admin.php
+- `HMACRepository.php` — getAll, getById ← admin.php
+- `PackageRepository.php` — deleteById ← admin.php (в domain/Line/)
+- `HMACValidator.php` — validate ← StreamingUtilities
 
-#### Шаг 3.3 — domain/Line/ (подписки/линии)
-```
-API::processLine()       (стр. 6812–6943, 132 строки) → domain/Line/LineService.php
-API::massEditLines()     (стр. 6283–6399, 117 строк)  → LineService::massEdit()
-API::massDeleteLines()   (стр. 1515–1532)              → LineService::massDelete()
-
-admin.php::deleteLines() (стр. 980)                    → domain/Line/LineRepository.php
-CoreUtilities::deleteLine()    (стр. 3855)             → LineService::delete()
-CoreUtilities::deleteLines()   (стр. 3858)             →
-CoreUtilities::updateLine()    (стр. 3861)             → LineService::update()
-CoreUtilities::updateLines()   (стр. 3872)             →
-```
-- ✅ `API::massDeleteLines()` вынесен в `domain/Line/LineService::massDelete()` (proxy в `admin_api.php`)
-- ✅ `API::massEditLines()` вынесен в `domain/Line/LineService::massEdit()` (proxy в `admin_api.php`)
-- ✅ `API::processLine()` вынесен в `domain/Line/LineService::process()` (proxy в `admin_api.php`)
-- ✅ `admin.php::deleteLines()` вынесен в `domain/Line/LineRepository::deleteMany()` (proxy в `admin.php`)
-- ✅ `CoreUtilities::deleteLine()/deleteLines()/updateLine()/updateLines()` вынесены в `domain/Line/LineService` (proxy в `CoreUtilities`)
-
-#### Шаг 3.4 — domain/User/ (пользователи, группы, реселлеры)
-```
-API::processUser()       (стр. 3579–3669)  → domain/User/UserService.php
-API::massEditUsers()     (стр. 6731–6811)  → UserService::massEdit()
-API::massDeleteUsers()   (стр. 1533–1550)  → UserService::massDelete()
-API::processGroup()      (стр. 1260–1350)  → domain/User/GroupService.php
-
-admin.php::getUserInfo()           (стр. 122) → domain/User/UserRepository.php
-admin.php::getUser()               (стр. 4024) →
-admin.php::getRegisteredUser()     (стр. 4034) →
-admin.php::getRegisteredUsers()    (стр. 4243) →
-admin.php::getResellers()          (стр. 532)  →
-admin.php::getDirectReports()      (стр. 545)  →
-admin.php::getSubUsers()           (стр. 854)  →
-admin.php::getParent()             (стр. 842)  →
-admin.php::getMemberGroups()       (стр. 620)  → domain/User/GroupRepository.php
-admin.php::getMemberGroup()        (стр. 3914) →
-admin.php::deleteGroup()           (стр. 3548) →
-
-StreamingUtilities::getUserInfo()  (стр. 970)  → domain/User/UserRepository (streaming-вариант)
-```
-- ✅ `API::massDeleteUsers()` вынесен в `domain/User/UserService::massDelete()` (proxy в `admin_api.php`)
-- ✅ `API::massEditUsers()` вынесен в `domain/User/UserService::massEdit()` (proxy в `admin_api.php`)
-- ✅ `API::processUser()` вынесен в `domain/User/UserService::process()` (proxy в `admin_api.php`)
-- ✅ `API::processGroup()` вынесен в `domain/User/GroupService::process()` (proxy в `admin_api.php`)
-- ✅ `admin.php::getUserInfo()` вынесен в `domain/User/UserRepository::getAuthUserByCredentials()` (proxy в `admin.php`)
-- ✅ `admin.php::getUser()` вынесен в `domain/User/UserRepository::getLineById()` (proxy в `admin.php`)
-- ✅ `admin.php::getRegisteredUser()` вынесен в `domain/User/UserRepository::getRegisteredUserById()` (proxy в `admin.php`)
-- ✅ `admin.php::getRegisteredUsers()` вынесен в `domain/User/UserRepository::getRegisteredUsers()` (proxy в `admin.php`)
-- ✅ `admin.php::getResellers()` вынесен в `domain/User/UserRepository::getResellers()` (proxy в `admin.php`)
-- ✅ `admin.php::getDirectReports()` вынесен в `domain/User/UserRepository::getDirectReports()` (proxy в `admin.php`)
-- ✅ `admin.php::getSubUsers()` вынесен в `domain/User/UserRepository::getSubUsers()` (proxy в `admin.php`)
-- ✅ `admin.php::getParent()` вынесен в `domain/User/UserRepository::getParent()` (proxy в `admin.php`)
-- ✅ `admin.php::getMemberGroups()` вынесен в `domain/User/GroupRepository::getAll()` (proxy в `admin.php`)
-- ✅ `admin.php::getMemberGroup()` вынесен в `domain/User/GroupRepository::getById()` (proxy в `admin.php`)
-- ✅ `admin.php::deleteGroup()` вынесен в `domain/User/GroupRepository::deleteById()` (proxy в `admin.php`)
-- ✅ `StreamingUtilities::getUserInfo()` вынесен в `domain/User/UserRepository::getStreamingUserInfo()` (proxy в `StreamingUtilities`)
-
-#### Шаг 3.5 — domain/Device/ (MAG + Enigma)
-```
-API::processMAG()         (стр. 2433–2624) → domain/Device/MagService.php
-API::massEditMags()       (стр. 6400–6589) → MagService::massEdit()
-API::massDeleteMags()     (стр. 1569–1586) → MagService::massDelete()
-
-API::processEnigma()      (стр. 2625–2812) → domain/Device/EnigmaService.php
-API::massEditEnigmas()    (стр. 6590–6730) → EnigmaService::massEdit()
-API::massDeleteEnigmas()  (стр. 1587–1604) → EnigmaService::massDelete()
-
-admin.php::syncDevices()  (стр. 371)       → domain/Device/DeviceSync.php
-```
-- ✅ `API::massDeleteMags()` вынесен в `domain/Device/MagService::massDelete()` (proxy в `admin_api.php`)
-- ✅ `API::massDeleteEnigmas()` вынесен в `domain/Device/EnigmaService::massDelete()` (proxy в `admin_api.php`)
-- ✅ `API::massEditMags()` вынесен в `domain/Device/MagService::massEdit()` (proxy в `admin_api.php`)
-- ✅ `API::massEditEnigmas()` вынесен в `domain/Device/EnigmaService::massEdit()` (proxy в `admin_api.php`)
-- ✅ `API::processMAG()` вынесен в `domain/Device/MagService::process()` (proxy в `admin_api.php`)
-- ✅ `API::processEnigma()` вынесен в `domain/Device/EnigmaService::process()` (proxy в `admin_api.php`)
-- ✅ `admin.php::syncDevices()` вынесен в `domain/Device/DeviceSync::syncLineDevices()` (proxy в `admin.php`)
-
-#### Шаг 3.6 — domain/Server/
-```
-API::processServer()     (стр. 4348–4516) → domain/Server/ServerService.php
-API::processProxy()      (стр. 4517–4587) → domain/Server/ProxyService.php
-API::installServer()     (стр. 4588–4683) → domain/Server/ServerInstaller.php
-API::orderServers()      (стр. 5950–5964) → ServerService::reorder()
-
-admin.php::getAllServers()       (стр. 3745) → domain/Server/ServerRepository.php
-admin.php::getStreamingServers() (стр. 3760) →
-admin.php::getProxyServers()    (стр. 3784) →
-admin.php::getFreeSpace()       (стр. 239)  →
-admin.php::getStreamsRamdisk()   (стр. 259)  →
-admin.php::killPID()            (стр. 275)  →
-admin.php::getRTMPStats()       (стр. 281)  →
-admin.php::deleteServer()       (стр. 3620) →
-admin.php::probeSource()        (стр. 4181) →
-admin.php::getSSLLog()          (стр. 3893) →
-admin.php::checksource()        (стр. 3886) →
-admin.php::freeTemp()           (стр. 4173) →
-admin.php::freeStreams()         (стр. 4177) →
-```
-
-- ✅ `API::processServer()` вынесен в `domain/Server/ServerService::process()` (proxy в `admin_api.php`)
-- ✅ `API::processProxy()` вынесен в `domain/Server/ServerService::processProxy()` (proxy в `admin_api.php`)
-- ✅ `API::installServer()` вынесен в `domain/Server/ServerService::install()` (proxy в `admin_api.php`)
-- ✅ `API::orderServers()` вынесен в `domain/Server/ServerService::reorder()` (proxy в `admin_api.php`)
-- ✅ `admin.php::getAllServers()` вынесен в `domain/Server/ServerRepository::getAllSimple()` (proxy в `admin.php`)
-- ✅ `admin.php::getStreamingServers()` вынесен в `domain/Server/ServerRepository::getStreamingSimple()` (proxy в `admin.php`)
-- ✅ `admin.php::getProxyServers()` вынесен в `domain/Server/ServerRepository::getProxySimple()` (proxy в `admin.php`)
-- ✅ `admin.php::getFreeSpace()` вынесен в `domain/Server/ServerRepository::getFreeSpace()` (proxy в `admin.php`)
-- ✅ `admin.php::getStreamsRamdisk()` вынесен в `domain/Server/ServerRepository::getStreamsRamdisk()` (proxy в `admin.php`)
-- ✅ `admin.php::killPID()` вынесен в `domain/Server/ServerRepository::killPID()` (proxy в `admin.php`)
-- ✅ `admin.php::getRTMPStats()` вынесен в `domain/Server/ServerRepository::getRTMPStats()` (proxy в `admin.php`)
-- ✅ `admin.php::deleteServer()` вынесен в `domain/Server/ServerRepository::deleteById()` (proxy в `admin.php`)
-- ✅ `admin.php::probeSource()` вынесен в `domain/Server/ServerRepository::probeSource()` (proxy в `admin.php`)
-- ✅ `admin.php::getSSLLog()` вынесен в `domain/Server/ServerRepository::getSSLLog()` (proxy в `admin.php`)
-- ✅ `admin.php::checksource()` вынесен в `domain/Server/ServerRepository::checkSource()` (proxy в `admin.php`)
-- ✅ `admin.php::freeTemp()` вынесен в `domain/Server/ServerRepository::freeTemp()` (proxy в `admin.php`)
-- ✅ `admin.php::freeStreams()` вынесен в `domain/Server/ServerRepository::freeStreams()` (proxy в `admin.php`)
-
-#### Шаг 3.7 — domain/Bouquet/
-```
-- ✅ `API::processBouquet()` вынесен в `domain/Bouquet/BouquetService::process()` (proxy в `admin_api.php`)
-- ✅ `API::reorderBouquet()` вынесен в `domain/Bouquet/BouquetService::reorder()` (proxy в `admin_api.php`)
-- ✅ `API::sortBouquets()` вынесен в `domain/Bouquet/BouquetService::sort()` (proxy в `admin_api.php`)
-
-- ✅ `admin.php::getBouquets()` вынесен в `domain/Bouquet/BouquetRepository::getAllSimple()` (proxy в `admin.php`)
-- ✅ `admin.php::getBouquetOrder()` вынесен в `domain/Bouquet/BouquetRepository::getOrder()` (proxy в `admin.php`)
-- ✅ `admin.php::getUserBouquets()` вынесен в `domain/Bouquet/BouquetRepository::getUserBouquets()` (proxy в `admin.php`)
-- ✅ `admin.php::scanBouquets()` вынесен в `domain/Bouquet/BouquetService::scan()` (proxy в `admin.php`)
-- ✅ `admin.php::scanBouquet()` вынесен в `domain/Bouquet/BouquetService::scanOne()` (proxy в `admin.php`)
-```
-
-#### Шаг 3.8 — domain/Epg/
-```
-- ✅ `API::processEPG()` вынесен в `domain/Epg/EpgService::process()` (proxy в `admin_api.php`)
-
-- ✅ `admin.php::getchannelepg()` вынесен в `domain/Epg/EpgService::getChannelEpg()` (proxy в `admin.php`)
-- ✅ `admin.php::getEPG()` вынесен в `domain/Epg/EpgRepository::getById()` (proxy в `admin.php`)
-- ✅ `admin.php::findEPG()` вынесен в `domain/Epg/EpgRepository::findByName()` (proxy в `admin.php`)
-
-- ✅ `CoreUtilities::getEPG()` вынесен в `domain/Epg/EpgRepository::getStreamEpg()` (proxy в `CoreUtilities.php`)
-- ✅ `CoreUtilities::getEPGs()` вынесен в `domain/Epg/EpgRepository::getStreamsEpg()` (proxy в `CoreUtilities.php`)
-- ✅ `CoreUtilities::getProgramme()` вынесен в `domain/Epg/EpgRepository::getProgramme()` (proxy в `CoreUtilities.php`)
-- ✅ `CoreUtilities::searchEPG()` вынесен в `domain/Epg/EpgRepository::search()` (proxy в `CoreUtilities.php`)
-```
-
-#### Шаг 3.9 — domain/Settings/ + domain/Ticket/
-```
-- ✅ `API::editSettings()` вынесен в `domain/Settings/SettingsService::edit()` (proxy в `admin_api.php`)
-- ✅ `API::editBackupSettings()` вынесен в `domain/Settings/SettingsService::editBackup()` (proxy в `admin_api.php`)
-- ✅ `API::editCacheCron()` вынесен в `domain/Settings/SettingsService::editCacheCron()` (proxy в `admin_api.php`)
-- ✅ `API::editAdminProfile()` вынесен в `domain/User/ProfileService::editAdminProfile()` (proxy в `admin_api.php`)
-
-- ✅ `API::submitTicket()` вынесен в `domain/Ticket/TicketService::submit()` (proxy в `admin_api.php`)
-```
-
-#### Шаг 3.10 — domain/Security/ (IP, ISP, UA, RTMP)
-```
-- ✅ `API::processISP()` вынесен в `domain/Security/BlocklistService::processISP()` (proxy в `admin_api.php`)
-- ✅ `API::processUA()` вынесен в `domain/Security/BlocklistService::processUA()` (proxy в `admin_api.php`)
-- ✅ `API::blockIP()` вынесен в `domain/Security/BlocklistService::blockIP()` (proxy в `admin_api.php`)
-- ✅ `API::processRTMPIP()` вынесен в `domain/Security/BlocklistService::processRTMPIP()` (proxy в `admin_api.php`)
-
-- ✅ `admin.php::getBlockedIPs()` вынесен в `domain/Security/BlocklistRepository::getBlockedIPsSimple()` (proxy в `admin.php`)
-- ✅ `admin.php::getRTMPIPs()` вынесен в `domain/Security/BlocklistRepository::getRTMPIPsSimple()` (proxy в `admin.php`)
-
-- ✅ `StreamingUtilities::checkBlockedUAs()` вынесен в `domain/Security/BlocklistService::checkBlockedUAs()` (proxy в `StreamingUtilities.php`)
-- ✅ `StreamingUtilities::checkISP()` вынесен в `domain/Security/BlocklistService::checkISP()` (proxy в `StreamingUtilities.php`)
-- ✅ `StreamingUtilities::checkServer()` вынесен в `domain/Security/BlocklistService::checkServer()` (proxy в `StreamingUtilities.php`)
-- ✅ `CoreUtilities::getBlockedUA()` вынесен в `domain/Security/BlocklistRepository::getBlockedUA()` (proxy в `CoreUtilities.php`)
-- ✅ `CoreUtilities::getBlockedIPs()` вынесен в `domain/Security/BlocklistRepository::getBlockedIPs()` (proxy в `CoreUtilities.php`)
-- ✅ `CoreUtilities::getBlockedISP()` вынесен в `domain/Security/BlocklistRepository::getBlockedISP()` (proxy в `CoreUtilities.php`)
-- ✅ `CoreUtilities::getBlockedServers()` вынесен в `domain/Security/BlocklistRepository::getBlockedServers()` (proxy в `CoreUtilities.php`)
-- ✅ `CoreUtilities::getProxyIPs()` вынесен в `domain/Security/BlocklistRepository::getProxyIPs()` (proxy в `CoreUtilities.php`)
-```
-
-#### Шаг 3.11 — domain/Auth/ (коды, HMAC, пакеты)
-```
-- ✅ `API::processCode()` вынесен в `domain/Auth/CodeService::process()` (proxy в `admin_api.php`)
-- ✅ `API::processHMAC()` вынесен в `domain/Auth/HMACService::process()` (proxy в `admin_api.php`)
-- ✅ `API::processPackage()` вынесен в `domain/Line/PackageService::process()` (proxy в `admin_api.php`)
-
-- ✅ `admin.php::getActiveCodes()` вынесен в `domain/Auth/CodeRepository::getActiveCodes()` (proxy в `admin.php`)
-- ✅ `admin.php::updateCodes()` вынесен в `domain/Auth/CodeRepository::updateCodes()` (proxy в `admin.php`)
-- ✅ `admin.php::getCurrentCode()` вынесен в `domain/Auth/CodeRepository::getCurrentCode()` (proxy в `admin.php`)
-- ✅ `admin.php::getHMACTokens()` вынесен в `domain/Auth/HMACRepository::getAll()` (proxy в `admin.php`)
-- ✅ `admin.php::getHMACToken()` вынесен в `domain/Auth/HMACRepository::getById()` (proxy в `admin.php`)
-- ✅ `admin.php::deletePackage()` вынесен в `domain/Line/PackageRepository::deleteById()` (proxy в `admin.php`)
-
-- ✅ `StreamingUtilities::validateHMAC()` вынесен в `domain/Auth/HMACValidator::validate()` (proxy в `StreamingUtilities.php`)
-```
-
-#### Шаг 3.12 — Playlist-генератор (большой метод)
-```
-- ✅ `CoreUtilities::generatePlaylist()` вынесен в `domain/Stream/PlaylistGenerator::generate()` (proxy в `CoreUtilities.php`)
-- ✅ `CoreUtilities::generateCron()` вынесен в `domain/Stream/CronGenerator::generate()` (proxy в `CoreUtilities.php`)
-```
-- `generatePlaylist()` — самый длинный метод в CoreUtilities
-- Дробится внутри на: live playlist, vod playlist, series playlist, radio playlist
+#### Шаг 3.12 — Playlist-генератор ✅
+- `PlaylistGenerator.php` — generate ← CoreUtilities (самый длинный метод, live/vod/series/radio)
+- `CronGenerator.php` — generate ← CoreUtilities
 
 ---
 
-### Фаза 4: Извлечение streaming/ (hot path)
+### Фаза 4: Извлечение streaming/ (hot path) ✅
 
-После Фазы 3 в StreamingUtilities останется только стриминг-специфичный код.
+#### Шаг 4.1 — streaming/Auth/ ✅
+- `StreamAuth.php` — checkAccess, validateConnections ← auth.php + StreamingUtilities
+- `TokenAuth.php` — парсинг токенов
+- `DeviceLock.php` — привязка к устройству
+- `ConnectionLimiter.php` — closeConnections, closeRTMP → Protection/
 
-#### Шаг 4.1 — streaming/Auth/
-```
-www/stream/auth.php (799 строк) → streaming/Auth/StreamAuth.php
-                                 → streaming/Auth/TokenAuth.php
-                                 → streaming/Auth/DeviceLock.php
+#### Шаг 4.2 — streaming/Delivery/ ✅
+- `LiveDelivery.php` ← www/stream/live.php
+- `StreamRedirector.php` — redirectStream, showVideoServer
+- `OffAirHandler.php` — getOffAirVideo
+- `HLSGenerator.php` — generateHLS
+- `SegmentReader.php` — getLLODSegments
+- `SignalSender.php` — sendSignal
+- `ProxySelector.php` → Balancer/
 
-StreamingUtilities::validateHMAC()           → (уже в domain/Auth/HMACValidator)
-StreamingUtilities::F4221e28760B623E()       → streaming/Auth/StreamAuth::checkAccess()
-StreamingUtilities::validateConnections()    → streaming/Auth/StreamAuth::validateConnections()
-StreamingUtilities::closeConnections()       → streaming/Protection/ConnectionLimiter.php
-StreamingUtilities::closeConnection()        →
-StreamingUtilities::closeRTMP()              →
-```
+#### Шаг 4.3 — streaming/Codec/ ✅
+- `FFprobeRunner.php` — probeStream, parseFFProbe
+- `FFmpegCommand.php` — сборка FFmpeg-команд
+- `SubtitleExtractor.php` — extractSubtitle
 
-#### Шаг 4.2 — streaming/Delivery/
-```
-www/stream/live.php (707 строк) → streaming/Delivery/LiveDelivery.php
+#### Шаг 4.4 — streaming/Protection/ + Health/ ✅
+- `ConnectionLimiter.php` — closeConnections
+- `HealthChecker.php` — isRunning
+- `ProcessChecker.php` — isPIDRunning, isPIDsRunning, checkPID
+- `WatchdogMonitor.php` — getWatchdog
 
-StreamingUtilities::redirectStream()     (стр. 397–525)  → streaming/Delivery/StreamRedirector.php
-StreamingUtilities::showVideoServer()    (стр. 559–622)  →
-StreamingUtilities::getOffAirVideo()     (стр. 526–558)  → streaming/Delivery/OffAirHandler.php
-StreamingUtilities::availableProxy()     (стр. 692–748)  → streaming/Balancer/ProxySelector.php
-StreamingUtilities::getStreamingURL()    (стр. 1910–1947)→
-StreamingUtilities::generateHLS()        (стр. 1516–1560)→ streaming/Delivery/HLSGenerator.php
-StreamingUtilities::getLLODSegments()    (стр. 1441)     → streaming/Delivery/SegmentReader.php
-StreamingUtilities::sendSignal()         (стр. 1290)     → streaming/Delivery/SignalSender.php
-```
-
-#### Шаг 4.3 — streaming/Codec/
-```
-CoreUtilities::probeStream()       (стр. 1588) → streaming/Codec/FFprobeRunner.php
-CoreUtilities::parseFFProbe()      (стр. 1603) →
-CoreUtilities::createChannelItem() (стр. 1470) → streaming/Codec/FFmpegCommand.php (сборка команд)
-CoreUtilities::extractSubtitle()   (стр. 1575) → streaming/Codec/SubtitleExtractor.php
-```
-
-#### Шаг 4.4 — streaming/Protection/
-```
-StreamingUtilities::closeConnections() → streaming/Protection/ConnectionLimiter.php (из 4.1)
-StreamingUtilities::isRunning()        → streaming/Health/HealthChecker.php
-
-CoreUtilities::isPIDRunning()    (стр. 1399) → streaming/Health/ProcessChecker.php
-CoreUtilities::isPIDsRunning()   (стр. 1375) →
-CoreUtilities::checkPID()        (стр. 1680) →
-
-admin.php::getWatchdog()         (стр. 3899) → streaming/Health/WatchdogMonitor.php
-```
-
-#### Шаг 4.5 — streaming/StreamingBootstrap.php
-- Заменить `www/stream/init.php` лёгким bootstrap
+#### Шаг 4.5 — streaming/StreamingBootstrap.php ✅
+- Лёгкий bootstrap заменяет `www/stream/init.php`
 - Загружает: autoload → constants → Database → Redis
-- НЕ загружает: CoreUtilities, API, Translator, session
 
 ---
 
@@ -1651,75 +1249,90 @@ admin.php::getWatchdog()         (стр. 3899) → streaming/Health/WatchdogMon
 
 Каждый модуль извлекается атомарно — система продолжает работать без него.
 
-#### Шаг 5.1 — modules/plex/
-```
-API::editPlexSettings()          → modules/plex/PlexService.php
-API::processPlexSync()           →
-admin.php::getPlexServers()      →
-admin.php::getPlexSections()     →
-admin.php::forcePlex()           →
-CoreUtilities::getPlexToken()    → modules/plex/PlexAuth.php
-CoreUtilities::getPlexLogin()    →
-CoreUtilities::checkPlexToken()  →
-CoreUtilities::cachePlexToken()  →
-CoreUtilities::getPlexServerCacheKey() →
-CoreUtilities::getCachedPlexToken()    →
-admin/settings_plex.php          → modules/plex/views/
-admin/plex_add.php               →
-admin/plex.php                   →
-crons/plex.php                   → modules/plex/PlexCron.php
-includes/cli/plex_item.php       →
-config/plex/                     → modules/plex/config/
-```
+#### Шаг 5.1 — modules/plex/ ⚡ (в процессе)
+
+**Завершено:**
+- ✅ `PlexAuth.php` — аутентификация (getPlexToken, checkPlexToken, cachePlexToken и др.)
+- ✅ `PlexRepository.php` — данные (getPlexServers, getPlexSections)
+- ✅ `PlexService.php` — бизнес-логика (editPlexSettings, processPlexSync, forcePlex)
+- ✅ `PlexCron.php` — крон синхронизации (Thread, Multithread, PlexCron::run())
+- ✅ `PlexItem.php` — CLI обработка элементов (PlexItem::run())
+- ✅ `crons/plex.php` — тонкая обёртка → PlexCron::run()
+- ✅ `includes/cli/plex_item.php` — тонкая обёртка → PlexItem::run()
+- ✅ Все 5 классов зарегистрированы в autoload.php
+- ✅ `admin/settings_plex.php` → modules/plex/views/ (контроллер + вынесенный view/scripts)
+- ✅ `admin/plex_add.php` → modules/plex/views/ (контроллер + общие view/scripts)
+- ✅ `admin/plex.php` → modules/plex/views/ (контроллер + список вынесен в view)
+- ✅ `config/plex/` → modules/plex/config/
+
+**Осталось:** —
 
 #### Шаг 5.2 — modules/watch/
-```
-API::editWatchSettings()      → modules/watch/WatchService.php
-API::processWatchFolder()     →
-API::scheduleRecording()      → modules/watch/RecordingService.php
-admin.php::getWatchFolders()  →
-admin.php::getWatchCategories() →
-admin.php::forceWatch()       →
-admin.php::getRecordings()    →
-admin.php::deleteRecording()  →
-admin/settings_watch.php      → modules/watch/views/
-admin/watch.php               →
-admin/watch_add.php           →
-admin/watch_output.php        →
-admin/record.php              →
-crons/watch.php               → modules/watch/WatchCron.php
-includes/cli/watch_item.php   →
-```
+- ✅ `API::editWatchSettings()` → modules/watch/WatchService.php
+- ✅ `API::processWatchFolder()` → modules/watch/WatchService.php
+- ✅ `API::scheduleRecording()` → modules/watch/RecordingService.php
+- ✅ `admin.php::getWatchFolders()` → modules/watch/WatchController.php
+- ✅ `admin.php::getWatchCategories()` → modules/watch/WatchController.php
+- ✅ `admin.php::forceWatch()` → modules/watch/WatchController.php
+- ✅ `admin.php::getRecordings()` → modules/watch/WatchController.php
+- ✅ `admin.php::deleteRecording()` → modules/watch/WatchController.php
+- ✅ `admin/settings_watch.php` → modules/watch/views/ (thin wrapper + view/scripts)
+- ✅ `admin/watch.php` → modules/watch/views/ (thin wrapper + view/scripts)
+- ✅ `admin/watch_add.php` → modules/watch/views/ (thin wrapper + view/scripts)
+- ✅ `admin/watch_output.php` → modules/watch/views/ (thin wrapper + view/scripts)
+- ✅ `admin/record.php` → modules/watch/views/ (thin wrapper + view/scripts)
+- ✅ `crons/watch.php` → modules/watch/WatchCron.php (entry point + extracted class)
+- ✅ `includes/cli/watch_item.php` → modules/watch/WatchItem.php (entry point + extracted class)
+- ✅ `WatchModule::registerCrons()` wired to WatchCron
+
+**Осталось:** —
 
 #### Шаг 5.3 — modules/tmdb/
-```
-admin.php::getMovieTMDB()   → modules/tmdb/TmdbService.php
-admin.php::getSeriesTMDB()  →
-admin.php::getSeasonTMDB()  →
-includes/libs/TMDb/         → modules/tmdb/lib/
-crons/tmdb.php              → modules/tmdb/TmdbCron.php
-crons/tmdb_popular.php      →
-```
+- ✅ `admin/api.php::tmdb_search` → modules/tmdb/TmdbService.php (search)
+- ✅ `admin/api.php::tmdb` → modules/tmdb/TmdbService.php (getDetails)
+- ✅ `crons/tmdb.php` → modules/tmdb/TmdbCron.php (entry point + extracted class)
+- ✅ `crons/tmdb_popular.php` → modules/tmdb/TmdbPopularCron.php (entry point + extracted class)
+- ✅ `TmdbModule.php` — registerCrons() wired (TmdbCron + TmdbPopularCron)
+- ✅ `includes/libs/TMDb/` → modules/tmdb/lib.php (proxy loader, lib stays in place)
+
+**Осталось:** —
 
 #### Шаг 5.4 — modules/ministra/
-```
-ministra/portal.php (2155 строк) → modules/ministra/PortalHandler.php
-ministra/*.js                     → modules/ministra/assets/
-```
+- ✅ `ministra/portal.php` (2156 строк) → PortalHandler.php (15 статических обработчиков, ~1345 строк)
+- ✅ `ministra/portal.php` helper functions → PortalHelpers.php (19 статических методов, ~860 строк)
+- ✅ `MinistraModule.php` — точка входа модуля (standalone endpoint, без cron/routes)
+- ✅ `ministra/portal.php` → тонкая обёртка: init/auth → PortalHandler (269 строк + хелперы + комментированный оригинал)
+- 🔲 `ministra/*.js` → modules/ministra/assets/ (JS-файлы портала — отложено)
+
+**Осталось:** JS-ассеты (отложено до Фазы 6)
 
 #### Шаг 5.5 — modules/fingerprint/ + modules/theft-detection/ + modules/magscan/
+- ✅ `FingerprintModule.php` — модуль Fingerprint Stream (выбор потока + наложение текста + таблица активности)
+- ✅ `TheftDetectionModule.php` — модуль обнаружения кражи VOD (таблица просмотров, данные из cache_engine)
+- ✅ `MagscanModule.php` — модуль настроек MAGSCAN (белые/чёрные списки MAC + IP)
+- ✅ `module.json` × 3 — метаданные модулей
+- ✅ `config/modules.php` — все 3 модуля раскомментированы и включены
+
+**Источники:**
 ```
-admin/fingerprint.php      → modules/fingerprint/
-admin/theft_detection.php  → modules/theft-detection/
-admin/magscan_settings.php → modules/magscan/
+admin/fingerprint.php (330 стр.) — UI-страница, API: fingerprint + line_activity
+admin/theft_detection.php (239 стр.) — UI-страница, данные: CACHE_TMP_PATH/theft_detection
+admin/magscan_settings.php (301 стр.) — UI-страница, POST: submit_magscan
 ```
 
 #### Шаг 5.6 — ModuleInterface + загрузчик модулей
-```
-Новый файл → core/Module/ModuleInterface.php
-Новый файл → core/Module/ModuleLoader.php
-Новый файл → config/modules.php
-```
+- ✅ `core/Module/ModuleInterface.php` — контракт модуля (111 строк): getName, getVersion, boot, registerRoutes, registerCrons, getEventSubscribers
+- ✅ `core/Module/ModuleLoader.php` — загрузчик модулей (243 строки): loadAll, load, checkDependencies, isLoaded, getModule
+- ✅ `config/modules.php` — конфигурация модулей: plex, watch, fingerprint, theft-detection, magscan (enabled), tmdb, ministra (commented)
+
+---
+
+#### Аудит Фазы 5 ✅
+Проведена полная проверка всех файлов Фазы 5. Найдено и исправлено:
+- **КРИТИЧЕСКОЕ**: `Thread`/`Multithread` дублировались в 3 файлах (PlexCron, WatchCron, cache_engine) → вынесены в `core/Process/Thread.php` + `core/Process/Multithread.php`, все 3 файла переведены на `require_once`
+- **autoload.php**: добавлены 14 отсутствующих записей (WatchCron, WatchItem, Tmdb*, Ministra*, Fingerprint*, TheftDetection*, Magscan*, Thread, Multithread)
+- **module.json**: созданы для `tmdb` и `ministra` (отсутствовали)
+- **config/modules.php**: `tmdb` и `ministra` раскомментированы и включены (были `enabled => false`)
 
 ---
 
diff --git a/src/admin/api.php b/src/admin/api.php
index 01cf073f..76cbf6af 100644
--- a/src/admin/api.php
+++ b/src/admin/api.php
@@ -3122,7 +3122,7 @@ if (isset($_SESSION['hash'])) {
 		}
 		if (CoreUtilities::$rRequest['action'] == 'disable_watch') {
 			if (hasPermissions('adv', 'folder_watch_settings')) {
-				$db->query("UPDATE `watch_folders` SET `active` = 0 WHERE `type` <> 'plex';");
+				WatchService::disableWatch($db);
 				echo json_encode(array('result' => true));
 
 				exit();
@@ -3134,7 +3134,7 @@ if (isset($_SESSION['hash'])) {
 		}
 		if (CoreUtilities::$rRequest['action'] == 'enable_watch') {
 			if (hasPermissions('adv', 'folder_watch_settings')) {
-				$db->query("UPDATE `watch_folders` SET `active` = 1 WHERE `type` <> 'plex';");
+				WatchService::enableWatch($db);
 				echo json_encode(array('result' => true));
 
 				exit();
diff --git a/src/admin/plex.php b/src/admin/plex.php
index 73674f8f..0a191f6c 100644
--- a/src/admin/plex.php
+++ b/src/admin/plex.php
@@ -8,347 +8,9 @@ if (!checkPermissions()) {
 }
 
 $_TITLE = 'Plex Sync';
+$rPlexServers = getPlexServers();
+
 include 'header.php';
-?>
-
-<div class="wrapper boxed-layout-ext" <?php if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
-											echo ' style="display: none;"';
-										} ?>>
-	<div class="container-fluid">
-		<div class="row">
-			<div class="col-12">
-				<div class="page-title-box">
-					<div class="page-title-right">
-						<?php include 'topbar.php'; ?>
-					</div>
-					<h4 class="page-title">Plex Sync</h4>
-				</div>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-12">
-				<?php if (isset($_STATUS) && $_STATUS == STATUS_SUCCESS) : ?>
-					<div class="alert alert-success alert-dismissible fade show" role="alert">
-						<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-						The server is now being synced. It will be scanned during the next Plex Sync run.
-					</div>
-				<?php endif; ?>
-				<div class="card">
-					<div class="card-body" style="overflow-x:auto;">
-						<table id="datatable" class="table table-striped table-borderless dt-responsive nowrap">
-							<thead>
-								<tr>
-									<th class="text-center">ID</th>
-									<th class="text-center">Status</th>
-									<th class="text-center">Plex IP</th>
-									<th>Server Name</th>
-									<th>Library</th>
-									<th class="text-center">Last Run</th>
-									<th class="text-center">Actions</th>
-								</tr>
-							</thead>
-							<tbody>
-								<?php foreach (getPlexServers() as $rServer) :
-									$rDate = ($rServer['last_run'] > 0) ? date('Y-m-d H:i:s', $rServer['last_run']) : 'Never';
-									$rLibraryName = 'Unknown';
-									foreach (json_decode($rServer['plex_libraries'], true) as $rLibrary) {
-										if (intval($rLibrary['key']) == intval($rServer['directory'])) {
-											$rLibraryName = $rLibrary['title'];
-											break;
-										}
-									}
-									$rServerAdd = is_null($rServer['server_add']) ? 0 : count(json_decode($rServer['server_add'], true));
-								?>
-									<tr id="folder-<?= intval($rServer['id']); ?>">
-										<td class="text-center"><?= intval($rServer['id']); ?></td>
-										<td class="text-center">
-											<?php if ($rServer['active']) : ?>
-												<i class="text-success fas fa-square"></i>
-											<?php else : ?>
-												<i class="text-secondary fas fa-square"></i>
-											<?php endif; ?>
-										</td>
-										<td class="text-center"><?= $rServer['plex_ip']; ?></td>
-										<td>
-											<?= $rServers[$rServer['server_id']]['server_name'] . ($rServerAdd > 0 ? "&nbsp; <button type='button' class='btn btn-info btn-xs waves-effect waves-light'>+ " . $rServerAdd . "</button>" : ""); ?>
-										</td>
-										<td><?= $rLibraryName; ?></td>
-										<td class="text-center"><?= $rDate; ?></td>
-										<td class="text-center">
-											<div class="btn-group">
-												<a href="./plex_add?id=<?= intval($rServer['id']); ?>"><button type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-pencil-outline"></i></button></a>
-												<button type="button" class="btn btn-light waves-effect waves-light btn-xs" onClick="api(<?= intval($rServer['id']); ?>, 'force');"><i class="mdi mdi-refresh"></i></button>
-												<button type="button" class="btn btn-light waves-effect waves-light btn-xs" onClick="api(<?= intval($rServer['id']); ?>, 'delete');"><i class="mdi mdi-close"></i></button>
-											</div>
-										</td>
-									</tr>
-								<?php endforeach; ?>
-							</tbody>
-						</table>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<?php include 'footer.php'; ?>
-<script id="scripts">
-	var resizeObserver = new ResizeObserver(entries => $(window).scroll());
-	$(document).ready(function() {
-		resizeObserver.observe(document.body)
-		$("form").attr('autocomplete', 'off');
-		$(document).keypress(function(event) {
-			if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
-		});
-		$.fn.dataTable.ext.errMode = 'none';
-		var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
-		elems.forEach(function(html) {
-			var switchery = new Switchery(html, {
-				'color': '#414d5f'
-			});
-			window.rSwitches[$(html).attr("id")] = switchery;
-		});
-		setTimeout(pingSession, 30000);
-		<?php if (!$rMobile && $rSettings['header_stats']): ?>
-			headerStats();
-		<?php endif; ?>
-		bindHref();
-		refreshTooltips();
-		$(window).scroll(function() {
-			if ($(this).scrollTop() > 200) {
-				if ($(document).height() > $(window).height()) {
-					$('#scrollToBottom').fadeOut();
-				}
-				$('#scrollToTop').fadeIn();
-			} else {
-				$('#scrollToTop').fadeOut();
-				if ($(document).height() > $(window).height()) {
-					$('#scrollToBottom').fadeIn();
-				} else {
-					$('#scrollToBottom').hide();
-				}
-			}
-		});
-		$("#scrollToTop").unbind("click");
-		$('#scrollToTop').click(function() {
-			$('html, body').animate({
-				scrollTop: 0
-			}, 800);
-			return false;
-		});
-		$("#scrollToBottom").unbind("click");
-		$('#scrollToBottom').click(function() {
-			$('html, body').animate({
-				scrollTop: $(document).height()
-			}, 800);
-			return false;
-		});
-		$(window).scroll();
-		$(".nextb").unbind("click");
-		$(".nextb").click(function() {
-			var rPos = 0;
-			var rActive = null;
-			$(".nav .nav-item").each(function() {
-				if ($(this).find(".nav-link").hasClass("active")) {
-					rActive = rPos;
-				}
-				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-					$(this).find(".nav-link").trigger("click");
-					return false;
-				}
-				rPos += 1;
-			});
-		});
-		$(".prevb").unbind("click");
-		$(".prevb").click(function() {
-			var rPos = 0;
-			var rActive = null;
-			$($(".nav .nav-item").get().reverse()).each(function() {
-				if ($(this).find(".nav-link").hasClass("active")) {
-					rActive = rPos;
-				}
-				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-					$(this).find(".nav-link").trigger("click");
-					return false;
-				}
-				rPos += 1;
-			});
-		});
-		(function($) {
-			$.fn.inputFilter = function(inputFilter) {
-				return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
-					if (inputFilter(this.value)) {
-						this.oldValue = this.value;
-						this.oldSelectionStart = this.selectionStart;
-						this.oldSelectionEnd = this.selectionEnd;
-					} else if (this.hasOwnProperty("oldValue")) {
-						this.value = this.oldValue;
-						this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
-					}
-				});
-			};
-		}(jQuery));
-		<?php if ($rSettings['js_navigate']): ?>
-			$(".navigation-menu li").mouseenter(function() {
-				$(this).find(".submenu").show();
-			});
-			delParam("status");
-			$(window).on("popstate", function() {
-				if (window.rRealURL) {
-					if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
-						navigate(window.location.href.split("/").reverse()[0]);
-					}
-				}
-			});
-		<?php endif; ?>
-		$(document).keydown(function(e) {
-			if (e.keyCode == 16) {
-				window.rShiftHeld = true;
-			}
-		});
-		$(document).keyup(function(e) {
-			if (e.keyCode == 16) {
-				window.rShiftHeld = false;
-			}
-		});
-		document.onselectstart = function() {
-			if (window.rShiftHeld) {
-				return false;
-			}
-		}
-	});
-
-
-
-	function disableAll(rConfirm = false) {
-		if (!rConfirm) {
-			new jBox("Confirm", {
-				confirmButton: "Disable",
-				cancelButton: "Cancel",
-				content: "Are you sure you want to disable all libraries?",
-				confirm: function() {
-					disableAll(true);
-				}
-			}).open();
-		} else {
-			$.getJSON("./api?action=disable_plex", function(data) {
-				$.toast("Libraries have been disabled.");
-			});
-		}
-	}
-
-	function enableAll(rConfirm = false) {
-		if (!rConfirm) {
-			new jBox("Confirm", {
-				confirmButton: "Enable",
-				cancelButton: "Cancel",
-				content: "Are you sure you want to enable all libraries?",
-				confirm: function() {
-					enableAll(true);
-				}
-			}).open();
-		} else {
-			$.getJSON("./api?action=enable_plex", function(data) {
-				$.toast("Libraries have been enabled.");
-			});
-		}
-	}
-
-	function killPlexSync(rConfirm = false) {
-		if (!rConfirm) {
-			new jBox("Confirm", {
-				confirmButton: "Kill",
-				cancelButton: "Cancel",
-				content: "Are you sure you want to kill all processes?",
-				confirm: function() {
-					killPlexSync(true);
-				}
-			}).open();
-		} else {
-			$.getJSON("./api?action=kill_plex", function(data) {
-				$.toast("Plex Sync processes have been killed.");
-			});
-		}
-	}
-
-	function api(rID, rType, rConfirm = false) {
-		if ((rType == "delete") && (!rConfirm)) {
-			new jBox("Confirm", {
-				confirmButton: "Delete",
-				cancelButton: "Cancel",
-				content: "Are you sure you want to delete this library?",
-				confirm: function() {
-					api(rID, rType, true);
-				}
-			}).open();
-		} else if ((rType == "force") && (!rConfirm)) {
-			new jBox("Confirm", {
-				confirmButton: "Run",
-				cancelButton: "Cancel",
-				content: "Are you sure you want to force this library to run now?",
-				confirm: function() {
-					api(rID, rType, true);
-				}
-			}).open();
-		} else {
-			rConfirm = true;
-		}
-		if (rConfirm) {
-			$.getJSON("./api?action=library&sub=" + rType + "&folder_id=" + rID, function(data) {
-				if (data.result === true) {
-					if (rType == "delete") {
-						if (rRow = findRowByID($("#datatable").DataTable(), 0, rID)) {
-							$("#datatable").DataTable().rows(rRow).remove().draw(false);
-						}
-						$.toast("Library successfully deleted.");
-					} else if (rType == "force") {
-						$.toast("Library has been forced to sync in the background.");
-					}
-				} else {
-					$.toast("An error occured while processing your request.");
-				}
-			});
-		}
-	}
-
-	$(document).ready(function() {
-		$("#datatable").DataTable({
-			language: {
-				paginate: {
-					previous: "<i class='mdi mdi-chevron-left'>",
-					next: "<i class='mdi mdi-chevron-right'>"
-				}
-			},
-			drawCallback: function() {
-				bindHref();
-				refreshTooltips();
-			},
-			order: [
-				[5, "desc"]
-			],
-			columnDefs: [{
-				"visible": false,
-				"targets": [0]
-			}],
-			responsive: false
-		});
-		$("#datatable").css("width", "100%");
-		$("form").submit(function(e) {
-			e.preventDefault();
-			$(':input[type="submit"]').prop('disabled', true);
-			submitForm(window.rCurrentPage, new FormData($("form")[0]));
-		});
-	});
-    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
-        $(document).ready(function() {
-            initSearch();
-        });
-    <?php endif; ?>
-</script>
-<script src="assets/js/listings.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+include dirname(__DIR__) . '/modules/plex/views/index.php';
+include 'footer.php';
+include dirname(__DIR__) . '/modules/plex/views/library_scripts.php';
diff --git a/src/admin/plex_add.php b/src/admin/plex_add.php
index 0d9ceef5..9ff0d3c6 100644
--- a/src/admin/plex_add.php
+++ b/src/admin/plex_add.php
@@ -14,473 +14,8 @@ if (!isset(CoreUtilities::$rRequest['id']) || ($rFolder = getWatchFolder(CoreUti
 
 $rBouquets = getBouquets();
 $_TITLE = 'Add Library';
+
 include 'header.php';
-?>
-
-<div class="wrapper boxed-layout" <?php if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') echo 'style="display: none;"' ?>>
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-12">
-                <div class="page-title-box">
-                    <div class="page-title-right">
-                        <?php include 'topbar.php'; ?>
-                    </div>
-                    <h4 class="page-title">
-                        <?= isset($rFolder) ? 'Edit' : 'Add' ?> Library
-                    </h4>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-xl-12">
-                <div class="card">
-                    <div class="card-body">
-                        <form action="#" method="POST" data-parsley-validate="">
-                            <?php if (isset($rFolder)): ?>
-                                <input type="hidden" name="edit" value="<?= intval($rFolder['id']) ?>" />
-                            <?php endif; ?>
-                            <input type="hidden" name="libraries" id="libraries" value="<?php echo (isset($rFolder['plex_libraries']) ? htmlspecialchars($rFolder['plex_libraries']) : ''); ?>" />
-                            <div id="basicwizard">
-                                <ul class="nav nav-pills bg-light nav-justified form-wizard-header mb-4">
-                                    <li class="nav-item">
-                                        <a href="#folder-details" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
-                                            <i class="mdi mdi-account-card-details-outline mr-1"></i>
-                                            <span class="d-none d-sm-inline">Details</span>
-                                        </a>
-                                    </li>
-                                    <li class="nav-item">
-                                        <a href="#settings" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
-                                            <i class="mdi mdi-wrench mr-1"></i>
-                                            <span class="d-none d-sm-inline">Settings</span>
-                                        </a>
-                                    </li>
-                                </ul>
-                                <div class="tab-content b-0 mb-0 pt-0">
-                                    <div class="tab-pane" id="folder-details">
-                                        <div class="row">
-                                            <div class="col-12">
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="server_id">Server Name</label>
-                                                    <div class="col-md-8">
-                                                        <select name="server_id[]" id="server_id" class="form-control select2-multiple" data-toggle="select2" multiple="multiple" data-placeholder="Choose...">
-                                                            <?php
-                                                            $rActiveServers = array();
-                                                            if (isset($rFolder)):
-                                                                if ($rFolder['server_id']):
-                                                                    $rActiveServers[] = $rFolder['server_id'];
-                                                                    echo '<option value="' . $rFolder['server_id'] . '" selected>' . CoreUtilities::$rServers[$rFolder['server_id']]['server_name'] . '</option>';
-                                                                endif;
-
-                                                                if ($rFolder['server_add']):
-                                                                    foreach (json_decode($rFolder['server_add'], true) as $rServerID):
-                                                                        $rActiveServers[] = $rServerID;
-                                                                        echo '<option value="' . $rServerID['server_id'] . '" selected>' . CoreUtilities::$rServers[$rServerID]['server_name'] . '</option>';
-                                                                    endforeach;
-                                                                endif;
-                                                            endif;
-                                                            foreach (getStreamingServers() as $rServer):
-                                                                if (!in_array($rServer['id'], $rActiveServers)):
-                                                                    echo '<option value="' . $rServer['id'] . '">' . $rServer['server_name'] . '</option>';
-                                                                endif;
-                                                            endforeach;
-                                                            ?>
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="plex_ip">Plex Server</label>
-                                                    <div class="col-md-6">
-                                                        <input type="text" id="plex_ip" name="plex_ip" class="form-control" value="<?php if (isset($rFolder)) echo $rFolder['plex_ip']; ?>" placeholder="Server IP" required data-parsley-trigger="change">
-                                                    </div>
-                                                    <div class="col-md-2">
-                                                        <input type="text" id="plex_port" name="plex_port" class="form-control text-center" value="<?php if (isset($rFolder)) echo $rFolder['plex_port']; ?>" placeholder="Port" required data-parsley-trigger="change">
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="username">Credentials</label>
-                                                    <div class="col-md-4">
-                                                        <input type="text" id="username" name="username" class="form-control" value="<?php if (isset($rFolder)) echo $rFolder['plex_username']; ?>" placeholder="Username" required data-parsley-trigger="change">
-                                                    </div>
-                                                    <div class="col-md-4">
-                                                        <input type="password" id="password" name="password" class="form-control" value="<?php if (isset($rFolder)) echo $rFolder['plex_password']; ?>" placeholder="Password">
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="library_id">Library</label>
-                                                    <div class="col-md-7">
-                                                        <select id="library_id" name="library_id" class="form-control" data-toggle="select2">
-                                                            <?php
-                                                            $rLibraries = (isset($rFolder['plex_libraries']) ? json_decode($rFolder['plex_libraries'], true) : array());
-                                                            foreach ($rLibraries as $rLibrary):
-                                                                if ($rFolder['directory'] == $rLibrary['key']):
-                                                                    echo '<option selected value="' . $rLibrary['key'] . '">' . $rLibrary['title'] . '</option>';
-                                                                else:
-                                                                    echo '<option value="' . $rLibrary['key'] . '">' . $rLibrary['title'] . '</option>';
-                                                                endif;
-                                                            endforeach;
-                                                            ?>
-                                                        </select>
-                                                    </div>
-                                                    <div class="col-md-1">
-                                                        <button class="btn btn-primary waves-effect waves-light" type="button" id="scanPlex"><i class="mdi mdi-reload"></i></button>
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="active">Enabled</label>
-                                                    <div class="col-md-2">
-                                                        <input name="active" id="active" type="checkbox" <? if (!isset($rFolder) || (isset($rFolder) && $rFolder['active'])) echo 'checked '; ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
-                                                    </div>
-                                                    <label class="col-md-4 col-form-label" for="direct_proxy">Direct Stream <i title="When using direct source, hide the original Plex URL by proxying the movie through your servers. This will consume bandwidth but won't require the movie to be saved to your servers permanently." class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input name="direct_proxy" id="direct_proxy" type="checkbox" <? if (!isset($rFolder) || (isset($rFolder) && $rFolder['direct_proxy'])) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd" />
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <ul class="list-inline wizard mb-0">
-                                            <li class="nextb list-inline-item float-right">
-                                                <a href="javascript: void(0);" class="btn btn-secondary">Next</a>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                    <div class="tab-pane" id="settings">
-                                        <div class="row">
-                                            <div class="col-12">
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="read_native">Native Frames <i title="Read input video at native frame rate." class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input name="read_native" id="read_native" type="checkbox" <? if (isset($rFolder) && $rFolder['read_native']) echo 'checked '; ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
-                                                    </div>
-                                                    <label class="col-md-4 col-form-label" for="movie_symlink">Create Symlink <i title="Generate a symlink to the original file instead of encoding. File needs to exist on all selected servers." class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input name="movie_symlink" id="movie_symlink" type="checkbox" <? if (!isset($rFolder) || (isset($rFolder) && $rFolder['movie_symlink'])) echo 'checked '; ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="auto_encode">Auto-Encode <i title="Start encoding as soon as the movie is added." class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input name="auto_encode" id="auto_encode" type="checkbox" <? if (!isset($rFolder) || (isset($rFolder) && $rFolder['auto_encode'])) echo 'checked '; ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
-                                                    </div>
-                                                    <label class="col-md-4 col-form-label" for="scan_missing">Scan Missing ID's <i title="Check all Plex ID's in the XC_VM database against Plex database and scan missing items too. If this is off, XC_VM will only request items modified after the last scan date. Turning this on will increase time taken to scan as the entire library needs to be scanned instead of the recent items." class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input name="scan_missing" id="scan_missing" type="checkbox" <? if (isset($rFolder) && $rFolder['scan_missing']) echo 'checked '; ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="auto_upgrade">Auto-Upgrade Quality <i title="Automatically upgrade quality if the system finds a new file with better quality that has the same Plex or TMDb ID." class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input name="auto_upgrade" id="auto_upgrade" type="checkbox" <? if (!isset($rFolder) || (isset($rFolder) && $rFolder['auto_upgrade'])) echo 'checked '; ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
-                                                    </div>
-                                                    <label class="col-md-4 col-form-label" for="store_categories">Store Categories <i title="Save unrecognised categories to Plex Settings, this will allow you to allocate a category after the first run and it will then be added on the second run." class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input name="store_categories" id="store_categories" type="checkbox" <? if (!isset($rFolder) || (isset($rFolder) && $rFolder['store_categories'])) echo 'checked '; ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="check_tmdb">Check Against TMDb <i title="If the item has a TMDb ID, check it against the database to ensure duplicates aren't created due to previous content in the XC_VM system." class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input name="check_tmdb" id="check_tmdb" type="checkbox" <? if (!isset($rFolder) || (isset($rFolder) && $rFolder['check_tmdb'])) echo 'checked '; ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
-                                                    </div>
-                                                    <label class="col-md-4 col-form-label" for="remove_subtitles">Remove Existing Subtitles <i title="Remove existing subtitles from file before encoding. You can't remove hardcoded subtitles using this method." class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input name="remove_subtitles" id="remove_subtitles" type="checkbox" <? if (isset($rFolder) && $rFolder['remove_subtitles']) echo 'checked '; ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="target_container"> <?= $language::get('target_container') ?> <i title="Which container to use when transcoding files." class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <select name="target_container" id="target_container" class="form-control" data-toggle="select2">
-                                                            <?php foreach (array('auto', 'mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts') as $container): ?>
-                                                                <option <? if (isset($rFolder) && $rFolder['target_container']) echo 'checked '; ?>
-                                                                    value="<?= $container ?>"><?= $container ?>
-                                                                </option>
-                                                            <?php endforeach; ?>
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="override_bouquets">Override Bouquets</label>
-                                                    <div class="col-md-8">
-                                                        <select name="override_bouquets[]" id="override_bouquets" class="form-control select2-multiple" data-toggle="select2" multiple="multiple" data-placeholder="Choose...">
-                                                            <?php foreach ($rBouquets as $rBouquet): ?>
-                                                                <?php $folderBouquets = json_decode($rFolder['bouquets'] ?? '[]', true); ?>
-                                                                <option <?php if (in_array(intval($rBouquet['id']), $folderBouquets)) echo 'selected '; ?> value="<?= $rBouquet['id'] ?>"><?= $rBouquet['bouquet_name'] ?></option>
-                                                            <?php endforeach; ?>
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="fallback_bouquets">Fallback Bouquets</label>
-                                                    <div class="col-md-8">
-                                                        <select name="fallback_bouquets[]" id="fallback_bouquets" class="form-control select2-multiple" data-toggle="select2" multiple="multiple" data-placeholder="Choose...">
-                                                            <?php foreach ($rBouquets as $rBouquet): ?>
-                                                                <?php $folderBouquets = json_decode($rFolder['fb_bouquets'] ?? '[]', true); ?>
-                                                                <option <?php if (in_array(intval($rBouquet['id']), $folderBouquets)) echo 'selected'; ?> value="<?= $rBouquet['id'] ?>"><?= $rBouquet['bouquet_name'] ?></option>
-                                                            <?php endforeach; ?>
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4" id="override_category">
-                                                    <label class="col-md-4 col-form-label" for="override_category">Override Category</label>
-                                                    <div class="col-md-8">
-                                                        <select name="override_category" id="override_category" class="form-control select2" data-toggle="select2">
-                                                            <option <?php if (isset($rFolder) && intval($rFolder['category_id']) == 0) echo 'selected '; ?> value="0">Do Not Use</option>
-                                                            <optgroup label="Movies">
-                                                                <?php foreach (getCategories('movie') as $rCategory): ?>
-                                                                    <option <?php if (isset($rFolder) && intval($rFolder['category_id']) == intval($rCategory['id'])) echo 'selected '; ?> value="<?= intval($rCategory['id']) ?>"><?= $rCategory['category_name'] ?></option>
-                                                                <?php endforeach; ?>
-                                                            <optgroup label="Series">
-                                                                <?php foreach (getCategories('series') as $rCategory): ?>
-                                                                    <option <?php if (isset($rFolder) && intval($rFolder['category_id']) == intval($rCategory['id'])) echo 'selected '; ?> value="<?= intval($rCategory['id']) ?>"><?= $rCategory['category_name'] ?></option>
-                                                                <?php endforeach; ?>
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4" id="fallback_category">
-                                                    <label class="col-md-4 col-form-label" for="fallback_category">Fallback Category</label>
-                                                    <div class="col-md-8">
-                                                        <select name="fallback_category" id="fallback_category" class="form-control select2" data-toggle="select2">
-                                                            <option <?php if (isset($rFolder) && intval($rFolder['fb_category_id']) == 0) echo 'selected '; ?> value="0">Do Not Use</option>
-                                                            <optgroup label="Movies">
-                                                                <?php foreach (getCategories('movie') as $rCategory): ?>
-                                                                    <option <?php if (isset($rFolder) && intval($rFolder['fb_category_id']) == intval($rCategory['id'])) echo 'selected '; ?> value="<?= intval($rCategory['id']) ?>"><?= $rCategory['category_name'] ?></option>
-                                                                <?php endforeach; ?>
-                                                            <optgroup label="Series">
-                                                                <?php foreach (getCategories('series') as $rCategory): ?>
-                                                                    <option <?php if (isset($rFolder) && intval($rFolder['fb_category_id']) == intval($rCategory['id'])) echo 'selected '; ?> value="<?= intval($rCategory['id']) ?>"><?= $rCategory['category_name'] ?></option>
-                                                                <?php endforeach; ?>
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="transcode_profile_id">Transcoding Profile <i title="Select a transcoding profile to autoamtically encode videos." class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-8">
-                                                        <select name="transcode_profile_id" id="transcode_profile_id" class="form-control" data-toggle="select2">
-                                                            <option <?php if (isset($rFolder) && intval($rFolder['transcode_profile_id']) == 0) echo 'selected '; ?>value="0">Transcoding Disabled</option>
-                                                            <?php foreach (getTranscodeProfiles() as $rProfile): ?>
-                                                                <option <?php if (isset($rFolder) && intval($rFolder['transcode_profile_id']) == intval($rProfile['profile_id'])) echo 'selected '; ?> value="<?= $rProfile['profile_id'] ?>"><?= $rProfile['profile_name'] ?></option>
-                                                            <?php endforeach; ?>
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <ul class="list-inline wizard mb-0">
-                                            <li class="prevb list-inline-item">
-                                                <a href="javascript: void(0);" class="btn btn-secondary">Previous</a>
-                                            </li>
-                                            <li class="list-inline-item float-right">
-                                                <input name="submit_folder" type="submit" class="btn btn-primary" value="<?= isset($rFolder) ? 'Edit' : 'Add' ?>" />
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<?php include 'footer.php'; ?>
-<script id="scripts">
-    var resizeObserver = new ResizeObserver(entries => $(window).scroll());
-    $(document).ready(function() {
-        resizeObserver.observe(document.body)
-        $("form").attr('autocomplete', 'off');
-        $(document).keypress(function(event) {
-            if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
-        });
-        $.fn.dataTable.ext.errMode = 'none';
-        var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
-        elems.forEach(function(html) {
-            var switchery = new Switchery(html, {
-                'color': '#414d5f'
-            });
-            window.rSwitches[$(html).attr("id")] = switchery;
-        });
-        setTimeout(pingSession, 30000);
-        <?php if (!$rMobile && $rSettings['header_stats']): ?>
-            headerStats();
-        <?php endif; ?>
-        bindHref();
-        refreshTooltips();
-        $(window).scroll(function() {
-            if ($(this).scrollTop() > 200) {
-                if ($(document).height() > $(window).height()) {
-                    $('#scrollToBottom').fadeOut();
-                }
-                $('#scrollToTop').fadeIn();
-            } else {
-                $('#scrollToTop').fadeOut();
-                if ($(document).height() > $(window).height()) {
-                    $('#scrollToBottom').fadeIn();
-                } else {
-                    $('#scrollToBottom').hide();
-                }
-            }
-        });
-        $("#scrollToTop").unbind("click");
-        $('#scrollToTop').click(function() {
-            $('html, body').animate({
-                scrollTop: 0
-            }, 800);
-            return false;
-        });
-        $("#scrollToBottom").unbind("click");
-        $('#scrollToBottom').click(function() {
-            $('html, body').animate({
-                scrollTop: $(document).height()
-            }, 800);
-            return false;
-        });
-        $(window).scroll();
-        $(".nextb").unbind("click");
-        $(".nextb").click(function() {
-            var rPos = 0;
-            var rActive = null;
-            $(".nav .nav-item").each(function() {
-                if ($(this).find(".nav-link").hasClass("active")) {
-                    rActive = rPos;
-                }
-                if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-                    $(this).find(".nav-link").trigger("click");
-                    return false;
-                }
-                rPos += 1;
-            });
-        });
-        $(".prevb").unbind("click");
-        $(".prevb").click(function() {
-            var rPos = 0;
-            var rActive = null;
-            $($(".nav .nav-item").get().reverse()).each(function() {
-                if ($(this).find(".nav-link").hasClass("active")) {
-                    rActive = rPos;
-                }
-                if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-                    $(this).find(".nav-link").trigger("click");
-                    return false;
-                }
-                rPos += 1;
-            });
-        });
-        (function($) {
-            $.fn.inputFilter = function(inputFilter) {
-                return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
-                    if (inputFilter(this.value)) {
-                        this.oldValue = this.value;
-                        this.oldSelectionStart = this.selectionStart;
-                        this.oldSelectionEnd = this.selectionEnd;
-                    } else if (this.hasOwnProperty("oldValue")) {
-                        this.value = this.oldValue;
-                        this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
-                    }
-                });
-            };
-        }(jQuery));
-        <?php if ($rSettings['js_navigate']): ?>
-            $(".navigation-menu li").mouseenter(function() {
-                $(this).find(".submenu").show();
-            });
-            delParam("status");
-            $(window).on("popstate", function() {
-                if (window.rRealURL) {
-                    if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
-                        navigate(window.location.href.split("/").reverse()[0]);
-                    }
-                }
-            });
-        <?php endif; ?>
-        $(document).keydown(function(e) {
-            if (e.keyCode == 16) {
-                window.rShiftHeld = true;
-            }
-        });
-        $(document).keyup(function(e) {
-            if (e.keyCode == 16) {
-                window.rShiftHeld = false;
-            }
-        });
-        document.onselectstart = function() {
-            if (window.rShiftHeld) {
-                return false;
-            }
-        }
-    });
-
-
-
-    function evaluateDirectSource() {
-        $(["read_native", "movie_symlink", "auto_encode", "auto_upgrade", "remove_subtitles", "target_container", "transcode_profile_id"]).each(function(rID, rElement) {
-            if ($(rElement)) {
-                if ($("#direct_proxy").is(":checked")) {
-                    if (window.rSwitches[rElement]) {
-                        setSwitch(window.rSwitches[rElement], false);
-                        window.rSwitches[rElement].disable();
-                    } else {
-                        $("#" + rElement).prop("disabled", true);
-                    }
-                } else {
-                    if (window.rSwitches[rElement]) {
-                        window.rSwitches[rElement].enable();
-                    } else {
-                        $("#" + rElement).prop("disabled", false);
-                    }
-                }
-            }
-        });
-    }
-
-    $(document).ready(function() {
-        $('select').select2({
-            width: '100%'
-        });
-        $("#scanPlex").click(function() {
-            if (($("#plex_ip").val().length > 0) && ($("#plex_port").val().length > 0) && ($("#username").val().length > 0) && ($("#password").val().length > 0)) {
-                $("#library_id").empty().trigger("change");
-                $.getJSON("./api?action=plex_sections&ip=" + encodeURIComponent($("#plex_ip").val()) + "&port=" + encodeURIComponent($("#plex_port").val()) + "&username=" + encodeURIComponent($("#username").val()) + "&password=" + encodeURIComponent($("#password").val()), function(data) {
-                    rLibraries = [];
-                    if (data.result == true) {
-                        for (i in data.data) {
-                            rLibraries.push({
-                                "key": data.data[i]["@attributes"]["key"],
-                                "title": data.data[i]["@attributes"]["title"]
-                            });
-                            $("#library_id").append(new Option(data.data[i]["@attributes"]["title"], data.data[i]["@attributes"]["key"])).trigger('change');
-                        }
-                        $.toast("Libraries have been scanned and added to the list.");
-                    } else {
-                        $.toast("Failed to get libraries! Check your server credentials.");
-                    }
-                    $("#libraries").val(JSON.stringify(rLibraries));
-                });
-            } else {
-                $.toast("Please fill in all Plex server information and credentials.");
-            }
-        });
-        $("#direct_proxy").change(function() {
-            evaluateDirectSource();
-        });
-        evaluateDirectSource();
-        $("form").submit(function(e) {
-            e.preventDefault();
-            $(':input[type="submit"]').prop('disabled', true);
-            submitForm(window.rCurrentPage, new FormData($("form")[0]));
-        });
-        $("#plex_port").inputFilter(function(value) {
-            return /^\d*$/.test(value);
-        });
-    });
-    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
-        $(document).ready(function() {
-            initSearch();
-        });
-    <?php endif; ?>
-</script>
-<script src="assets/js/listings.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+include dirname(__DIR__) . '/modules/plex/views/library_edit.php';
+include 'footer.php';
+include dirname(__DIR__) . '/modules/plex/views/library_edit_scripts.php';
\ No newline at end of file
diff --git a/src/admin/record.php b/src/admin/record.php
index d5507dbe..ec189e08 100644
--- a/src/admin/record.php
+++ b/src/admin/record.php
@@ -3,8 +3,7 @@
 include 'session.php';
 include 'functions.php';
 
-if (checkPermissions()) {
-} else {
+if (!checkPermissions()) {
     goHome();
 }
 
@@ -59,349 +58,8 @@ if (!$rStream) {
 }
 
 $_TITLE = 'Record';
-include 'header.php'; ?>
-<div class="wrapper boxed-layout"
-    <?php if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') {
-    } else {
-        echo ' style="display: none;"';
-    } ?>>
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-12">
-                <div class="page-title-box">
-                    <div class="page-title-right">
-                        <?php include 'topbar.php'; ?>
-                    </div>
-                    <h4 class="page-title">Record an Event</h4>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-xl-12">
-                <div class="card">
-                    <div class="card-body">
-                        <?php if ($rStream) {
-                        } else { ?>
-                            <form action="record" method="POST" data-parsley-validate="">
-                            <?php } ?>
-                            <table class="table table-borderless mb-0">
-                                <thead class="thead-light">
-                                    <tr>
-                                        <th>Channel</th>
-                                        <th class="text-center">Start</th>
-                                        <th class="text-center"><?php echo ($rStream ? 'Finish' : 'Minutes'); ?></th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <?php if ($rStream) { ?>
-                                            <td><?php echo $rStream['stream_display_name']; ?></td>
-                                            <td class="text-center">
-                                                <?php echo date(CoreUtilities::$rSettings['date_format'], $rProgramme['start']); ?><br /><?php echo date('H:i', $rProgramme['start']); ?>
-                                            </td>
-                                            <td class="text-center">
-                                                <?php echo date(CoreUtilities::$rSettings['date_format'], $rProgramme['end']); ?><br /><?php echo date('H:i', $rProgramme['end']); ?>
-                                            </td>
-                                        <?php } else { ?>
-                                            <td><select id="stream_id" name="stream_id" class="form-control"
-                                                    data-toggle="select2"></select></td>
-                                            <td style="max-width:120px;" class="text-center"><input type="text"
-                                                    class="form-control text-center date" id="start_date" name="start_date"
-                                                    value="" data-toggle="date-picker" data-single-date-picker="true"></td>
-                                            <td style="max-width:40px;" class="text-center"><input type="text"
-                                                    class="form-control text-center" id="duration" name="duration"
-                                                    value="0"></td>
-                                        <?php } ?>
-                                    </tr>
-                                </tbody>
-                            </table>
-                            <?php if ($rStream) {
-                            } else { ?>
-                                <ul class="list-inline wizard mb-0">
-                                    <li class="list-inline-item float-right">
-                                        <input type="submit" class="btn btn-primary" value="Continue" />
-                                    </li>
-                                </ul>
-                            </form>
-                        <?php } ?>
-                    </div>
-                </div>
-            </div>
-            <?php if (!$rStream) {
-            } else { ?>
-                <div class="col-xl-12">
-                    <?php if ($rProgramme['archive'] || $rProgramme['start'] > time()) {
-                    } else { ?>
-                        <div class="alert alert-warning text-center" role="alert">
-                            The programme you are intending to record has already started!
-                        </div>
-                    <?php } ?>
-                    <div class="card">
-                        <div class="card-body">
-                            <form
-                                <?php if (!isset(CoreUtilities::$rRequest['import'])) {
-                                } else {
-                                    echo ' enctype="multipart/form-data"';
-                                } ?>
-                                action="#" method="POST" data-parsley-validate="">
-                                <input type="hidden" name="stream_id" value="<?php echo intval($rStream['id']); ?>" />
-                                <input type="hidden" name="start" value="<?php echo intval($rProgramme['start']); ?>" />
-                                <input type="hidden" name="end" value="<?php echo intval($rProgramme['end']); ?>" />
-                                <input type="hidden" name="archive"
-                                    value="<?php echo (isset($rProgramme['archive']) ? 1 : 0); ?>" />
-                                <div id="basicwizard">
-                                    <ul class="nav nav-pills bg-light nav-justified form-wizard-header mb-4">
-                                        <li class="nav-item">
-                                            <a href="#stream-details" data-toggle="tab"
-                                                class="nav-link rounded-0 pt-2 pb-2">
-                                                <i class="mdi mdi-account-card-details-outline mr-1"></i>
-                                                <span class="d-none d-sm-inline">Details</span>
-                                            </a>
-                                        </li>
-                                    </ul>
-                                    <div class="tab-content b-0 mb-0 pt-0">
-                                        <div class="tab-pane" id="stream-details">
-                                            <div class="row">
-                                                <div class="col-12">
-                                                    <div class="form-group row mb-4">
-                                                        <label class="col-md-4 col-form-label" for="title">Event
-                                                            Title</label>
-                                                        <div class="col-md-8">
-                                                            <input type="text" class="form-control" id="title" name="title"
-                                                                value="<?php echo str_replace('"', '&quot;', $rProgramme['title']); ?>"
-                                                                required data-parsley-trigger="change">
-                                                        </div>
-                                                    </div>
-                                                    <div class="form-group row mb-4">
-                                                        <label class="col-md-4 col-form-label" for="description">Event
-                                                            Description</label>
-                                                        <div class="col-md-8">
-                                                            <textarea rows="6" class="form-control" id="description"
-                                                                name="description"><?php echo htmlspecialchars($rProgramme['description']); ?></textarea>
-                                                        </div>
-                                                    </div>
-                                                    <!-- Additional form fields can be added here -->
-                                                    <div class="form-group row mb-4">
-                                                        <label class="col-md-4 col-form-label" for="stream_icon">Poster
-                                                            URL</label>
-                                                        <div class="col-md-8 input-group">
-                                                            <input type="text" class="form-control" id="stream_icon"
-                                                                name="stream_icon" value="">
-                                                            <div class="input-group-append">
-                                                                <a href="javascript:void(0)" onClick="openImage(this)"
-                                                                    class="btn btn-primary waves-effect waves-light"><i
-                                                                        class="mdi mdi-eye"></i></a>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="form-group row mb-4">
-                                                        <label class="col-md-4 col-form-label"
-                                                            for="category_id">Categories</label>
-                                                        <div class="col-md-8">
-                                                            <select name="category_id[]" id="category_id"
-                                                                class="form-control select2-multiple" data-toggle="select2"
-                                                                multiple="multiple" data-placeholder="Choose...">
-                                                                <?php foreach (getCategories('movie') as $rCategory) { ?>
-                                                                    <option value="<?php echo $rCategory['id']; ?>">
-                                                                        <?php echo $rCategory['category_name']; ?></option>
-                                                                <?php } ?>
-                                                            </select>
-                                                        </div>
-                                                    </div>
-                                                    <div class="form-group row mb-4">
-                                                        <label class="col-md-4 col-form-label"
-                                                            for="bouquets">Bouquets</label>
-                                                        <div class="col-md-8">
-                                                            <select name="bouquets[]" id="bouquets"
-                                                                class="form-control select2-multiple" data-toggle="select2"
-                                                                multiple="multiple" data-placeholder="Choose...">
-                                                                <?php foreach (getBouquets() as $rBouquet) { ?>
-                                                                    <option value="<?php echo $rBouquet['id']; ?>">
-                                                                        <?php echo $rBouquet['bouquet_name']; ?></option>
-                                                                <?php } ?>
-                                                            </select>
-                                                        </div>
-                                                    </div>
-                                                    <div class="form-group row mb-4">
-                                                        <label class="col-md-4 col-form-label" for="source_id">Recording
-                                                            Server</label>
-                                                        <div class="col-md-8">
-                                                            <select name="source_id" id="source_id" class="form-control"
-                                                                data-toggle="select2">
-                                                                <?php foreach ($rAvailableServers as $rServerID) { ?>
-                                                                    <option
-                                                                        value="<?php echo CoreUtilities::$rServers[$rServerID]['id']; ?>">
-                                                                        <?php echo CoreUtilities::$rServers[$rServerID]['server_name']; ?>
-                                                                        - <?php echo CoreUtilities::$rServers[$rServerID]['server_ip']; ?>
-                                                                    </option>
-                                                                <?php } ?>
-                                                            </select>
-                                                        </div>
-                                                    </div>
 
-                                                    <ul class="list-inline wizard mb-0">
-                                                        <li class="list-inline-item float-right">
-                                                            <input type="submit" class="btn btn-primary" value="Schedule" />
-                                                        </li>
-                                                    </ul>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            <?php } ?>
-        </div>
-    </div>
-</div>
-<?php include 'footer.php'; ?>
-<script id="scripts">
-			var resizeObserver = new ResizeObserver(entries => $(window).scroll());
-			$(document).ready(function() {
-				resizeObserver.observe(document.body)
-				$("form").attr('autocomplete', 'off');
-				$(document).keypress(function(event) {
-					if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
-				});
-				$.fn.dataTable.ext.errMode = 'none';
-				var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
-				elems.forEach(function(html) {
-					var switchery = new Switchery(html, {
-						'color': '#414d5f'
-					});
-					window.rSwitches[$(html).attr("id")] = switchery;
-				});
-				setTimeout(pingSession, 30000);
-				<?php if (!$rMobile && $rSettings['header_stats']): ?>
-					headerStats();
-				<?php endif; ?>
-				bindHref();
-				refreshTooltips();
-				$(window).scroll(function() {
-					if ($(this).scrollTop() > 200) {
-						if ($(document).height() > $(window).height()) {
-							$('#scrollToBottom').fadeOut();
-						}
-						$('#scrollToTop').fadeIn();
-					} else {
-						$('#scrollToTop').fadeOut();
-						if ($(document).height() > $(window).height()) {
-							$('#scrollToBottom').fadeIn();
-						} else {
-							$('#scrollToBottom').hide();
-						}
-					}
-				});
-				$("#scrollToTop").unbind("click");
-				$('#scrollToTop').click(function() {
-					$('html, body').animate({
-						scrollTop: 0
-					}, 800);
-					return false;
-				});
-				$("#scrollToBottom").unbind("click");
-				$('#scrollToBottom').click(function() {
-					$('html, body').animate({
-						scrollTop: $(document).height()
-					}, 800);
-					return false;
-				});
-				$(window).scroll();
-				$(".nextb").unbind("click");
-				$(".nextb").click(function() {
-					var rPos = 0;
-					var rActive = null;
-					$(".nav .nav-item").each(function() {
-						if ($(this).find(".nav-link").hasClass("active")) {
-							rActive = rPos;
-						}
-						if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-							$(this).find(".nav-link").trigger("click");
-							return false;
-						}
-						rPos += 1;
-					});
-				});
-				$(".prevb").unbind("click");
-				$(".prevb").click(function() {
-					var rPos = 0;
-					var rActive = null;
-					$($(".nav .nav-item").get().reverse()).each(function() {
-						if ($(this).find(".nav-link").hasClass("active")) {
-							rActive = rPos;
-						}
-						if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-							$(this).find(".nav-link").trigger("click");
-							return false;
-						}
-						rPos += 1;
-					});
-				});
-				(function($) {
-					$.fn.inputFilter = function(inputFilter) {
-						return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
-							if (inputFilter(this.value)) {
-								this.oldValue = this.value;
-								this.oldSelectionStart = this.selectionStart;
-								this.oldSelectionEnd = this.selectionEnd;
-							} else if (this.hasOwnProperty("oldValue")) {
-								this.value = this.oldValue;
-								this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
-							}
-						});
-					};
-				}(jQuery));
-				<?php if ($rSettings['js_navigate']): ?>
-					$(".navigation-menu li").mouseenter(function() {
-						$(this).find(".submenu").show();
-					});
-					delParam("status");
-					$(window).on("popstate", function() {
-						if (window.rRealURL) {
-							if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
-								navigate(window.location.href.split("/").reverse()[0]);
-							}
-						}
-					});
-				<?php endif; ?>
-				$(document).keydown(function(e) {
-					if (e.keyCode == 16) {
-						window.rShiftHeld = true;
-					}
-				});
-				$(document).keyup(function(e) {
-					if (e.keyCode == 16) {
-						window.rShiftHeld = false;
-					}
-				});
-				document.onselectstart = function() {
-					if (window.rShiftHeld) {
-						return false;
-					}
-				}
-			});
-
-			<?php
-		echo '        ' . "\r\n" . '        function openImage(elem) {' . "\r\n\t\t\t" . 'rPath = $(elem).parent().parent().find("input").val();' . "\r\n\t\t\t" . 'if (rPath) {' . "\r\n" . '                $.magnificPopup.open({' . "\r\n" . '                    items: {' . "\r\n" . "                        src: 'resize?maxw=512&maxh=512&url=' + encodeURIComponent(rPath)," . "\r\n" . "                        type: 'image'" . "\r\n" . '                    }' . "\r\n" . '                });' . "\r\n\t\t\t" . '}' . "\r\n\t\t" . '}' . "\r\n" . '        ' . "\r\n\t\t" . '$(document).ready(function() {' . "\r\n" . "            \$('select').select2({width: '100%'});" . "\r\n" . "            \$('#stream_id').select2({" . "\r\n\t\t\t" . '  ajax: {' . "\r\n\t\t\t\t" . "url: './api'," . "\r\n\t\t\t\t" . "dataType: 'json'," . "\r\n\t\t\t\t" . 'data: function (params) {' . "\r\n\t\t\t\t" . '  return {' . "\r\n\t\t\t\t\t" . 'search: params.term,' . "\r\n\t\t\t\t\t" . "action: 'streamlist'," . "\r\n\t\t\t\t\t" . 'page: params.page' . "\r\n\t\t\t\t" . '  };' . "\r\n\t\t\t\t" . '},' . "\r\n\t\t\t\t" . 'processResults: function (data, params) {' . "\r\n\t\t\t\t" . '  params.page = params.page || 1;' . "\r\n\t\t\t\t" . '  return {' . "\r\n\t\t\t\t\t" . 'results: data.items,' . "\r\n\t\t\t\t\t" . 'pagination: {' . "\r\n\t\t\t\t\t\t" . 'more: (params.page * 100) < data.total_count' . "\r\n\t\t\t\t\t" . '}' . "\r\n\t\t\t\t" . '  };' . "\r\n\t\t\t\t" . '},' . "\r\n\t\t\t\t" . 'cache: true,' . "\r\n\t\t\t\t" . 'width: "100%"' . "\r\n\t\t\t" . '  },' . "\r\n\t\t\t" . "  placeholder: 'Search for a stream...'" . "\r\n\t\t\t" . '});' . "\r\n" . "            \$('#start_date').daterangepicker({" . "\r\n\t\t\t\t" . 'singleDatePicker: true,' . "\r\n\t\t\t\t" . 'showDropdowns: true,' . "\r\n\t\t\t\t" . 'minDate: new Date(),' . "\r\n" . '                timePicker: true,' . "\r\n\t\t\t\t" . 'locale: {' . "\r\n\t\t\t\t\t" . "format: 'YYYY-MM-DD HH:mm'" . "\r\n\t\t\t\t" . '}' . "\r\n\t\t\t" . '});' . "\r\n" . '            ';
-
-		if ($rStream) {
-			echo '            $("form").submit(function(e){' . "\r\n" . '                e.preventDefault();' . "\r\n" . "                \$(':input[type=\"submit\"]').prop('disabled', true);" . "\r\n" . '                submitForm(window.rCurrentPage, new FormData($("form")[0]));' . "\r\n" . '            });' . "\r\n" . '            ';
-		} else {
-			echo '            $("form").submit(function(e){' . "\r\n" . '                if (!$("#stream_id").val()) {' . "\r\n" . '                    $.toast("Please select a stream.");' . "\r\n" . '                    e.preventDefault();' . "\r\n" . '                } else if ($("#duration").val() <= 0) {' . "\r\n" . '                    $.toast("Please enter a duration in minutes.");' . "\r\n" . '                    e.preventDefault();' . "\r\n" . '                }' . "\r\n" . '            });' . "\r\n" . '            ';
-		}
-
-		echo '            $("#duration").inputFilter(function(value) { return /^\\d*$/.test(value); });' . "\r\n\t\t" . '});' . "\r\n" . '        ' . "\r\n\t\t";
-		?>
-    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
-        $(document).ready(function() {
-            initSearch();
-        });
-    <?php endif; ?>
-</script>
-<script src="assets/js/listings.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+include 'header.php';
+include dirname(__DIR__) . '/modules/watch/views/record.php';
+include 'footer.php';
+include dirname(__DIR__) . '/modules/watch/views/record_scripts.php';
diff --git a/src/admin/session.php b/src/admin/session.php
index 570c232d..c95b7cf3 100644
--- a/src/admin/session.php
+++ b/src/admin/session.php
@@ -13,7 +13,7 @@ if (defined('TMP_PATH')) {
 	define('TMP_PATH', '/home/xc_vm/tmp/');
 }
 
-if (session_status() != PHP_SESSION_NONE) {
+if (session_status() != PHP_SESSION_NONE || headers_sent()) {
 } else {
 	session_start();
 }
@@ -27,7 +27,7 @@ if (!(isset($_SESSION['hash']) && isset($_SESSION['last_activity']) && $rSession
 		}
 	}
 
-	if (session_status() !== PHP_SESSION_NONE) {
+	if (session_status() !== PHP_SESSION_NONE || headers_sent()) {
 	} else {
 		session_start();
 	}
diff --git a/src/admin/settings_plex.php b/src/admin/settings_plex.php
index e3edada0..f1e8132e 100644
--- a/src/admin/settings_plex.php
+++ b/src/admin/settings_plex.php
@@ -9,413 +9,8 @@ if (!checkPermissions()) {
 
 $rBouquets = getBouquets();
 $_TITLE = 'Plex Settings';
+
 include 'header.php';
-?>
-<div class="wrapper boxed-layout-ext"
-    <?php if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') {
-        echo '';
-    } else {
-        echo ' style="display: none;"';
-    } ?>>
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-12">
-                <div class="page-title-box">
-                    <div class="page-title-right">
-                        <?php include 'topbar.php'; ?>
-                    </div>
-                    <h4 class="page-title">Plex Settings</h4>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-xl-12">
-                <?php if (isset($_STATUS) && $_STATUS == STATUS_SUCCESS) : ?>
-                    <div class="alert alert-success alert-dismissible fade show" role="alert">
-                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                        Plex settings successfully updated!
-                    </div>
-                <?php endif; ?>
-                <div class="card">
-                    <div class="card-body">
-                        <form action="#" method="POST">
-                            <div id="basicwizard">
-                                <ul class="nav nav-pills bg-light nav-justified form-wizard-header mb-4">
-                                    <li class="nav-item">
-                                        <a href="#setup" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
-                                            <i class="mdi mdi-account-card-details-outline mr-1"></i>
-                                            <span class="d-none d-sm-inline">Setup</span>
-                                        </a>
-                                    </li>
-                                    <li class="nav-item">
-                                        <a href="#categories" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
-                                            <i class="mdi mdi-movie mr-1"></i>
-                                            <span class="d-none d-sm-inline">Movie Categories</span>
-                                        </a>
-                                    </li>
-                                    <li class="nav-item">
-                                        <a href="#categories-tv" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
-                                            <i class="mdi mdi-youtube-tv mr-1"></i>
-                                            <span class="d-none d-sm-inline">TV Categories</span>
-                                        </a>
-                                    </li>
-                                </ul>
-                                <div class="tab-content b-0 mb-0 pt-0">
-                                    <div class="tab-pane" id="setup">
-                                        <div class="row">
-                                            <div class="col-12">
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label"
-                                                        for="thread_count_movie">Movie Thread Count <i
-                                                            title="Number of threads to run simultaneously for movies."
-                                                            class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input type="text" class="form-control text-center"
-                                                            id="thread_count_movie" name="thread_count_movie"
-                                                            value="<?= htmlspecialchars($rSettings['thread_count_movie']); ?>"
-                                                            required data-parsley-trigger="change">
-                                                    </div>
-                                                    <label class="col-md-4 col-form-label"
-                                                        for="thread_count_show">Series Thread Count <i
-                                                            title="Number of threads to run simultaneously for TV series. This should be lower as the series thread will be responsible for grabbing all episodes. So this is the number of TV series to scan at once rather than episodes. Try 1/10th of movie thread limit."
-                                                            class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input type="text" class="form-control text-center"
-                                                            id="thread_count_show" name="thread_count_show"
-                                                            value="<?= htmlspecialchars($rSettings['thread_count_show']); ?>"
-                                                            required data-parsley-trigger="change">
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="scan_seconds">Scan
-                                                        Frequency <i title="Scan a library every X seconds."
-                                                            class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input type="text" class="form-control text-center"
-                                                            id="scan_seconds" name="scan_seconds"
-                                                            value="<?= htmlspecialchars($rSettings['scan_seconds']); ?>"
-                                                            required data-parsley-trigger="change">
-                                                    </div>
-                                                    <label class="col-md-4 col-form-label" for="max_genres">Max
-                                                        Categories & Bouquets <i
-                                                            title="Maximum number of TMDb genres to convert into categories and bouquets. Enter 0 for unlimited."
-                                                            class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input type="text" class="form-control text-center"
-                                                            id="max_genres" name="max_genres"
-                                                            value="<?= htmlspecialchars($rSettings['max_genres']); ?>"
-                                                            required data-parsley-trigger="change">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <ul class="list-inline wizard mb-0">
-                                            <li class="list-inline-item float-right">
-                                                <input name="submit_settings" type="submit" class="btn btn-primary"
-                                                    value="Save Changes" />
-                                            </li>
-                                        </ul>
-                                    </div>
-                                    <div class="tab-pane" id="categories">
-                                        <div class="row">
-                                            <div class="col-12">
-                                                <p class="sub-header">
-                                                    Select a Category and / or Bouquet to apply to each Genre.
-                                                </p>
-                                                <?php
-                                                $db->query('SELECT * FROM `watch_categories` WHERE `type` = 3 ORDER BY `genre` ASC;');
-                                                if ($db->num_rows() > 0) {
-                                                    foreach ($db->get_rows() as $rRow) {
-                                                ?>
-                                                        <div class="form-group row mb-4">
-                                                            <label class="col-md-2 col-form-label"
-                                                                for="genre_<?= $rRow['genre_id']; ?>"><?= $rRow['genre']; ?></label>
-                                                            <div class="col-md-4">
-                                                                <select name="genre_<?= $rRow['genre_id']; ?>"
-                                                                    id="genre_<?= $rRow['genre_id']; ?>"
-                                                                    class="form-control select2" data-toggle="select2">
-                                                                    <option value="0"
-                                                                        <?= intval($rRow['category_id']) == 0 ? 'selected' : ''; ?>>
-                                                                        Do Not Use</option>
-                                                                    <?php
-                                                                    foreach (getCategories('movie') as $rCategory) {
-                                                                    ?>
-                                                                        <option value="<?= $rCategory['id']; ?>"
-                                                                            <?= intval($rRow['category_id']) == intval($rCategory['id']) ? 'selected' : ''; ?>>
-                                                                            <?= $rCategory['category_name']; ?>
-                                                                        </option>
-                                                                    <?php
-                                                                    }
-                                                                    ?>
-                                                                </select>
-                                                            </div>
-                                                            <label class="col-md-2 col-form-label"
-                                                                for="bouquet_<?= $rRow['genre_id']; ?>">Bouquets</label>
-                                                            <div class="col-md-4">
-                                                                <select name="bouquet_<?= $rRow['genre_id']; ?>[]"
-                                                                    id="bouquet_<?= $rRow['genre_id']; ?>"
-                                                                    class="form-control select2-multiple" data-toggle="select2"
-                                                                    multiple="multiple" data-placeholder="Choose...">
-                                                                    <?php
-                                                                    foreach ($rBouquets as $rBouquet) {
-                                                                    ?>
-                                                                        <option value="<?= $rBouquet['id']; ?>"
-                                                                            <?= in_array(intval($rBouquet['id']), json_decode($rRow['bouquets'], true)) ? 'selected' : ''; ?>>
-                                                                            <?= $rBouquet['bouquet_name']; ?>
-                                                                        </option>
-                                                                    <?php
-                                                                    }
-                                                                    ?>
-                                                                </select>
-                                                            </div>
-                                                        </div>
-                                                <?php
-                                                    }
-                                                }
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <ul class="list-inline wizard mb-0">
-                                            <li class="list-inline-item float-right">
-                                                <input name="submit_settings" type="submit" class="btn btn-primary"
-                                                    value="Save Changes" />
-                                            </li>
-                                        </ul>
-                                    </div>
-                                    <div class="tab-pane" id="categories-tv">
-                                        <div class="row">
-                                            <div class="col-12">
-                                                <p class="sub-header">
-                                                    Select a Category and / or Bouquet to apply to each Genre.
-                                                </p>
-                                                <?php
-                                                $db->query('SELECT * FROM `watch_categories` WHERE `type` = 4 ORDER BY `genre` ASC;');
-                                                if ($db->num_rows() > 0) {
-                                                    foreach ($db->get_rows() as $rRow) {
-                                                ?>
-                                                        <div class="form-group row mb-4">
-                                                            <label class="col-md-2 col-form-label"
-                                                                for="genretv_<?= $rRow['genre_id']; ?>"><?= $rRow['genre']; ?></label>
-                                                            <div class="col-md-4">
-                                                                <select name="genretv_<?= $rRow['genre_id']; ?>"
-                                                                    id="genretv_<?= $rRow['genre_id']; ?>"
-                                                                    class="form-control select2" data -toggle="select2">
-                                                                    <option value="0"
-                                                                        <?= intval($rRow['category_id']) == 0 ? 'selected' : ''; ?>>
-                                                                        Do Not Use</option>
-                                                                    <?php
-                                                                    foreach (getCategories('series') as $rCategory) {
-                                                                    ?>
-                                                                        <option value="<?= $rCategory['id']; ?>"
-                                                                            <?= intval($rRow['category_id']) == intval($rCategory['id']) ? 'selected' : ''; ?>>
-                                                                            <?= $rCategory['category_name']; ?>
-                                                                        </option>
-                                                                    <?php
-                                                                    }
-                                                                    ?>
-                                                                </select>
-                                                            </div>
-                                                            <label class="col-md-2 col-form-label"
-                                                                for="bouquettv_<?= $rRow['genre_id']; ?>">Bouquets</label>
-                                                            <div class="col-md-4">
-                                                                <select name="bouquettv_<?= $rRow['genre_id']; ?>[]"
-                                                                    id="bouquettv_<?= $rRow['genre_id']; ?>"
-                                                                    class="form-control select2-multiple" data-toggle="select2"
-                                                                    multiple="multiple" data-placeholder="Choose...">
-                                                                    <?php
-                                                                    foreach ($rBouquets as $rBouquet) {
-                                                                    ?>
-                                                                        <option value="<?= $rBouquet['id']; ?>"
-                                                                            <?= in_array(intval($rBouquet['id']), json_decode($rRow['bouquets'], true)) ? 'selected' : ''; ?>>
-                                                                            <?= $rBouquet['bouquet_name']; ?>
-                                                                        </option>
-                                                                    <?php
-                                                                    }
-                                                                    ?>
-                                                                </select>
-                                                            </div>
-                                                        </div>
-                                                <?php
-                                                    }
-                                                }
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <ul class="list-inline wizard mb-0">
-                                            <li class="list-inline-item float-right">
-                                                <input name="submit_settings" type="submit" class="btn btn-primary"
-                                                    value="Save Changes" />
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-</div>
-<?php include 'footer.php'; ?>
-<script id="scripts">
-    var resizeObserver = new ResizeObserver(entries => $(window).scroll());
-    $(document).ready(function() {
-        resizeObserver.observe(document.body)
-        $("form").attr('autocomplete', 'off');
-        $(document).keypress(function(event) {
-            if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
-        });
-        $.fn.dataTable.ext.errMode = 'none';
-        var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
-        elems.forEach(function(html) {
-            var switchery = new Switchery(html, {
-                'color': '#414d5f'
-            });
-            window.rSwitches[$(html).attr("id")] = switchery;
-        });
-        setTimeout(pingSession, 30000);
-        <?php if (!$rMobile && $rSettings['header_stats']): ?>
-            headerStats();
-        <?php endif; ?>
-        bindHref();
-        refreshTooltips();
-        $(window).scroll(function() {
-            if ($(this).scrollTop() > 200) {
-                if ($(document).height() > $(window).height()) {
-                    $('#scrollToBottom').fadeOut();
-                }
-                $('#scrollToTop').fadeIn();
-            } else {
-                $('#scrollToTop').fadeOut();
-                if ($(document).height() > $(window).height()) {
-                    $('#scrollToBottom').fadeIn();
-                } else {
-                    $('#scrollToBottom').hide();
-                }
-            }
-        });
-        $("#scrollToTop").unbind("click");
-        $('#scrollToTop').click(function() {
-            $('html, body').animate({
-                scrollTop: 0
-            }, 800);
-            return false;
-        });
-        $("#scrollToBottom").unbind("click");
-        $('#scrollToBottom').click(function() {
-            $('html, body').animate({
-                scrollTop: $(document).height()
-            }, 800);
-            return false;
-        });
-        $(window).scroll();
-        $(".nextb").unbind("click");
-        $(".nextb").click(function() {
-            var rPos = 0;
-            var rActive = null;
-            $(".nav .nav-item").each(function() {
-                if ($(this).find(".nav-link").hasClass("active")) {
-                    rActive = rPos;
-                }
-                if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-                    $(this).find(".nav-link").trigger("click");
-                    return false;
-                }
-                rPos += 1;
-            });
-        });
-        $(".prevb").unbind("click");
-        $(".prevb").click(function() {
-            var rPos = 0;
-            var rActive = null;
-            $($(".nav .nav-item").get().reverse()).each(function() {
-                if ($(this).find(".nav-link").hasClass("active")) {
-                    rActive = rPos;
-                }
-                if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-                    $(this).find(".nav-link").trigger("click");
-                    return false;
-                }
-                rPos += 1;
-            });
-        });
-        (function($) {
-            $.fn.inputFilter = function(inputFilter) {
-                return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
-                    if (inputFilter(this.value)) {
-                        this.oldValue = this.value;
-                        this.oldSelectionStart = this.selectionStart;
-                        this.oldSelectionEnd = this.selectionEnd;
-                    } else if (this.hasOwnProperty("oldValue")) {
-                        this.value = this.oldValue;
-                        this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
-                    }
-                });
-            };
-        }(jQuery));
-        <?php if ($rSettings['js_navigate']): ?>
-            $(".navigation-menu li").mouseenter(function() {
-                $(this).find(".submenu").show();
-            });
-            delParam("status");
-            $(window).on("popstate", function() {
-                if (window.rRealURL) {
-                    if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
-                        navigate(window.location.href.split("/").reverse()[0]);
-                    }
-                }
-            });
-        <?php endif; ?>
-        $(document).keydown(function(e) {
-            if (e.keyCode == 16) {
-                window.rShiftHeld = true;
-            }
-        });
-        $(document).keyup(function(e) {
-            if (e.keyCode == 16) {
-                window.rShiftHeld = false;
-            }
-        });
-        document.onselectstart = function() {
-            if (window.rShiftHeld) {
-                return false;
-            }
-        }
-    });
-
-    $(document).ready(function() {
-        $("#scan_seconds").inputFilter(function(value) {
-            return /^\d*$/.test(value);
-        });
-        $("#max_items").inputFilter(function(value) {
-            return /^\d*$/.test(value);
-        });
-        $("#thread_count_movie").inputFilter(function(value) {
-            return /^\d*$/.test(value);
-        });
-        $("#thread_count_show").inputFilter(function(value) {
-            return /^\d*$/.test(value);
-        });
-        $('select').select2({
-            width: '100%'
-        });
-        $("form").submit(function(e) {
-            e.preventDefault();
-            $(':input[type="submit"]').prop('disabled', true);
-            submitForm(window.rCurrentPage, new FormData($("form")[0]));
-        });
-    });
-    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
-        $(document).ready(function() {
-            initSearch();
-        });
-    <?php endif; ?>
-</script>
-<script src="assets/js/listings.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+include dirname(__DIR__) . '/modules/plex/views/settings.php';
+include 'footer.php';
+include dirname(__DIR__) . '/modules/plex/views/settings_scripts.php';
\ No newline at end of file
diff --git a/src/admin/settings_watch.php b/src/admin/settings_watch.php
index d0b70177..55296a01 100644
--- a/src/admin/settings_watch.php
+++ b/src/admin/settings_watch.php
@@ -9,449 +9,8 @@ if (!checkPermissions()) {
 
 $rBouquets = getBouquets();
 $_TITLE = 'Watch Settings';
+
 include 'header.php';
-?>
-<div class="wrapper boxed-layout-ext"
-    <?php if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') {
-    } else {
-        echo ' style="display: none;"';
-    } ?>>
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-12">
-                <div class="page-title-box">
-                    <div class="page-title-right">
-                        <?php include 'topbar.php'; ?>
-                    </div>
-                    <h4 class="page-title">Folder Watch Settings</h4>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-xl-12">
-                <?php if (isset($_STATUS) && $_STATUS == STATUS_SUCCESS) { ?>
-                    <div class="alert alert-success alert-dismissible fade show" role="alert">
-                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                        Watch settings successfully updated!
-                    </div>
-                <?php } ?>
-                <div class="card">
-                    <div class="card-body">
-                        <form action="#" method="POST">
-                            <div id="basicwizard">
-                                <ul class="nav nav-pills bg-light nav-justified form-wizard-header mb-4">
-                                    <li class="nav-item">
-                                        <a href="#setup" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
-                                            <i class="mdi mdi-account-card-details-outline mr-1"></i>
-                                            <span class="d-none d-sm-inline">Setup</span>
-                                        </a>
-                                    </li>
-                                    <li class="nav-item">
-                                        <a href="#categories" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
-                                            <i class="mdi mdi-movie mr-1"></i>
-                                            <span class="d-none d-sm-inline">Movie Categories</span>
-                                        </a>
-                                    </li>
-                                    <li class="nav-item">
-                                        <a href="#categories-tv" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
-                                            <i class="mdi mdi-youtube-tv mr-1"></i>
-                                            <span class="d-none d-sm-inline">TV Categories</span>
-                                        </a>
-                                    </li>
-                                </ul>
-                                <div class="tab-content b-0 mb-0 pt-0">
-                                    <div class="tab-pane" id="setup">
-                                        <div class="row">
-                                            <div class="col-12">
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="scan_seconds">Scan
-                                                        Frequency <i title="Scan a folder every X seconds."
-                                                            class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input type="text" class="form-control text-center"
-                                                            id="scan_seconds" name="scan_seconds"
-                                                            value="<?php echo htmlspecialchars($rSettings['scan_seconds']); ?>"
-                                                            required data-parsley-trigger="change">
-                                                    </div>
-                                                    <label class="col-md-4 col-form-label" for="percentage_match">Match
-                                                        Percentage <i
-                                                            title="TMDb match tolerance. Will not accept match if below this percentage threshold."
-                                                            class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input type="text" class="form-control text-center"
-                                                            id="percentage_match" name="percentage_match"
-                                                            value="<?php echo htmlspecialchars($rSettings['percentage_match']); ?>"
-                                                            required data-parsley-trigger="change">
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="thread_count">Thread
-                                                        Count <i title="Number of threads to run simultaneously."
-                                                            class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input type="text" class="form-control text-center"
-                                                            id="thread_count" name="thread_count"
-                                                            value="<?php echo htmlspecialchars($rSettings['thread_count']); ?>"
-                                                            required data-parsley-trigger="change">
-                                                    </div>
-                                                    <label class="col-md-4 col-form-label" for="max_genres">Max
-                                                        Categories & Bouquets <i
-                                                            title="Maximum number of TMDb genres to convert into categories and bouquets. Enter 0 for unlimited."
-                                                            class="tooltip text-secondary far fa-circle"></i></label>
-
-                                                    <div class="col-md-2">
-                                                        <input type="text" class="form-control text-center"
-                                                            id="max_genres" name="max_genres"
-                                                            value="<?php echo htmlspecialchars($rSettings['max_genres']); ?>"
-                                                            required data-parsley-trigger="change">
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label" for="max_items">Max Items <i
-                                                            title="Maximum number of items to add per folder per scan. Set this to 0 to scan everything."
-                                                            class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input type="text" class="form-control text-center"
-                                                            id="max_items" name="max_items"
-                                                            value="<?php echo htmlspecialchars($rSettings['max_items']); ?>"
-                                                            required data-parsley-trigger="change">
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row mb-4">
-                                                    <label class="col-md-4 col-form-label"
-                                                        for="alternative_titles">Check Alternative Titles <i
-                                                            title="If a title partially matches a TMDb result, check the alternative titles of that Movie or TV Show to see if any of those match the title."
-                                                            class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input name="alternative_titles" id="alternative_titles"
-                                                            type="checkbox"
-                                                            <?php if ($rSettings['alternative_titles'] == 1) {
-                                                                echo 'checked';
-                                                            } ?>
-                                                            data-plugin="switchery" class="js-switch"
-                                                            data-color="#039cfd" />
-                                                    </div>
-                                                    <label class="col-md-4 col-form-label" for="fallback_parser">Use
-                                                        Fallback Parser <i
-                                                            title="If no match is found using your preferred title parser, fallback to the parser you didn't select and run again."
-                                                            class="tooltip text-secondary far fa-circle"></i></label>
-                                                    <div class="col-md-2">
-                                                        <input name="fallback_parser" id="fallback_parser"
-                                                            type="checkbox"
-                                                            <?php if ($rSettings['fallback_parser'] == 1) {
-                                                                echo 'checked';
-                                                            } ?>
-                                                            data-plugin="switchery" class="js-switch"
-                                                            data-color="#039cfd" />
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <ul class="list-inline wizard mb-0">
-                                            <li class="list-inline-item float-right">
-                                                <input name="submit_settings" type="submit" class="btn btn-primary"
-                                                    value="Save Changes" />
-                                            </li>
-                                        </ul>
-                                    </div>
-                                    <div class="tab-pane" id="categories">
-                                        <div class="row">
-                                            <div class="col-12">
-                                                <p class="sub-header">
-                                                    Select a Category and / or Bouquet to apply to each Genre.
-                                                </p>
-                                                <?php
-                                                $db->query('SELECT * FROM `watch_categories` WHERE `type` = 1 ORDER BY `genre` ASC;');
-                                                if ($db->num_rows() > 0) {
-                                                    foreach ($db->get_rows() as $rRow) {
-                                                ?>
-                                                        <div class="form-group row mb-4">
-                                                            <label class="col-md-2 col-form-label"
-                                                                for="genre_<?php echo $rRow['genre_id']; ?>"><?php echo $rRow['genre']; ?></label>
-                                                            <div class="col-md-4">
-                                                                <select name="genre_<?php echo $rRow['genre_id']; ?>"
-                                                                    id="genre_<?php echo $rRow['genre_id']; ?>"
-                                                                    class="form-control select2" data-toggle="select2">
-                                                                    <option
-                                                                        <?php if (intval($rRow['category_id']) == 0) {
-                                                                            echo 'selected';
-                                                                        } ?>
-                                                                        value="0">Do Not Use</option>
-                                                                    <?php foreach (getCategories('movie') as $rCategory) { ?>
-                                                                        <option
-                                                                            <?php if (intval($rRow['category_id']) == intval($rCategory['id'])) {
-                                                                                echo 'selected';
-                                                                            } ?>
-                                                                            value="<?php echo $rCategory['id']; ?>">
-                                                                            <?php echo $rCategory['category_name']; ?></option>
-                                                                    <?php } ?>
-                                                                </select>
-                                                            </div>
-                                                            <label class="col-md-2 col-form-label"
-                                                                for="bouquet_<?php echo $rRow['genre_id']; ?>">Bouquets</label>
-                                                            <div class="col-md-4">
-                                                                <select name="bouquet_<?php echo $rRow['genre_id']; ?>[]"
-                                                                    id="bouquet_<?php echo $rRow['genre_id']; ?>"
-                                                                    class="form-control select2-multiple" data-toggle="select2"
-                                                                    multiple="multiple" data-placeholder="Choose...">
-                                                                    <?php foreach ($rBouquets as $rBouquet) { ?>
-                                                                        <option
-                                                                            <?php if (in_array(intval($rBouquet['id']), json_decode($rRow['bouquets'], true))) {
-                                                                                echo 'selected';
-                                                                            } ?>
-                                                                            value="<?php echo $rBouquet['id']; ?>">
-                                                                            <?php echo $rBouquet['bouquet_name']; ?>
-                                                                        </option>
-                                                                    <?php } ?>
-                                                                </select>
-
-                                                            </div>
-                                                        </div>
-                                                <?php
-                                                    }
-                                                }
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <ul class="list-inline wizard mb-0">
-                                            <li class="list-inline-item float-right">
-                                                <input name="submit_settings" type="submit" class="btn btn-primary"
-                                                    value="Save Changes" />
-                                            </li>
-                                        </ul>
-                                    </div>
-                                    <div class="tab-pane" id="categories-tv">
-                                        <div class="row">
-                                            <div class="col-12">
-                                                <p class="sub-header">
-                                                    Select a Category and / or Bouquet to apply to each Genre.
-                                                </p>
-                                                <?php
-                                                $db->query('SELECT * FROM `watch_categories` WHERE `type` = 2 ORDER BY `genre` ASC;');
-                                                if ($db->num_rows() > 0) {
-                                                    foreach ($db->get_rows() as $rRow) {
-                                                ?>
-                                                        <div class="form-group row mb-4">
-                                                            <label class="col-md-2 col-form-label"
-                                                                for="genretv_<?php echo $rRow['genre_id']; ?>"><?php echo $rRow['genre']; ?></label>
-                                                            <div class="col-md-4">
-                                                                <select name="genretv_<?php echo $rRow['genre_id']; ?>"
-                                                                    id="genretv_<?php echo $rRow['genre_id']; ?>"
-                                                                    class="form-control select2" data-toggle="select2">
-                                                                    <option
-                                                                        <?php if (intval($rRow['category_id']) == 0) {
-                                                                            echo 'selected';
-                                                                        } ?>
-                                                                        value="0">Do Not Use</option>
-                                                                    <?php foreach (getCategories('series') as $rCategory) { ?>
-                                                                        <option
-                                                                            <?php if (intval($rRow['category_id']) == intval($rCategory['id'])) {
-                                                                                echo 'selected';
-                                                                            } ?>
-                                                                            value="<?php echo $rCategory['id']; ?>">
-                                                                            <?php echo $rCategory['category_name']; ?></option>
-                                                                    <?php } ?>
-                                                                </select>
-                                                            </div>
-                                                            <label class="col-md-2 col-form-label"
-                                                                for="bouquettv_<?php echo $rRow['genre_id']; ?>">Bouquets</label>
-                                                            <div class="col-md-4">
-                                                                <select name="bouquettv_<?php echo $rRow['genre_id']; ?>[]"
-                                                                    id="bouquettv_<?php echo $rRow['genre_id']; ?>"
-                                                                    class="form-control select2-multiple" data-toggle="select2"
-                                                                    multiple="multiple" data-placeholder="Choose...">
-                                                                    <?php foreach ($rBouquets as $rBouquet) { ?>
-                                                                        <option
-                                                                            <?php if (in_array(intval($rBouquet['id']), json_decode($rRow['bouquets'], true))) {
-                                                                                echo 'selected';
-                                                                            } ?>
-                                                                            value="<?php echo $rBouquet['id']; ?>">
-                                                                            <?php echo $rBouquet['bouquet_name']; ?></option>
-                                                                    <?php } ?>
-                                                                </select>
-                                                            </div>
-                                                        </div>
-                                                <?php
-                                                    }
-                                                }
-                                                ?>
-                                            </div>
-                                        </div>
-                                        <ul class="list-inline wizard mb-0">
-                                            <li class="list-inline-item float-right">
-                                                <input name="submit_settings" type="submit" class="btn btn-primary"
-                                                    value="Save Changes" />
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <?php include 'footer.php'; ?>
-    <script id="scripts">
-        var resizeObserver = new ResizeObserver(entries => $(window).scroll());
-        $(document).ready(function() {
-            resizeObserver.observe(document.body)
-            $("form").attr('autocomplete', 'off');
-            $(document).keypress(function(event) {
-                if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
-            });
-            $.fn.dataTable.ext.errMode = 'none';
-            var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
-            elems.forEach(function(html) {
-                var switchery = new Switchery(html, {
-                    'color': '#414d5f'
-                });
-                window.rSwitches[$(html).attr("id")] = switchery;
-            });
-            setTimeout(pingSession, 30000);
-            <?php if (!$rMobile && $rSettings['header_stats']): ?>
-                headerStats();
-            <?php endif; ?>
-            bindHref();
-            refreshTooltips();
-            $(window).scroll(function() {
-                if ($(this).scrollTop() > 200) {
-                    if ($(document).height() > $(window).height()) {
-                        $('#scrollToBottom').fadeOut();
-                    }
-                    $('#scrollToTop').fadeIn();
-                } else {
-                    $('#scrollToTop').fadeOut();
-                    if ($(document).height() > $(window).height()) {
-                        $('#scrollToBottom').fadeIn();
-                    } else {
-                        $('#scrollToBottom').hide();
-                    }
-                }
-            });
-            $("#scrollToTop").unbind("click");
-            $('#scrollToTop').click(function() {
-                $('html, body').animate({
-                    scrollTop: 0
-                }, 800);
-                return false;
-            });
-            $("#scrollToBottom").unbind("click");
-            $('#scrollToBottom').click(function() {
-                $('html, body').animate({
-                    scrollTop: $(document).height()
-                }, 800);
-                return false;
-            });
-            $(window).scroll();
-            $(".nextb").unbind("click");
-            $(".nextb").click(function() {
-                var rPos = 0;
-                var rActive = null;
-                $(".nav .nav-item").each(function() {
-                    if ($(this).find(".nav-link").hasClass("active")) {
-                        rActive = rPos;
-                    }
-                    if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-                        $(this).find(".nav-link").trigger("click");
-                        return false;
-                    }
-                    rPos += 1;
-                });
-            });
-            $(".prevb").unbind("click");
-            $(".prevb").click(function() {
-                var rPos = 0;
-                var rActive = null;
-                $($(".nav .nav-item").get().reverse()).each(function() {
-                    if ($(this).find(".nav-link").hasClass("active")) {
-                        rActive = rPos;
-                    }
-                    if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-                        $(this).find(".nav-link").trigger("click");
-                        return false;
-                    }
-                    rPos += 1;
-                });
-            });
-            (function($) {
-                $.fn.inputFilter = function(inputFilter) {
-                    return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
-                        if (inputFilter(this.value)) {
-                            this.oldValue = this.value;
-                            this.oldSelectionStart = this.selectionStart;
-                            this.oldSelectionEnd = this.selectionEnd;
-                        } else if (this.hasOwnProperty("oldValue")) {
-                            this.value = this.oldValue;
-                            this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
-                        }
-                    });
-                };
-            }(jQuery));
-            <?php if ($rSettings['js_navigate']): ?>
-                $(".navigation-menu li").mouseenter(function() {
-                    $(this).find(".submenu").show();
-                });
-                delParam("status");
-                $(window).on("popstate", function() {
-                    if (window.rRealURL) {
-                        if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
-                            navigate(window.location.href.split("/").reverse()[0]);
-                        }
-                    }
-                });
-            <?php endif; ?>
-            $(document).keydown(function(e) {
-                if (e.keyCode == 16) {
-                    window.rShiftHeld = true;
-                }
-            });
-            $(document).keyup(function(e) {
-                if (e.keyCode == 16) {
-                    window.rShiftHeld = false;
-                }
-            });
-            document.onselectstart = function() {
-                if (window.rShiftHeld) {
-                    return false;
-                }
-            }
-        });
-
-        <?php if (CoreUtilities::$rSettings['enable_search']): ?>
-            $(document).ready(function() {
-                initSearch();
-            });
-
-        <?php endif; ?>
-
-        $(document).ready(function() {
-            $("#scan_seconds").inputFilter(function(value) {
-                return /^\d*$/.test(value);
-            });
-            $("#percentage_match").inputFilter(function(value) {
-                return /^\d*$/.test(value);
-            });
-            $("#max_items").inputFilter(function(value) {
-                return /^\d*$/.test(value);
-            });
-            $("#thread_count").inputFilter(function(value) {
-                return /^\d*$/.test(value);
-            });
-            $('select').select2({
-                width: '100%'
-            });
-            $("form").submit(function(e) {
-                e.preventDefault();
-                $(':input[type="submit"]').prop('disabled', true);
-                submitForm(window.rCurrentPage, new FormData($("form")[0]));
-            });
-        });
-    </script>
-    <script src="assets/js/listings.js"></script>
-    </body>
-
-    </html>
\ No newline at end of file
+include dirname(__DIR__) . '/modules/watch/views/settings_watch.php';
+include 'footer.php';
+include dirname(__DIR__) . '/modules/watch/views/settings_watch_scripts.php';
diff --git a/src/admin/watch.php b/src/admin/watch.php
index b154cdb7..edf82853 100644
--- a/src/admin/watch.php
+++ b/src/admin/watch.php
@@ -3,320 +3,13 @@
 include 'session.php';
 include 'functions.php';
 
-if (checkPermissions()) {
-} else {
+if (!checkPermissions()) {
 	goHome();
 }
 
 $_TITLE = 'Watch Folder';
+
 include 'header.php';
-echo '<div class="wrapper boxed-layout-ext"';
-
-if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') {
-} else {
-	echo ' style="display: none;"';
-}
-
-echo '>' . "\n" . '    <div class="container-fluid">' . "\n\t\t" . '<div class="row">' . "\n\t\t\t" . '<div class="col-12">' . "\n\t\t\t\t" . '<div class="page-title-box">' . "\n\t\t\t\t\t" . '<div class="page-title-right">' . "\n" . '                        ';
-include 'topbar.php';
-echo "\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t" . '<h4 class="page-title">Watch Folder</h4>' . "\n\t\t\t\t" . '</div>' . "\n\t\t\t" . '</div>' . "\n\t\t" . '</div>     ' . "\n\t\t" . '<div class="row">' . "\n\t\t\t" . '<div class="col-12">' . "\n" . '                ';
-
-if (!(isset($_STATUS) && $_STATUS == STATUS_SUCCESS)) {
-} else {
-	echo '                <div class="alert alert-success alert-dismissible fade show" role="alert">' . "\n" . '                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">' . "\n" . '                        <span aria-hidden="true">&times;</span>' . "\n" . '                    </button>' . "\n" . '                    The folder is now being watched. It will be scanned during the next Watch Folder run.' . "\n" . '                </div>' . "\n\t\t\t\t";
-}
-
-echo "\t\t\t\t" . '<div class="card">' . "\n\t\t\t\t\t" . '<div class="card-body" style="overflow-x:auto;">' . "\n\t\t\t\t\t\t" . '<table id="datatable" class="table table-striped table-borderless dt-responsive nowrap">' . "\n\t\t\t\t\t\t\t" . '<thead>' . "\n\t\t\t\t\t\t\t\t" . '<tr>' . "\n\t\t\t\t\t\t\t\t\t" . '<th class="text-center">ID</th>' . "\n" . '                                    <th class="text-center">Status</th>' . "\n\t\t\t\t\t\t\t\t\t" . '<th>Type</th>' . "\n\t\t\t\t\t\t\t\t\t" . '<th>Server Name</th>' . "\n\t\t\t\t\t\t\t\t\t" . '<th>Directory</th>' . "\n\t\t\t\t\t\t\t\t\t" . '<th class="text-center">Last Run</th>' . "\n\t\t\t\t\t\t\t\t\t" . '<th class="text-center">Actions</th>' . "\n\t\t\t\t\t\t\t\t" . '</tr>' . "\n\t\t\t\t\t\t\t" . '</thead>' . "\n\t\t\t\t\t\t\t" . '<tbody>' . "\n\t\t\t\t\t\t\t\t";
-
-foreach (getWatchFolders() as $rFolder) {
-	if (0 < $rFolder['last_run']) {
-		$rDate = date('Y-m-d H:i:s', $rFolder['last_run']);
-	} else {
-		$rDate = 'Never';
-	}
-
-	echo "\t\t\t\t\t\t\t\t" . '<tr id="folder-';
-	echo intval($rFolder['id']);
-	echo '">' . "\n\t\t\t\t\t\t\t\t\t" . '<td class="text-center">';
-	echo intval($rFolder['id']);
-	echo '</td>' . "\n" . '                                    <td class="text-center">' . "\n" . '                                        ';
-
-	if ($rFolder['active']) {
-		echo '                                        <i class="text-success fas fa-square"></i>' . "\n" . '                                        ';
-	} else {
-		echo '                                        <i class="text-secondary fas fa-square"></i>' . "\n" . '                                        ';
-	}
-
-	echo '                                    </td>' . "\n\t\t\t\t\t\t\t\t\t" . '<td>';
-	echo array('movie' => 'Movies', 'series' => 'Series')[$rFolder['type']];
-	echo '</td>' . "\n\t\t\t\t\t\t\t\t\t" . '<td>';
-	echo $rServers[$rFolder['server_id']]['server_name'];
-	echo '</td>' . "\n\t\t\t\t\t\t\t\t\t" . '<td>';
-	echo $rFolder['directory'];
-	echo '</td>' . "\n\t\t\t\t\t\t\t\t\t" . '<td class="text-center">';
-	echo $rDate;
-	echo '</td>' . "\n\t\t\t\t\t\t\t\t\t" . '<td class="text-center">' . "\n\t\t\t\t\t\t\t\t\t\t" . '<div class="btn-group">' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<a href="./watch_add?id=';
-	echo intval($rFolder['id']);
-	echo '"><button type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-pencil-outline"></i></button></a>' . "\n" . '                                            <button type="button" class="btn btn-light waves-effect waves-light btn-xs" onClick="api(';
-	echo intval($rFolder['id']);
-	echo ", 'force');\"><i class=\"mdi mdi-refresh\"></i></button>" . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<button type="button" class="btn btn-light waves-effect waves-light btn-xs" onClick="api(';
-	echo intval($rFolder['id']);
-	echo ", 'delete');\"><i class=\"mdi mdi-close\"></i></button>" . "\n\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t" . '</td>' . "\n\t\t\t\t\t\t\t\t" . '</tr>' . "\n\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t" . '</tbody>' . "\n\t\t\t\t\t\t" . '</table>' . "\n\t\t\t\t\t" . '</div> ' . "\n\t\t\t\t" . '</div> ' . "\n\t\t\t" . '</div>' . "\n\t\t" . '</div>' . "\n\t" . '</div>' . "\n" . '</div>' . "\n";
-include 'footer.php'; ?>
-<script id="scripts">
-	var resizeObserver = new ResizeObserver(entries => $(window).scroll());
-	$(document).ready(function() {
-		resizeObserver.observe(document.body)
-		$("form").attr('autocomplete', 'off');
-		$(document).keypress(function(event) {
-			if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
-		});
-		$.fn.dataTable.ext.errMode = 'none';
-		var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
-		elems.forEach(function(html) {
-			var switchery = new Switchery(html, {
-				'color': '#414d5f'
-			});
-			window.rSwitches[$(html).attr("id")] = switchery;
-		});
-		setTimeout(pingSession, 30000);
-		<?php if (!$rMobile && $rSettings['header_stats']): ?>
-			headerStats();
-		<?php endif; ?>
-		bindHref();
-		refreshTooltips();
-		$(window).scroll(function() {
-			if ($(this).scrollTop() > 200) {
-				if ($(document).height() > $(window).height()) {
-					$('#scrollToBottom').fadeOut();
-				}
-				$('#scrollToTop').fadeIn();
-			} else {
-				$('#scrollToTop').fadeOut();
-				if ($(document).height() > $(window).height()) {
-					$('#scrollToBottom').fadeIn();
-				} else {
-					$('#scrollToBottom').hide();
-				}
-			}
-		});
-		$("#scrollToTop").unbind("click");
-		$('#scrollToTop').click(function() {
-			$('html, body').animate({
-				scrollTop: 0
-			}, 800);
-			return false;
-		});
-		$("#scrollToBottom").unbind("click");
-		$('#scrollToBottom').click(function() {
-			$('html, body').animate({
-				scrollTop: $(document).height()
-			}, 800);
-			return false;
-		});
-		$(window).scroll();
-		$(".nextb").unbind("click");
-		$(".nextb").click(function() {
-			var rPos = 0;
-			var rActive = null;
-			$(".nav .nav-item").each(function() {
-				if ($(this).find(".nav-link").hasClass("active")) {
-					rActive = rPos;
-				}
-				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-					$(this).find(".nav-link").trigger("click");
-					return false;
-				}
-				rPos += 1;
-			});
-		});
-		$(".prevb").unbind("click");
-		$(".prevb").click(function() {
-			var rPos = 0;
-			var rActive = null;
-			$($(".nav .nav-item").get().reverse()).each(function() {
-				if ($(this).find(".nav-link").hasClass("active")) {
-					rActive = rPos;
-				}
-				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-					$(this).find(".nav-link").trigger("click");
-					return false;
-				}
-				rPos += 1;
-			});
-		});
-		(function($) {
-			$.fn.inputFilter = function(inputFilter) {
-				return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
-					if (inputFilter(this.value)) {
-						this.oldValue = this.value;
-						this.oldSelectionStart = this.selectionStart;
-						this.oldSelectionEnd = this.selectionEnd;
-					} else if (this.hasOwnProperty("oldValue")) {
-						this.value = this.oldValue;
-						this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
-					}
-				});
-			};
-		}(jQuery));
-		<?php if ($rSettings['js_navigate']): ?>
-			$(".navigation-menu li").mouseenter(function() {
-				$(this).find(".submenu").show();
-			});
-			delParam("status");
-			$(window).on("popstate", function() {
-				if (window.rRealURL) {
-					if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
-						navigate(window.location.href.split("/").reverse()[0]);
-					}
-				}
-			});
-		<?php endif; ?>
-		$(document).keydown(function(e) {
-			if (e.keyCode == 16) {
-				window.rShiftHeld = true;
-			}
-		});
-		$(document).keyup(function(e) {
-			if (e.keyCode == 16) {
-				window.rShiftHeld = false;
-			}
-		});
-		document.onselectstart = function() {
-			if (window.rShiftHeld) {
-				return false;
-			}
-		}
-	});
-
-	function disableAll(rConfirm = false) {
-		if (!rConfirm) {
-			new jBox("Confirm", {
-				confirmButton: "Disable",
-				cancelButton: "Cancel",
-				content: "Are you sure you want to disable all folders?",
-				confirm: function() {
-					disableAll(true);
-				}
-			}).open();
-		} else {
-			$.getJSON("./api?action=disable_watch", function(data) {
-				$.toast("Folders have been disabled.");
-			});
-		}
-	}
-
-	function enableAll(rConfirm = false) {
-		if (!rConfirm) {
-			new jBox("Confirm", {
-				confirmButton: "Enable",
-				cancelButton: "Cancel",
-				content: "Are you sure you want to enable all folders?",
-				confirm: function() {
-					enableAll(true);
-				}
-			}).open();
-		} else {
-			$.getJSON("./api?action=enable_watch", function(data) {
-				$.toast("Folders have been enabled.");
-			});
-		}
-	}
-
-	function killWatchFolder(rConfirm = false) {
-		if (!rConfirm) {
-			new jBox("Confirm", {
-				confirmButton: "Kill",
-				cancelButton: "Cancel",
-				content: "Are you sure you want to kill all processes?",
-				confirm: function() {
-					killWatchFolder(true);
-				}
-			}).open();
-		} else {
-			$.getJSON("./api?action=kill_watch", function(data) {
-				$.toast("Watch folder processes have been killed.");
-			});
-		}
-	}
-
-	function api(rID, rType, rConfirm = false) {
-		if ((rType == "delete") && (!rConfirm)) {
-			new jBox("Confirm", {
-				confirmButton: "Delete",
-				cancelButton: "Cancel",
-				content: "Are you sure you want to delete this folder?",
-				confirm: function() {
-					api(rID, rType, true);
-				}
-			}).open();
-		} else if ((rType == "force") && (!rConfirm)) {
-			new jBox("Confirm", {
-				confirmButton: "Run",
-				cancelButton: "Cancel",
-				content: "Are you sure you want to force this folder to run now?",
-				confirm: function() {
-					api(rID, rType, true);
-				}
-			}).open();
-		} else {
-			rConfirm = true;
-		}
-		if (rConfirm) {
-			$.getJSON("./api?action=folder&sub=" + rType + "&folder_id=" + rID, function(data) {
-				if (data.result === true) {
-					if (rType == "delete") {
-						if (rRow = findRowByID($("#datatable").DataTable(), 0, rID)) {
-							$("#datatable").DataTable().rows(rRow).remove().draw(false);
-						}
-						$.toast("Folder successfully deleted.");
-					} else if (rType == "force") {
-						$.toast("Folder has been forced to run in the background.");
-					}
-				} else {
-					$.toast("An error occured while processing your request.");
-				}
-			});
-		}
-	}
-
-	$(document).ready(function() {
-		$("#datatable").DataTable({
-			language: {
-				paginate: {
-					previous: "<i class='mdi mdi-chevron-left'>",
-					next: "<i class='mdi mdi-chevron-right'>"
-				}
-			},
-			drawCallback: function() {
-				bindHref();
-				refreshTooltips();
-			},
-			order: [
-				[5, "desc"]
-			],
-			columnDefs: [{
-				"visible": false,
-				"targets": [0]
-			}],
-			responsive: false
-		});
-		$("#datatable").css("width", "100%");
-		$("form").submit(function(e) {
-			e.preventDefault();
-			$(':input[type="submit"]').prop('disabled', true);
-			submitForm(window.rCurrentPage, new FormData($("form")[0]));
-		});
-	});
-    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
-        $(document).ready(function() {
-            initSearch();
-        });
-    <?php endif; ?>
-</script>
-<script src="assets/js/listings.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+include dirname(__DIR__) . '/modules/watch/views/watch.php';
+include 'footer.php';
+include dirname(__DIR__) . '/modules/watch/views/watch_scripts.php';
diff --git a/src/admin/watch_add.php b/src/admin/watch_add.php
index 6dc10d16..0de85872 100644
--- a/src/admin/watch_add.php
+++ b/src/admin/watch_add.php
@@ -3,8 +3,7 @@
 include 'session.php';
 include 'functions.php';
 
-if (checkPermissions()) {
-} else {
+if (!checkPermissions()) {
 	goHome();
 }
 
@@ -15,753 +14,8 @@ if (!isset(CoreUtilities::$rRequest['id']) || ($rFolder = getWatchFolder(CoreUti
 
 $rBouquets = getBouquets();
 $_TITLE = 'Add Folder';
+
 include 'header.php';
-echo '<div class="wrapper boxed-layout"';
-
-if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') {
-} else {
-	echo ' style="display: none;"';
-}
-
-echo '>' . "\n" . '    <div class="container-fluid">' . "\n\t\t" . '<div class="row">' . "\n\t\t\t" . '<div class="col-12">' . "\n\t\t\t\t" . '<div class="page-title-box">' . "\n\t\t\t\t\t" . '<div class="page-title-right">' . "\n" . '                        ';
-include 'topbar.php';
-echo "\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t" . '<h4 class="page-title">';
-
-if (isset($rFolder)) {
-	echo 'Edit';
-} else {
-	echo 'Add';
-}
-
-echo ' Folder</h4>' . "\n\t\t\t\t" . '</div>' . "\n\t\t\t" . '</div>' . "\n\t\t" . '</div>     ' . "\n\t\t" . '<div class="row">' . "\n\t\t\t" . '<div class="col-xl-12">' . "\n\t\t\t\t" . '<div class="card">' . "\n\t\t\t\t\t" . '<div class="card-body">' . "\n\t\t\t\t\t\t" . '<form action="#" method="POST" data-parsley-validate="">' . "\n\t\t\t\t\t\t\t";
-
-if (!isset($rFolder)) {
-} else {
-	echo "\t\t\t\t\t\t\t" . '<input type="hidden" name="edit" value="';
-	echo intval($rFolder['id']);
-	echo '" />' . "\n\t\t\t\t\t\t\t";
-}
-
-echo "\t\t\t\t\t\t\t" . '<div id="basicwizard">' . "\n\t\t\t\t\t\t\t\t" . '<ul class="nav nav-pills bg-light nav-justified form-wizard-header mb-4">' . "\n\t\t\t\t\t\t\t\t\t" . '<li class="nav-item">' . "\n\t\t\t\t\t\t\t\t\t\t" . '<a href="#folder-details" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2"> ' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<i class="mdi mdi-account-card-details-outline mr-1"></i>' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<span class="d-none d-sm-inline">Details</span>' . "\n\t\t\t\t\t\t\t\t\t\t" . '</a>' . "\n\t\t\t\t\t\t\t\t\t" . '</li>' . "\n" . '                                    <li class="nav-item">' . "\n\t\t\t\t\t\t\t\t\t\t" . '<a href="#settings" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2"> ' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<i class="mdi mdi-wrench mr-1"></i>' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<span class="d-none d-sm-inline">Settings</span>' . "\n\t\t\t\t\t\t\t\t\t\t" . '</a>' . "\n\t\t\t\t\t\t\t\t\t" . '</li>' . "\n\t\t\t\t\t\t\t\t\t" . '<li class="nav-item">' . "\n\t\t\t\t\t\t\t\t\t\t" . '<a href="#override" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2"> ' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<i class="mdi mdi-movie mr-1"></i>' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<span class="d-none d-sm-inline">Overrides</span>' . "\n\t\t\t\t\t\t\t\t\t\t" . '</a>' . "\n\t\t\t\t\t\t\t\t\t" . '</li>' . "\n\t\t\t\t\t\t\t\t" . '</ul>' . "\n\t\t\t\t\t\t\t\t" . '<div class="tab-content b-0 mb-0 pt-0">' . "\n\t\t\t\t\t\t\t\t\t" . '<div class="tab-pane" id="folder-details">' . "\n\t\t\t\t\t\t\t\t\t\t" . '<div class="row">' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-12">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="folder_type">Folder Type</label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select id="folder_type" name="folder_type" class="form-control" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach (array('movie' => 'Movies', 'series' => 'TV Series') as $e3c07a78e3d4883f => $rType) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option value="';
-	echo $e3c07a78e3d4883f;
-	echo '"';
-
-	if (!(isset($rFolder) && $rFolder['type'] == $e3c07a78e3d4883f)) {
-	} else {
-		echo ' selected';
-	}
-
-	echo '>';
-	echo $rType;
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="server_id">Server Name</label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select id="server_id" name="server_id" class="form-control" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach (getStreamingServers() as $rServer) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option value="';
-	echo $rServer['id'];
-	echo '"';
-
-	if (!(isset($rFolder) && $rFolder['server_id'] == $rServer['id'])) {
-	} else {
-		echo ' selected';
-	}
-
-	echo '>';
-	echo $rServer['server_name'];
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="selected_path">Selected Path</label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8 input-group">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input type="text" id="selected_path" name="selected_path" class="form-control" value="';
-
-if (isset($rFolder)) {
-	echo $rFolder['directory'];
-} else {
-	echo '/';
-}
-
-echo '" required data-parsley-trigger="change">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="input-group-append">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<button class="btn btn-primary waves-effect waves-light" type="button" id="changeDir"><i class="mdi mdi-chevron-right"></i></button>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                                <div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="rclone_dir">Rclone Path <i title="Enter the Rclone path here to scan the folder using the Rclone API, would be quicker for remote drives.<br/><br/>You need to modify the rclone.conf file in the config folder with the correct mount information for this to work." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input type="text" id="rclone_dir" name="rclone_dir" class="form-control" value="';
-
-if (!isset($rFolder)) {
-} else {
-	echo $rFolder['rclone_dir'];
-}
-
-echo '">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                                <div class="form-group row mb-4">' . "\n" . '                                                    <label class="col-md-4 col-form-label" for="active">Enabled</label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="active" id="active" type="checkbox" ';
-
-if (isset($rFolder)) {
-	if (!$rFolder['active']) {
-	} else {
-		echo 'checked ';
-	}
-} else {
-	echo 'checked ';
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                                </div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-6">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<table id="datatable" class="table">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<thead>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<tr>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<th width="20px"></th>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<th>Directory</th>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</tr>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</thead>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<tbody></tbody>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</table>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-6">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<table id="datatable-files" class="table">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<thead>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<tr>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<th width="20px"></th>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<th>Filename</th>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</tr>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</thead>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<tbody></tbody>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</table>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '</div> ' . "\n\t\t\t\t\t\t\t\t\t\t" . '</div> ' . "\n\t\t\t\t\t\t\t\t\t\t" . '<ul class="list-inline wizard mb-0">' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<li class="nextb list-inline-item float-right">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<a href="javascript: void(0);" class="btn btn-secondary">Next</a>' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '</li>' . "\n\t\t\t\t\t\t\t\t\t\t" . '</ul>' . "\n\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t" . '<div class="tab-pane" id="settings">' . "\n\t\t\t\t\t\t\t\t\t\t" . '<div class="row">' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-12">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="disable_tmdb">Disable TMDb <i title="Do not use TMDb to match the content." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="disable_tmdb" id="disable_tmdb" type="checkbox" ';
-
-if (!isset($rFolder)) {
-} else {
-	if (!$rFolder['disable_tmdb']) {
-	} else {
-		echo 'checked ';
-	}
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="ignore_no_match">Ignore No Match <i title="Add to database even if no TMDb match is found." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="ignore_no_match" id="ignore_no_match" type="checkbox" ';
-
-if (!isset($rFolder)) {
-} else {
-	if (!$rFolder['ignore_no_match']) {
-	} else {
-		echo 'checked ';
-	}
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                                <div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="read_native">Native Frames <i title="Read input video at native frame rate." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="read_native" id="read_native" type="checkbox" ';
-
-if (!isset($rFolder)) {
-} else {
-	if (!$rFolder['read_native']) {
-	} else {
-		echo 'checked ';
-	}
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="movie_symlink">Create Symlink <i title="Generate a symlink to the original file instead of encoding. File needs to exist on all selected servers." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="movie_symlink" id="movie_symlink" type="checkbox" ';
-
-if (!isset($rFolder)) {
-} else {
-	if (!$rFolder['movie_symlink']) {
-	} else {
-		echo 'checked ';
-	}
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="auto_encode">Auto-Encode <i title="Start encoding as soon as the movie is added." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="auto_encode" id="auto_encode" type="checkbox" ';
-
-if (isset($rFolder)) {
-	if (!$rFolder['auto_encode']) {
-	} else {
-		echo 'checked ';
-	}
-} else {
-	echo 'checked ';
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . "<label class=\"col-md-4 col-form-label\" for=\"ffprobe_input\">Probe Input <i title=\"Use ffmpeg to probe input files to ensure broken / incomplete files aren't added. Will increase load.\" class=\"tooltip text-secondary far fa-circle\"></i></label>" . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="ffprobe_input" id="ffprobe_input" type="checkbox" ';
-
-if (isset($rFolder)) {
-	if (!$rFolder['ffprobe_input']) {
-	} else {
-		echo 'checked ';
-	}
-} else {
-	echo 'checked ';
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                                <div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="auto_subtitles">Auto-Add Subtitles <i title="Automatically embed subtitles of the same name in the same folder." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="auto_subtitles" id="auto_subtitles" type="checkbox" ';
-
-if (!isset($rFolder)) {
-} else {
-	if (!$rFolder['auto_subtitles']) {
-	} else {
-		echo 'checked ';
-	}
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                                    <label class="col-md-4 col-form-label" for="auto_upgrade">Auto-Upgrade Quality <i title="Automatically upgrade quality if the system finds a new file with better quality that has the same TMDb ID." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="auto_upgrade" id="auto_upgrade" type="checkbox" ';
-
-if (!isset($rFolder)) {
-} else {
-	if (!$rFolder['auto_upgrade']) {
-	} else {
-		echo 'checked ';
-	}
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                                <div class="form-group row mb-4">' . "\n" . '                                                    <label class="col-md-4 col-form-label" for="extract_metadata">Extract Metadata <i title="Use ffprobe to extract metadata information of the file and use that instead of the filename for matching against TMDb." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="extract_metadata" id="extract_metadata" type="checkbox" ';
-
-if (!isset($rFolder)) {
-} else {
-	if (!$rFolder['extract_metadata']) {
-	} else {
-		echo 'checked ';
-	}
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . "                                                    <label class=\"col-md-4 col-form-label\" for=\"duplicate_tmdb\">Allow TMDb Duplicates <i title=\"Disable checks for duplicates using the TMDb ID. Turn this on if you want to add duplicates based on different file locations. Auto-upgrade won't work if you enable this.\" class=\"tooltip text-secondary far fa-circle\"></i></label>" . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="duplicate_tmdb" id="duplicate_tmdb" type="checkbox" ';
-
-if (!isset($rFolder)) {
-} else {
-	if (!$rFolder['duplicate_tmdb']) {
-	} else {
-		echo 'checked ';
-	}
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                                <div class="form-group row mb-4">' . "\n" . "                                                    <label class=\"col-md-4 col-form-label\" for=\"remove_subtitles\">Remove Existing Subtitles <i title=\"Remove existing subtitles from file before encoding. You can't remove hardcoded subtitles using this method.\" class=\"tooltip text-secondary far fa-circle\"></i></label>" . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="remove_subtitles" id="remove_subtitles" type="checkbox" ';
-
-if (!isset($rFolder)) {
-} else {
-	if (!$rFolder['remove_subtitles']) {
-	} else {
-		echo 'checked ';
-	}
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="target_container">';
-echo $language::get('target_container');
-echo ' <i title="Which container to use when transcoding files." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select name="target_container" id="target_container" class="form-control" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach (array('auto', 'mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts') as $rContainer) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-	if (!isset($rFolder)) {
-	} else {
-		if ($rFolder['target_container'] != $rContainer) {
-		} else {
-			echo 'selected ';
-		}
-	}
-
-	echo 'value="';
-	echo $rContainer;
-	echo '">';
-	echo $rContainer;
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                                </div>' . "\n" . '                                                <div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="transcode_profile_id">Transcoding Profile <i title="Select a transcoding profile to autoamtically encode videos." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select name="transcode_profile_id" id="transcode_profile_id" class="form-control" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-if (!isset($rFolder)) {
-} else {
-	if (intval($rFolder['transcode_profile_id']) != 0) {
-	} else {
-		echo 'selected ';
-	}
-}
-
-echo 'value="0">Transcoding Disabled</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach (getTranscodeProfiles() as $rProfile) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-	if (!isset($rFolder)) {
-	} else {
-		if (intval($rFolder['transcode_profile_id']) != intval($rProfile['profile_id'])) {
-		} else {
-			echo 'selected ';
-		}
-	}
-
-	echo 'value="';
-	echo $rProfile['profile_id'];
-	echo '">';
-	echo $rProfile['profile_name'];
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '</div> ' . "\n\t\t\t\t\t\t\t\t\t\t" . '</div> ' . "\n\t\t\t\t\t\t\t\t\t\t" . '<ul class="list-inline wizard mb-0">' . "\n" . '                                            <li class="prevb list-inline-item">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<a href="javascript: void(0);" class="btn btn-secondary">Previous</a>' . "\n" . '                                            </li>' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<li class="nextb list-inline-item float-right">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<a href="javascript: void(0);" class="btn btn-secondary">Next</a>' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '</li>' . "\n\t\t\t\t\t\t\t\t\t\t" . '</ul>' . "\n\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                    <div class="tab-pane" id="override">' . "\n\t\t\t\t\t\t\t\t\t\t" . '<div class="row">' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-12">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4" id="category_movie"';
-
-if (!isset($rFolder)) {
-} else {
-	if ($rFolder['type'] == 'movie') {
-	} else {
-		echo ' style="display: none;"';
-	}
-}
-
-echo '>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="category_id_movie">Override Category <i title="Ignore category allocation and force category allocation." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select name="category_id_movie" id="category_id_movie" class="form-control select2" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-if (!isset($rFolder)) {
-} else {
-	if (intval($rFolder['category_id']) != 0) {
-	} else {
-		echo 'selected ';
-	}
-}
-
-echo 'value="0">Do Not Use</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach (getCategories('movie') as $rCategory) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-	if (!isset($rFolder)) {
-	} else {
-		if (intval($rFolder['category_id']) != intval($rCategory['id'])) {
-		} else {
-			echo 'selected ';
-		}
-	}
-
-	echo 'value="';
-	echo intval($rCategory['id']);
-	echo '">';
-	echo $rCategory['category_name'];
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4" id="category_series"';
-
-if (isset($rFolder)) {
-	if ($rFolder['type'] == 'series') {
-	} else {
-		echo ' style="display: none;"';
-	}
-} else {
-	echo ' style="display: none;"';
-}
-
-echo '>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="category_id_series">Override Category <i title="Ignore category allocation and force category allocation." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select name="category_id_series" id="category_id_series" class="form-control select2" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-if (!isset($rFolder)) {
-} else {
-	if (intval($rFolder['category_id']) != 0) {
-	} else {
-		echo 'selected ';
-	}
-}
-
-echo 'value="0">Do Not Use</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach (getCategories('series') as $rCategory) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-	if (!isset($rFolder)) {
-	} else {
-		if (intval($rFolder['category_id']) != intval($rCategory['id'])) {
-		} else {
-			echo 'selected ';
-		}
-	}
-
-	echo 'value="';
-	echo intval($rCategory['id']);
-	echo '">';
-	echo $rCategory['category_name'];
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="bouquets">Override Bouquets <i title="Ignore category allocation and force bouquet allocation." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select name="bouquets[]" id="bouquets" class="form-control select2-multiple" data-toggle="select2" multiple="multiple" data-placeholder="Choose...">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach ($rBouquets as $rBouquet) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-	if (!isset($rFolder)) {
-	} else {
-		if (!in_array(intval($rBouquet['id']), json_decode($rFolder['bouquets'], true))) {
-		} else {
-			echo 'selected ';
-		}
-	}
-
-	echo 'value="';
-	echo intval($rBouquet['id']);
-	echo '">';
-	echo $rBouquet['bouquet_name'];
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4" id="fb_category_movie"';
-
-if (!isset($rFolder)) {
-} else {
-	if ($rFolder['type'] == 'movie') {
-	} else {
-		echo ' style="display: none;"';
-	}
-}
-
-echo '>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . "<label class=\"col-md-4 col-form-label\" for=\"fb_category_id_movie\">Fallback Category <i title=\"Add to this category if the Genre isn't found in the category allocation list.\" class=\"tooltip text-secondary far fa-circle\"></i></label>" . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select name="fb_category_id_movie" id="fb_category_id_movie" class="form-control select2" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-if (!isset($rFolder)) {
-} else {
-	if (intval($rFolder['fb_category_id']) != 0) {
-	} else {
-		echo 'selected ';
-	}
-}
-
-echo 'value="0">Do Not Use</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach (getCategories('movie') as $rCategory) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-	if (!isset($rFolder)) {
-	} else {
-		if (intval($rFolder['fb_category_id']) != intval($rCategory['id'])) {
-		} else {
-			echo 'selected ';
-		}
-	}
-
-	echo 'value="';
-	echo intval($rCategory['id']);
-	echo '">';
-	echo $rCategory['category_name'];
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4" id="fb_category_series"';
-
-if (isset($rFolder)) {
-	if ($rFolder['type'] == 'series') {
-	} else {
-		echo ' style="display: none;"';
-	}
-} else {
-	echo ' style="display: none;"';
-}
-
-echo '>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . "<label class=\"col-md-4 col-form-label\" for=\"fb_category_id_series\">Fallback Category <i title=\"Add to this category if the Genre isn't found in the category allocation list.\" class=\"tooltip text-secondary far fa-circle\"></i></label>" . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select name="fb_category_id_series" id="fb_category_id_series" class="form-control select2" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-if (!isset($rFolder)) {
-} else {
-	if (intval($rFolder['fb_category_id']) != 0) {
-	} else {
-		echo 'selected ';
-	}
-}
-
-echo 'value="0">Do Not Use</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach (getCategories('series') as $rCategory) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-	if (!isset($rFolder)) {
-	} else {
-		if (intval($rFolder['fb_category_id']) != intval($rCategory['id'])) {
-		} else {
-			echo 'selected ';
-		}
-	}
-
-	echo 'value="';
-	echo intval($rCategory['id']);
-	echo '">';
-	echo $rCategory['category_name'];
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . "<label class=\"col-md-4 col-form-label\" for=\"fb_bouquets\">Fallback Bouquets <i title=\"Add to these bouquets if the Genre isn't found in the category allocation list.\" class=\"tooltip text-secondary far fa-circle\"></i></label>" . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select name="fb_bouquets[]" id="fb_bouquets" class="form-control select2-multiple" data-toggle="select2" multiple="multiple" data-placeholder="Choose...">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach ($rBouquets as $rBouquet) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-	if (!isset($rFolder)) {
-	} else {
-		if (!in_array(intval($rBouquet['id']), json_decode($rFolder['fb_bouquets'], true))) {
-		} else {
-			echo 'selected ';
-		}
-	}
-
-	echo 'value="';
-	echo intval($rBouquet['id']);
-	echo '">';
-	echo $rBouquet['bouquet_name'];
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                                <div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . "<label class=\"col-md-4 col-form-label\" for=\"fallback_title\">Fallback to Folder Name <i title=\"If the title of the file isn't matched with TMDb, try to match the folder name instead.\" class=\"tooltip text-secondary far fa-circle\"></i></label>" . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="fallback_title" id="fallback_title" type="checkbox" ';
-
-if (!isset($rFolder)) {
-} else {
-	if (!$rFolder['fallback_title']) {
-	} else {
-		echo 'checked ';
-	}
-}
-
-echo 'data-plugin="switchery" class="js-switch" data-color="#039cfd"/>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="allowed_extensions">Allowed Extensions <i title="Allow scanning of the following extensions only. An empty list will allow all extensions." class="tooltip text-secondary far fa-circle"></i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select name="allowed_extensions[]" id="allowed_extensions" class="form-control select2-multiple" data-toggle="select2" multiple="multiple" data-placeholder="Choose...">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach (array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts') as $rExtension) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option ';
-
-	if (!isset($rFolder)) {
-	} else {
-		if (!in_array($rExtension, json_decode($rFolder['allowed_extensions'], true))) {
-		} else {
-			echo 'selected ';
-		}
-	}
-
-	echo 'value="';
-	echo $rExtension;
-	echo '">';
-	echo $rExtension;
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n" . '                                                <div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<label class="col-md-4 col-form-label" for="language">Force TMDB Language</i></label>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<div class="col-md-8">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<select name="language" id="language" class="form-control" data-toggle="select2">' . "\n" . '                                                            <option value="">Do Not Force</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-foreach (array_slice($rTMDBLanguages, 1, count($rTMDBLanguages) - 1) as $rKey => $rLanguage) {
-	echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '<option';
-
-	if (!(isset($rFolder) && $rFolder['language'] == $rKey)) {
-	} else {
-		echo ' selected';
-	}
-
-	echo ' value="';
-	echo $rKey;
-	echo '">';
-	echo $rLanguage;
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '</div> ' . "\n\t\t\t\t\t\t\t\t\t\t" . '</div> ' . "\n\t\t\t\t\t\t\t\t\t\t" . '<ul class="list-inline wizard mb-0">' . "\n" . '                                            <li class="prevb list-inline-item">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<a href="javascript: void(0);" class="btn btn-secondary">Previous</a>' . "\n" . '                                            </li>' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '<li class="list-inline-item float-right">' . "\n\t\t\t\t\t\t\t\t\t\t\t\t" . '<input name="submit_folder" type="submit" class="btn btn-primary" value="';
-
-if (isset($rFolder)) {
-	echo 'Edit';
-} else {
-	echo 'Add';
-}
-
-echo '" />' . "\n\t\t\t\t\t\t\t\t\t\t\t" . '</li>' . "\n\t\t\t\t\t\t\t\t\t\t" . '</ul>' . "\n\t\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t" . '</div> ' . "\n\t\t\t\t\t\t\t" . '</div> ' . "\n\t\t\t\t\t\t" . '</form>' . "\n\t\t\t\t\t" . '</div> ' . "\n\t\t\t\t" . '</div> ' . "\n\t\t\t" . '</div> ' . "\n\t\t" . '</div>' . "\n\t" . '</div>' . "\n" . '</div>' . "\n";
-include 'footer.php'; ?>
-<script id="scripts">
-	var resizeObserver = new ResizeObserver(entries => $(window).scroll());
-	$(document).ready(function() {
-		resizeObserver.observe(document.body)
-		$("form").attr('autocomplete', 'off');
-		$(document).keypress(function(event) {
-			if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
-		});
-		$.fn.dataTable.ext.errMode = 'none';
-		var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
-		elems.forEach(function(html) {
-			var switchery = new Switchery(html, {
-				'color': '#414d5f'
-			});
-			window.rSwitches[$(html).attr("id")] = switchery;
-		});
-		setTimeout(pingSession, 30000);
-		<?php if (!$rMobile && $rSettings['header_stats']): ?>
-			headerStats();
-		<?php endif; ?>
-		bindHref();
-		refreshTooltips();
-		$(window).scroll(function() {
-			if ($(this).scrollTop() > 200) {
-				if ($(document).height() > $(window).height()) {
-					$('#scrollToBottom').fadeOut();
-				}
-				$('#scrollToTop').fadeIn();
-			} else {
-				$('#scrollToTop').fadeOut();
-				if ($(document).height() > $(window).height()) {
-					$('#scrollToBottom').fadeIn();
-				} else {
-					$('#scrollToBottom').hide();
-				}
-			}
-		});
-		$("#scrollToTop").unbind("click");
-		$('#scrollToTop').click(function() {
-			$('html, body').animate({
-				scrollTop: 0
-			}, 800);
-			return false;
-		});
-		$("#scrollToBottom").unbind("click");
-		$('#scrollToBottom').click(function() {
-			$('html, body').animate({
-				scrollTop: $(document).height()
-			}, 800);
-			return false;
-		});
-		$(window).scroll();
-		$(".nextb").unbind("click");
-		$(".nextb").click(function() {
-			var rPos = 0;
-			var rActive = null;
-			$(".nav .nav-item").each(function() {
-				if ($(this).find(".nav-link").hasClass("active")) {
-					rActive = rPos;
-				}
-				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-					$(this).find(".nav-link").trigger("click");
-					return false;
-				}
-				rPos += 1;
-			});
-		});
-		$(".prevb").unbind("click");
-		$(".prevb").click(function() {
-			var rPos = 0;
-			var rActive = null;
-			$($(".nav .nav-item").get().reverse()).each(function() {
-				if ($(this).find(".nav-link").hasClass("active")) {
-					rActive = rPos;
-				}
-				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-					$(this).find(".nav-link").trigger("click");
-					return false;
-				}
-				rPos += 1;
-			});
-		});
-		(function($) {
-			$.fn.inputFilter = function(inputFilter) {
-				return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
-					if (inputFilter(this.value)) {
-						this.oldValue = this.value;
-						this.oldSelectionStart = this.selectionStart;
-						this.oldSelectionEnd = this.selectionEnd;
-					} else if (this.hasOwnProperty("oldValue")) {
-						this.value = this.oldValue;
-						this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
-					}
-				});
-			};
-		}(jQuery));
-		<?php if ($rSettings['js_navigate']): ?>
-			$(".navigation-menu li").mouseenter(function() {
-				$(this).find(".submenu").show();
-			});
-			delParam("status");
-			$(window).on("popstate", function() {
-				if (window.rRealURL) {
-					if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
-						navigate(window.location.href.split("/").reverse()[0]);
-					}
-				}
-			});
-		<?php endif; ?>
-		$(document).keydown(function(e) {
-			if (e.keyCode == 16) {
-				window.rShiftHeld = true;
-			}
-		});
-		$(document).keyup(function(e) {
-			if (e.keyCode == 16) {
-				window.rShiftHeld = false;
-			}
-		});
-		document.onselectstart = function() {
-			if (window.rShiftHeld) {
-				return false;
-			}
-		}
-	});
-	
-	function selectDirectory(elem) {
-		window.currentDirectory += elem + "/";
-		$("#selected_path").val(window.currentDirectory);
-		$("#changeDir").click();
-	}
-
-	function selectParent() {
-		$("#selected_path").val(window.currentDirectory.split("/").slice(0, -2).join("/") + "/");
-		$("#changeDir").click();
-	}
-
-	$(document).ready(function() {
-		$('select').select2({
-			width: '100%'
-		});
-		$("#datatable").DataTable({
-			responsive: false,
-			paging: false,
-			bInfo: false,
-			searching: false,
-			scrollY: "250px",
-			drawCallback: function() {
-				bindHref();
-				refreshTooltips();
-			},
-			columnDefs: [{
-				"className": "dt-center",
-				"targets": [0]
-			}, ],
-			"language": {
-				"emptyTable": ""
-			}
-		});
-		$("#datatable-files").DataTable({
-			responsive: false,
-			paging: false,
-			bInfo: false,
-			searching: true,
-			scrollY: "250px",
-			drawCallback: function() {
-				bindHref();
-				refreshTooltips();
-			},
-			columnDefs: [{
-				"className": "dt-center",
-				"targets": [0]
-			}, ],
-			"language": {
-				"emptyTable": "No compatible files found"
-			}
-		});
-		$("#select_folder").click(function() {
-			$("#import_folder").val("s:" + $("#server_id").val() + ":" + window.currentDirectory);
-			$.magnificPopup.close();
-		});
-		$("#changeDir").click(function() {
-			window.currentDirectory = $("#selected_path").val();
-			if (window.currentDirectory.substr(-1) != "/") {
-				window.currentDirectory += "/";
-			}
-			$("#selected_path").val(window.currentDirectory);
-			$("#datatable").DataTable().clear();
-			$("#datatable").DataTable().row.add(["", "Loading..."]);
-			$("#datatable").DataTable().draw(true);
-			$("#datatable-files").DataTable().clear();
-			$("#datatable-files").DataTable().row.add(["", "Please wait..."]);
-			$("#datatable-files").DataTable().draw(true);
-			$.getJSON("./api?action=listdir&dir=" + window.currentDirectory + "&server=" + $("#server_id").val() + "&filter=video", function(data) {
-				$("#datatable").DataTable().clear();
-				$("#datatable-files").DataTable().clear();
-				if (window.currentDirectory != "/") {
-					$("#datatable").DataTable().row.add(["<i class='mdi mdi-subdirectory-arrow-left'></i>", "Parent Directory"]);
-				}
-				if (data.result == true) {
-					$(data.data.dirs).each(function(id, dir) {
-						$("#datatable").DataTable().row.add(["<i class='mdi mdi-folder-open-outline'></i>", dir]);
-					});
-					$("#datatable").DataTable().draw(true);
-					$(data.data.files).each(function(id, dir) {
-						$("#datatable-files").DataTable().row.add(["<i class='mdi mdi-file-video'></i>", dir]);
-					});
-					$("#datatable-files").DataTable().draw(true);
-				}
-			});
-		});
-		$('#datatable').on('click', 'tbody > tr', function() {
-			if ($(this).find("td").eq(1).html() == "Parent Directory") {
-				selectParent();
-			} else {
-				selectDirectory($(this).find("td").eq(1).html());
-			}
-		});
-		$("#server_id").change(function() {
-			$("#selected_path").val("/");
-			$("#changeDir").click();
-		});
-		$("#changeDir").click();
-		$("#folder_type").change(function() {
-			if ($(this).val() == "movie") {
-				$("#category_movie").show();
-				$("#category_series").hide();
-				$("#fb_category_movie").show();
-				$("#fb_category_series").hide();
-			} else {
-				$("#category_movie").hide();
-				$("#category_series").show();
-				$("#fb_category_movie").hide();
-				$("#fb_category_series").show();
-			}
-		});
-		$("form").submit(function(e) {
-			e.preventDefault();
-			$(':input[type="submit"]').prop('disabled', true);
-			submitForm(window.rCurrentPage, new FormData($("form")[0]));
-		});
-	});
-    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
-        $(document).ready(function() {
-            initSearch();
-        });
-    <?php endif; ?>
-</script>
-<script src="assets/js/listings.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+include dirname(__DIR__) . '/modules/watch/views/watch_add.php';
+include 'footer.php';
+include dirname(__DIR__) . '/modules/watch/views/watch_add_scripts.php';
diff --git a/src/admin/watch_output.php b/src/admin/watch_output.php
index 1565d7bd..99c1e8d6 100644
--- a/src/admin/watch_output.php
+++ b/src/admin/watch_output.php
@@ -3,209 +3,13 @@
 include 'session.php';
 include 'functions.php';
 
-if (checkPermissions()) {
-} else {
+if (!checkPermissions()) {
 	goHome();
 }
 
 $_TITLE = 'Watch Folder Logs';
+
 include 'header.php';
-echo '<div class="wrapper"';
-
-if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') {
-} else {
-	echo ' style="display: none;"';
-}
-
-echo '>' . "\n" . '    <div class="container-fluid">' . "\n\t\t" . '<div class="row">' . "\n\t\t\t" . '<div class="col-12">' . "\n\t\t\t\t" . '<div class="page-title-box">' . "\n\t\t\t\t\t" . '<div class="page-title-right">' . "\n" . '                        ';
-include 'topbar.php';
-echo "\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t" . '<h4 class="page-title">Folder Watch / Plex Sync Output</h4>' . "\n\t\t\t\t" . '</div>' . "\n\t\t\t" . '</div>' . "\n\t\t" . '</div>' . "\n\t\t" . '<div class="row">' . "\n\t\t\t" . '<div class="col-12">' . "\n\t\t\t\t" . '<div class="card">' . "\n\t\t\t\t\t" . '<div class="card-body" style="overflow-x:auto;">' . "\n\t\t\t\t\t\t" . '<form id="series_form">' . "\n\t\t\t\t\t\t\t" . '<div class="form-group row mb-4">' . "\n\t\t\t\t\t\t\t\t" . '<div class="col-md-3">' . "\n\t\t\t\t\t\t\t\t\t" . '<input type="text" class="form-control" id="result_search" value="" placeholder="Search Results...">' . "\n\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t" . '<select id="result_server" class="form-control" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t" . '<option value="" selected>All Servers</option>' . "\n\t\t\t\t\t\t\t\t\t\t";
-
-foreach ($rServers as $rServer) {
-	echo "\t\t\t\t\t\t\t\t\t\t" . '<option value="';
-	echo $rServer['id'];
-	echo '">';
-	echo $rServer['server_name'];
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t" . '<select id="result_type" class="form-control" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t" . '<option value="" selected>All Types</option>' . "\n\t\t\t\t\t\t\t\t\t\t";
-
-foreach (array(1 => 'Movies', 2 => 'Series') as $rID => $rType) {
-	echo "\t\t\t\t\t\t\t\t\t\t" . '<option value="';
-	echo $rID;
-	echo '">';
-	echo $rType;
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t" . '<select id="result_status" class="form-control" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t" . '<option value="" selected>All Statuses</option>' . "\n\t\t\t\t\t\t\t\t\t\t";
-
-foreach (array(1 => 'Added', 2 => 'SQL Error', 3 => 'No Category', 4 => 'No Match', 5 => 'Invalid File') as $rID => $rType) {
-	echo "\t\t\t\t\t\t\t\t\t\t" . '<option value="';
-	echo $rID;
-	echo '">';
-	echo $rType;
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t\t" . '<label class="col-md-1 col-form-label text-center" for="result_show_entries">Show</label>' . "\n\t\t\t\t\t\t\t\t" . '<div class="col-md-2">' . "\n\t\t\t\t\t\t\t\t\t" . '<select id="result_show_entries" class="form-control" data-toggle="select2">' . "\n\t\t\t\t\t\t\t\t\t\t";
-
-foreach (array(10, 25, 50, 250, 500, 1000) as $rShow) {
-	echo "\t\t\t\t\t\t\t\t\t\t" . '<option';
-
-	if ($rSettings['default_entries'] != $rShow) {
-	} else {
-		echo ' selected';
-	}
-
-	echo ' value="';
-	echo $rShow;
-	echo '">';
-	echo $rShow;
-	echo '</option>' . "\n\t\t\t\t\t\t\t\t\t\t";
-}
-echo "\t\t\t\t\t\t\t\t\t" . '</select>' . "\n\t\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t\t" . '</div>' . "\n\t\t\t\t\t\t" . '</form>' . "\n\t\t\t\t\t\t" . '<table id="datatable-md1" class="table table-striped table-borderless dt-responsive nowrap font-normal">' . "\n\t\t\t\t\t\t\t" . '<thead>' . "\n\t\t\t\t\t\t\t\t" . '<tr>' . "\n\t\t\t\t\t\t\t\t\t" . '<th class="text-center">ID</th>' . "\n\t\t\t\t\t\t\t\t\t" . '<th>Type</th>' . "\n\t\t\t\t\t\t\t\t\t" . '<th>Server</th>' . "\n\t\t\t\t\t\t\t\t\t" . '<th>Filename</th>' . "\n\t\t\t\t\t\t\t\t\t" . '<th class="text-center">Status</th>' . "\n\t\t\t\t\t\t\t\t\t" . '<th class="text-center">Date Added</th>' . "\n\t\t\t\t\t\t\t\t\t" . '<th class="text-center">Actions</th>' . "\n\t\t\t\t\t\t\t\t" . '</tr>' . "\n\t\t\t\t\t\t\t" . '</thead>' . "\n\t\t\t\t\t\t\t" . '<tbody></tbody>' . "\n\t\t\t\t\t\t" . '</table>' . "\n\t\t\t\t\t" . '</div> ' . "\n\t\t\t\t" . '</div> ' . "\n\t\t\t" . '</div>' . "\n\t\t" . '</div>' . "\n\t" . '</div>' . "\n" . '</div>' . "\n";
-include 'footer.php'; ?>
-<script id="scripts">
-			var resizeObserver = new ResizeObserver(entries => $(window).scroll());
-			$(document).ready(function() {
-				resizeObserver.observe(document.body)
-				$("form").attr('autocomplete', 'off');
-				$(document).keypress(function(event) {
-					if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
-				});
-				$.fn.dataTable.ext.errMode = 'none';
-				var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
-				elems.forEach(function(html) {
-					var switchery = new Switchery(html, {
-						'color': '#414d5f'
-					});
-					window.rSwitches[$(html).attr("id")] = switchery;
-				});
-				setTimeout(pingSession, 30000);
-				<?php if (!$rMobile && $rSettings['header_stats']): ?>
-					headerStats();
-				<?php endif; ?>
-				bindHref();
-				refreshTooltips();
-				$(window).scroll(function() {
-					if ($(this).scrollTop() > 200) {
-						if ($(document).height() > $(window).height()) {
-							$('#scrollToBottom').fadeOut();
-						}
-						$('#scrollToTop').fadeIn();
-					} else {
-						$('#scrollToTop').fadeOut();
-						if ($(document).height() > $(window).height()) {
-							$('#scrollToBottom').fadeIn();
-						} else {
-							$('#scrollToBottom').hide();
-						}
-					}
-				});
-				$("#scrollToTop").unbind("click");
-				$('#scrollToTop').click(function() {
-					$('html, body').animate({
-						scrollTop: 0
-					}, 800);
-					return false;
-				});
-				$("#scrollToBottom").unbind("click");
-				$('#scrollToBottom').click(function() {
-					$('html, body').animate({
-						scrollTop: $(document).height()
-					}, 800);
-					return false;
-				});
-				$(window).scroll();
-				$(".nextb").unbind("click");
-				$(".nextb").click(function() {
-					var rPos = 0;
-					var rActive = null;
-					$(".nav .nav-item").each(function() {
-						if ($(this).find(".nav-link").hasClass("active")) {
-							rActive = rPos;
-						}
-						if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-							$(this).find(".nav-link").trigger("click");
-							return false;
-						}
-						rPos += 1;
-					});
-				});
-				$(".prevb").unbind("click");
-				$(".prevb").click(function() {
-					var rPos = 0;
-					var rActive = null;
-					$($(".nav .nav-item").get().reverse()).each(function() {
-						if ($(this).find(".nav-link").hasClass("active")) {
-							rActive = rPos;
-						}
-						if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
-							$(this).find(".nav-link").trigger("click");
-							return false;
-						}
-						rPos += 1;
-					});
-				});
-				(function($) {
-					$.fn.inputFilter = function(inputFilter) {
-						return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
-							if (inputFilter(this.value)) {
-								this.oldValue = this.value;
-								this.oldSelectionStart = this.selectionStart;
-								this.oldSelectionEnd = this.selectionEnd;
-							} else if (this.hasOwnProperty("oldValue")) {
-								this.value = this.oldValue;
-								this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
-							}
-						});
-					};
-				}(jQuery));
-				<?php if ($rSettings['js_navigate']): ?>
-					$(".navigation-menu li").mouseenter(function() {
-						$(this).find(".submenu").show();
-					});
-					delParam("status");
-					$(window).on("popstate", function() {
-						if (window.rRealURL) {
-							if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
-								navigate(window.location.href.split("/").reverse()[0]);
-							}
-						}
-					});
-				<?php endif; ?>
-				$(document).keydown(function(e) {
-					if (e.keyCode == 16) {
-						window.rShiftHeld = true;
-					}
-				});
-				$(document).keyup(function(e) {
-					if (e.keyCode == 16) {
-						window.rShiftHeld = false;
-					}
-				});
-				document.onselectstart = function() {
-					if (window.rShiftHeld) {
-						return false;
-					}
-				}
-			});
-
-			<?php
-		echo '        ' . "\r\n\t\t" . 'var rClearing = false;' . "\r\n\r\n\t\t" . 'function api(rID, rType, rConfirm=false) {' . "\r\n" . '            if ((rType == "delete") && (!rConfirm)) {' . "\r\n" . '                new jBox("Confirm", {' . "\r\n" . '                    confirmButton: "Delete",' . "\r\n" . '                    cancelButton: "Cancel",' . "\r\n" . '                    content: "Are you sure you want to delete this record?",' . "\r\n" . '                    confirm: function () {' . "\r\n" . '                        api(rID, rType, true);' . "\r\n" . '                    }' . "\r\n" . '                }).open();' . "\r\n\t\t\t" . '} else {' . "\r\n" . '                rConfirm = true;' . "\r\n" . '            }' . "\r\n" . '            if (rConfirm) {' . "\r\n" . '                $.getJSON("./api?action=watch_output&sub=" + rType + "&result_id=" + rID, function(data) {' . "\r\n" . '                    if (data.result == true) {' . "\r\n" . '                        if (rType == "delete") {' . "\r\n" . '                            $.toast("Record successfully deleted.");' . "\r\n" . '                        }' . "\r\n" . '                        $("#datatable-md1").DataTable().ajax.reload( null, false );' . "\r\n" . '                    } else {' . "\r\n" . '                        $.toast("An error occured while processing your request.");' . "\r\n" . '                    }' . "\r\n" . '                }).fail(function() {' . "\r\n" . '                    $.toast("An error occured while processing your request.");' . "\r\n" . '                });' . "\r\n" . '            }' . "\r\n\t\t" . '}' . "\r\n\t\t" . 'function getServer() {' . "\r\n\t\t\t" . 'return $("#result_server").val();' . "\r\n\t\t" . '}' . "\r\n\t\t" . 'function getType() {' . "\r\n\t\t\t" . 'return $("#result_type").val();' . "\r\n\t\t" . '}' . "\r\n\t\t" . 'function getStatus() {' . "\r\n\t\t\t" . 'return $("#result_status").val();' . "\r\n\t\t" . '}' . "\r\n\t\t" . 'function clearFilters() {' . "\r\n\t\t\t" . 'window.rClearing = true;' . "\r\n\t\t\t" . "\$(\"#result_search\").val(\"\").trigger('change');" . "\r\n\t\t\t" . "\$('#result_server').val(\"\").trigger('change');" . "\r\n\t\t\t" . "\$('#result_type').val(\"\").trigger('change');" . "\r\n\t\t\t" . "\$('#result_status').val(\"\").trigger('change');" . "\r\n\t\t\t" . "\$('#result_show_entries').val(\"";
-		echo (intval($rSettings['default_entries']) ?: 10);
-		echo "\").trigger('change');" . "\r\n\t\t\t" . 'window.rClearing = false;' . "\r\n\t\t\t" . "\$('#datatable-md1').DataTable().search(\$(\"#result_search\").val());" . "\r\n\t\t\t" . "\$('#datatable-md1').DataTable().page.len(\$('#result_show_entries').val());" . "\r\n\t\t\t" . "\$(\"#datatable-md1\").DataTable().page(0).draw('page');" . "\r\n\t\t\t" . '$("#datatable-md1").DataTable().ajax.reload( null, false );' . "\r\n\t\t" . '}' . "\r\n\t\t" . '$(document).ready(function() {' . "\r\n\t\t\t" . "\$('select').select2({width: '100%'});" . "\r\n\t\t\t" . '$("#datatable-md1").DataTable({' . "\r\n\t\t\t\t" . 'language: {' . "\r\n\t\t\t\t\t" . 'paginate: {' . "\r\n\t\t\t\t\t\t" . "previous: \"<i class='mdi mdi-chevron-left'>\"," . "\r\n\t\t\t\t\t\t" . "next: \"<i class='mdi mdi-chevron-right'>\"" . "\r\n\t\t\t\t\t" . '}' . "\r\n\t\t\t\t" . '},' . "\r\n\t\t\t\t" . 'drawCallback: function() {' . "\r\n\t\t\t\t\t" . 'bindHref(); refreshTooltips();' . "\r\n\t\t\t\t" . '},' . "\r\n\t\t\t\t" . 'responsive: false,' . "\r\n\t\t\t\t" . 'processing: true,' . "\r\n\t\t\t\t" . 'serverSide: true,' . "\r\n\t\t\t\t" . 'ajax: {' . "\r\n\t\t\t\t\t" . 'url: "./table",' . "\r\n\t\t\t\t\t" . '"data": function(d) {' . "\r\n\t\t\t\t\t\t" . 'd.id = "watch_output";' . "\r\n\t\t\t\t\t\t" . 'd.server = getServer();' . "\r\n\t\t\t\t\t\t" . 'd.type = getType();' . "\r\n\t\t\t\t\t\t" . 'd.status = getStatus();' . "\r\n\t\t\t\t\t" . '}' . "\r\n\t\t\t\t" . '},' . "\r\n\t\t\t\t" . 'columnDefs: [' . "\r\n\t\t\t\t\t" . '{"className": "dt-center", "targets": [0,4,5,6]},' . "\r\n\t\t\t\t\t" . '{"orderable": false, "targets": [6]}' . "\r\n\t\t\t\t" . '],' . "\r\n\t\t\t\t" . 'order: [[ 5, "desc" ]],' . "\r\n\t\t\t\t" . 'pageLength: ';
-		echo (intval($rSettings['default_entries']) ?: 10);
-		echo "\t\t\t" . '});' . "\r\n\t\t\t" . '$("#datatable-md1").css("width", "100%");' . "\r\n\t\t\t" . "\$('#result_search').keyup(function(){" . "\r\n\t\t\t\t" . 'if (!window.rClearing) {' . "\r\n\t\t\t\t\t" . "\$('#datatable-md1').DataTable().search(\$(this).val()).draw();" . "\r\n\t\t\t\t" . '}' . "\r\n\t\t\t" . '})' . "\r\n\t\t\t" . "\$('#result_show_entries').change(function(){" . "\r\n\t\t\t\t" . 'if (!window.rClearing) {' . "\r\n\t\t\t\t\t" . "\$('#datatable-md1').DataTable().page.len(\$(this).val()).draw();" . "\r\n\t\t\t\t" . '}' . "\r\n\t\t\t" . '})' . "\r\n\t\t\t" . "\$('#result_server').change(function(){" . "\r\n\t\t\t\t" . 'if (!window.rClearing) {' . "\r\n\t\t\t\t\t" . '$("#datatable-md1").DataTable().ajax.reload( null, false );' . "\r\n\t\t\t\t" . '}' . "\r\n\t\t\t" . '})' . "\r\n\t\t\t" . "\$('#result_type').change(function(){" . "\r\n\t\t\t\t" . 'if (!window.rClearing) {' . "\r\n\t\t\t\t\t" . '$("#datatable-md1").DataTable().ajax.reload( null, false );' . "\r\n\t\t\t\t" . '}' . "\r\n\t\t\t" . '})' . "\r\n\t\t\t" . "\$('#result_status').change(function(){" . "\r\n\t\t\t\t" . 'if (!window.rClearing) {' . "\r\n\t\t\t\t\t" . '$("#datatable-md1").DataTable().ajax.reload( null, false );' . "\r\n\t\t\t\t" . '}' . "\r\n\t\t\t" . '})' . "\r\n\t\t\t" . "\$('#datatable-md1').DataTable().search(\$(this).val()).draw();" . "\r\n\t\t\t" . "\$('#range_clear_to').daterangepicker({" . "\r\n\t\t\t\t" . 'singleDatePicker: true,' . "\r\n\t\t\t\t" . 'showDropdowns: true,' . "\r\n\t\t\t\t" . 'locale: {' . "\r\n\t\t\t\t\t" . "format: 'YYYY-MM-DD'" . "\r\n\t\t\t\t" . '},' . "\r\n\t\t\t\t" . 'autoUpdateInput: false' . "\r\n\t\t\t" . '}).val("");' . "\r\n\t\t\t" . "\$('#range_clear_from').daterangepicker({" . "\r\n\t\t\t\t" . 'singleDatePicker: true,' . "\r\n\t\t\t\t" . 'showDropdowns: true,' . "\r\n\t\t\t\t" . 'locale: {' . "\r\n\t\t\t\t\t" . "format: 'YYYY-MM-DD'" . "\r\n\t\t\t\t" . '},' . "\r\n\t\t\t\t" . 'autoUpdateInput: false' . "\r\n\t\t\t" . '}).val("");' . "\r\n\t\t\t" . "\$('#range_clear_from').on('apply.daterangepicker', function(ev, picker) {" . "\r\n\t\t\t\t" . "\$(this).val(picker.startDate.format('YYYY-MM-DD'));" . "\r\n\t\t\t" . '});' . "\r\n\t\t\t" . "\$('#range_clear_from').on('cancel.daterangepicker', function(ev, picker) {" . "\r\n\t\t\t\t" . "\$(this).val('');" . "\r\n\t\t\t" . '});' . "\r\n\t\t\t" . "\$('#range_clear_to').on('apply.daterangepicker', function(ev, picker) {" . "\r\n\t\t\t\t" . "\$(this).val(picker.startDate.format('YYYY-MM-DD'));" . "\r\n\t\t\t" . '});' . "\r\n\t\t\t" . "\$('#range_clear_to').on('cancel.daterangepicker', function(ev, picker) {" . "\r\n\t\t\t\t" . "\$(this).val('');" . "\r\n\t\t\t" . '});' . "\r\n\t\t\t" . '$("#btn-clear-logs").click(function() {' . "\r\n\t\t\t\t" . '$(".bs-logs-modal-center").modal("show");' . "\r\n\t\t\t" . '});' . "\r\n" . '            $("#clear_logs").click(function() {' . "\r\n" . '                new jBox("Confirm", {' . "\r\n" . '                    confirmButton: "Delete",' . "\r\n" . '                    cancelButton: "Cancel",' . "\r\n" . '                    content: "';
-		echo $language::get('clear_confirm');
-		echo '",' . "\r\n" . '                    confirm: function () {' . "\r\n" . '                        $(".bs-logs-modal-center").modal("hide");' . "\r\n" . '                        $.getJSON("./api?action=clear_logs&type=watch_logs&from=" + encodeURIComponent($("#range_clear_from").val()) + "&to=" + encodeURIComponent($("#range_clear_to").val()), function(data) {' . "\r\n" . '                            $.toast("Logs have been cleared.");' . "\r\n" . '                            $("#datatable-activity").DataTable().ajax.reload( null, false );' . "\r\n" . '                        });' . "\r\n" . '                    }' . "\r\n" . '                }).open();' . "\r\n\t\t\t" . '});' . "\r\n" . '            $("#btn-export-csv").click(function() {' . "\r\n" . '                $.toast("Generating CSV report...");' . "\r\n" . '                window.location.href = "api?action=report&params=" + encodeURIComponent(JSON.stringify($("#datatable-md1").DataTable().ajax.params()));' . "\r\n\t\t\t" . '});' . "\r\n\t\t" . '});' . "\r\n" . '        ';
-		?>
-    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
-        $(document).ready(function() {
-            initSearch();
-        });
-    <?php endif; ?>
-</script>
-<script src="assets/js/listings.js"></script>
-</body>
-
-</html>
+include dirname(__DIR__) . '/modules/watch/views/watch_output.php';
+include 'footer.php';
+include dirname(__DIR__) . '/modules/watch/views/watch_output_scripts.php';
diff --git a/src/autoload.php b/src/autoload.php
index b0de6396..06243e5a 100644
--- a/src/autoload.php
+++ b/src/autoload.php
@@ -348,6 +348,69 @@ class XC_Autoloader {
             'FileLogger'            => $base . 'core/Logging/FileLogger.php',
             'DatabaseLogger'        => $base . 'core/Logging/DatabaseLogger.php',
             'RedisManager'          => $base . 'infrastructure/redis/RedisManager.php',
+            'StreamAuth'            => $base . 'streaming/Auth/StreamAuth.php',
+            'TokenAuth'             => $base . 'streaming/Auth/TokenAuth.php',
+            'DeviceLock'            => $base . 'streaming/Auth/DeviceLock.php',
+            'ConnectionLimiter'     => $base . 'streaming/Protection/ConnectionLimiter.php',
+            'StreamRedirector'      => $base . 'streaming/Delivery/StreamRedirector.php',
+            'OffAirHandler'         => $base . 'streaming/Delivery/OffAirHandler.php',
+            'HLSGenerator'          => $base . 'streaming/Delivery/HLSGenerator.php',
+            'SegmentReader'         => $base . 'streaming/Delivery/SegmentReader.php',
+            'SignalSender'          => $base . 'streaming/Delivery/SignalSender.php',
+            'ProxySelector'         => $base . 'streaming/Balancer/ProxySelector.php',
+            'FFprobeRunner'         => $base . 'streaming/Codec/FFprobeRunner.php',
+            'FFmpegCommand'         => $base . 'streaming/Codec/FFmpegCommand.php',
+            'SubtitleExtractor'     => $base . 'streaming/Codec/SubtitleExtractor.php',
+            'HealthChecker'         => $base . 'streaming/Health/HealthChecker.php',
+            'ProcessChecker'        => $base . 'streaming/Health/ProcessChecker.php',
+            'WatchdogMonitor'       => $base . 'streaming/Health/WatchdogMonitor.php',
+            'StreamingBootstrap'    => $base . 'streaming/StreamingBootstrap.php',
+
+            // ── Ядро: HTTP Router + Module System ─────────────────
+            'Router'                => $base . 'core/Http/Router.php',
+            'ModuleInterface'       => $base . 'core/Module/ModuleInterface.php',
+            'ModuleLoader'          => $base . 'core/Module/ModuleLoader.php',
+
+            // ── Ядро: Process (Thread/Multithread) ────────────────
+            'Thread'                => $base . 'core/Process/Thread.php',
+            'Multithread'           => $base . 'core/Process/Multithread.php',
+
+            // ── Модуль: Plex ──────────────────────────────────────
+            'PlexAuth'              => $base . 'modules/plex/PlexAuth.php',
+            'PlexRepository'        => $base . 'modules/plex/PlexRepository.php',
+            'PlexService'           => $base . 'modules/plex/PlexService.php',
+            'PlexCron'              => $base . 'modules/plex/PlexCron.php',
+            'PlexItem'              => $base . 'modules/plex/PlexItem.php',
+            'PlexController'        => $base . 'modules/plex/PlexController.php',
+            'PlexModule'            => $base . 'modules/plex/PlexModule.php',
+
+            // ── Модуль: Watch ─────────────────────────────────────
+            'WatchService'          => $base . 'modules/watch/WatchService.php',
+            'RecordingService'      => $base . 'modules/watch/RecordingService.php',
+            'WatchController'       => $base . 'modules/watch/WatchController.php',
+            'WatchCron'             => $base . 'modules/watch/WatchCron.php',
+            'WatchItem'             => $base . 'modules/watch/WatchItem.php',
+            'WatchModule'           => $base . 'modules/watch/WatchModule.php',
+
+            // ── Модуль: TMDB ──────────────────────────────────────
+            'TmdbModule'            => $base . 'modules/tmdb/TmdbModule.php',
+            'TmdbService'           => $base . 'modules/tmdb/TmdbService.php',
+            'TmdbCron'              => $base . 'modules/tmdb/TmdbCron.php',
+            'TmdbPopularCron'       => $base . 'modules/tmdb/TmdbPopularCron.php',
+
+            // ── Модуль: Ministra ──────────────────────────────────
+            'MinistraModule'        => $base . 'modules/ministra/MinistraModule.php',
+            'PortalHandler'         => $base . 'modules/ministra/PortalHandler.php',
+            'PortalHelpers'         => $base . 'modules/ministra/PortalHelpers.php',
+
+            // ── Модуль: Fingerprint ───────────────────────────────
+            'FingerprintModule'     => $base . 'modules/fingerprint/FingerprintModule.php',
+
+            // ── Модуль: Theft Detection ───────────────────────────
+            'TheftDetectionModule'  => $base . 'modules/theft-detection/TheftDetectionModule.php',
+
+            // ── Модуль: MAGSCAN ───────────────────────────────────
+            'MagscanModule'         => $base . 'modules/magscan/MagscanModule.php',
 
             // ── Ядро (legacy) ─────────────────────────────────────
             'Database'              => $base . 'core/Database/Database.php',
diff --git a/src/config/modules.php b/src/config/modules.php
new file mode 100644
index 00000000..4c5d4d47
--- /dev/null
+++ b/src/config/modules.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * XC_VM — Конфигурация модулей
+ *
+ * Определяет, какие модули включены в системе.
+ * ModuleLoader читает этот файл и загружает модули при bootstrap.
+ *
+ * Формат:
+ *   'module_name' => [
+ *       'enabled' => true|false,    // Включён ли модуль
+ *       'class'   => 'ClassName',   // Класс модуля (implements ModuleInterface)
+ *   ]
+ *
+ * При удалении модуля из этого списка (или enabled => false),
+ * система продолжает работать без него.
+ *
+ * @see ModuleInterface
+ * @see ModuleLoader
+ */
+
+return [
+    'plex' => [
+        'enabled' => true,
+        'class'   => 'PlexModule',
+    ],
+    'watch' => [
+        'enabled' => true,
+        'class'   => 'WatchModule',
+    ],
+    'tmdb' => [
+        'enabled' => true,
+        'class'   => 'TmdbModule',
+    ],
+    'ministra' => [
+        'enabled' => true,
+        'class'   => 'MinistraModule',
+    ],
+    'fingerprint' => [
+        'enabled' => true,
+        'class'   => 'FingerprintModule',
+    ],
+    'theft-detection' => [
+        'enabled' => true,
+        'class'   => 'TheftDetectionModule',
+    ],
+    'magscan' => [
+        'enabled' => true,
+        'class'   => 'MagscanModule',
+    ],
+];
diff --git a/src/core/Http/Router.php b/src/core/Http/Router.php
new file mode 100644
index 00000000..1022bb7a
--- /dev/null
+++ b/src/core/Http/Router.php
@@ -0,0 +1,449 @@
+<?php
+
+/**
+ * XC_VM — HTTP Router
+ *
+ * Маршрутизатор запросов. Заменяет паттерн switch($rAction) в admin/api.php
+ * и прямые include в admin-страницах. Поддерживает модульные маршруты.
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Использование:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   $router = new Router();
+ *
+ *   // Регистрация маршрутов напрямую
+ *   $router->get('watch', [WatchController::class, 'index']);
+ *   $router->get('watch/add', [WatchController::class, 'add']);
+ *   $router->post('watch/save', [WatchController::class, 'save']);
+ *
+ *   // Группировка с префиксом
+ *   $router->group('plex', function(Router $r) {
+ *       $r->get('', [PlexController::class, 'index']);
+ *       $r->get('add', [PlexController::class, 'add']);
+ *       $r->post('save', [PlexController::class, 'save']);
+ *   });
+ *
+ *   // API-маршруты (JSON)
+ *   $router->api('watch/enable', [WatchController::class, 'apiEnable']);
+ *   $router->api('watch/disable', [WatchController::class, 'apiDisable']);
+ *
+ *   // Dispatch (определяет маршрут по URL и вызывает handler)
+ *   $router->dispatch($page, $method);
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Модульная регистрация:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   // В модуле (реализация ModuleInterface::registerRoutes):
+ *   class WatchModule implements ModuleInterface {
+ *       public function registerRoutes(Router $router): void {
+ *           $router->group('watch', function(Router $r) {
+ *               $r->get('', [WatchController::class, 'index']);
+ *               $r->get('add', [WatchController::class, 'add']);
+ *               $r->post('settings', [WatchController::class, 'saveSettings']);
+ *               $r->api('enable', [WatchController::class, 'apiEnable']);
+ *           });
+ *       }
+ *   }
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Обратная совместимость:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   Пока admin/api.php использует switch($rAction), модули могут
+ *   регистрировать API-маршруты через Router, а legacy-код вызывает
+ *   $router->dispatchApi($action) как fallback в конце switch-цепочки.
+ *
+ * @see core/Http/Request.php
+ * @see core/Http/Response.php
+ * @see ModuleInterface::registerRoutes()
+ */
+
+class Router {
+
+    /**
+     * Зарегистрированные маршруты для страниц (GET)
+     * Формат: ['route/path' => ['handler' => callable, 'middleware' => [...], 'permission' => [...]]]
+     * @var array
+     */
+    protected $getRoutes = [];
+
+    /**
+     * Зарегистрированные маршруты для POST
+     * @var array
+     */
+    protected $postRoutes = [];
+
+    /**
+     * API-маршруты (JSON ответ)
+     * Формат: ['action_name' => ['handler' => callable, 'permission' => [...]]]
+     * @var array
+     */
+    protected $apiRoutes = [];
+
+    /**
+     * Текущий префикс группы
+     * @var string
+     */
+    protected $groupPrefix = '';
+
+    /**
+     * Текущий набор middleware для группы
+     * @var array
+     */
+    protected $groupMiddleware = [];
+
+    /**
+     * Текущий набор permissions для группы
+     * @var array
+     */
+    protected $groupPermission = [];
+
+    /**
+     * Singleton instance
+     * @var Router|null
+     */
+    protected static $instance = null;
+
+    /**
+     * Получить singleton
+     *
+     * @return Router
+     */
+    public static function getInstance() {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+        return self::$instance;
+    }
+
+    /**
+     * Сбросить (для тестов)
+     */
+    public static function resetInstance() {
+        self::$instance = null;
+    }
+
+    // ───────────────────────────────────────────────────────────
+    //  Регистрация маршрутов
+    // ───────────────────────────────────────────────────────────
+
+    /**
+     * Зарегистрировать GET-маршрут (страница)
+     *
+     * @param string $route Путь маршрута (напр. 'watch', 'watch/add')
+     * @param callable|array $handler Обработчик: [ClassName, 'method'] или callable
+     * @param array $options Доп. опции: 'permission' => ['type', 'key'], 'middleware' => [...]
+     * @return $this
+     */
+    public function get($route, $handler, array $options = []) {
+        $fullRoute = $this->buildRoute($route);
+        $this->getRoutes[$fullRoute] = $this->buildRouteEntry($handler, $options);
+        return $this;
+    }
+
+    /**
+     * Зарегистрировать POST-маршрут (обработка формы)
+     *
+     * @param string $route Путь маршрута
+     * @param callable|array $handler Обработчик
+     * @param array $options Доп. опции
+     * @return $this
+     */
+    public function post($route, $handler, array $options = []) {
+        $fullRoute = $this->buildRoute($route);
+        $this->postRoutes[$fullRoute] = $this->buildRouteEntry($handler, $options);
+        return $this;
+    }
+
+    /**
+     * Зарегистрировать маршрут для GET и POST одновременно
+     *
+     * @param string $route Путь маршрута
+     * @param callable|array $handler Обработчик
+     * @param array $options Доп. опции
+     * @return $this
+     */
+    public function any($route, $handler, array $options = []) {
+        $this->get($route, $handler, $options);
+        $this->post($route, $handler, $options);
+        return $this;
+    }
+
+    /**
+     * Зарегистрировать API-маршрут (JSON-ответ через action=...)
+     *
+     * API-маршруты обрабатываются через admin/api.php по action-имени.
+     * При вызове $router->dispatchApi('watch_enable') Router ищет
+     * зарегистрированный маршрут и вызывает его handler.
+     *
+     * @param string $action Имя действия (напр. 'enable_watch', 'disable_plex')
+     * @param callable|array $handler Обработчик
+     * @param array $options Доп. опции: 'permission' => ['type', 'key']
+     * @return $this
+     */
+    public function api($action, $handler, array $options = []) {
+        $fullAction = $this->groupPrefix ? $this->groupPrefix . '_' . $action : $action;
+        $this->apiRoutes[$fullAction] = $this->buildRouteEntry($handler, $options);
+        return $this;
+    }
+
+    /**
+     * Группировка маршрутов с общим префиксом, middleware и permissions
+     *
+     * @param string $prefix Префикс (напр. 'watch', 'plex')
+     * @param callable $callback function(Router $router) — регистрирует маршруты внутри группы
+     * @param array $options Опции группы: 'middleware' => [...], 'permission' => [...]
+     * @return $this
+     */
+    public function group($prefix, callable $callback, array $options = []) {
+        // Сохраняем текущий контекст
+        $prevPrefix     = $this->groupPrefix;
+        $prevMiddleware = $this->groupMiddleware;
+        $prevPermission = $this->groupPermission;
+
+        // Устанавливаем новый контекст
+        $this->groupPrefix     = $prevPrefix ? $prevPrefix . '/' . $prefix : $prefix;
+        $this->groupMiddleware = array_merge($prevMiddleware, $options['middleware'] ?? []);
+        $this->groupPermission = $options['permission'] ?? $prevPermission;
+
+        // Вызываем callback, который регистрирует маршруты
+        $callback($this);
+
+        // Восстанавливаем контекст
+        $this->groupPrefix     = $prevPrefix;
+        $this->groupMiddleware = $prevMiddleware;
+        $this->groupPermission = $prevPermission;
+
+        return $this;
+    }
+
+    // ───────────────────────────────────────────────────────────
+    //  Dispatch
+    // ───────────────────────────────────────────────────────────
+
+    /**
+     * Определить маршрут для страницы и вызвать обработчик
+     *
+     * @param string $page Имя страницы из URL (напр. 'watch', 'plex_add' → 'plex/add')
+     * @param string $method HTTP-метод ('GET' или 'POST')
+     * @return bool true если маршрут найден и выполнен, false — не найден
+     */
+    public function dispatch($page, $method = 'GET') {
+        // Нормализация: 'plex_add' → 'plex/add', 'watch' → 'watch'
+        $route = $this->normalizePage($page);
+
+        // Выбираем набор маршрутов в зависимости от метода
+        $routes = ($method === 'POST') ? $this->postRoutes : $this->getRoutes;
+
+        // Fallback: если POST-маршрут не найден, ищем в GET
+        if ($method === 'POST' && !isset($routes[$route]) && isset($this->getRoutes[$route])) {
+            $routes = $this->getRoutes;
+        }
+
+        if (!isset($routes[$route])) {
+            return false;
+        }
+
+        $entry = $routes[$route];
+
+        // Проверка прав
+        if (!$this->checkPermission($entry)) {
+            $this->denyAccess();
+            return true;
+        }
+
+        // Выполнение middleware
+        foreach ($entry['middleware'] as $mw) {
+            if (is_callable($mw)) {
+                $result = call_user_func($mw);
+                if ($result === false) {
+                    return true; // middleware остановил выполнение
+                }
+            }
+        }
+
+        // Вызов обработчика
+        $this->callHandler($entry['handler']);
+        return true;
+    }
+
+    /**
+     * Определить API-маршрут и вызвать обработчик
+     *
+     * Используется в admin/api.php как fallback для модульных действий.
+     * Пример: если action='enable_watch' зарегистрирован модулем,
+     * Router вызовет [WatchController::class, 'apiEnable'].
+     *
+     * @param string $action Имя действия (из $_GET['action'])
+     * @return bool true если маршрут найден и выполнен, false — не найден
+     */
+    public function dispatchApi($action) {
+        if (!isset($this->apiRoutes[$action])) {
+            return false;
+        }
+
+        $entry = $this->apiRoutes[$action];
+
+        // Проверка прав
+        if (!$this->checkPermission($entry)) {
+            echo json_encode(['result' => false]);
+            exit();
+        }
+
+        // Вызов обработчика
+        $this->callHandler($entry['handler']);
+        return true;
+    }
+
+    /**
+     * Проверить, зарегистрирован ли маршрут страницы
+     *
+     * @param string $page Имя страницы
+     * @return bool
+     */
+    public function hasRoute($page) {
+        $route = $this->normalizePage($page);
+        return isset($this->getRoutes[$route]) || isset($this->postRoutes[$route]);
+    }
+
+    /**
+     * Проверить, зарегистрирован ли API-маршрут
+     *
+     * @param string $action Имя действия
+     * @return bool
+     */
+    public function hasApiRoute($action) {
+        return isset($this->apiRoutes[$action]);
+    }
+
+    /**
+     * Получить все зарегистрированные маршруты (для отладки)
+     *
+     * @return array ['get' => [...], 'post' => [...], 'api' => [...]]
+     */
+    public function getRoutes() {
+        return [
+            'get'  => array_keys($this->getRoutes),
+            'post' => array_keys($this->postRoutes),
+            'api'  => array_keys($this->apiRoutes),
+        ];
+    }
+
+    // ───────────────────────────────────────────────────────────
+    //  Internal Helpers
+    // ───────────────────────────────────────────────────────────
+
+    /**
+     * Построить полный путь с учётом groupPrefix
+     *
+     * @param string $route
+     * @return string
+     */
+    protected function buildRoute($route) {
+        if ($this->groupPrefix && $route !== '') {
+            return $this->groupPrefix . '/' . $route;
+        }
+        return $this->groupPrefix ?: $route;
+    }
+
+    /**
+     * Сформировать запись маршрута
+     *
+     * @param callable|array $handler
+     * @param array $options
+     * @return array
+     */
+    protected function buildRouteEntry($handler, array $options) {
+        return [
+            'handler'    => $handler,
+            'middleware'  => array_merge($this->groupMiddleware, $options['middleware'] ?? []),
+            'permission' => $options['permission'] ?? $this->groupPermission,
+        ];
+    }
+
+    /**
+     * Нормализовать имя страницы в маршрут
+     *
+     * Конвертирует legacy-имена (admin-style) в формат маршрута:
+     *   'watch'          → 'watch'
+     *   'watch_add'      → 'watch/add'
+     *   'settings_watch' → 'settings/watch'
+     *   'plex_add'       → 'plex/add'
+     *   'settings_plex'  → 'settings/plex'
+     *
+     * @param string $page
+     * @return string
+     */
+    protected function normalizePage($page) {
+        // Убираем расширение .php если есть
+        $page = preg_replace('/\.php$/', '', $page);
+        // Конвертируем _ в /
+        return str_replace('_', '/', $page);
+    }
+
+    /**
+     * Проверить разрешения для маршрута
+     *
+     * @param array $entry Запись маршрута
+     * @return bool
+     */
+    protected function checkPermission(array $entry) {
+        if (empty($entry['permission'])) {
+            return true;
+        }
+
+        $perm = $entry['permission'];
+
+        // Поддержка формата ['type', 'key'] для hasPermissions()
+        if (is_array($perm) && count($perm) === 2 && is_string($perm[0])) {
+            if (function_exists('hasPermissions')) {
+                return hasPermissions($perm[0], $perm[1]);
+            }
+            return true; // fallback если функция недоступна
+        }
+
+        // Произвольный callable
+        if (is_callable($perm)) {
+            return call_user_func($perm);
+        }
+
+        return true;
+    }
+
+    /**
+     * Вызвать обработчик маршрута
+     *
+     * Поддерживает:
+     *   - [ClassName::class, 'method'] → new ClassName()->method()
+     *   - callable (closure)
+     *   - [object, 'method']
+     *
+     * @param callable|array $handler
+     */
+    protected function callHandler($handler) {
+        if (is_array($handler) && count($handler) === 2 && is_string($handler[0])) {
+            // [ClassName, 'method'] → инстанцируем и вызываем
+            $class  = $handler[0];
+            $method = $handler[1];
+            $obj    = new $class();
+            $obj->$method();
+        } elseif (is_callable($handler)) {
+            call_user_func($handler);
+        }
+    }
+
+    /**
+     * Отправить ответ "доступ запрещён"
+     */
+    protected function denyAccess() {
+        if (function_exists('goHome')) {
+            goHome();
+        } else {
+            http_response_code(403);
+            echo 'Access denied';
+            exit();
+        }
+    }
+}
diff --git a/src/core/Module/ModuleInterface.php b/src/core/Module/ModuleInterface.php
new file mode 100644
index 00000000..f74de1be
--- /dev/null
+++ b/src/core/Module/ModuleInterface.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * XC_VM — Контракт модуля
+ *
+ * Каждый модуль в modules/ ДОЛЖЕН реализовать этот интерфейс.
+ * Модуль — это изолированная директория с известным контрактом.
+ * Его можно удалить, и система продолжит работать.
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Жизненный цикл:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   1. ModuleLoader сканирует config/modules.php
+ *   2. Для каждого модуля: require module.json → проверка зависимостей
+ *   3. boot(ServiceContainer) — регистрация сервисов
+ *   4. registerRoutes(Router) — регистрация маршрутов и API-действий
+ *   5. registerCrons() — возвращает массив крон-задач
+ *   6. getEventSubscribers() — подписки на события ядра
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Пример:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   class WatchModule implements ModuleInterface {
+ *       public function getName(): string { return 'watch'; }
+ *       public function getVersion(): string { return '1.0.0'; }
+ *
+ *       public function boot(ServiceContainer $container): void {
+ *           $container->set('watch.service', function($c) {
+ *               return new WatchService($c->get('db'));
+ *           });
+ *       }
+ *
+ *       public function registerRoutes(Router $router): void {
+ *           $router->group('watch', function(Router $r) {
+ *               $r->get('', [WatchController::class, 'index']);
+ *               $r->get('add', [WatchController::class, 'add']);
+ *           });
+ *       }
+ *
+ *       public function registerCrons(): array { return []; }
+ *       public function getEventSubscribers(): array { return []; }
+ *   }
+ *
+ * @see Router::group()
+ * @see ServiceContainer::set()
+ */
+
+interface ModuleInterface {
+
+    /**
+     * Уникальное имя модуля (совпадает с именем директории)
+     *
+     * @return string Напр. 'watch', 'plex', 'ministra'
+     */
+    public function getName(): string;
+
+    /**
+     * Версия модуля (semver)
+     *
+     * @return string Напр. '1.0.0'
+     */
+    public function getVersion(): string;
+
+    /**
+     * Инициализация модуля: регистрация сервисов в DI-контейнере
+     *
+     * Вызывается один раз при загрузке модуля.
+     * Модуль может регистрировать свои сервисы, фабрики и значения.
+     *
+     * @param ServiceContainer $container DI-контейнер
+     */
+    public function boot(ServiceContainer $container): void;
+
+    /**
+     * Регистрация маршрутов модуля
+     *
+     * Вызывается после boot(). Модуль регистрирует:
+     * - GET/POST маршруты для страниц
+     * - API-маршруты для AJAX-действий
+     *
+     * @param Router $router HTTP-роутер
+     */
+    public function registerRoutes(Router $router): void;
+
+    /**
+     * Получить список крон-задач модуля
+     *
+     * Возвращает массив крон-конфигураций:
+     *   [
+     *       ['class' => WatchCron::class, 'method' => 'run', 'interval' => 60],
+     *   ]
+     *
+     * @return array Массив крон-задач
+     */
+    public function registerCrons(): array;
+
+    /**
+     * Получить массив подписок на события ядра
+     *
+     * Формат:
+     *   [
+     *       EventClass::class => [HandlerClass::class, 'onEvent'],
+     *   ]
+     *
+     * @return array Подписки: EventClass => handler
+     */
+    public function getEventSubscribers(): array;
+}
diff --git a/src/core/Module/ModuleLoader.php b/src/core/Module/ModuleLoader.php
new file mode 100644
index 00000000..44be75df
--- /dev/null
+++ b/src/core/Module/ModuleLoader.php
@@ -0,0 +1,242 @@
+<?php
+
+/**
+ * XC_VM — Загрузчик модулей
+ *
+ * Сканирует config/modules.php, проверяет зависимости,
+ * инициализирует модули и регистрирует их маршруты/кроны/события.
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Использование:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   // В bootstrap.php:
+ *   $loader = new ModuleLoader($container, $router);
+ *   $loader->loadAll();
+ *
+ *   // Или загрузить конкретный модуль:
+ *   $loader->load('watch');
+ *
+ *   // Проверить загруженность:
+ *   $loader->isLoaded('plex'); // true/false
+ *
+ *   // Получить загруженный модуль:
+ *   $module = $loader->getModule('watch');
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * config/modules.php:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   return [
+ *       'plex'  => ['enabled' => true,  'class' => 'PlexModule'],
+ *       'watch' => ['enabled' => true,  'class' => 'WatchModule'],
+ *       'tmdb'  => ['enabled' => false, 'class' => 'TmdbModule'],
+ *   ];
+ *
+ * @see ModuleInterface
+ * @see Router
+ * @see ServiceContainer
+ */
+
+class ModuleLoader {
+
+    /** @var ServiceContainer */
+    protected $container;
+
+    /** @var Router */
+    protected $router;
+
+    /** @var ModuleInterface[] Загруженные модули: name => instance */
+    protected $modules = [];
+
+    /** @var array Конфигурация модулей (из modules.php) */
+    protected $config = [];
+
+    /**
+     * @param ServiceContainer $container DI-контейнер
+     * @param Router $router HTTP-роутер
+     */
+    public function __construct(ServiceContainer $container, Router $router) {
+        $this->container = $container;
+        $this->router    = $router;
+    }
+
+    /**
+     * Загрузить все включённые модули из config/modules.php
+     *
+     * @param string|null $configPath Путь к modules.php. По умолчанию — CONFIG_PATH . 'modules.php'
+     * @return $this
+     */
+    public function loadAll($configPath = null) {
+        if ($configPath === null) {
+            $configPath = defined('CONFIG_PATH') ? CONFIG_PATH . 'modules.php' : __DIR__ . '/../../config/modules.php';
+        }
+
+        if (file_exists($configPath)) {
+            $this->config = require $configPath;
+        }
+
+        if (!is_array($this->config)) {
+            $this->config = [];
+        }
+
+        foreach ($this->config as $name => $settings) {
+            if (!empty($settings['enabled'])) {
+                $this->load($name, $settings);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Загрузить один модуль по имени
+     *
+     * @param string $name Имя модуля
+     * @param array|null $settings Настройки модуля (из config). Если null — читает из загруженного config
+     * @return bool true если модуль загружен, false если ошибка
+     */
+    public function load($name, array $settings = null) {
+        // Уже загружен
+        if (isset($this->modules[$name])) {
+            return true;
+        }
+
+        if ($settings === null) {
+            $settings = $this->config[$name] ?? [];
+        }
+
+        // Определяем класс модуля
+        $class = $settings['class'] ?? null;
+        if (!$class) {
+            // Fallback: пробуем имя модуля с заглавной + 'Module'
+            $class = ucfirst($name) . 'Module';
+        }
+
+        // Проверяем существование класса
+        if (!class_exists($class)) {
+            // Попытка загрузить по пути модуля
+            $modulePath = $this->getModulePath($name);
+            $moduleFile = $modulePath . '/' . $class . '.php';
+            if (file_exists($moduleFile)) {
+                require_once $moduleFile;
+            }
+
+            if (!class_exists($class)) {
+                error_log("ModuleLoader: class '{$class}' not found for module '{$name}'");
+                return false;
+            }
+        }
+
+        // Проверяем контракт
+        $module = new $class();
+        if (!($module instanceof ModuleInterface)) {
+            error_log("ModuleLoader: class '{$class}' does not implement ModuleInterface");
+            return false;
+        }
+
+        // Проверяем зависимости (module.json)
+        if (!$this->checkDependencies($name)) {
+            error_log("ModuleLoader: dependencies not met for module '{$name}'");
+            return false;
+        }
+
+        // 1. Boot — регистрация сервисов
+        $module->boot($this->container);
+
+        // 2. Маршруты
+        $module->registerRoutes($this->router);
+
+        // 3. Кроны — сохраняем в контейнере для CronRunner
+        $crons = $module->registerCrons();
+        if (!empty($crons)) {
+            $existing = $this->container->has('module.crons') ? $this->container->get('module.crons') : [];
+            $existing[$name] = $crons;
+            $this->container->set('module.crons', $existing);
+        }
+
+        // 4. События
+        $subscribers = $module->getEventSubscribers();
+        if (!empty($subscribers) && $this->container->has('events')) {
+            $dispatcher = $this->container->get('events');
+            foreach ($subscribers as $event => $handler) {
+                $dispatcher->listen($event, $handler);
+            }
+        }
+
+        // Сохраняем модуль
+        $this->modules[$name] = $module;
+
+        return true;
+    }
+
+    /**
+     * Проверить, загружен ли модуль
+     *
+     * @param string $name Имя модуля
+     * @return bool
+     */
+    public function isLoaded($name) {
+        return isset($this->modules[$name]);
+    }
+
+    /**
+     * Получить экземпляр загруженного модуля
+     *
+     * @param string $name Имя модуля
+     * @return ModuleInterface|null
+     */
+    public function getModule($name) {
+        return $this->modules[$name] ?? null;
+    }
+
+    /**
+     * Получить все загруженные модули
+     *
+     * @return ModuleInterface[]
+     */
+    public function getModules() {
+        return $this->modules;
+    }
+
+    /**
+     * Получить путь к директории модуля
+     *
+     * @param string $name Имя модуля
+     * @return string
+     */
+    public function getModulePath($name) {
+        $base = defined('MAIN_HOME') ? MAIN_HOME : dirname(__DIR__, 2) . '/';
+        return $base . 'modules/' . $name;
+    }
+
+    /**
+     * Проверить зависимости модуля (из module.json)
+     *
+     * @param string $name Имя модуля
+     * @return bool
+     */
+    protected function checkDependencies($name) {
+        $jsonPath = $this->getModulePath($name) . '/module.json';
+        if (!file_exists($jsonPath)) {
+            return true; // нет module.json — нет зависимостей
+        }
+
+        $manifest = json_decode(file_get_contents($jsonPath), true);
+        if (!is_array($manifest)) {
+            return true;
+        }
+
+        $deps = $manifest['dependencies'] ?? [];
+        foreach ($deps as $dep) {
+            if (!$this->isLoaded($dep)) {
+                // Попробуем загрузить зависимость
+                if (!$this->load($dep)) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/src/core/Process/Multithread.php b/src/core/Process/Multithread.php
new file mode 100644
index 00000000..9481cae3
--- /dev/null
+++ b/src/core/Process/Multithread.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * XC_VM — Параллельное выполнение команд
+ *
+ * Запускает набор shell-команд в параллель через Thread.
+ * Поддерживает пул с ограничением одновременных процессов.
+ *
+ * Извлечён из crons/cache_engine.php, modules/plex/PlexCron.php,
+ * modules/watch/WatchCron.php (устранение дублирования — Фаза 5 аудит).
+ *
+ * Использование:
+ *   $mt = new Multithread(['cmd1', 'cmd2', 'cmd3'], $poolSize);
+ *   $output = $mt->run();
+ *
+ * @see Thread
+ */
+
+class Multithread {
+
+    /** @var array Вывод каждой команды */
+    public $output = array();
+
+    /** @var array Ошибки каждой команды */
+    public $error = array();
+
+    /** @var Thread[]|null Активные потоки */
+    public $thread = null;
+
+    /** @var array Команды в работе */
+    public $commands = array();
+
+    /** @var bool Используется ли пул */
+    public $hasPool = false;
+
+    /** @var array Очередь команд для пула */
+    public $toExecuted = array();
+
+    /**
+     * @param array $commands Массив shell-команд
+     * @param int $sizePool Размер пула (0 = без ограничений)
+     */
+    public function __construct($commands, $sizePool = 0) {
+        $this->hasPool = 0 < $sizePool;
+        if (!$this->hasPool) {
+        } else {
+            $this->toExecuted = array_splice($commands, $sizePool);
+        }
+        $this->commands = $commands;
+        foreach ($this->commands as $key => $command) {
+            $this->thread[$key] = Thread::create($command);
+        }
+    }
+
+    /**
+     * Выполнить все команды и дождаться завершения
+     *
+     * @return array Массив выводов
+     */
+    public function run() {
+        while (0 < count($this->commands)) {
+            foreach ($this->commands as $key => $command) {
+                if (!isset($this->thread[$key])) {
+                    unset($this->commands[$key]);
+                    $this->launchNextInQueue();
+                    continue;
+                }
+                if (!isset($this->output[$key])) {
+                    $this->output[$key] = '';
+                }
+                if (!isset($this->error[$key])) {
+                    $this->error[$key] = '';
+                }
+                $this->output[$key] .= @$this->thread[$key]->listen();
+                $this->error[$key] .= @$this->thread[$key]->getError();
+                if ($this->thread[$key]->isActive()) {
+                    $this->output[$key] .= $this->thread[$key]->listen();
+                    if (!$this->thread[$key]->isBusy()) {
+                    } else {
+                        $this->thread[$key]->close();
+                        unset($this->commands[$key]);
+                        $this->launchNextInQueue();
+                    }
+                } else {
+                    $this->thread[$key]->close();
+                    unset($this->commands[$key]);
+                    $this->launchNextInQueue();
+                }
+            }
+        }
+        return $this->output;
+    }
+
+    /**
+     * Запустить следующую команду из очереди
+     *
+     * @return bool|void
+     */
+    public function launchNextInQueue() {
+        if (count($this->toExecuted) != 0) {
+            reset($this->toExecuted);
+            $keyToExecuted = key($this->toExecuted);
+            $this->commands[$keyToExecuted] = $this->toExecuted[$keyToExecuted];
+            $this->thread[$keyToExecuted] = Thread::create($this->toExecuted[$keyToExecuted]);
+            unset($this->toExecuted[$keyToExecuted]);
+        } else {
+            return true;
+        }
+    }
+}
diff --git a/src/core/Process/Thread.php b/src/core/Process/Thread.php
new file mode 100644
index 00000000..937f735a
--- /dev/null
+++ b/src/core/Process/Thread.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * XC_VM — Обёртка для процесса
+ *
+ * Управление дочерним процессом через proc_open().
+ * Используется совместно с Multithread для параллельного выполнения.
+ *
+ * Извлечён из crons/cache_engine.php, modules/plex/PlexCron.php,
+ * modules/watch/WatchCron.php (устранение дублирования — Фаза 5 аудит).
+ *
+ * @see Multithread
+ */
+
+class Thread {
+
+    /** @var resource|null proc_open handle */
+    public $process = null;
+
+    /** @var array Pipes (stdin, stdout, stderr) */
+    public $pipes = null;
+
+    /** @var string Внутренний буфер */
+    public $buffer = null;
+
+    /** @var string Накопленный stdout */
+    public $output = null;
+
+    /** @var string Накопленный stderr */
+    public $error = null;
+
+    /** @var int Таймаут в секундах (0 = без ограничений) */
+    public $timeout = null;
+
+    /** @var int Время запуска процесса */
+    public $start_time = null;
+
+    public function __construct() {
+        $this->process = 0;
+        $this->buffer = '';
+        $this->pipes = (array) null;
+        $this->output = '';
+        $this->error = '';
+        $this->start_time = time();
+        $this->timeout = 0;
+    }
+
+    /**
+     * Создать новый процесс из команды
+     *
+     * @param string $command Shell-команда
+     * @return Thread
+     */
+    public static function create($command) {
+        $t = new Thread();
+        $descriptor = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
+        $t->process = proc_open($command, $descriptor, $t->pipes);
+        stream_set_blocking($t->pipes[1], 0);
+        stream_set_blocking($t->pipes[2], 0);
+        return $t;
+    }
+
+    /**
+     * Проверить, активен ли процесс
+     *
+     * @return bool
+     */
+    public function isActive() {
+        $this->buffer .= $this->listen();
+        $f = stream_get_meta_data($this->pipes[1]);
+        return !$f['eof'];
+    }
+
+    /**
+     * Закрыть процесс
+     *
+     * @return int Exit code
+     */
+    public function close() {
+        $r = proc_close($this->process);
+        $this->process = null;
+        return $r;
+    }
+
+    /**
+     * Отправить данные в stdin процесса
+     *
+     * @param string $thought
+     */
+    public function tell($thought) {
+        fwrite($this->pipes[0], $thought);
+    }
+
+    /**
+     * Прочитать вывод из stdout
+     *
+     * @return string
+     */
+    public function listen() {
+        $buffer = $this->buffer;
+        $this->buffer = '';
+        while ($r = fgets($this->pipes[1], 1024)) {
+            $buffer .= $r;
+            $this->output .= $r;
+        }
+        return $buffer;
+    }
+
+    /**
+     * Получить статус процесса
+     *
+     * @return array
+     */
+    public function getStatus() {
+        return proc_get_status($this->process);
+    }
+
+    /**
+     * Проверить, превышен ли таймаут
+     *
+     * @return bool
+     */
+    public function isBusy() {
+        return 0 < $this->timeout && $this->start_time + $this->timeout < time();
+    }
+
+    /**
+     * Прочитать stderr
+     *
+     * @return string
+     */
+    public function getError() {
+        $buffer = '';
+        while ($r = fgets($this->pipes[2], 1024)) {
+            $buffer .= $r;
+        }
+        return $buffer;
+    }
+}
diff --git a/src/crons/cache_engine.php b/src/crons/cache_engine.php
index 4db9b8ff..55684943 100644
--- a/src/crons/cache_engine.php
+++ b/src/crons/cache_engine.php
@@ -38,130 +38,8 @@ if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
 } else {
     exit('Please run as XC_VM!' . "\n");
 }
-class Thread {
-    public $process = null;
-    public $pipes = null;
-    public $buffer = null;
-    public $output = null;
-    public $error = null;
-    public $timeout = null;
-    public $start_time = null;
-    public function __construct() {
-        $this->process = 0;
-        $this->buffer = '';
-        $this->pipes = (array) null;
-        $this->output = '';
-        $this->error = '';
-        $this->start_time = time();
-        $this->timeout = 0;
-    }
-    public static function create($command) {
-        $t = new Thread();
-        $descriptor = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
-        $t->process = proc_open($command, $descriptor, $t->pipes);
-        stream_set_blocking($t->pipes[1], 0);
-        stream_set_blocking($t->pipes[2], 0);
-        return $t;
-    }
-    public function isActive() {
-        $this->buffer .= $this->listen();
-        $f = stream_get_meta_data($this->pipes[1]);
-        return !$f['eof'];
-    }
-    public function close() {
-        $r = proc_close($this->process);
-        $this->process = null;
-        return $r;
-    }
-    public function tell($thought) {
-        fwrite($this->pipes[0], $thought);
-    }
-    public function listen() {
-        $buffer = $this->buffer;
-        $this->buffer = '';
-        while ($r = fgets($this->pipes[1], 1024)) {
-            $buffer .= $r;
-            $this->output .= $r;
-        }
-        return $buffer;
-    }
-    public function getStatus() {
-        return proc_get_status($this->process);
-    }
-    public function isBusy() {
-        return 0 < $this->timeout && $this->start_time + $this->timeout < time();
-    }
-    public function getError() {
-        $buffer = '';
-        while ($r = fgets($this->pipes[2], 1024)) {
-            $buffer .= $r;
-        }
-        return $buffer;
-    }
-}
-class Multithread {
-    public $output = array();
-    public $error = array();
-    public $thread = null;
-    public $commands = array();
-    public $hasPool = false;
-    public $toExecuted = array();
-    public function __construct($commands, $sizePool = 0) {
-        $this->hasPool = 0 < $sizePool;
-        if (!$this->hasPool) {
-        } else {
-            $this->toExecuted = array_splice($commands, $sizePool);
-        }
-        $this->commands = $commands;
-        foreach ($this->commands as $key => $command) {
-            $this->thread[$key] = Thread::create($command);
-        }
-    }
-    public function run() {
-        while (0 < count($this->commands)) {
-            foreach ($this->commands as $key => $command) {
-                if (!isset($this->thread[$key])) {
-                    unset($this->commands[$key]);
-                    self::launchNextInQueue();
-                    continue;
-                }
-                if (!isset($this->output[$key])) {
-                    $this->output[$key] = '';
-                }
-                if (!isset($this->error[$key])) {
-                    $this->error[$key] = '';
-                }
-                $this->output[$key] .= @$this->thread[$key]->listen();
-                $this->error[$key] .= @$this->thread[$key]->getError();
-                if ($this->thread[$key]->isActive()) {
-                    $this->output[$key] .= $this->thread[$key]->listen();
-                    if (!$this->thread[$key]->isBusy()) {
-                    } else {
-                        $this->thread[$key]->close();
-                        unset($this->commands[$key]);
-                        self::launchNextInQueue();
-                    }
-                } else {
-                    $this->thread[$key]->close();
-                    unset($this->commands[$key]);
-                    self::launchNextInQueue();
-                }
-            }
-        }
-        return $this->output;
-    }
-    public function launchNextInQueue() {
-        if (count($this->toExecuted) != 0) {
-            reset($this->toExecuted);
-            $keyToExecuted = key($this->toExecuted);
-            $this->commands[$keyToExecuted] = $this->toExecuted[$keyToExecuted];
-            $this->thread[$keyToExecuted] = Thread::create($this->toExecuted[$keyToExecuted]);
-            unset($this->toExecuted[$keyToExecuted]);
-        } else {
-            return true;
-        }
-    }
-}
+require_once __DIR__ . '/../core/Process/Thread.php';
+require_once __DIR__ . '/../core/Process/Multithread.php';
 function getChangedStreams() {
     global $db;
     $rReturn = array('changes' => array(), 'delete' => array());
diff --git a/src/crons/plex.php b/src/crons/plex.php
index 95f7af74..20a2880d 100644
--- a/src/crons/plex.php
+++ b/src/crons/plex.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Plex Sync Cron — точка входа.
+ *
+ * Логика извлечена в modules/plex/PlexCron.php (Фаза 5.1).
+ * Этот файл содержит только CLI-бутстрап и вызов модуля.
+ */
 ini_set('memory_limit', -1);
 setlocale(LC_ALL, 'en_US.UTF-8');
 putenv('LC_ALL=en_US.UTF-8');
@@ -24,12 +30,13 @@ if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
                 exit();
             }
         }
-        file_put_contents(CACHE_TMP_PATH . 'plex_pid', getmypid());
+        $rIdentifier = CACHE_TMP_PATH . 'plex_pid';
+        file_put_contents($rIdentifier, getmypid());
         cli_set_process_title('XC_VM[Plex Sync]');
         $rScanOffset = (intval(CoreUtilities::$rSettings['scan_seconds']) ?: 3600);
         set_time_limit(0);
         if (!empty(CoreUtilities::$rSettings['tmdb_api_key'])) {
-            loadCron();
+            PlexCron::run();
         } else {
             exit('No TMDb API key.');
         }
@@ -39,426 +46,6 @@ if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
 } else {
     exit('Please run as XC_VM!' . "\n");
 }
-class Thread {
-    public $process = null;
-    public $pipes = null;
-    public $buffer = null;
-    public $output = null;
-    public $error = null;
-    public $timeout = null;
-    public $start_time = null;
-    public function __construct() {
-        $this->process = 0;
-        $this->buffer = '';
-        $this->pipes = (array) null;
-        $this->output = '';
-        $this->error = '';
-        $this->start_time = time();
-        $this->timeout = 0;
-    }
-    public static function create($command) {
-        $t = new Thread();
-        $descriptor = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
-        $t->process = proc_open($command, $descriptor, $t->pipes);
-        stream_set_blocking($t->pipes[1], 0);
-        stream_set_blocking($t->pipes[2], 0);
-        return $t;
-    }
-    public function isActive() {
-        $this->buffer .= $this->listen();
-        $f = stream_get_meta_data($this->pipes[1]);
-        return !$f['eof'];
-    }
-    public function close() {
-        $r = proc_close($this->process);
-        $this->process = null;
-        return $r;
-    }
-    public function tell($thought) {
-        fwrite($this->pipes[0], $thought);
-    }
-    public function listen() {
-        $buffer = $this->buffer;
-        $this->buffer = '';
-        while ($r = fgets($this->pipes[1], 1024)) {
-            $buffer .= $r;
-            $this->output .= $r;
-        }
-        return $buffer;
-    }
-    public function getStatus() {
-        return proc_get_status($this->process);
-    }
-    public function isBusy() {
-        return 0 < $this->timeout && $this->start_time + $this->timeout < time();
-    }
-    public function getError() {
-        $buffer = '';
-        while ($r = fgets($this->pipes[2], 1024)) {
-            $buffer .= $r;
-        }
-        return $buffer;
-    }
-}
-class Multithread {
-    public $output = array();
-    public $error = array();
-    public $thread = null;
-    public $commands = array();
-    public $hasPool = false;
-    public $toExecuted = array();
-    public function __construct($commands, $sizePool = 0) {
-        $this->hasPool = 0 < $sizePool;
-        if (!$this->hasPool) {
-        } else {
-            $this->toExecuted = array_splice($commands, $sizePool);
-        }
-        $this->commands = $commands;
-        foreach ($this->commands as $key => $command) {
-            $this->thread[$key] = Thread::create($command);
-        }
-    }
-    public function run() {
-        while (0 < count($this->commands)) {
-            foreach ($this->commands as $key => $command) {
-                $this->output[$key] .= @$this->thread[$key]->listen();
-                $this->error[$key] .= @$this->thread[$key]->getError();
-                if ($this->thread[$key]->isActive()) {
-                    $this->output[$key] .= $this->thread[$key]->listen();
-                    if (!$this->thread[$key]->isBusy()) {
-                    } else {
-                        $this->thread[$key]->close();
-                        unset($this->commands[$key]);
-                        self::launchNextInQueue();
-                    }
-                } else {
-                    $this->thread[$key]->close();
-                    unset($this->commands[$key]);
-                    self::launchNextInQueue();
-                }
-            }
-        }
-        return $this->output;
-    }
-    public function launchNextInQueue() {
-        if (count($this->toExecuted) != 0) {
-            reset($this->toExecuted);
-            $keyToExecuted = key($this->toExecuted);
-            $this->commands[$keyToExecuted] = $this->toExecuted[$keyToExecuted];
-            $this->thread[$keyToExecuted] = Thread::create($this->toExecuted[$keyToExecuted]);
-            unset($this->toExecuted[$keyToExecuted]);
-        } else {
-            return true;
-        }
-    }
-}
-function getPlexCategories($rType = null) {
-    global $db;
-    $rReturn = array();
-    if ($rType) {
-        $db->query('SELECT * FROM `watch_categories` WHERE `type` = ? ORDER BY `genre_id` ASC;', $rType);
-    } else {
-        $db->query('SELECT * FROM `watch_categories` ORDER BY `genre_id` ASC;');
-    }
-    foreach ($db->get_rows() as $rRow) {
-        $rReturn[$rRow['genre']] = $rRow;
-    }
-    return $rReturn;
-}
-function readURL($rURL) {
-    $rCurl = curl_init($rURL);
-    curl_setopt($rCurl, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($rCurl, CURLOPT_CONNECTTIMEOUT, 10);
-    curl_setopt($rCurl, CURLOPT_TIMEOUT, 10);
-    return curl_exec($rCurl);
-}
-
-function loadCron() {
-    global $db;
-    global $rScanOffset;
-    global $rForce;
-    $rPlexCategories = array(3 => getplexcategories(3), 4 => getplexcategories(4));
-    checkBouquets();
-    checkCategories();
-    if (!$rForce) {
-        $db->query("SELECT * FROM `watch_folders` WHERE `type` = 'plex' AND `server_id` = ? AND `active` = 1 AND (UNIX_TIMESTAMP() - `last_run` > ? OR `last_run` IS NULL) ORDER BY `id` ASC;", SERVER_ID, $rScanOffset);
-    } else {
-        $db->query("SELECT * FROM `watch_folders` WHERE `type` = 'plex' AND `server_id` = ? AND `id` = ?;", SERVER_ID, $rForce);
-    }
-    $rRows = $db->get_rows();
-    if (count($rRows) > 0) {
-        shell_exec('rm -f ' . WATCH_TMP_PATH . '*.ppid');
-        $rLeafCount = $rUUIDs = $rSeriesTMDB = $rStreamDatabase = array();
-        $rTMDBDatabase = array('movie' => array(), 'series' => array());
-        $rPlexDatabase = array('movie' => array(), 'series' => array());
-        echo 'Generating cache...' . "\n";
-        $db->query('SELECT `id`, `tmdb_id`, `plex_uuid` FROM `streams_series` WHERE `tmdb_id` IS NOT NULL AND `tmdb_id` > 0;');
-        foreach ($db->get_rows() as $rRow) {
-            $rSeriesTMDB[$rRow['id']] = $rRow['tmdb_id'];
-            if (!empty($rRow['plex_uuid'])) {
-                $rUUIDs[] = $rRow['plex_uuid'];
-            }
-        }
-        $db->query('SELECT `streams`.`id`, `streams_series`.`plex_uuid`, `streams_episodes`.`series_id`, `streams_episodes`.`season_num`, `streams_episodes`.`episode_num`, `streams`.`stream_source` FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` LEFT JOIN `streams_series` ON `streams_series`.`id` = `streams_episodes`.`series_id` WHERE `streams_servers`.`server_id` = ?;', SERVER_ID);
-        foreach ($db->get_rows() as $rRow) {
-            $rStreamDatabase[] = $rRow['stream_source'];
-            $rTMDBID = ($rSeriesTMDB[$rRow['series_id']] ?: null);
-            list($rSource) = json_decode($rRow['stream_source'], true);
-            if ($rTMDBID) {
-                $rTMDBDatabase['series'][$rTMDBID][$rRow['season_num'] . '_' . $rRow['episode_num']] = array('id' => $rRow['id'], 'source' => $rSource);
-            }
-            if (!empty($rRow['plex_uuid'])) {
-                $rPlexDatabase['series'][$rRow['plex_uuid']][$rRow['season_num'] . '_' . $rRow['episode_num']] = array('id' => $rRow['id'], 'source' => $rSource);
-                $rLeafCount[$rRow['plex_uuid']]++;
-            }
-        }
-        $db->query('SELECT `streams`.`id`, `streams`.`plex_uuid`, `streams`.`stream_source`, `streams`.`movie_properties` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`type` = 2 AND `streams_servers`.`server_id` = ?;', SERVER_ID);
-        foreach ($db->get_rows() as $rRow) {
-            $rStreamDatabase[] = $rRow['stream_source'];
-            $rTMDBID = (json_decode($rRow['movie_properties'], true)['tmdb_id'] ?: null);
-            list($rSource) = json_decode($rRow['stream_source'], true);
-            if ($rTMDBID) {
-                $rTMDBDatabase['movie'][$rTMDBID] = array('id' => $rRow['id'], 'source' => $rSource);
-            }
-            if (!empty($rRow['plex_uuid'])) {
-                $rPlexDatabase['movie'][$rRow['plex_uuid']] = array('id' => $rRow['id'], 'source' => $rSource);
-                $rUUIDs[] = $rRow['plex_uuid'];
-            }
-        }
-        exec('find ' . WATCH_TMP_PATH . ' -maxdepth 1 -name "*.pcache" -print0 | xargs -0 rm');
-        file_put_contents(WATCH_TMP_PATH . 'stream_database.pcache', json_encode($rStreamDatabase));
-        foreach ($rTMDBDatabase['series'] as $rTMDBID => $rData) {
-            file_put_contents(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.pcache', json_encode($rData));
-        }
-        foreach ($rTMDBDatabase['movie'] as $rTMDBID => $rData) {
-            file_put_contents(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.pcache', json_encode($rData));
-        }
-        foreach ($rPlexDatabase['series'] as $rPlexID => $rData) {
-            file_put_contents(WATCH_TMP_PATH . 'series_' . $rPlexID . '.pcache', json_encode($rData));
-        }
-        foreach ($rPlexDatabase['movie'] as $rPlexID => $rData) {
-            file_put_contents(WATCH_TMP_PATH . 'movie_' . $rPlexID . '.pcache', json_encode($rData));
-        }
-        unset($rTMDBDatabase, $rPlexDatabase);
-        echo 'Finished generating cache!' . "\n";
-    }
-    foreach ($rRows as $rRow) {
-        $rLimit = 100;
-        $rThreadData = array();
-
-        // Get a Plex token (with caching)
-        $rToken = CoreUtilities::getPlexToken($rRow['plex_ip'], $rRow['plex_port'], $rRow['plex_username'], $rRow['plex_password']);
-
-        $db->query('UPDATE `watch_folders` SET `last_run` = UNIX_TIMESTAMP() WHERE `id` = ?;', $rRow['id']);
-
-        $rSectionURL = 'http://' . $rRow['plex_ip'] . ':' . $rRow['plex_port'] . '/library/sections?X-Plex-Token=' . $rToken;
-        $rSections = json_decode(json_encode(simplexml_load_string(readurl($rSectionURL))), true);
-        $rThreadCount = 1;
-        foreach (makeArray($rSections['Directory']) as $F24f1be2729b363d) {
-            if ($F24f1be2729b363d['@attributes']['type'] == 'movie') {
-                $rThreadCount = (intval(CoreUtilities::$rSettings['thread_count_movie']) ?: 25);
-            } else {
-                $rThreadCount = (intval(CoreUtilities::$rSettings['thread_count_show']) ?: 5);
-            }
-            $rKey = $F24f1be2729b363d['@attributes']['key'];
-            if ($rKey == $rRow['directory']) {
-                $B9690335cedc4164 = 'http://' . $rRow['plex_ip'] . ':' . $rRow['plex_port'] . '/library/sections/' . $rKey . '/all?X-Plex-Token=' . $rToken . '&X-Plex-Container-Start=0&X-Plex-Container-Size=1';
-                $rCount = (intval(json_decode(json_encode(simplexml_load_string(readurl($B9690335cedc4164))), true)['@attributes']['totalSize']) ?: 0);
-                echo 'Count: ' . $rCount . "\n";
-                if ($rCount > 0) {
-                    $rSteps = [];
-                    for ($i = 0; $i <= $rCount; $i += $rLimit) {
-                        $rSteps[] = $i;
-                    }
-
-                    if (!$rSteps) {
-                        $rSteps = [0];
-                    }
-                    foreach ($rSteps as $rStart) {
-                        $d7bd8e11c885f937 = 'http://' . $rRow['plex_ip'] . ':' . $rRow['plex_port'] . '/library/sections/' . $rKey . '/all?X-Plex-Token=' . $rToken . '&X-Plex-Container-Start=' . $rStart . '&X-Plex-Container-Size=' . $rLimit . '&sort=updatedAt%3Adesc';
-                        $rContent = json_decode(json_encode(simplexml_load_string(readurl($d7bd8e11c885f937))), true);
-                        if (!isset($rContent['Video'])) {
-                            $rContent['Video'] = $rContent['Directory'];
-                        }
-                        foreach (makeArray($rContent['Video']) as $rItem) {
-                            $rUUID = $rKey . '_' . $rItem['@attributes']['ratingKey'];
-                            $rUpdatedAt = intval($rItem['@attributes']['updatedAt'] ?? 0);
-                            $lastRun = intval($rRow['last_run'] ?? 0);
-                            $rIsNewOrUpdated = !$lastRun || $rUpdatedAt === 0 || $lastRun < $rUpdatedAt;
-
-                            if ($F24f1be2729b363d['@attributes']['type'] == 'movie') {
-                                // Movies
-                                $rIsMissing = $rRow['scan_missing'] && !in_array($rUUID, $rUUIDs, true);
-                                if ($rIsNewOrUpdated || $rIsMissing || $rForce) {
-                                    $rThreadData[] = [
-                                        'folder_id' => $rRow['id'],
-                                        'type' => 'movie',
-                                        'key' => $rItem['@attributes']['ratingKey'],
-                                        'uuid' => $rUUID,
-                                        'plex_categories' => $rPlexCategories,
-                                        'read_native' => $rRow['read_native'],
-                                        'movie_symlink' => $rRow['movie_symlink'],
-                                        'remove_subtitles' => $rRow['remove_subtitles'],
-                                        'auto_encode' => $rRow['auto_encode'],
-                                        'auto_upgrade' => $rRow['auto_upgrade'],
-                                        'transcode_profile_id' => $rRow['transcode_profile_id'],
-                                        'max_genres' => intval(CoreUtilities::$rSettings['max_genres'] ?? 5),
-                                        'plex' => true,
-                                        'ip' => $rRow['plex_ip'],
-                                        'port' => $rRow['plex_port'],
-                                        'token' => $rToken,
-                                        'fb_bouquets' => $rRow['fb_bouquets'],
-                                        'store_categories' => $rRow['store_categories'],
-                                        'category_id' => $rRow['category_id'],
-                                        'bouquets' => $rRow['bouquets'],
-                                        'fb_category_id' => $rRow['fb_category_id'],
-                                        'check_tmdb' => $rRow['check_tmdb'],
-                                        'target_container' => $rRow['target_container'],
-                                        'server_add' => $rRow['server_add'],
-                                        'direct_proxy' => $rRow['direct_proxy']
-                                    ];
-                                }
-                            } else {
-                                // TV series
-                                $rCurrentLeafCount = intval($rItem['@attributes']['leafCount'] ?? 0);
-                                $rPreviousLeafCount = $rLeafCount[$rUUID] ?? 0;
-                                $rLeafCountChanged = $rCurrentLeafCount != $rPreviousLeafCount;
-                                $rIsMissing = $rRow['scan_missing'] && empty($rLeafCount[$rUUID]);
-
-                                if ($rIsNewOrUpdated || $rLeafCountChanged || $rIsMissing) {
-                                    $rThreadData[] = [
-                                        'folder_id' => $rRow['id'],
-                                        'type' => $F24f1be2729b363d['@attributes']['type'],
-                                        'key' => $rItem['@attributes']['ratingKey'],
-                                        'uuid' => $rUUID,
-                                        'plex_categories' => $rPlexCategories,
-                                        'read_native' => $rRow['read_native'],
-                                        'movie_symlink' => $rRow['movie_symlink'],
-                                        'remove_subtitles' => $rRow['remove_subtitles'],
-                                        'auto_encode' => $rRow['auto_encode'],
-                                        'auto_upgrade' => $rRow['auto_upgrade'],
-                                        'transcode_profile_id' => $rRow['transcode_profile_id'],
-                                        'max_genres' => intval(CoreUtilities::$rSettings['max_genres'] ?? 5),
-                                        'plex' => true,
-                                        'ip' => $rRow['plex_ip'],
-                                        'port' => $rRow['plex_port'],
-                                        'token' => $rToken,
-                                        'fb_bouquets' => $rRow['fb_bouquets'],
-                                        'store_categories' => $rRow['store_categories'],
-                                        'category_id' => $rRow['category_id'],
-                                        'bouquets' => $rRow['bouquets'],
-                                        'fb_category_id' => $rRow['fb_category_id'],
-                                        'check_tmdb' => $rRow['check_tmdb'],
-                                        'target_container' => $rRow['target_container'],
-                                        'server_add' => $rRow['server_add'],
-                                        'direct_proxy' => $rRow['direct_proxy']
-                                    ];
-                                }
-                            }
-                        }
-                    }
-                }
-                break;
-            }
-        }
-        if (count($rThreadData) > 0) {
-            echo 'Scan complete! Adding ' . count($rThreadData) . ' files...' . "\n";
-        }
-
-        $cacheDataKey = array();
-        foreach ($rThreadData as $rData) {
-            if ($rData['type'] == 'movie') {
-                $rCommand = '/usr/bin/timeout 20 ' . PHP_BIN . ' ' . INCLUDES_PATH . 'cli/plex_item.php "' . base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . '"';
-            } else {
-                $rCommand = '/usr/bin/timeout 300 ' . PHP_BIN . ' ' . INCLUDES_PATH . 'cli/plex_item.php "' . base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . '"';
-            }
-            $cacheDataKey[] = $rCommand;
-        }
-        unset($rThreadData);
-        $db->close_mysql();
-        if ($rThreadCount <= 1) {
-            foreach ($cacheDataKey as $rCommand) {
-                shell_exec($rCommand);
-            }
-        } else {
-            $cacheMetadataKey = new Multithread($cacheDataKey, $rThreadCount);
-            $cacheMetadataKey->run();
-        }
-        $db->db_connect();
-        checkBouquets();
-        checkCategories();
-    }
-}
-
-function makeArray($rArray) {
-    if (isset($rArray['@attributes'])) {
-        $rArray = array($rArray);
-    }
-    return $rArray;
-}
-
-function getBouquet($rID) {
-    global $db;
-    $db->query('SELECT * FROM `bouquets` WHERE `id` = ?;', $rID);
-    if ($db->num_rows() == 1) {
-        return $db->get_row();
-    }
-}
-
-function checkCategories() {
-    global $db;
-    $rPlexCategories = array('movie' => getplexcategories(3), 'show' => getplexcategories(4));
-    $rCategories = glob(WATCH_TMP_PATH . '*.pcat');
-    $rCatID = array('movie' => 1, 'show' => 1);
-    $db->query('SELECT MAX(`genre_id`) AS `max` FROM `watch_categories` WHERE `type` = 3;');
-    $rCatID['movie'] = intval($db->get_row()['max']);
-    $db->query('SELECT MAX(`genre_id`) AS `max` FROM `watch_categories` WHERE `type` = 4;');
-    $rCatID['show'] = intval($db->get_row()['max']);
-    foreach ($rCategories as $a539efc67de58f76) {
-        $rCategory = json_decode(file_get_contents($a539efc67de58f76), true);
-        if (in_array($rCategory['title'], array_keys($rPlexCategories[$rCategory['type']]))) {
-        } else {
-            $rCatID[$rCategory['type']] += 1;
-            $db->query("INSERT INTO `watch_categories` (`type`, `genre_id`, `genre`, `category_id`, `bouquets`) VALUES (?, ?, ?, 0, '[]');", array('movie' => 3, 'show' => 4)[$rCategory['type']], $rCatID[$rCategory['type']], $rCategory['title']);
-        }
-        unlink($a539efc67de58f76);
-    }
-}
-
-function checkBouquets() {
-    global $db;
-    $a39a336ad3894348 = array();
-    $rBouquets = glob(WATCH_TMP_PATH . '*.pbouquet');
-    foreach ($rBouquets as $D3e2134ebfab5c71) {
-        $rBouquet = json_decode(file_get_contents($D3e2134ebfab5c71), true);
-        if (isset($a39a336ad3894348[$rBouquet['bouquet_id']])) {
-        } else {
-            $a39a336ad3894348[$rBouquet['bouquet_id']] = array('movie' => array(), 'series' => array());
-        }
-        $a39a336ad3894348[$rBouquet['bouquet_id']][$rBouquet['type']][] = $rBouquet['id'];
-        unlink($D3e2134ebfab5c71);
-    }
-    foreach ($a39a336ad3894348 as $rBouquetID => $rBouquetData) {
-        $rBouquet = getBouquet($rBouquetID);
-        if ($rBouquet) {
-            foreach (array_keys($rBouquetData) as $rType) {
-                if ($rType == 'movie') {
-                    $rColumn = 'bouquet_movies';
-                } else {
-                    $rColumn = 'bouquet_series';
-                }
-                $rChannels = json_decode($rBouquet[$rColumn], true);
-                foreach ($rBouquetData[$rType] as $rID) {
-                    if (0 >= intval($rID) || in_array($rID, $rChannels)) {
-                    } else {
-                        $rChannels[] = $rID;
-                    }
-                }
-                $db->query('UPDATE `bouquets` SET `' . $rColumn . '` = ? WHERE `id` = ?;', '[' . implode(',', array_map('intval', $rChannels)) . ']', $rBouquetID);
-            }
-        }
-    }
-}
 
 function shutdown() {
     global $db;
diff --git a/src/crons/providers.php b/src/crons/providers.php
index 4f279f19..66c683d1 100644
--- a/src/crons/providers.php
+++ b/src/crons/providers.php
@@ -58,9 +58,10 @@ function loadCron() {
         $rInfo = readurl($rURL);
         if ($rInfo) {
             $rStatus = 1;
-            $rArray['max_connections'] = $rInfo['user_info']['max_connections'];
-            $rArray['active_connections'] = $rInfo['user_info']['active_cons'];
-            $rArray['exp_date'] = $rInfo['user_info']['exp_date'];
+            $rUserInfo = $rInfo['user_info'] ?? [];
+            $rArray['max_connections'] = $rUserInfo['max_connections'] ?? null;
+            $rArray['active_connections'] = $rUserInfo['active_cons'] ?? 0;
+            $rArray['exp_date'] = $rUserInfo['exp_date'] ?? null;
         } else {
             $rStatus = 0;
             $rArray['exp_date'] = ($rRow['exp_date'] ?: -1);
diff --git a/src/crons/tmdb.php b/src/crons/tmdb.php
index 4aa92774..1d47bf5a 100644
--- a/src/crons/tmdb.php
+++ b/src/crons/tmdb.php
@@ -1,450 +1,30 @@
 <?php
 if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
     if ($argc) {
+        register_shutdown_function('shutdown');
         require str_replace('\\', '/', dirname($argv[0])) . '/../includes/admin.php';
         require INCLUDES_PATH . 'libs/tmdb.php';
         require INCLUDES_PATH . 'libs/tmdb_release.php';
+        require str_replace('\\', '/', dirname($argv[0])) . '/../modules/tmdb/TmdbCron.php';
         cli_set_process_title('XC_VM[TMDB]');
         $rIdentifier = CRONS_TMP_PATH . md5(CoreUtilities::generateUniqueCode() . __FILE__);
         CoreUtilities::checkCron($rIdentifier);
-        $rCategories = getCategories();
         $rTimeout = 3600;
         set_time_limit($rTimeout);
         ini_set('max_execution_time', $rTimeout);
-        if (strlen(CoreUtilities::$rSettings['tmdb_api_key']) != 0) {
-            $rUpdateSeries = array();
-            $db->query('SELECT `id`, `type`, `stream_id` FROM `watch_refresh` WHERE `status` = 0 ORDER BY `stream_id` ASC;');
-            foreach ($db->get_rows() as $rRow) {
-                if ($rRow['type'] == 1) {
-                    $db->query('SELECT * FROM `streams` WHERE `id` = ?;', $rRow['stream_id']);
-                    if ($db->num_rows() == 1) {
-                        $rStream = $db->get_row();
-                        if (0 < strlen($rStream['tmdb_language'])) {
-                            $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], $rStream['tmdb_language']);
-                        } else {
-                            if (0 < strlen(CoreUtilities::$rSettings['tmdb_language'])) {
-                                $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], CoreUtilities::$rSettings['tmdb_language']);
-                            } else {
-                                $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key']);
-                            }
-                        }
-                        if ($rStream['tmdb_id']) {
-                            $rTMDBID = $rStream['tmdb_id'];
-                        } else {
-                            if (0 < strlen($rStream['movie_properties'])) {
-                                $rTMDBID = intval(json_decode($rStream['movie_properties'], true)['tmdb_id']);
-                            } else {
-                                $rTMDBID = 0;
-                            }
-                        }
-                        if ($rTMDBID != 0) {
-                        } else {
-                            $rFilename = pathinfo(json_decode($rStream['stream_source'], true)[0])['filename'];
-                            foreach (array($rFilename, $rStream['stream_display_name']) as $rStreamTitle) {
-                                $rRelease = parserelease($rStreamTitle);
-                                $rTitle = $rRelease['title'];
-                                if (!isset($rRelease['excess'])) {
-                                } else {
-                                    $rTitle = trim($rTitle, (is_array($rRelease['excess']) ? $rRelease['excess'][0] : $rRelease['excess']));
-                                }
-                                if (isset($rRelease['group'])) {
-                                    $rAltTitle = $rTitle . '-' . $rRelease['group'];
-                                } else {
-                                    if (!isset($rRelease['alternative_title'])) {
-                                    } else {
-                                        $rAltTitle = $rTitle . ' - ' . $rRelease['alternative_title'];
-                                    }
-                                }
-                                if (!isset($rRelease['season'])) {
-                                } else {
-                                    $rTitle .= $rRelease['season'];
-                                }
-                                $rYear = $rRelease['year'];
-                                if ($rTitle) {
-                                } else {
-                                    $rTitle = $rStreamTitle;
-                                }
-                                $rMatch = null;
-                                $rMatches = array();
-                                foreach (range(0, 1) as $rIgnoreYear) {
-                                    if (!$rIgnoreYear) {
-                                    } else {
-                                        if ($rYear) {
-                                            $rYear = null;
-                                        } else {
-                                            break;
-                                        }
-                                    }
-                                    $rResults = $rTMDB->searchMovie($rTitle, $rYear);
-                                    foreach ($rResults as $rResultArr) {
-                                        similar_text(strtoupper($rTitle), strtoupper(($rResultArr->get('title') ?: $rResultArr->get('name'))), $rPercentage);
-                                        if (!$rAltTitle) {
-                                        } else {
-                                            similar_text(strtoupper($rAltTitle), strtoupper(($rResultArr->get('title') ?: $rResultArr->get('name'))), $rPercentageAlt);
-                                        }
-                                        if (!(CoreUtilities::$rSettings['percentage_match'] <= $rPercentage || CoreUtilities::$rSettings['percentage_match'] <= $rPercentageAlt)) {
-                                        } else {
-                                            if ($rYear && !in_array(intval(substr(($rResultArr->get('release_date') ?: $rResultArr->get('first_air_date')), 0, 4)), range(intval($rYear) - 1, intval($rYear) + 1))) {
-                                            } else {
-                                                if ($rAltTitle && strtolower(($rResultArr->get('title') ?: $rResultArr->get('name'))) == strtolower($rAltTitle)) {
-                                                    $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
-                                                    break;
-                                                }
-                                                if (strtolower(($rResultArr->get('title') ?: $rResultArr->get('name'))) == strtolower($rTitle) && !$rAltTitle) {
-                                                    $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
-                                                    break;
-                                                }
-                                                $rMatches[] = array('percentage' => $rPercentage, 'data' => $rResultArr);
-                                            }
-                                        }
-                                    }
-                                    if (0 >= count($rMatches)) {
-                                    } else {
-                                        break;
-                                    }
-                                }
-                                if (0 >= count($rMatches)) {
-                                } else {
-                                    $rMax = max(array_column($rMatches, 'percentage'));
-                                    $rKeys = array_filter(array_map(function ($rMatches) use ($rMax) {
-                                        return ($rMatches['percentage'] == $rMax ? $rMatches['data'] : null);
-                                    }, $rMatches));
-                                    list($rMatch) = array_values($rKeys);
-                                }
-                                if (!$rMatch) {
-                                } else {
-                                    $rTMDBID = $rMatch->get('id');
-                                    break;
-                                }
-                            }
-                        }
-                        if (0 < $rTMDBID) {
-                            $rMovie = $rTMDB->getMovie($rTMDBID);
-                            $rMovieData = json_decode($rMovie->getJSON(), true);
-                            $rMovieData['trailer'] = $rMovie->getTrailer();
-                            $rThumb = ($rMovieData['poster_path'] ? 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rMovieData['poster_path'] : '');
-                            $rBG = ($rMovieData['backdrop_path'] ? 'https://image.tmdb.org/t/p/w1280' . $rMovieData['backdrop_path'] : '');
-                            if (!CoreUtilities::$rSettings['download_images']) {
-                            } else {
-                                if (empty($rThumb)) {
-                                } else {
-                                    $rThumb = CoreUtilities::downloadImage($rThumb, 2);
-                                }
-                                if (empty($rBG)) {
-                                } else {
-                                    $rBG = CoreUtilities::downloadImage($rBG);
-                                }
-                            }
-                            if (!$rBG) {
-                            } else {
-                                $rBG = array($rBG);
-                            }
-                            $rCast = array();
-                            foreach ($rMovieData['credits']['cast'] as $rMember) {
-                                if (count($rCast) >= 5) {
-                                } else {
-                                    $rCast[] = $rMember['name'];
-                                }
-                            }
-                            $rDirectors = array();
-                            foreach ($rMovieData['credits']['crew'] as $rMember) {
-                                if (!(count($rDirectors) < 5 && ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing')) || in_array($rMember['name'], $rDirectors)) {
-                                } else {
-                                    $rDirectors[] = $rMember['name'];
-                                }
-                            }
-                            $rCountry = '';
-                            if (!isset($rMovieData['production_countries'][0]['name'])) {
-                            } else {
-                                $rCountry = $rMovieData['production_countries'][0]['name'];
-                            }
-                            $rGenres = array();
-                            foreach ($rMovieData['genres'] as $rGenre) {
-                                if (count($rGenres) >= 3) {
-                                } else {
-                                    $rGenres[] = $rGenre['name'];
-                                }
-                            }
-                            $rSeconds = intval($rMovieData['runtime']) * 60;
-                            $rProperties = array('kinopoisk_url' => 'https://www.themoviedb.org/movie/' . $rMovieData['id'], 'tmdb_id' => $rMovieData['id'], 'name' => $rMovieData['title'], 'o_name' => $rMovieData['original_title'], 'cover_big' => $rThumb, 'movie_image' => $rThumb, 'release_date' => $rMovieData['release_date'], 'episode_run_time' => $rMovieData['runtime'], 'youtube_trailer' => $rMovieData['trailer'], 'director' => implode(', ', $rDirectors), 'actors' => implode(', ', $rCast), 'cast' => implode(', ', $rCast), 'description' => $rMovieData['overview'], 'plot' => $rMovieData['overview'], 'age' => '', 'mpaa_rating' => '', 'rating_count_kinopoisk' => 0, 'country' => $rCountry, 'genre' => implode(', ', $rGenres), 'backdrop_path' => $rBG, 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => $rMovieData['vote_average']);
-                            $rTitle = $rMovieData['title'];
-                            $rYear = null;
-                            $rRating = ($rMovieData['vote_average'] ?: 0);
-                            if (0 >= strlen($rMovieData['release_date'])) {
-                            } else {
-                                $rYear = intval(substr($rMovieData['release_date'], 0, 4));
-                            }
-                            $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $rRow['id']);
-                            $db->query('UPDATE `streams` SET `stream_display_name` = ?, `year` = ?, `movie_properties` = ?, `rating` = ? WHERE `id` = ?;', $rTitle, $rYear, json_encode($rProperties, JSON_UNESCAPED_UNICODE), $rRating, $rRow['stream_id']);
-                        } else {
-                            $db->query('UPDATE `watch_refresh` SET `status` = -1 WHERE `id` = ?;', $rRow['id']);
-                        }
-                    } else {
-                        $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $rRow['id']);
-                    }
-                } else {
-                    if ($rRow['type'] == 2) {
-                        $db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $rRow['stream_id']);
-                        if ($db->num_rows() == 1) {
-                            $rStream = $db->get_row();
-                            if (0 < strlen($rStream['tmdb_language'])) {
-                                $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], $rStream['tmdb_language']);
-                            } else {
-                                if (0 < strlen(CoreUtilities::$rSettings['tmdb_language'])) {
-                                    $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], CoreUtilities::$rSettings['tmdb_language']);
-                                } else {
-                                    $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key']);
-                                }
-                            }
-                            $rTMDBID = intval($rStream['tmdb_id']);
-                            if ($rTMDBID != 0) {
-                            } else {
-                                $rFilename = $rStream['title'];
-                                $rRelease = parserelease($rFilename);
-                                $rTitle = $rRelease['title'];
-                                if (!isset($rRelease['excess'])) {
-                                } else {
-                                    $rTitle = trim($rTitle, (is_array($rRelease['excess']) ? $rRelease['excess'][0] : $rRelease['excess']));
-                                }
-                                if (isset($rRelease['group'])) {
-                                    $rAltTitle = $rTitle . '-' . $rRelease['group'];
-                                } else {
-                                    if (!isset($rRelease['alternative_title'])) {
-                                    } else {
-                                        $rAltTitle = $rTitle . ' - ' . $rRelease['alternative_title'];
-                                    }
-                                }
-                                $rYear = $rRelease['year'];
-                                if ($rTitle) {
-                                } else {
-                                    $rTitle = $rFilename;
-                                }
-                                $rMatch = null;
-                                $rMatches = array();
-                                foreach (range(0, 1) as $rIgnoreYear) {
-                                    if (!$rIgnoreYear) {
-                                    } else {
-                                        if ($rYear) {
-                                            $rYear = null;
-                                        } else {
-                                            break;
-                                        }
-                                    }
-                                    $rResults = $rTMDB->searchTVShow($rTitle, $rYear);
-                                    foreach ($rResults as $rResultArr) {
-                                        similar_text(strtoupper($rTitle), strtoupper(($rResultArr->get('title') ?: $rResultArr->get('name'))), $rPercentage);
-                                        if (!$rAltTitle) {
-                                        } else {
-                                            similar_text(strtoupper($rAltTitle), strtoupper(($rResultArr->get('title') ?: $rResultArr->get('name'))), $rPercentageAlt);
-                                        }
-                                        if (!(CoreUtilities::$rSettings['percentage_match'] <= $rPercentage || CoreUtilities::$rSettings['percentage_match'] <= $rPercentageAlt)) {
-                                        } else {
-                                            if ($rYear && !in_array(intval(substr(($rResultArr->get('release_date') ?: $rResultArr->get('first_air_date')), 0, 4)), range(intval($rYear) - 1, intval($rYear) + 1))) {
-                                            } else {
-                                                if ($rAltTitle && strtolower(($rResultArr->get('title') ?: $rResultArr->get('name'))) == strtolower($rAltTitle)) {
-                                                    $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
-                                                    break;
-                                                }
-                                                if (strtolower(($rResultArr->get('title') ?: $rResultArr->get('name'))) == strtolower($rTitle) && !$rAltTitle) {
-                                                    $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
-                                                    break;
-                                                }
-                                                $rMatches[] = array('percentage' => $rPercentage, 'data' => $rResultArr);
-                                            }
-                                        }
-                                    }
-                                    if (0 >= count($rMatches)) {
-                                    } else {
-                                        break;
-                                    }
-                                }
-                                if (0 >= count($rMatches)) {
-                                } else {
-                                    $rMax = max(array_column($rMatches, 'percentage'));
-                                    $rKeys = array_filter(array_map(function ($rMatches) use ($rMax) {
-                                        return ($rMatches['percentage'] == $rMax ? $rMatches['data'] : null);
-                                    }, $rMatches));
-                                    list($rMatch) = array_values($rKeys);
-                                }
-                            }
-                            if (0 < $rTMDBID) {
-                                $rShow = $rTMDB->getTVShow($rTMDBID);
-                                $rShowData = json_decode($rShow->getJSON(), true);
-                                $rSeriesArray = $rStream;
-                                $rSeriesArray['title'] = $rShowData['name'];
-                                $rSeriesArray['tmdb_id'] = $rShowData['id'];
-                                $rSeriesArray['plot'] = $rShowData['overview'];
-                                $rSeriesArray['rating'] = $rShowData['vote_average'];
-                                $rSeriesArray['release_date'] = $rShowData['first_air_date'];
-                                $rSeriesArray['youtube_trailer'] = getSeriesTrailer($rShowData['id']);
-                                $rSeriesArray['cover'] = ($rShowData['poster_path'] ? 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rShowData['poster_path'] : '');
-                                $rSeriesArray['cover_big'] = $rSeriesArray['cover'];
-                                $rSeriesArray['backdrop_path'] = array();
-                                $rBG = ($rShowData['backdrop_path'] ? 'https://image.tmdb.org/t/p/w1280' . $rShowData['backdrop_path'] : '');
-                                if (!CoreUtilities::$rSettings['download_images']) {
-                                } else {
-                                    if (empty($rSeriesArray['cover'])) {
-                                    } else {
-                                        $rSeriesArray['cover'] = CoreUtilities::downloadImage($rSeriesArray['cover'], 2);
-                                    }
-                                    if (empty($rBG)) {
-                                    } else {
-                                        $rBG = CoreUtilities::downloadImage($rBG);
-                                    }
-                                }
-                                if (empty($rBG)) {
-                                } else {
-                                    $rSeriesArray['backdrop_path'][] = $rBG;
-                                }
-                                $rCast = array();
-                                foreach ($rShowData['credits']['cast'] as $rMember) {
-                                    if (count($rCast) >= 5) {
-                                    } else {
-                                        $rCast[] = $rMember['name'];
-                                    }
-                                }
-                                $rSeriesArray['cast'] = implode(', ', $rCast);
-                                $rDirectors = array();
-                                foreach ($rShowData['credits']['crew'] as $rMember) {
-                                    if (!(count($rDirectors) < 5 && ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing')) || in_array($rMember['name'], $rDirectors)) {
-                                    } else {
-                                        $rDirectors[] = $rMember['name'];
-                                    }
-                                }
-                                $rSeriesArray['director'] = implode(', ', $rDirectors);
-                                $rGenres = array();
-                                foreach ($rShowData['genres'] as $rGenre) {
-                                    if (count($rGenres) >= 3) {
-                                    } else {
-                                        $rGenres[] = $rGenre['name'];
-                                    }
-                                }
-                                $rSeriesArray['genre'] = implode(', ', $rGenres);
-                                $rSeriesArray['episode_run_time'] = intval($rShowData['episode_run_time'][0]);
-                                $rPrepare = prepareArray($rSeriesArray);
-                                $rQuery = 'REPLACE INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                                if ($db->query($rQuery, ...$rPrepare['data'])) {
-                                    $rInsertID = $db->last_insert_id();
-                                    updateSeries(intval($rInsertID));
-                                    $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $rRow['id']);
-                                } else {
-                                    $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $rRow['id']);
-                                }
-                            } else {
-                                $db->query('UPDATE `watch_refresh` SET `status` = -1 WHERE `id` = ?;', $rRow['id']);
-                            }
-                        } else {
-                            $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $rRow['id']);
-                        }
-                    } else {
-                        if ($rRow['type'] == 3) {
-                            $db->query('SELECT * FROM `streams` WHERE `id` = ?;', $rRow['stream_id']);
-                            if ($db->num_rows() == 1) {
-                                $rStream = $db->get_row();
-                                $db->query('SELECT * FROM `streams_episodes` WHERE `stream_id` = ?;', $rRow['stream_id']);
-                                if ($db->num_rows() == 1) {
-                                    $rSeriesEpisode = $db->get_row();
-                                    $db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $rSeriesEpisode['series_id']);
-                                    if ($db->num_rows() == 1) {
-                                        $rSeries = $db->get_row();
-                                        if (0 < strlen($rSeries['tmdb_language'])) {
-                                            $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], $rSeries['tmdb_language']);
-                                        } else {
-                                            if (0 < strlen(CoreUtilities::$rSettings['tmdb_language'])) {
-                                                $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], CoreUtilities::$rSettings['tmdb_language']);
-                                            } else {
-                                                $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key']);
-                                            }
-                                        }
-                                        if (0 < strlen($rSeries['tmdb_id'])) {
-                                            $rShow = $rTMDB->getTVShow($rSeries['tmdb_id']);
-                                            $rShowData = json_decode($rShow->getJSON(), true);
-                                            if (!isset($rShowData['name'])) {
-                                            } else {
-                                                $rFilename = pathinfo(json_decode($rStream['stream_source'], true)[0])['filename'];
-                                                $rRelease = parserelease($rFilename);
-                                                $rReleaseSeason = $rRelease['season'];
-                                                if (is_array($rRelease['episode'])) {
-                                                    $rReleaseEpisode = $rRelease['episode'][0];
-                                                } else {
-                                                    $rReleaseEpisode = $rRelease['episode'];
-                                                }
-                                                if ($rReleaseSeason && $rReleaseEpisode) {
-                                                } else {
-                                                    $rReleaseSeason = $rSeriesEpisode['season_num'];
-                                                    $rReleaseEpisode = $rSeriesEpisode['episode_num'];
-                                                }
-                                                if (is_array($rRelease['episode']) && count($rRelease['episode']) == 2) {
-                                                    $rTitle = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason)) . 'E' . sprintf('%02d', $rRelease['episode'][0]) . '-' . sprintf('%02d', $rRelease['episode'][1]);
-                                                } else {
-                                                    $rTitle = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason)) . 'E' . sprintf('%02d', $rReleaseEpisode);
-                                                }
-                                                $rEpisodes = json_decode($rTMDB->getSeason($rShowData['id'], intval($rReleaseSeason))->getJSON(), true);
-                                                $rProperties = array();
-                                                foreach ($rEpisodes['episodes'] as $rEpisode) {
-                                                    if (intval($rEpisode['episode_number']) != $rReleaseEpisode) {
-                                                    } else {
-                                                        if (0 >= strlen($rEpisode['still_path'])) {
-                                                        } else {
-                                                            $rImage = 'https://image.tmdb.org/t/p/w1280' . $rEpisode['still_path'];
-                                                            if (!CoreUtilities::$rSettings['download_images']) {
-                                                            } else {
-                                                                $rImage = CoreUtilities::downloadImage($rImage, 5);
-                                                            }
-                                                        }
-                                                        if (0 >= strlen($rEpisode['name'])) {
-                                                        } else {
-                                                            $rTitle .= ' - ' . $rEpisode['name'];
-                                                        }
-                                                        $rSeconds = intval($rShowData['episode_run_time'][0]) * 60;
-                                                        $rProperties = array('tmdb_id' => $rEpisode['id'], 'release_date' => $rEpisode['air_date'], 'plot' => $rEpisode['overview'], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'movie_image' => $rImage, 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => $rEpisode['vote_average'], 'season' => $rReleaseSeason);
-                                                        if (strlen($rProperties['movie_image'][0]) != 0) {
-                                                        } else {
-                                                            unset($rProperties['movie_image']);
-                                                        }
-                                                        break;
-                                                    }
-                                                }
-                                                $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $rRow['id']);
-                                                $db->query('UPDATE `streams` SET `stream_display_name` = ?, `movie_properties` = ? WHERE `id` = ?;', $rTitle, json_encode($rProperties, JSON_UNESCAPED_UNICODE), $rRow['stream_id']);
-                                                $db->query('UPDATE `streams_episodes` SET `season_num` = ?, `episode_num` = ? WHERE `stream_id` = ?;', $rReleaseSeason, $rReleaseEpisode, $rRow['stream_id']);
-                                                if (in_array($rSeries['id'], $rUpdateSeries)) {
-                                                } else {
-                                                    $rUpdateSeries[] = $rSeries['id'];
-                                                }
-                                            }
-                                        } else {
-                                            $db->query('UPDATE `watch_refresh` SET `status` = -5 WHERE `id` = ?;', $rRow['id']);
-                                        }
-                                    } else {
-                                        $db->query('UPDATE `watch_refresh` SET `status` = -4 WHERE `id` = ?;', $rRow['id']);
-                                    }
-                                } else {
-                                    $db->query('UPDATE `watch_refresh` SET `status` = -3 WHERE `id` = ?;', $rRow['id']);
-                                }
-                            } else {
-                                $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $rRow['id']);
-                            }
-                        } else {
-                            if (in_array($rRow['stream_id'], $rUpdateSeries)) {
-                            } else {
-                                $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $rRow['id']);
-                                $rUpdateSeries[] = intval($rRow['stream_id']);
-                            }
-                        }
-                    }
-                }
-            }
-            foreach ($rUpdateSeries as $rSeriesID) {
-                updateSeries(intval($rSeriesID));
-            }
-            @unlink($rIdentifier);
-        } else {
-            exit('No TMDb API key.');
-        }
+        TmdbCron::run();
     } else {
         exit(0);
     }
 } else {
     exit('Please run as XC_VM!' . "\n");
 }
+function shutdown() {
+    global $db;
+    global $rIdentifier;
+    if (!is_object($db)) {
+    } else {
+        $db->close_mysql();
+    }
+    @unlink($rIdentifier);
+}
diff --git a/src/crons/tmdb_popular.php b/src/crons/tmdb_popular.php
index 17313e4c..83c193fc 100644
--- a/src/crons/tmdb_popular.php
+++ b/src/crons/tmdb_popular.php
@@ -4,147 +4,13 @@ if ((posix_getpwuid(posix_geteuid())['name'] ?? null) === 'xc_vm') {
 
     if (!empty($argc)) {
         register_shutdown_function('shutdown');
-
         require str_replace('\\', '/', dirname($argv[0])) . '/../www/init.php';
         require_once MAIN_HOME . 'includes/libs/tmdb.php';
-
+        require_once MAIN_HOME . 'modules/tmdb/TmdbPopularCron.php';
         cli_set_process_title('XC_VM[Popular]');
-
         $rIdentifier = CRONS_TMP_PATH . md5(CoreUtilities::generateUniqueCode() . __FILE__);
         CoreUtilities::checkCron($rIdentifier);
-
-        if (strlen(CoreUtilities::$rSettings['tmdb_api_key'] ?? '') > 0) {
-            $lang = CoreUtilities::$rSettings['tmdb_language'] ?? '';
-            $rTMDB = $lang !== ''
-                ? new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], $lang)
-                : new TMDB(CoreUtilities::$rSettings['tmdb_api_key']);
-
-            $rPages   = 100;
-            $rTMDBIDs = [];
-
-            // --- Movies
-            $db->query(
-                'SELECT `id`, `movie_properties` FROM `streams`
-                 WHERE `type` = 2 AND `movie_properties` IS NOT NULL AND LENGTH(`movie_properties`) > 0;'
-            );
-            foreach ($db->get_rows() as $rRow) {
-                $rProperties = json_decode($rRow['movie_properties'], true);
-                if (!empty($rProperties['tmdb_id'])) {
-                    $rTMDBIDs[$rProperties['tmdb_id']] = $rRow['id'];
-                }
-            }
-
-            // --- Series
-            $db->query(
-                'SELECT `id`, `tmdb_id` FROM `streams_series`
-                 WHERE `tmdb_id` IS NOT NULL AND LENGTH(`tmdb_id`) > 0;'
-            );
-            foreach ($db->get_rows() as $rRow) {
-                $rTMDBIDs[$rRow['tmdb_id']] = $rRow['id'];
-            }
-
-            $rReturn = ['movies' => [], 'series' => []];
-
-            // Popular movies
-            foreach (range(1, $rPages) as $rPage) {
-                foreach ($rTMDB->getPopularMovies($rPage) as $rItem) {
-                    $id = $rItem->getID();
-                    if (isset($rTMDBIDs[$id])) {
-                        $rReturn['movies'][] = $rTMDBIDs[$id];
-                    }
-                }
-            }
-
-            // Popular TV shows
-            foreach (range(1, $rPages) as $rPage) {
-                foreach ($rTMDB->getPopularTVShows($rPage) as $rItem) {
-                    $id = $rItem->getID();
-                    if (isset($rTMDBIDs[$id])) {
-                        $rReturn['series'][] = $rTMDBIDs[$id];
-                    }
-                }
-            }
-
-            file_put_contents(CONTENT_PATH . 'tmdb_popular', igbinary_serialize($rReturn));
-
-            // Similar Movies
-            $db->query(
-                'SELECT COUNT(*) AS `count` FROM `streams`
-                 WHERE `type` = 2 AND `similar` IS NULL AND `tmdb_id` > 0;'
-            );
-            $rCount = (int)($db->get_row()['count'] ?? 0);
-            if ($rCount > 0) {
-                $rSteps = $rCount >= 1000 ? range(0, $rCount, 1000) : [0];
-                foreach ($rSteps as $rStep) {
-                    $db->query(
-                        'SELECT `id`, `tmdb_id` FROM `streams`
-                         WHERE `type` = 2 AND `similar` IS NULL AND `tmdb_id` > 0
-                         LIMIT ' . $rStep . ', 1000;'
-                    );
-                    foreach ($db->get_rows() as $rRow) {
-                        $rSimilar = [];
-                        foreach (range(1, 3) as $rPage) {
-                            $items = $rTMDB->getSimilarMovies($rRow['tmdb_id'], $rPage);
-                            foreach (json_decode(json_encode($items), true) as $rItem) {
-                                $rSimilar[] = (int)($rItem['_data']['id'] ?? 0);
-                            }
-                        }
-                        $db->query(
-                            'UPDATE `streams` SET `similar` = ? WHERE `id` = ?;',
-                            json_encode(array_values(array_unique($rSimilar))),
-                            $rRow['id']
-                        );
-                    }
-                }
-            }
-
-            // Similar Series
-            $db->query(
-                'SELECT COUNT(*) AS `count` FROM `streams_series`
-                 WHERE `similar` IS NULL AND `tmdb_id` > 0;'
-            );
-            $rCount = (int)($db->get_row()['count'] ?? 0);
-            if ($rCount > 0) {
-                $rSteps = $rCount >= 1000 ? range(0, $rCount, 1000) : [0];
-                foreach ($rSteps as $rStep) {
-                    $db->query(
-                        'SELECT `id`, `tmdb_id` FROM `streams_series`
-                         WHERE `similar` IS NULL AND `tmdb_id` > 0
-                         LIMIT ' . $rStep . ', 1000;'
-                    );
-                    foreach ($db->get_rows() as $rRow) {
-                        $rSimilar = [];
-                        foreach (range(1, 3) as $rPage) {
-                            $items = $rTMDB->getSimilarSeries($rRow['tmdb_id'], $rPage);
-                            foreach (json_decode(json_encode($items), true) as $rItem) {
-                                $rSimilar[] = (int)($rItem['id'] ?? 0);
-                            }
-                        }
-                        $db->query(
-                            'UPDATE `streams_series` SET `similar` = ? WHERE `id` = ?;',
-                            json_encode(array_values(array_unique($rSimilar))),
-                            $rRow['id']
-                        );
-                    }
-                }
-            }
-        }
-
-        // Popular live streams
-        $rPopularLive = [];
-        $db->query(
-            'SELECT `stream_id`, COUNT(`activity_id`) AS `count`
-             FROM `lines_activity`
-             LEFT JOIN `streams` ON `streams`.`id` = `lines_activity`.`stream_id`
-             WHERE `type` = 1 AND `date_end` < UNIX_TIMESTAMP() - (86400*28)
-             GROUP BY `stream_id`
-             ORDER BY `count` DESC
-             LIMIT 500;'
-        );
-        foreach ($db->get_rows() as $rRow) {
-            $rPopularLive[] = $rRow['stream_id'];
-        }
-        file_put_contents(CONTENT_PATH . 'live_popular', igbinary_serialize($rPopularLive));
+        TmdbPopularCron::run();
     } else {
         exit(0);
     }
diff --git a/src/crons/watch.php b/src/crons/watch.php
index dae42eaf..623b9e5d 100644
--- a/src/crons/watch.php
+++ b/src/crons/watch.php
@@ -6,6 +6,7 @@ if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
     if ($argc) {
         register_shutdown_function('shutdown');
         require str_replace('\\', '/', dirname($argv[0])) . '/../www/init.php';
+        require str_replace('\\', '/', dirname($argv[0])) . '/../modules/watch/WatchCron.php';
         $rForce = null;
         if (count($argv) != 2) {
         } else {
@@ -31,7 +32,7 @@ if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
         $F7fa29461a8a5ee2 = (intval(CoreUtilities::$rSettings['max_items']) ?: 0);
         set_time_limit(0);
         if (strlen(CoreUtilities::$rSettings['tmdb_api_key']) != 0) {
-            loadCron();
+            WatchCron::run();
         } else {
             exit('No TMDb API key.');
         }
@@ -41,329 +42,7 @@ if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
 } else {
     exit('Please run as XC_VM!' . "\n");
 }
-class Thread {
-    public $process = null;
-    public $pipes = null;
-    public $buffer = null;
-    public $output = null;
-    public $error = null;
-    public $timeout = null;
-    public $start_time = null;
-    public function __construct() {
-        $this->process = 0;
-        $this->buffer = '';
-        $this->pipes = (array) null;
-        $this->output = '';
-        $this->error = '';
-        $this->start_time = time();
-        $this->timeout = 0;
-    }
-    public static function create($command) {
-        $t = new Thread();
-        $descriptor = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
-        $t->process = proc_open($command, $descriptor, $t->pipes);
-        stream_set_blocking($t->pipes[1], 0);
-        stream_set_blocking($t->pipes[2], 0);
-        return $t;
-    }
-    public function isActive() {
-        $this->buffer .= $this->listen();
-        $f = stream_get_meta_data($this->pipes[1]);
-        return !$f['eof'];
-    }
-    public function close() {
-        $r = proc_close($this->process);
-        $this->process = null;
-        return $r;
-    }
-    public function tell($thought) {
-        fwrite($this->pipes[0], $thought);
-    }
-    public function listen() {
-        $buffer = $this->buffer;
-        $this->buffer = '';
-        while ($r = fgets($this->pipes[1], 1024)) {
-            $buffer .= $r;
-            $this->output .= $r;
-        }
-        return $buffer;
-    }
-    public function getStatus() {
-        return proc_get_status($this->process);
-    }
-    public function isBusy() {
-        return 0 < $this->timeout && $this->start_time + $this->timeout < time();
-    }
-    public function getError() {
-        $buffer = '';
-        while ($r = fgets($this->pipes[2], 1024)) {
-            $buffer .= $r;
-        }
-        return $buffer;
-    }
-}
-class Multithread {
-    public $output = array();
-    public $error = array();
-    public $thread = null;
-    public $commands = array();
-    public $hasPool = false;
-    public $toExecuted = array();
-    public function __construct($commands, $sizePool = 0) {
-        $this->hasPool = 0 < $sizePool;
-        if (!$this->hasPool) {
-        } else {
-            $this->toExecuted = array_splice($commands, $sizePool);
-        }
-        $this->commands = $commands;
-        foreach ($this->commands as $key => $command) {
-            $this->thread[$key] = Thread::create($command);
-        }
-    }
-    public function run() {
-        while (0 < count($this->commands)) {
-            foreach ($this->commands as $key => $command) {
-                $this->output[$key] .= @$this->thread[$key]->listen();
-                $this->error[$key] .= @$this->thread[$key]->getError();
-                if ($this->thread[$key]->isActive()) {
-                    $this->output[$key] .= $this->thread[$key]->listen();
-                    if (!$this->thread[$key]->isBusy()) {
-                    } else {
-                        $this->thread[$key]->close();
-                        unset($this->commands[$key]);
-                        self::launchNextInQueue();
-                    }
-                } else {
-                    $this->thread[$key]->close();
-                    unset($this->commands[$key]);
-                    self::launchNextInQueue();
-                }
-            }
-        }
-        return $this->output;
-    }
-    public function launchNextInQueue() {
-        if (count($this->toExecuted) != 0) {
-            reset($this->toExecuted);
-            $keyToExecuted = key($this->toExecuted);
-            $this->commands[$keyToExecuted] = $this->toExecuted[$keyToExecuted];
-            $this->thread[$keyToExecuted] = Thread::create($this->toExecuted[$keyToExecuted]);
-            unset($this->toExecuted[$keyToExecuted]);
-        } else {
-            return true;
-        }
-    }
-}
-function getWatchCategories($rType = null) {
-    global $db;
-    $rReturn = array();
-    if ($rType) {
-        $db->query('SELECT * FROM `watch_categories` WHERE `type` = ? ORDER BY `genre_id` ASC;', $rType);
-    } else {
-        $db->query('SELECT * FROM `watch_categories` ORDER BY `genre_id` ASC;');
-    }
-    foreach ($db->get_rows() as $rRow) {
-        $rReturn[$rRow['genre_id']] = $rRow;
-    }
-    return $rReturn;
-}
-function loadCron() {
-    global $db;
-    global $rThreadCount;
-    global $rScanOffset;
-    global $F7fa29461a8a5ee2;
-    global $rForce;
-    $rWatchCategories = array(1 => getWatchCategories(1), 2 => getWatchCategories(2));
-    if (0 >= count(glob(WATCH_TMP_PATH . '*.bouquet'))) {
-    } else {
-        checkBouquets();
-    }
-    if (!$rForce) {
-        $db->query("SELECT * FROM `watch_folders` WHERE `type` <> 'plex' AND `server_id` = ? AND `active` = 1 AND (UNIX_TIMESTAMP() - `last_run` > ? OR `last_run` IS NULL) ORDER BY `id` ASC;", SERVER_ID, $rScanOffset);
-    } else {
-        $db->query("SELECT * FROM `watch_folders` WHERE `type` <> 'plex' AND `server_id` = ? AND `id` = ?;", SERVER_ID, $rForce);
-    }
-    $rRows = $db->get_rows();
-    if (0 >= count($rRows)) {
-    } else {
-        shell_exec('rm -f ' . WATCH_TMP_PATH . '*.wpid');
-        $rSeriesTMDB = $rStreamDatabase = array();
-        $rTMDBDatabase = array('movie' => array(), 'series' => array());
-        echo 'Generating cache...' . "\n";
-        $db->query('SELECT `id`, `tmdb_id` FROM `streams_series` WHERE `tmdb_id` IS NOT NULL AND `tmdb_id` > 0;');
-        foreach ($db->get_rows() as $rRow) {
-            $rSeriesTMDB[$rRow['id']] = $rRow['tmdb_id'];
-        }
-        $db->query('SELECT `streams`.`id`, `streams_episodes`.`series_id`, `streams_episodes`.`season_num`, `streams_episodes`.`episode_num`, `streams`.`stream_source` FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams_servers`.`server_id` = ?;', SERVER_ID);
-        foreach ($db->get_rows() as $rRow) {
-            $rStreamDatabase[] = $rRow['stream_source'];
-            $rTMDBID = $rSeriesTMDB[$rRow['series_id']];
-            if (!$rTMDBID) {
-            } else {
-                list($rSource) = json_decode($rRow['stream_source'], true);
-                $rTMDBDatabase['series'][$rTMDBID][$rRow['season_num'] . '_' . $rRow['episode_num']] = array('id' => $rRow['id'], 'source' => $rSource);
-            }
-        }
-        $db->query('SELECT `streams`.`id`, `streams`.`stream_source`, `streams`.`movie_properties` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`type` = 2 AND `streams_servers`.`server_id` = ?;', SERVER_ID);
-        foreach ($db->get_rows() as $rRow) {
-            $rStreamDatabase[] = $rRow['stream_source'];
-            $rTMDBID = (json_decode($rRow['movie_properties'], true)['tmdb_id'] ?: null);
-            if (!$rTMDBID) {
-            } else {
-                list($rSource) = json_decode($rRow['stream_source'], true);
-                $rTMDBDatabase['movie'][$rTMDBID] = array('id' => $rRow['id'], 'source' => $rSource);
-            }
-        }
-        exec('find ' . WATCH_TMP_PATH . ' -maxdepth 1 -name "*.cache" -print0 | xargs -0 rm');
-        foreach ($rTMDBDatabase['series'] as $rTMDBID => $rData) {
-            file_put_contents(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.cache', json_encode($rData));
-        }
-        foreach ($rTMDBDatabase['movie'] as $rTMDBID => $rData) {
-            file_put_contents(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.cache', json_encode($rData));
-        }
-        unset($rTMDBDatabase);
-        echo 'Finished generating cache!' . "\n";
-    }
-    foreach ($rRows as $rRow) {
-        $db->query('UPDATE `watch_folders` SET `last_run` = UNIX_TIMESTAMP() WHERE `id` = ?;', $rRow['id']);
-        $rExtensions = json_decode($rRow['allowed_extensions'], true);
-        if ($rExtensions) {
-        } else {
-            $rExtensions = array();
-        }
-        if (count($rExtensions) == 0) {
-            $rExtensions = array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'flv', 'wmv', 'mov', 'ts');
-        }
-        $rSubtitles = $rFiles = array();
-        if (0 < strlen($rRow['rclone_dir'])) {
-            $rCommand = 'rclone --config "' . CONFIG_PATH . 'rclone.conf" lsjson ' . escapeshellarg($rRow['rclone_dir']) . ' -R --fast-list --files-only';
-            exec($rCommand, $a364ed03b3639bd1, $Ee034ad5c6b0c8a3);
-            $rData = implode(' ', $a364ed03b3639bd1);
-            if (!substr($rData, 0, 1) != '[') {
-            } else {
-                $rData = '[' . explode('[', $rData, 1)[1];
-            }
-            $a364ed03b3639bd1 = json_decode($rData, true);
-            foreach ($a364ed03b3639bd1 as $rFile) {
-                $rFile['Path'] = rtrim($rRow['directory'], '/') . '/' . $rFile['Path'];
-                if (!(count($rExtensions) == 0 || in_array(strtolower(pathinfo($rFile['Name'])['extension']), $rExtensions))) {
-                } else {
-                    $rFiles[] = $rFile['Path'];
-                }
-                if (!isset($rRow['auto_subtitles'])) {
-                } else {
-                    if (!in_array(strtolower(pathinfo($rFile['Path'])['extension']), array('srt', 'sub', 'sbv'))) {
-                    } else {
-                        $rSubtitles[] = $rFile['Path'];
-                    }
-                }
-            }
-        } else {
-            if (0 < count($rExtensions)) {
-                $rExtensions = escapeshellcmd(implode('|', $rExtensions));
-                $rCommand = '/usr/bin/find "' . escapeshellcmd($rRow['directory']) . '" -regex ".*\\.\\(' . $rExtensions . '\\)"';
-            } else {
-                $rCommand = '/usr/bin/find "' . escapeshellcmd($rRow['directory']) . '"';
-            }
-            exec($rCommand, $rFiles, $Ee034ad5c6b0c8a3);
-            if (isset($rRow['auto_subtitles'])) {
-                $rExtensions = escapeshellcmd(implode('|', array('srt', 'sub', 'sbv')));
-                $rCommand = '/usr/bin/find "' . escapeshellcmd($rRow['directory']) . '" -regex ".*\\.\\(' . $rExtensions . '\\)"';
-                exec($rCommand, $rSubtitles, $Ee034ad5c6b0c8a3);
-            } else {
-                $rSubtitles = array();
-            }
-        }
-        $rThreadData = array();
-        foreach ($rFiles as $rFile) {
-            if (time() - filemtime($rFile) >= 30) {
-                if (in_array(json_encode(array('s:' . SERVER_ID . ':' . $rFile), JSON_UNESCAPED_UNICODE), $rStreamDatabase)) {
-                } else {
-                    $rPathInfo = pathinfo($rFile);
-                    $d8c5b5dc1e354db6 = array();
-                    if (!isset($rRow['auto_subtitles'])) {
-                    } else {
-                        foreach (array('srt', 'sub', 'sbv') as $rExt) {
-                            $rSubtitle = $rPathInfo['dirname'] . '/' . $rPathInfo['filename'] . '.' . $rExt;
-                            if (!in_array($rSubtitle, $rSubtitles)) {
-                            } else {
-                                $d8c5b5dc1e354db6 = array('files' => array($rSubtitle), 'names' => array('Subtitles'), 'charset' => array('UTF-8'), 'location' => SERVER_ID);
-                                break;
-                            }
-                        }
-                    }
-                    $rThreadData[] = array('folder_id' => $rRow['id'], 'type' => $rRow['type'], 'directory' => $rRow['directory'], 'file' => $rFile, 'subtitles' => $d8c5b5dc1e354db6, 'category_id' => $rRow['category_id'], 'bouquets' => $rRow['bouquets'], 'disable_tmdb' => $rRow['disable_tmdb'], 'ignore_no_match' => $rRow['ignore_no_match'], 'fb_bouquets' => $rRow['fb_bouquets'], 'fb_category_id' => $rRow['fb_category_id'], 'language' => $rRow['language'], 'watch_categories' => $rWatchCategories, 'read_native' => $rRow['read_native'], 'movie_symlink' => $rRow['movie_symlink'], 'remove_subtitles' => $rRow['remove_subtitles'], 'auto_encode' => $rRow['auto_encode'], 'auto_upgrade' => $rRow['auto_upgrade'], 'fallback_title' => $rRow['fallback_title'], 'ffprobe_input' => $rRow['ffprobe_input'], 'transcode_profile_id' => $rRow['transcode_profile_id'], 'max_genres' => intval(CoreUtilities::$rSettings['max_genres']), 'duplicate_tmdb' => $rRow['duplicate_tmdb'], 'target_container' => $rRow['target_container'], 'alternative_titles' => CoreUtilities::$rSettings['alternative_titles'], 'fallback_parser' => CoreUtilities::$rSettings['fallback_parser']);
-                    if (!(0 < $F7fa29461a8a5ee2 && count($rThreadData) == $F7fa29461a8a5ee2)) {
-                    } else {
-                        break;
-                    }
-                }
-            }
-        }
-        if (count($rThreadData) > 0) {
-            echo 'Scan complete! Adding ' . count($rThreadData) . ' files...' . "\n";
-        }
-        $cacheDataKey = array();
-        foreach ($rThreadData as $rData) {
-            $rCommand = '/usr/bin/timeout 60 ' . PHP_BIN . ' ' . INCLUDES_PATH . 'cli/watch_item.php "' . base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . '"';
-            $cacheDataKey[] = $rCommand;
-        }
-        $db->close_mysql();
-        if ($rThreadCount <= 1) {
-            foreach ($cacheDataKey as $rCommand) {
-                shell_exec($rCommand);
-            }
-        } else {
-            $cacheMetadataKey = new Multithread($cacheDataKey, $rThreadCount);
-            $cacheMetadataKey->run();
-        }
-        $db->db_connect();
-        checkBouquets();
-    }
-}
-function getBouquet($rID) {
-    global $db;
-    $db->query('SELECT * FROM `bouquets` WHERE `id` = ?;', $rID);
-    if ($db->num_rows() != 1) {
-    } else {
-        return $db->get_row();
-    }
-}
-function checkBouquets() {
-    global $db;
-    $a39a336ad3894348 = array();
-    $rBouquets = glob(WATCH_TMP_PATH . '*.bouquet');
-    foreach ($rBouquets as $D3e2134ebfab5c71) {
-        $rBouquet = json_decode(file_get_contents($D3e2134ebfab5c71), true);
-        if (isset($a39a336ad3894348[$rBouquet['bouquet_id']])) {
-        } else {
-            $a39a336ad3894348[$rBouquet['bouquet_id']] = array('movie' => array(), 'series' => array());
-        }
-        $a39a336ad3894348[$rBouquet['bouquet_id']][$rBouquet['type']][] = $rBouquet['id'];
-        unlink($D3e2134ebfab5c71);
-    }
-    foreach ($a39a336ad3894348 as $rBouquetID => $rBouquetData) {
-        $rBouquet = getBouquet($rBouquetID);
-        if (!$rBouquet) {
-        } else {
-            foreach (array('movie', 'series') as $rType) {
-                if ($rType == 'movie') {
-                    $rColumn = 'bouquet_movies';
-                } else {
-                    $rColumn = 'bouquet_series';
-                }
-                $rChannels = json_decode($rBouquet[$rColumn], true);
-                foreach ($rBouquetData[$rType] as $rID) {
-                    if (0 >= intval($rID) || in_array($rID, $rChannels)) {
-                    } else {
-                        $rChannels[] = $rID;
-                    }
-                }
-                $db->query('UPDATE `bouquets` SET `' . $rColumn . '` = ? WHERE `id` = ?;', '[' . implode(',', array_map('intval', $rChannels)) . ']', $rBouquetID);
-            }
-        }
-    }
-}
+
 function shutdown() {
     global $db;
     global $rIdentifier;
diff --git a/src/includes/CoreUtilities.php b/src/includes/CoreUtilities.php
index 77c2056e..743cbea9 100644
--- a/src/includes/CoreUtilities.php
+++ b/src/includes/CoreUtilities.php
@@ -563,37 +563,10 @@ class CoreUtilities {
 		return $rOutput;
 	}
 	public static function isPIDsRunning($rServerIDS, $rPIDs, $rEXE) {
-		if (is_array($rServerIDS)) {
-		} else {
-			$rServerIDS = array(intval($rServerIDS));
-		}
-		$rPIDs = array_map('intval', $rPIDs);
-		$rOutput = array();
-		foreach ($rServerIDS as $rServerID) {
-			if (is_array(self::$rServers) && array_key_exists($rServerID, self::$rServers)) {
-				$rResponse = self::serverRequest($rServerID, self::$rServers[$rServerID]['api_url_ip'] . '&action=pidsAreRunning', array('program' => $rEXE, 'pids' => $rPIDs));
-				if ($rResponse) {
-					$rDecoded = json_decode($rResponse, true);
-					if (is_array($rDecoded)) {
-						$rOutput[$rServerID] = array_map('trim', $rDecoded);
-					} else {
-						$rOutput[$rServerID] = false;
-					}
-				} else {
-					$rOutput[$rServerID] = false;
-				}
-			}
-		}
-		return $rOutput;
+		return ProcessChecker::isPIDsRunning(self::$rServers, $rServerIDS, $rPIDs, $rEXE, array(self::class, 'serverRequest'));
 	}
 	public static function isPIDRunning($rServerID, $rPID, $rEXE) {
-		if (!is_null($rPID) && is_numeric($rPID) && is_array(self::$rServers) && array_key_exists($rServerID, self::$rServers)) {
-			if (!($rOutput = self::isPIDsRunning($rServerID, array($rPID), $rEXE))) {
-				return false;
-			}
-			return $rOutput[$rServerID][$rPID];
-		}
-		return false;
+		return ProcessChecker::isPIDRunning(self::$rServers, $rServerID, $rPID, $rEXE, array(self::class, 'isPIDsRunning'));
 	}
 	public static function serverRequest($rServerID, $rURL, $rPostData = array()) {
 		return CurlClient::serverRequest(self::$rServers, $rServerID, $rURL, $rPostData);
@@ -608,92 +581,22 @@ class CoreUtilities {
 		return StreamProcess::createChannel($rStreamID);
 	}
 	public static function createChannelItem($rStreamID, $rSource) {
-		return StreamProcess::createChannelItem(self::$db, self::$rSettings, self::$rServers, self::$rFFMPEG_CPU, self::$rFFMPEG_GPU, $rStreamID, $rSource);
+		return FFmpegCommand::createChannelItem(self::$db, self::$rSettings, self::$rServers, self::$rFFMPEG_CPU, self::$rFFMPEG_GPU, $rStreamID, $rSource);
 	}
 	public static function extractSubtitle($rStreamID, $rSourceURL, $rIndex) {
-		$rTimeout = 10;
-		$rCommand = 'timeout ' . $rTimeout . ' ' . self::$rFFMPEG_CPU . ' -y -nostdin -hide_banner -loglevel ' . ((self::$rSettings['ffmpeg_warnings'] ? 'warning' : 'error')) . ' -err_detect ignore_err -i "' . $rSourceURL . '" -map 0:s:' . intval($rIndex) . ' ' . VOD_PATH . intval($rStreamID) . '_' . intval($rIndex) . '.srt';
-		exec($rCommand, $rOutput);
-		if (file_exists(VOD_PATH . intval($rStreamID) . '_' . intval($rIndex) . '.srt')) {
-			if (filesize(VOD_PATH . intval($rStreamID) . '_' . intval($rIndex) . '.srt') != 0) {
-				return true;
-			}
-			unlink(VOD_PATH . intval($rStreamID) . '_' . intval($rIndex) . '.srt');
-			return false;
-		}
-		return false;
+		return SubtitleExtractor::extractSubtitle(self::$rFFMPEG_CPU, self::$rSettings, $rStreamID, $rSourceURL, $rIndex);
 	}
 	public static function probeStream($rSourceURL, $rFetchArguments = array(), $rPrepend = '', $rParse = true) {
-		$rAnalyseDuration = abs(intval(self::$rSettings['stream_max_analyze']));
-		$rProbesize = abs(intval(self::$rSettings['probesize']));
-		$rTimeout = intval($rAnalyseDuration / 1000000) + self::$rSettings['probe_extra_wait'];
-		if (!is_array($rFetchArguments)) {
-			$rFetchArguments = !empty($rFetchArguments) ? [$rFetchArguments] : [];
-		}
-		$rCommand = $rPrepend . 'timeout ' . $rTimeout . ' ' . self::$rFFPROBE . ' -probesize ' . $rProbesize . ' -analyzeduration ' . $rAnalyseDuration . ' ' . implode(' ', $rFetchArguments) . ' -i "' . $rSourceURL . '" -v quiet -print_format json -show_streams -show_format';
-		exec($rCommand, $rReturn);
-		$result = implode("\n", $rReturn);
-		if ($rParse) {
-			return self::parseFFProbe(json_decode($result, true));
-		}
-		return json_decode($result, true);
+		return FFprobeRunner::probeStream(self::$rSettings, self::$rFFPROBE, $rSourceURL, $rFetchArguments, $rPrepend, $rParse, array(self::class, 'parseFFProbe'));
 	}
 	public static function parseFFProbe($rCodecs) {
-		if (empty($rCodecs)) {
-			return false;
-		}
-		if (empty($rCodecs['codecs'])) {
-			$rOutput = array();
-			$rOutput['codecs']['video'] = '';
-			$rOutput['codecs']['audio'] = '';
-			$rOutput['container'] = $rCodecs['format']['format_name'];
-			$rOutput['filename'] = $rCodecs['format']['filename'];
-			$rOutput['bitrate'] = (!empty($rCodecs['format']['bit_rate']) ? $rCodecs['format']['bit_rate'] : null);
-			$rOutput['of_duration'] = (!empty($rCodecs['format']['duration']) ? $rCodecs['format']['duration'] : 'N/A');
-			$rOutput['duration'] = (!empty($rCodecs['format']['duration']) ? gmdate('H:i:s', intval($rCodecs['format']['duration'])) : 'N/A');
-			foreach ($rCodecs['streams'] as $rCodec) {
-				if (isset($rCodec['codec_type']) && !($rCodec['codec_type'] != 'audio' && $rCodec['codec_type'] != 'video' && $rCodec['codec_type'] != 'subtitle')) {
-					if ($rCodec['codec_type'] == 'audio' || $rCodec['codec_type'] == 'video') {
-						if (!empty($rOutput['codecs'][$rCodec['codec_type']])) {
-						} else {
-							$rOutput['codecs'][$rCodec['codec_type']] = $rCodec;
-						}
-					} else {
-						if ($rCodec['codec_type'] != 'subtitle') {
-						} else {
-							if (isset($rOutput['codecs'][$rCodec['codec_type']])) {
-							} else {
-								$rOutput['codecs'][$rCodec['codec_type']] = array();
-							}
-							$rOutput['codecs'][$rCodec['codec_type']][] = $rCodec;
-						}
-					}
-				}
-			}
-			return $rOutput;
-		} else {
-			return $rCodecs;
-		}
+		return FFprobeRunner::parseFFProbe($rCodecs);
 	}
 	public static function stopStream($rStreamID, $rStop = false) {
 		StreamProcess::stopStream(self::$db, $rStreamID, $rStop);
 	}
 	public static function checkPID($rPID, $rSearch) {
-		if (is_array($rSearch)) {
-		} else {
-			$rSearch = array($rSearch);
-		}
-		if (!file_exists('/proc/' . $rPID)) {
-		} else {
-			$rCommand = trim(file_get_contents('/proc/' . $rPID . '/cmdline'));
-			foreach ($rSearch as $rTerm) {
-				if (!stristr($rCommand, $rTerm)) {
-				} else {
-					return true;
-				}
-			}
-		}
-		return false;
+		return ProcessChecker::checkPID($rPID, $rSearch);
 	}
 	public static function startMonitor($rStreamID, $rRestart = 0) {
 		return StreamProcess::startMonitor($rStreamID, $rRestart);
@@ -2254,38 +2157,7 @@ class CoreUtilities {
 	 * @return string|false The valid Plex token or false on failure
 	 */
 	public static function getPlexToken($plexIP = null, $plexPort = null, $plexUsername = null, $plexPassword = null) {
-		// Generate a unique cache key based on connection details and credentials
-		$serverKey = self::getPlexServerCacheKey($plexIP, $plexPort, $plexUsername, $plexPassword);
-
-		// 1. Try to retrieve token from file cache
-		$rToken = self::getCachedPlexToken($serverKey);
-		if ($rToken) {
-			// Even if cached, verify that the token is still valid on the server
-			$rToken = self::checkPlexToken($plexIP, $plexPort, $rToken);
-		}
-
-		// 2. If no valid token yet – perform a fresh login via plex.tv
-		if (!$rToken) {
-			echo "Plex token not found in cache or invalid, logging in for server {$plexIP}:{$plexPort}...\n";
-
-			$rData = self::getPlexLogin($plexUsername, $plexPassword);
-
-			if (isset($rData['user']['authToken'])) {
-				// Validate the freshly obtained token against the local server
-				$rToken = self::checkPlexToken($plexIP, $plexPort, $rData['user']['authToken']);
-
-				if ($rToken) {
-					// Cache the working token for future use
-					self::cachePlexToken($serverKey, $rToken);
-					echo "New Plex token successfully cached for key: $serverKey\n";
-				}
-			} else {
-				echo "Failed to login to Plex (wrong credentials or network issue)!\n";
-				$rToken = false;
-			}
-		}
-
-		return $rToken;
+		return PlexAuth::getPlexToken($plexIP, $plexPort, $plexUsername, $plexPassword);
 	}
 
 	/**
@@ -2299,12 +2171,7 @@ class CoreUtilities {
 	 * @return string MD5 hash used as cache filename
 	 */
 	public static function getPlexServerCacheKey($ip, $port, $username = null, $password = null) {
-		// Include credentials in the hash when provided – allows multiple accounts on same server
-		if ($username && $password) {
-			return md5($ip . ':' . $port . ':' . $username . ':' . $password);
-		}
-
-		return md5($ip . ':' . $port);
+		return PlexAuth::getPlexServerCacheKey($ip, $port, $username, $password);
 	}
 
 	/**
@@ -2315,26 +2182,7 @@ class CoreUtilities {
 	 * @return string|null Token string if valid and not near expiry, otherwise null
 	 */
 	public static function getCachedPlexToken($serverKey) {
-		$cacheFile = CONFIG_PATH . 'plex/plex_token_' . $serverKey . '.json';
-
-		if (!file_exists($cacheFile)) {
-			return null;
-		}
-
-		$data = json_decode(file_get_contents($cacheFile), true);
-
-		// Validate cache structure
-		if (!$data || !isset($data['token']) || !isset($data['expires'])) {
-			return null;
-		}
-
-		// If token will expire within the next 24 hours – treat it as expired and refresh
-		if ($data['expires'] < time() + 86400) {
-			@unlink($cacheFile); // Clean up almost-expired cache file
-			return null;
-		}
-
-		return $data['token'];
+		return PlexAuth::getCachedPlexToken($serverKey);
 	}
 
 	/**
@@ -2347,29 +2195,7 @@ class CoreUtilities {
 	 * @return array Response array from plex.tv (decoded JSON)
 	 */
 	public static function getPlexLogin($rUsername, $rPassword) {
-		$headers = [
-			'Content-Type: application/xml; charset=utf-8',
-			'X-Plex-Client-Identifier: 526e163c-8dbd-11eb-8dcd-0242ac130003',
-			'X-Plex-Product: XC_VM',
-			'X-Plex-Version: v' . XC_VM_VERSION
-		];
-
-		$ch = curl_init('https://plex.tv/users/sign_in.json');
-		curl_setopt_array($ch, [
-			CURLOPT_HTTPHEADER     => $headers,
-			CURLOPT_HEADER         => false,
-			CURLOPT_HTTPAUTH       => CURLAUTH_BASIC,
-			CURLOPT_USERPWD        => $rUsername . ':' . $rPassword,
-			CURLOPT_TIMEOUT        => 30,
-			CURLOPT_SSL_VERIFYPEER => false, // Note: consider enabling in production
-			CURLOPT_POST           => true,
-			CURLOPT_RETURNTRANSFER => true,
-		]);
-
-		$response = curl_exec($ch);
-		curl_close($ch);
-
-		return json_decode($response, true);
+		return PlexAuth::getPlexLogin($rUsername, $rPassword);
 	}
 
 	/**
@@ -2382,30 +2208,7 @@ class CoreUtilities {
 	 * @return string The same token if valid, empty string otherwise
 	 */
 	public static function checkPlexToken($rIP, $rPort, $rToken) {
-		$checkURL = 'http://' . $rIP . ':' . $rPort . '/myplex/account?X-Plex-Token=' . $rToken;
-
-		$ch = curl_init($checkURL);
-		curl_setopt_array($ch, [
-			CURLOPT_RETURNTRANSFER => true,
-			CURLOPT_CONNECTTIMEOUT => 10,
-			CURLOPT_TIMEOUT        => 10,
-			CURLOPT_SSL_VERIFYPEER => false, // Consider enabling with proper certs
-		]);
-
-		$data = curl_exec($ch);
-		curl_close($ch);
-
-		// Plex returns XML – convert to array for easy attribute access
-		$xml = simplexml_load_string($data);
-		if ($xml === false) {
-			return '';
-		}
-
-		$json = json_decode(json_encode($xml), true);
-
-		return (isset($json['@attributes']['signInState']) && $json['@attributes']['signInState'] === 'ok')
-			? $rToken
-			: '';
+		return PlexAuth::checkPlexToken($rIP, $rPort, $rToken);
 	}
 
 	/**
@@ -2417,21 +2220,6 @@ class CoreUtilities {
 	 * @return void
 	 */
 	public static function cachePlexToken($serverKey, $token) {
-		$cacheFile = CONFIG_PATH . 'plex/plex_token_' . $serverKey . '.json';
-
-		$data = [
-			'token'     => $token,
-			'cached_at' => time(),
-			// Plex tokens are generally valid for months; 30 days is a safe conservative value
-			'expires'   => time() + 30 * 86400
-		];
-
-		// Ensure the directory exists
-		if (!is_dir(dirname($cacheFile))) {
-			mkdir(dirname($cacheFile), 0755, true);
-		}
-
-		file_put_contents($cacheFile, json_encode($data, JSON_PRETTY_PRINT));
-		@chmod($cacheFile, 0600); // Restrict permissions – contains sensitive token
+		PlexAuth::cachePlexToken($serverKey, $token);
 	}
 }
diff --git a/src/includes/StreamingUtilities.php b/src/includes/StreamingUtilities.php
index b5cac2d6..1f6df406 100644
--- a/src/includes/StreamingUtilities.php
+++ b/src/includes/StreamingUtilities.php
@@ -162,540 +162,28 @@ class StreamingUtilities {
 		return ConnectionTracker::getCapacity(self::$rSettings, self::$rServers, self::$redis, self::$db, $rProxy);
 	}
 	public static function redirectStream($rStreamID, $rExtension, $rUserInfo, $rCountryCode, $rUserISP = '', $rType = '') {
-		if (self::$rCached) {
-			$rStream = (igbinary_unserialize(file_get_contents(STREAMS_TMP_PATH . 'stream_' . $rStreamID)) ?: null);
-			$rStream['bouquets'] = self::getBouquetMap($rStreamID);
-		} else {
-			$rStream = self::getStreamData($rStreamID);
-		}
-		if ($rStream) {
-			$rStream['info']['bouquets'] = $rStream['bouquets'];
-			$rAvailableServers = array();
-			if ($rType == 'archive') {
-				if (!(0 < $rStream['info']['tv_archive_duration'] && 0 < $rStream['info']['tv_archive_server_id'] && array_key_exists($rStream['info']['tv_archive_server_id'], self::$rServers))) {
-				} else {
-					$rAvailableServers = array($rStream['info']['tv_archive_server_id']);
-				}
-			} else {
-				if (!($rStream['info']['direct_source'] == 1 && $rStream['info']['direct_proxy'] == 0)) {
-					foreach (self::$rServers as $rServerID => $rServerInfo) {
-						if (!(!array_key_exists($rServerID, $rStream['servers']) || !$rServerInfo['server_online'] || $rServerInfo['server_type'] != 0)) {
-							if (!isset($rStream['servers'][$rServerID])) {
-							} else {
-								if ($rType == 'movie') {
-									if (!((!empty($rStream['servers'][$rServerID]['pid']) && $rStream['servers'][$rServerID]['to_analyze'] == 0 && $rStream['servers'][$rServerID]['stream_status'] == 0 || $rStream['info']['direct_source'] == 1 && $rStream['info']['direct_proxy'] == 1) && ($rStream['info']['target_container'] == $rExtension || $rExtension == 'srt' || $rExtension == 'm3u8' || $rExtension == 'ts') && $rServerInfo['timeshift_only'] == 0)) {
-									} else {
-										$rAvailableServers[] = $rServerID;
-									}
-								} else {
-									if (!(($rStream['servers'][$rServerID]['on_demand'] == 1 && $rStream['servers'][$rServerID]['stream_status'] != 1 || 0 < $rStream['servers'][$rServerID]['pid'] && $rStream['servers'][$rServerID]['stream_status'] == 0) && $rStream['servers'][$rServerID]['to_analyze'] == 0 && (int) $rStream['servers'][$rServerID]['delay_available_at'] <= time() && $rServerInfo['timeshift_only'] == 0 || $rStream['info']['direct_source'] == 1 && $rStream['info']['direct_proxy'] == 1)) {
-									} else {
-										$rAvailableServers[] = $rServerID;
-									}
-								}
-							}
-						}
-					}
-				} else {
-					header('Location: ' . str_replace(' ', '%20', json_decode($rStream['info']['stream_source'], true)[0]));
-					exit();
-				}
-			}
-			if (!empty($rAvailableServers)) {
-				shuffle($rAvailableServers);
-				$rServerCapacity = self::getCapacity();
-				$rAcceptServers = array();
-				foreach ($rAvailableServers as $rServerID) {
-					$rOnlineClients = (isset($rServerCapacity[$rServerID]['online_clients']) ? $rServerCapacity[$rServerID]['online_clients'] : 0);
-					if ($rOnlineClients != 0) {
-					} else {
-						$rServerCapacity[$rServerID]['capacity'] = 0;
-					}
-					$rAcceptServers[$rServerID] = (0 < self::$rServers[$rServerID]['total_clients'] && $rOnlineClients < self::$rServers[$rServerID]['total_clients'] ? $rServerCapacity[$rServerID]['capacity'] : false);
-				}
-				$rAcceptServers = array_filter($rAcceptServers, 'is_numeric');
-				if (empty($rAcceptServers)) {
-					if ($rType == 'archive') {
-						return null;
-					}
-					return array();
-				}
-				$rKeys = array_keys($rAcceptServers);
-				$rValues = array_values($rAcceptServers);
-				array_multisort($rValues, SORT_ASC, $rKeys, SORT_ASC);
-				$rAcceptServers = array_combine($rKeys, $rValues);
-				if ($rExtension == 'rtmp' && array_key_exists(SERVER_ID, $rAcceptServers)) {
-					$rRedirectID = SERVER_ID;
-				} else {
-					if (isset($rUserInfo) && $rUserInfo['force_server_id'] != 0 && array_key_exists($rUserInfo['force_server_id'], $rAcceptServers)) {
-						$rRedirectID = $rUserInfo['force_server_id'];
-					} else {
-						$rPriorityServers = array();
-						foreach (array_keys($rAcceptServers) as $rServerID) {
-							if (self::$rServers[$rServerID]['enable_geoip'] == 1) {
-								if (in_array($rCountryCode, self::$rServers[$rServerID]['geoip_countries'])) {
-									$rRedirectID = $rServerID;
-									break;
-								}
-								if (self::$rServers[$rServerID]['geoip_type'] == 'strict') {
-									unset($rAcceptServers[$rServerID]);
-								} else {
-									if (isset($rStream) && !self::$rSettings['ondemand_balance_equal'] && $rStream['servers'][$rServerID]['on_demand']) {
-										$rPriorityServers[$rServerID] = (self::$rServers[$rServerID]['geoip_type'] == 'low_priority' ? 3 : 2);
-									} else {
-										$rPriorityServers[$rServerID] = (self::$rServers[$rServerID]['geoip_type'] == 'low_priority' ? 2 : 1);
-									}
-								}
-							} else {
-								if (self::$rServers[$rServerID]['enable_isp'] == 1) {
-									if (in_array(strtolower(trim(preg_replace('/[^A-Za-z0-9 ]/', '', $rUserISP))), self::$rServers[$rServerID]['isp_names'])) {
-										$rRedirectID = $rServerID;
-										break;
-									}
-									if (self::$rServers[$rServerID]['isp_type'] == 'strict') {
-										unset($rAcceptServers[$rServerID]);
-									} else {
-										if (isset($rStream) && !self::$rSettings['ondemand_balance_equal'] && $rStream['servers'][$rServerID]['on_demand']) {
-											$rPriorityServers[$rServerID] = (self::$rServers[$rServerID]['isp_type'] == 'low_priority' ? 3 : 2);
-										} else {
-											$rPriorityServers[$rServerID] = (self::$rServers[$rServerID]['isp_type'] == 'low_priority' ? 2 : 1);
-										}
-									}
-								} else {
-									if (isset($rStream) && !self::$rSettings['ondemand_balance_equal'] && $rStream['servers'][$rServerID]['on_demand']) {
-										$rPriorityServers[$rServerID] = 2;
-									} else {
-										$rPriorityServers[$rServerID] = 1;
-									}
-								}
-							}
-						}
-						if (!(empty($rPriorityServers) && empty($rRedirectID))) {
-							$rRedirectID = (empty($rRedirectID) ? array_search(min($rPriorityServers), $rPriorityServers) : $rRedirectID);
-						} else {
-							return false;
-						}
-					}
-				}
-				if ($rType == 'archive') {
-					return $rRedirectID;
-				}
-				$rStream['info']['redirect_id'] = $rRedirectID;
-				$fc4c58c5d1cd68d1 = $rRedirectID;
-				return array_merge($rStream['info'], $rStream['servers'][$fc4c58c5d1cd68d1]);
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
+		return StreamRedirector::redirectStream(self::$rCached, self::$rSettings, self::$rServers, $rStreamID, $rExtension, $rUserInfo, $rCountryCode, $rUserISP, $rType, array(self::class, 'getBouquetMap'), array(self::class, 'getStreamData'), array(self::class, 'getCapacity'));
 	}
 	public static function getOffAirVideo($Fd50c63671da34f8) {
-		if (!(isset(self::$rSettings[$Fd50c63671da34f8]) && 0 < strlen(self::$rSettings[$Fd50c63671da34f8]))) {
-			switch ($Fd50c63671da34f8) {
-				case 'connected_video_path':
-					if (!file_exists(VIDEO_PATH . 'connected.ts')) {
-						break;
-					}
-					return VIDEO_PATH . 'connected.ts';
-				case 'expired_video_path':
-					if (!file_exists(VIDEO_PATH . 'expired.ts')) {
-						break;
-					}
-					return VIDEO_PATH . 'expired.ts';
-				case 'banned_video_path':
-					if (!file_exists(VIDEO_PATH . 'banned.ts')) {
-						break;
-					}
-					return VIDEO_PATH . 'banned.ts';
-				case 'not_on_air_video_path':
-					if (!file_exists(VIDEO_PATH . 'offline.ts')) {
-						break;
-					}
-					return VIDEO_PATH . 'offline.ts';
-				case 'expiring_video_path':
-					if (!file_exists(VIDEO_PATH . 'expiring.ts')) {
-						break;
-					}
-					return VIDEO_PATH . 'expiring.ts';
-			}
-		} else {
-			return self::$rSettings[$Fd50c63671da34f8];
-		}
+		return OffAirHandler::getOffAirVideo(self::$rSettings, $Fd50c63671da34f8);
 	}
 	public static function showVideoServer($Fca476d6a870416e, $Fd50c63671da34f8, $rExtension, $rUserInfo, $rIP, $rCountryCode, $rISP, $rServerID = null, $rProxyID = null) {
-		$Fd50c63671da34f8 = self::getOffAirVideo($Fd50c63671da34f8);
-		if (!(!$rUserInfo['is_restreamer'] && self::$rSettings[$Fca476d6a870416e] && 0 < strlen($Fd50c63671da34f8))) {
-			switch ($Fca476d6a870416e) {
-				case 'show_expired_video':
-					generateError('EXPIRED');
-					break;
-				case 'show_banned_video':
-					generateError('BANNED');
-					break;
-				case 'show_not_on_air_video':
-					generateError('STREAM_OFFLINE');
-					break;
-				default:
-					generate404();
-					break;
-			}
-		} else {
-			if (!$rServerID) {
-				$rServerID = self::F4221e28760b623E($rUserInfo, $rIP, $rCountryCode, $rISP);
-			}
-			if (!$rServerID) {
-				$rServerID = SERVER_ID;
-			}
-			$rOriginatorID = null;
-			if (self::isProxied($rServerID) && (!$rUserInfo['is_restreamer'] || !self::$rSettings['restreamer_bypass_proxy'])) {
-				$rProxies = self::getProxies($rServerID);
-				$rProxyID = self::availableProxy(array_keys($rProxies), $rCountryCode, $rUserInfo['con_isp_name']);
-				if (!$rProxyID) {
-					generate404();
-				}
-				$rOriginatorID = $rServerID;
-				$rServerID = $rProxyID;
-			}
-			if (self::$rServers[$rServerID]['random_ip'] && 0 < count(self::$rServers[$rServerID]['domains']['urls'])) {
-				$rURL = self::$rServers[$rServerID]['domains']['protocol'] . '://' . self::$rServers[$rServerID]['domains']['urls'][array_rand(self::$rServers[$rServerID]['domains']['urls'])] . ':' . self::$rServers[$rServerID]['domains']['port'];
-			} else {
-				$rURL = rtrim(self::$rServers[$rServerID]['site_url'], '/');
-			}
-			if (!$rOriginatorID || self::$rServers[$rOriginatorID]['is_main']) {
-			} else {
-				$rURL .= '/' . md5($rServerID . '_' . $rOriginatorID . '_' . OPENSSL_EXTRA);
-			}
-			$rTokenData = array('expires' => time() + 10, 'video_path' => $Fd50c63671da34f8);
-			$rToken = StreamingUtilities::encryptData(json_encode($rTokenData), self::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
-			if ($rExtension == 'm3u8') {
-				$segmentDuration = 10;
-				$sequence = intval(time() / $segmentDuration);
-				$rM3U8 = "#EXTM3U\n#EXT-X-VERSION:3\n#EXT-X-MEDIA-SEQUENCE:{$sequence}\n#EXT-X-ALLOW-CACHE:NO\n#EXT-X-TARGETDURATION:{$segmentDuration}\n#EXT-X-PLAYLIST-TYPE:EVENT\n";
-
-				// Create 3 segments
-				for ($i = 0; $i < 3; $i++) {
-					$rM3U8 .= "#EXTINF:{$segmentDuration}.0,\n" . $rURL . '/auth/' . $rToken  . "\n";
-				}
-
-				header('Content-Type: application/x-mpegurl');
-				header('Content-Length: ' . strlen($rM3U8));
-				echo $rM3U8;
-				exit();
-			}
-			header('Location: ' . $rURL . '/auth/' . $rToken);
-			exit();
-		}
+		return OffAirHandler::showVideoServer(self::$rSettings, self::$rServers, $Fca476d6a870416e, $Fd50c63671da34f8, $rExtension, $rUserInfo, $rIP, $rCountryCode, $rISP, $rServerID, $rProxyID, array(self::class, 'F4221e28760B623E'), array(self::class, 'getProxies'), array(self::class, 'availableProxy'), array(self::class, 'encryptData'));
 	}
 	public static function F4221e28760B623E($rUserInfo, $rUserIP, $rCountryCode, $rUserISP = '') {
-		$rAvailableServers = array();
-		foreach (self::$rServers as $rServerID => $rServerInfo) {
-			if ($rServerInfo['server_online'] && $rServerInfo['server_type'] == 0) {
-				$rAvailableServers[] = $rServerID;
-			}
-		}
-		if (!empty($rAvailableServers)) {
-			shuffle($rAvailableServers);
-			$rServerCapacity = self::getCapacity();
-			$rAcceptServers = array();
-			foreach ($rAvailableServers as $rServerID) {
-				$rOnlineClients = (isset($rServerCapacity[$rServerID]['online_clients']) ? $rServerCapacity[$rServerID]['online_clients'] : 0);
-				if ($rOnlineClients != 0) {
-				} else {
-					$rServerCapacity[$rServerID]['capacity'] = 0;
-				}
-				$rAcceptServers[$rServerID] = (0 < self::$rServers[$rServerID]['total_clients'] && $rOnlineClients < self::$rServers[$rServerID]['total_clients'] ? $rServerCapacity[$rServerID]['capacity'] : false);
-			}
-			$rAcceptServers = array_filter($rAcceptServers, 'is_numeric');
-			if (empty($rAcceptServers)) {
-				return false;
-			}
-			$rKeys = array_keys($rAcceptServers);
-			$rValues = array_values($rAcceptServers);
-			array_multisort($rValues, SORT_ASC, $rKeys, SORT_ASC);
-			$rAcceptServers = array_combine($rKeys, $rValues);
-			if ($rUserInfo['force_server_id'] != 0 && array_key_exists($rUserInfo['force_server_id'], $rAcceptServers)) {
-				$rRedirectID = $rUserInfo['force_server_id'];
-			} else {
-				$rPriorityServers = array();
-				foreach (array_keys($rAcceptServers) as $rServerID) {
-					if (self::$rServers[$rServerID]['enable_geoip'] == 1) {
-						if (in_array($rCountryCode, self::$rServers[$rServerID]['geoip_countries'])) {
-							$rRedirectID = $rServerID;
-							break;
-						}
-						if (self::$rServers[$rServerID]['geoip_type'] == 'strict') {
-							unset($rAcceptServers[$rServerID]);
-						} else {
-							$rPriorityServers[$rServerID] = (self::$rServers[$rServerID]['geoip_type'] == 'low_priority' ? 1 : 2);
-						}
-					} else {
-						if (self::$rServers[$rServerID]['enable_isp'] == 1) {
-							if (in_array($rUserISP, self::$rServers[$rServerID]['isp_names'])) {
-								$rRedirectID = $rServerID;
-								break;
-							}
-							if (self::$rServers[$rServerID]['isp_type'] == 'strict') {
-								unset($rAcceptServers[$rServerID]);
-							} else {
-								$rPriorityServers[$rServerID] = (self::$rServers[$rServerID]['isp_type'] == 'low_priority' ? 1 : 2);
-							}
-						} else {
-							$rPriorityServers[$rServerID] = 1;
-						}
-					}
-				}
-				if (!(empty($rPriorityServers) && empty($rRedirectID))) {
-					$rRedirectID = (empty($rRedirectID) ? array_search(min($rPriorityServers), $rPriorityServers) : $rRedirectID);
-				} else {
-					return false;
-				}
-			}
-			return $rRedirectID;
-		} else {
-			return false;
-		}
+		return StreamAuth::checkAccess(self::$rServers, self::$rSettings, $rUserInfo, $rUserIP, $rCountryCode, $rUserISP, array(self::class, 'getCapacity'));
 	}
 	public static function availableProxy($rProxies, $rCountryCode, $rUserISP = '') {
-		if (!empty($rProxies)) {
-			$rServerCapacity = self::getCapacity(true);
-			$rAcceptServers = array();
-			foreach ($rProxies as $rServerID) {
-				$rOnlineClients = (isset($rServerCapacity[$rServerID]['online_clients']) ? $rServerCapacity[$rServerID]['online_clients'] : 0);
-				if ($rOnlineClients != 0) {
-				} else {
-					$rServerCapacity[$rServerID]['capacity'] = 0;
-				}
-				$rAcceptServers[$rServerID] = (0 < self::$rServers[$rServerID]['total_clients'] && $rOnlineClients < self::$rServers[$rServerID]['total_clients'] ? $rServerCapacity[$rServerID]['capacity'] : false);
-			}
-			$rAcceptServers = array_filter($rAcceptServers, 'is_numeric');
-			if (empty($rAcceptServers)) {
-				return null;
-			}
-			$rKeys = array_keys($rAcceptServers);
-			$rValues = array_values($rAcceptServers);
-			array_multisort($rValues, SORT_ASC, $rKeys, SORT_ASC);
-			$rAcceptServers = array_combine($rKeys, $rValues);
-			$rPriorityServers = array();
-			foreach (array_keys($rAcceptServers) as $rServerID) {
-				if (self::$rServers[$rServerID]['enable_geoip'] == 1) {
-					if (in_array($rCountryCode, self::$rServers[$rServerID]['geoip_countries'])) {
-						$rRedirectID = $rServerID;
-						break;
-					}
-					if (self::$rServers[$rServerID]['geoip_type'] == 'strict') {
-						unset($rAcceptServers[$rServerID]);
-					} else {
-						$rPriorityServers[$rServerID] = (self::$rServers[$rServerID]['geoip_type'] == 'low_priority' ? 1 : 2);
-					}
-				} else {
-					if (self::$rServers[$rServerID]['enable_isp'] == 1) {
-						if (in_array($rUserISP, self::$rServers[$rServerID]['isp_names'])) {
-							$rRedirectID = $rServerID;
-							break;
-						}
-						if (self::$rServers[$rServerID]['isp_type'] == 'strict') {
-							unset($rAcceptServers[$rServerID]);
-						} else {
-							$rPriorityServers[$rServerID] = (self::$rServers[$rServerID]['isp_type'] == 'low_priority' ? 1 : 2);
-						}
-					} else {
-						$rPriorityServers[$rServerID] = 1;
-					}
-				}
-			}
-			if (!(empty($rPriorityServers) && empty($rRedirectID))) {
-				$rRedirectID = (empty($rRedirectID) ? array_search(min($rPriorityServers), $rPriorityServers) : $rRedirectID);
-				return $rRedirectID;
-			}
-			return null;
-		} else {
-			return null;
-		}
+		return ProxySelector::availableProxy(self::$rServers, $rProxies, $rCountryCode, $rUserISP, array(self::class, 'getCapacity'));
 	}
 	public static function closeConnections($rUserID, $rMaxConnections, $rIsHMAC = null, $rIdentifier = '', $rIP = null, $rUserAgent = null) {
-		if (self::$rSettings['redis_handler']) {
-			$rConnections = array();
-			$rKeys = self::getConnections($rUserID, true, true);
-			$rToKill = count($rKeys) - $rMaxConnections;
-			if ($rToKill > 0) {
-				foreach (array_map('igbinary_unserialize', self::$redis->mGet($rKeys)) as $rConnection) {
-					if (!is_array($rConnection)) {
-					} else {
-						$rConnections[] = $rConnection;
-					}
-				}
-				unset($rKeys);
-				$rDate = array_column($rConnections, 'date_start');
-				array_multisort($rDate, SORT_ASC, $rConnections);
-			} else {
-				return null;
-			}
-		} else {
-			if ($rIsHMAC) {
-				self::$db->query('SELECT `lines_live`.*, `on_demand` FROM `lines_live` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `lines_live`.`stream_id` AND `streams_servers`.`server_id` = `lines_live`.`server_id` WHERE `lines_live`.`hmac_id` = ? AND `lines_live`.`hls_end` = 0 AND `lines_live`.`hmac_identifier` = ? ORDER BY `lines_live`.`activity_id` ASC', $rIsHMAC, $rIdentifier);
-			} else {
-				self::$db->query('SELECT `lines_live`.*, `on_demand` FROM `lines_live` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `lines_live`.`stream_id` AND `streams_servers`.`server_id` = `lines_live`.`server_id` WHERE `lines_live`.`user_id` = ? AND `lines_live`.`hls_end` = 0 ORDER BY `lines_live`.`activity_id` ASC', $rUserID);
-			}
-			$rConnectionCount = self::$db->num_rows();
-			$rToKill = $rConnectionCount - $rMaxConnections;
-			if ($rToKill > 0) {
-				$rConnections = self::$db->get_rows();
-			} else {
-				return null;
-			}
-		}
-		$rIP = self::getUserIP();
-		$rKilled = 0;
-		$rDelSID = $rDelUUID = $rIDs = array();
-		if ($rIP && $rUserAgent) {
-			$rKillTypes = array(2, 1, 0);
-		} else {
-			if ($rIP) {
-				$rKillTypes = array(1, 0);
-			} else {
-				$rKillTypes = array(0);
-			}
-		}
-		foreach ($rKillTypes as $rKillOwnIP) {
-			$i = 0;
-			while ($i < count($rConnections) && $rKilled < $rToKill) {
-				if ($rKilled != $rToKill) {
-					if ($rConnections[$i]['pid'] != getmypid()) {
-						if (!($rConnections[$i]['user_ip'] == $rIP && $rConnections[$i]['user_agent'] == $rUserAgent && $rKillOwnIP == 2 || $rConnections[$i]['user_ip'] == $rIP && $rKillOwnIP == 1 || $rKillOwnIP == 0)) {
-						} else {
-							if (!self::closeConnection($rConnections[$i])) {
-							} else {
-								$rKilled++;
-								if ($rConnections[$i]['container'] == 'hls') {
-								} else {
-									if (self::$rSettings['redis_handler']) {
-										$rIDs[] = $rConnections[$i];
-									} else {
-										$rIDs[] = intval($rConnections[$i]['activity_id']);
-									}
-									$rDelUUID[] = $rConnections[$i]['uuid'];
-									$rDelSID[$rConnections[$i]['stream_id']][] = $rDelUUID;
-								}
-								if (!($rConnections[$i]['on_demand'] && $rConnections[$i]['server_id'] == SERVER_ID && self::$rSettings['on_demand_instant_off'])) {
-								} else {
-									self::removeFromQueue($rConnections[$i]['stream_id'], $rConnections[$i]['pid']);
-								}
-							}
-						}
-					}
-					$i++;
-				} else {
-					break;
-				}
-			}
-		}
-		if (empty($rIDs)) {
-		} else {
-			if (self::$rSettings['redis_handler']) {
-				$rUUIDs = array();
-				$rRedis = self::$redis->multi();
-				foreach ($rIDs as $rConnection) {
-					$rRedis->zRem('LINE#' . $rConnection['identity'], $rConnection['uuid']);
-					$rRedis->zRem('LINE_ALL#' . $rConnection['identity'], $rConnection['uuid']);
-					$rRedis->zRem('STREAM#' . $rConnection['stream_id'], $rConnection['uuid']);
-					$rRedis->zRem('SERVER#' . $rConnection['server_id'], $rConnection['uuid']);
-					if (!$rConnection['user_id']) {
-					} else {
-						$rRedis->zRem('SERVER_LINES#' . $rConnection['server_id'], $rConnection['uuid']);
-					}
-					if (!$rConnection['proxy_id']) {
-					} else {
-						$rRedis->zRem('PROXY#' . $rConnection['proxy_id'], $rConnection['uuid']);
-					}
-					$rRedis->del($rConnection['uuid']);
-					$rUUIDs[] = $rConnection['uuid'];
-				}
-				$rRedis->zRem('CONNECTIONS', ...$rUUIDs);
-				$rRedis->zRem('LIVE', ...$rUUIDs);
-				$rRedis->sRem('ENDED', ...$rUUIDs);
-				$rRedis->exec();
-			} else {
-				self::$db->query('DELETE FROM `lines_live` WHERE `activity_id` IN (' . implode(',', array_map('intval', $rIDs)) . ')');
-			}
-			foreach ($rDelUUID as $rUUID) {
-				@unlink(CONS_TMP_PATH . $rUUID);
-			}
-			foreach ($rDelSID as $rStreamID => $rUUIDs) {
-				foreach ($rUUIDs as $rUUID) {
-					@unlink(CONS_TMP_PATH . $rStreamID . '/' . $rUUID);
-				}
-			}
-		}
-		return $rKilled;
+		return ConnectionLimiter::closeConnections(self::$db, self::$redis, self::$rSettings, self::$rServers, $rUserID, $rMaxConnections, $rIsHMAC, $rIdentifier, $rIP, $rUserAgent, array(self::class, 'getConnections'), array(self::class, 'getUserIP'), array(self::class, 'closeConnection'), array(self::class, 'removeFromQueue'));
 	}
 	public static function closeConnection($rActivityInfo) {
-		if (!empty($rActivityInfo)) {
-			if (is_array($rActivityInfo)) {
-			} else {
-				if (!self::$rSettings['redis_handler']) {
-					if (strlen(strval($rActivityInfo)) == 32) {
-						self::$db->query('SELECT * FROM `lines_live` WHERE `uuid` = ?', $rActivityInfo);
-					} else {
-						self::$db->query('SELECT * FROM `lines_live` WHERE `activity_id` = ?', $rActivityInfo);
-					}
-					$rActivityInfo = self::$db->get_row();
-				} else {
-					$rActivityInfo = igbinary_unserialize(self::$redis->get($rActivityInfo));
-				}
-			}
-			if (is_array($rActivityInfo)) {
-				if ($rActivityInfo['container'] == 'rtmp') {
-					if ($rActivityInfo['server_id'] == SERVER_ID) {
-						shell_exec('wget --timeout=2 -O /dev/null -o /dev/null "' . self::$rServers[SERVER_ID]['rtmp_mport_url'] . 'control/drop/client?clientid=' . intval($rActivityInfo['pid']) . '" >/dev/null 2>/dev/null &');
-					} else {
-						if (self::$rSettings['redis_handler']) {
-							self::redisSignal($rActivityInfo['pid'], $rActivityInfo['server_id'], 1);
-						} else {
-							self::$db->query('INSERT INTO `signals` (`pid`,`server_id`,`rtmp`,`time`) VALUES(?,?,?,UNIX_TIMESTAMP())', $rActivityInfo['pid'], $rActivityInfo['server_id'], 1);
-						}
-					}
-				} else {
-					if ($rActivityInfo['container'] == 'hls' || $rActivityInfo['container'] == 'm3u8') {
-						if (self::$rSettings['redis_handler']) {
-							self::updateConnection($rActivityInfo, array(), 'close');
-						} else {
-							self::$db->query('UPDATE `lines_live` SET `hls_end` = 1 WHERE `activity_id` = ?', $rActivityInfo['activity_id']);
-						}
-					} else {
-						if ($rActivityInfo['server_id'] == SERVER_ID) {
-							if (!($rActivityInfo['pid'] != getmypid() && is_numeric($rActivityInfo['pid']) && 0 < $rActivityInfo['pid'])) {
-							} else {
-								posix_kill(intval($rActivityInfo['pid']), 9);
-							}
-						} else {
-							if (self::$rSettings['redis_handler']) {
-								self::redisSignal($rActivityInfo['pid'], $rActivityInfo['server_id'], 0);
-							} else {
-								self::$db->query('INSERT INTO `signals` (`pid`,`server_id`,`time`) VALUES(?,?,UNIX_TIMESTAMP())', $rActivityInfo['pid'], $rActivityInfo['server_id']);
-							}
-						}
-					}
-				}
-				self::writeOfflineActivity($rActivityInfo['server_id'], $rActivityInfo['proxy_id'], $rActivityInfo['user_id'], $rActivityInfo['stream_id'], $rActivityInfo['date_start'], $rActivityInfo['user_agent'], $rActivityInfo['user_ip'], $rActivityInfo['container'], $rActivityInfo['geoip_country_code'], $rActivityInfo['isp'], $rActivityInfo['external_device'], $rActivityInfo['divergence'], $rActivityInfo['hmac_id'], $rActivityInfo['hmac_identifier']);
-				return true;
-			}
-			return false;
-		}
-		return false;
+		return ConnectionLimiter::closeConnection(self::$db, self::$redis, self::$rSettings, self::$rServers, $rActivityInfo, array(self::class, 'updateConnection'), array(self::class, 'redisSignal'), array(self::class, 'writeOfflineActivity'));
 	}
 	public static function closeRTMP($rPID) {
-		if (!empty($rPID)) {
-			self::$db->query("SELECT * FROM `lines_live` WHERE `container` = 'rtmp' AND `pid` = ? AND `server_id` = ?", $rPID, SERVER_ID);
-			if (0 >= self::$db->num_rows()) {
-				return false;
-			}
-			$rActivityInfo = self::$db->get_row();
-			self::$db->query('DELETE FROM `lines_live` WHERE `activity_id` = ?', $rActivityInfo['activity_id']);
-			self::writeOfflineActivity($rActivityInfo['server_id'], $rActivityInfo['proxy_id'], $rActivityInfo['user_id'], $rActivityInfo['stream_id'], $rActivityInfo['date_start'], $rActivityInfo['user_agent'], $rActivityInfo['user_ip'], $rActivityInfo['container'], $rActivityInfo['geoip_country_code'], $rActivityInfo['isp'], $rActivityInfo['external_device'], $rActivityInfo['divergence'], $rActivityInfo['hmac_id'], $rActivityInfo['hmac_identifier']);
-			return true;
-		}
-		return false;
+		return ConnectionLimiter::closeRTMP(self::$db, $rPID, array(self::class, 'writeOfflineActivity'));
 	}
 	public static function writeOfflineActivity($rServerID, $rProxyID, $rUserID, $rStreamID, $rStart, $rUserAgent, $rIP, $rExtension, $rGeoIP, $rISP, $rExternalDevice = '', $rDivergence = 0, $rIsHMAC = null, $rIdentifier = '') {
 		if (self::$rSettings['save_closed_connection'] != 0) {
@@ -842,21 +330,7 @@ class StreamingUtilities {
 		return true;
 	}
 	public static function sendSignal($rSignalData, $rSegmentFile, $rCodec = 'h264', $rReturn = false) {
-		if (empty($rSignalData['xy_offset'])) {
-			$x = rand(150, 380);
-			$y = rand(110, 250);
-		} else {
-			list($x, $y) = explode('x', $rSignalData['xy_offset']);
-		}
-		if ($rReturn) {
-			$rOutput = SIGNALS_TMP_PATH . $rSignalData['activity_id'] . '_' . $rSegmentFile;
-			shell_exec(self::$rFFMPEG_CPU . ' -copyts -vsync 0 -nostats -nostdin -hide_banner -loglevel quiet -y -i ' . escapeshellarg(STREAMS_PATH . $rSegmentFile) . ' -filter_complex "drawtext=fontfile=' . FFMPEG_FONT . ":text='" . escapeshellcmd($rSignalData['message']) . "':fontsize=" . escapeshellcmd($rSignalData['font_size']) . ':x=' . intval($x) . ':y=' . intval($y) . ':fontcolor=' . escapeshellcmd($rSignalData['font_color']) . '" -map 0 -vcodec ' . $rCodec . ' -preset ultrafast -acodec copy -scodec copy -mpegts_flags +initial_discontinuity -mpegts_copyts 1 -f mpegts ' . escapeshellarg($rOutput));
-			$rData = file_get_contents($rOutput);
-			unlink($rOutput);
-			return $rData;
-		}
-		passthru(self::$rFFMPEG_CPU . ' -copyts -vsync 0 -nostats -nostdin -hide_banner -loglevel quiet -y -i ' . escapeshellarg(STREAMS_PATH . $rSegmentFile) . ' -filter_complex "drawtext=fontfile=' . FFMPEG_FONT . ":text='" . escapeshellcmd($rSignalData['message']) . "':fontsize=" . escapeshellcmd($rSignalData['font_size']) . ':x=' . intval($x) . ':y=' . intval($y) . ':fontcolor=' . escapeshellcmd($rSignalData['font_color']) . '" -map 0 -vcodec ' . $rCodec . ' -preset ultrafast -acodec copy -scodec copy -mpegts_flags +initial_discontinuity -mpegts_copyts 1 -f mpegts -');
-		return true;
+		return SignalSender::sendSignal(self::$rFFMPEG_CPU, $rSignalData, $rSegmentFile, $rCodec, $rReturn);
 	}
 	public static function getUserIP() {
 		return $_SERVER['REMOTE_ADDR'];
@@ -904,16 +378,7 @@ class StreamingUtilities {
 		return ImageUtils::validateURL($rURL, $rForceProtocol, array('StreamingUtilities', 'getPublicURL'));
 	}
 	public static function isRunning() {
-		$rNginx = 0;
-		exec('ps -fp $(pgrep -u xc_vm)', $rOutput, $rReturnVar);
-		foreach ($rOutput as $rProcess) {
-			$rSplit = explode(' ', preg_replace('!\\s+!', ' ', trim($rProcess)));
-			if (!($rSplit[8] == 'nginx:' && $rSplit[9] == 'master')) {
-			} else {
-				$rNginx++;
-			}
-		}
-		return 0 < $rNginx;
+		return HealthChecker::isRunning();
 	}
 	public static function getPublicURL($rServerID = null, $rForceProtocol = null) {
 		$rOriginatorID = null;
@@ -972,39 +437,7 @@ class StreamingUtilities {
 		}
 	}
 	public static function getLLODSegments($rStreamID, $rPlaylist, $rPrebuffer = 1) {
-		$rPrebuffer++;
-		$rSegments = $rKeySegments = array();
-		if (!file_exists($rPlaylist)) {
-		} else {
-			$rSource = file_get_contents($rPlaylist);
-			if (!preg_match_all('/(.*?).ts((#\\w+)+|#?)/', $rSource, $rMatches)) {
-			} else {
-				if (0 >= count($rMatches[1])) {
-				} else {
-					$rLastKey = null;
-					for ($i = 0; $i < count($rMatches[1]); $i++) {
-						$rFilename = $rMatches[1][$i];
-						list($rSID, $rSegmentID) = explode('_', $rFilename);
-						if (empty($rMatches[2][$i])) {
-						} else {
-							$rKeySegments[$rSegmentID] = array();
-							$rLastKey = $rSegmentID;
-						}
-						if (!$rLastKey) {
-						} else {
-							$rKeySegments[$rLastKey][] = $rSegmentID;
-						}
-					}
-				}
-			}
-			$rKeySegments = array_slice($rKeySegments, count($rKeySegments) - $rPrebuffer, $rPrebuffer, true);
-			foreach ($rKeySegments as $rKeySegment => $rSubSegments) {
-				foreach ($rSubSegments as $rSegmentID) {
-					$rSegments[] = $rStreamID . '_' . $rSegmentID . '.ts';
-				}
-			}
-		}
-		return (!empty($rSegments) ? $rSegments : null);
+		return SegmentReader::getLLODSegments($rStreamID, $rPlaylist, $rPrebuffer);
 	}
 	public static function getPlaylistSegments($rPlaylist, $rPrebuffer = 0, $rSegmentDuration = 10) {
 		if (file_exists($rPlaylist)) {
@@ -1047,61 +480,10 @@ class StreamingUtilities {
 	}
 
 	public static function generateHLS($rM3U8, $rUsername, $rPassword, $rStreamID, $rUUID, $rIP, $rIsHMAC = null, $rIdentifier = '', $rVideoCodec = 'h264', $rOnDemand = 0, $rServerID = null, $rProxyID = null) {
-		if (file_exists($rM3U8)) {
-			$rSource = file_get_contents($rM3U8);
-			if (self::$rSettings['encrypt_hls']) {
-				$rKeyToken = StreamingUtilities::encryptData($rIP . '/' . $rStreamID, self::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
-				$rSource = "#EXTM3U\n#EXT-X-KEY:METHOD=AES-128,URI=\"" . (($rProxyID ? '/' . md5($rProxyID . '_' . $rServerID . '_' . OPENSSL_EXTRA) : '')) . '/key/' . $rKeyToken . '",IV=0x' . bin2hex(file_get_contents(STREAMS_PATH . $rStreamID . '_.iv')) . "\n" . substr($rSource, 8, strlen($rSource) - 8);
-			}
-
-			// Handle fMP4 init segment if present
-			if (preg_match('/#EXT-X-MAP:URI="(.*?)"/', $rSource, $rInitMatch)) {
-				$rInitSegment = $rInitMatch[1];  // e.g., "1_init.mp4"
-
-				if ($rIsHMAC) {
-					$rInitToken = StreamingUtilities::encryptData('HMAC#' . $rIsHMAC . '/' . $rIdentifier . '/' . $rIP . '/' . $rStreamID . '/' . $rInitSegment . '/' . $rUUID . '/' . SERVER_ID . '/' . $rVideoCodec . '/' . $rOnDemand, self::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
-				} else {
-					$rInitToken = StreamingUtilities::encryptData($rUsername . '/' . $rPassword . '/' . $rIP . '/' . $rStreamID . '/' . $rInitSegment . '/' . $rUUID . '/' . SERVER_ID . '/' . $rVideoCodec . '/' . $rOnDemand, self::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
-				}
-
-				if (self::$rSettings['allow_cdn_access']) {
-					$rSource = str_replace('URI="' . $rInitSegment . '"', 'URI="' . (($rProxyID ? '/' . md5($rProxyID . '_' . $rServerID . '_' . OPENSSL_EXTRA) : '')) . '/hls/' . $rInitSegment . '?token=' . $rInitToken . '"', $rSource);
-				} else {
-					$rSource = str_replace('URI="' . $rInitSegment . '"', 'URI="' . (($rProxyID ? '/' . md5($rProxyID . '_' . $rServerID . '_' . OPENSSL_EXTRA) : '')) . '/hls/' . $rInitToken . '"', $rSource);
-				}
-			}
-
-			if (preg_match_all('/(.*?)\.(ts|m4s)/', $rSource, $rMatches)) {
-				foreach ($rMatches[0] as $rMatch) {
-					if ($rIsHMAC) {
-						$rToken = StreamingUtilities::encryptData('HMAC#' . $rIsHMAC . '/' . $rIdentifier . '/' . $rIP . '/' . $rStreamID . '/' . $rMatch . '/' . $rUUID . '/' . SERVER_ID . '/' . $rVideoCodec . '/' . $rOnDemand, self::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
-					} else {
-						$rToken = StreamingUtilities::encryptData($rUsername . '/' . $rPassword . '/' . $rIP . '/' . $rStreamID . '/' . $rMatch . '/' . $rUUID . '/' . SERVER_ID . '/' . $rVideoCodec . '/' . $rOnDemand, self::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
-					}
-					if (self::$rSettings['allow_cdn_access']) {
-						$rSource = str_replace($rMatch, (($rProxyID ? '/' . md5($rProxyID . '_' . $rServerID . '_' . OPENSSL_EXTRA) : '')) . '/hls/' . $rMatch . '?token=' . $rToken, $rSource);
-					} else {
-						$rSource = str_replace($rMatch, (($rProxyID ? '/' . md5($rProxyID . '_' . $rServerID . '_' . OPENSSL_EXTRA) : '')) . '/hls/' . $rToken, $rSource);
-					}
-				}
-
-				return $rSource;
-			}
-		}
-
-		return false;
+		return HLSGenerator::generateHLS(self::$rSettings, $rM3U8, $rUsername, $rPassword, $rStreamID, $rUUID, $rIP, $rIsHMAC, $rIdentifier, $rVideoCodec, $rOnDemand, $rServerID, $rProxyID, array(self::class, 'encryptData'));
 	}
 	public static function validateConnections($rUserInfo, $rIsHMAC = false, $rIdentifier = '', $rIP = null, $rUserAgent = null) {
-		if ($rUserInfo['max_connections'] != 0) {
-			if (!$rIsHMAC) {
-				if (!empty($rUserInfo['pair_id'])) {
-					self::closeConnections($rUserInfo['pair_id'], $rUserInfo['max_connections'], null, '', $rIP, $rUserAgent);
-				}
-				self::closeConnections($rUserInfo['id'], $rUserInfo['max_connections'], null, '', $rIP, $rUserAgent);
-			} else {
-				self::closeConnections(null, $rUserInfo['max_connections'], $rIsHMAC, $rIdentifier, $rIP, $rUserAgent);
-			}
-		}
+		StreamAuth::validateConnections($rUserInfo, $rIsHMAC, $rIdentifier, $rIP, $rUserAgent, array(self::class, 'closeConnections'));
 	}
 	public static function getBouquetMap($rStreamID) {
 		return BouquetMapper::getMapEntry($rStreamID);
@@ -1223,38 +605,7 @@ class StreamingUtilities {
 		return ConnectionTracker::getProxies(self::$rServers, $rServerID, $rOnline);
 	}
 	public static function getStreamingURL($rServerID = null, $rOriginatorID = null, $rForceHTTP = false) {
-		if (isset($rServerID)) {
-		} else {
-			$rServerID = SERVER_ID;
-		}
-		if ($rForceHTTP) {
-			$rProtocol = 'http';
-		} else {
-			if (self::$rSettings['keep_protocol']) {
-				$rProtocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443 ? 'https' : 'http');
-			} else {
-				$rProtocol = self::$rServers[$rServerID]['server_protocol'];
-			}
-		}
-		$rDomain = null;
-		if (0 < strlen(HOST) && in_array(strtolower(HOST), array_map('strtolower', self::$rServers[$rServerID]['domains']['urls']))) {
-			$rDomain = HOST;
-		} else {
-			if (!(self::$rServers[$rServerID]['random_ip'] && 0 < count(self::$rServers[$rServerID]['domains']['urls']))) {
-			} else {
-				$rDomain = self::$rServers[$rServerID]['domains']['urls'][array_rand(self::$rServers[$rServerID]['domains']['urls'])];
-			}
-		}
-		if ($rDomain) {
-			$rURL = $rProtocol . '://' . $rDomain . ':' . self::$rServers[$rServerID][$rProtocol . '_broadcast_port'];
-		} else {
-			$rURL = rtrim(self::$rServers[$rServerID][$rProtocol . '_url'], '/');
-		}
-		if (!(self::$rServers[$rServerID]['server_type'] == 1 && $rOriginatorID && self::$rServers[$rOriginatorID]['is_main'] == 0)) {
-		} else {
-			$rURL .= '/' . md5($rServerID . '_' . $rOriginatorID . '_' . OPENSSL_EXTRA);
-		}
-		return $rURL;
+		return StreamRedirector::getStreamingURL(self::$rSettings, self::$rServers, $rServerID, $rOriginatorID, $rForceHTTP);
 	}
 
 	/**
diff --git a/src/includes/admin.php b/src/includes/admin.php
index 6924337d..6e27967d 100644
--- a/src/includes/admin.php
+++ b/src/includes/admin.php
@@ -235,58 +235,17 @@ function getTranscodeProfiles() {
 
 function getWatchFolders($rType = null) {
 	global $db;
-	$rReturn = array();
-
-	if ($rType) {
-		$db->query("SELECT * FROM `watch_folders` WHERE `type` = ? AND `type` <> 'plex' ORDER BY `id` ASC;", $rType);
-	} else {
-
-		$db->query("SELECT * FROM `watch_folders` WHERE `type` <> 'plex' ORDER BY `id` ASC;");
-	}
-
-	if (0 >= $db->num_rows()) {
-	} else {
-		foreach ($db->get_rows() as $rRow) {
-			$rReturn[] = $rRow;
-		}
-	}
-
-	return $rReturn;
+	return WatchService::getWatchFolders($db, $rType);
 }
 
 function getPlexServers() {
 	global $db;
-	$rReturn = array();
-	$db->query("SELECT * FROM `watch_folders` WHERE `type` = 'plex' ORDER BY `id` ASC;");
-
-	if (0 >= $db->num_rows()) {
-	} else {
-		foreach ($db->get_rows() as $rRow) {
-			$rReturn[] = $rRow;
-		}
-	}
-
-	return $rReturn;
+	return PlexRepository::getPlexServers($db);
 }
 
 function getWatchCategories($rType = null) {
 	global $db;
-	$rReturn = array();
-
-	if ($rType) {
-		$db->query('SELECT * FROM `watch_categories` WHERE `type` = ? ORDER BY `genre_id` ASC;', $rType);
-	} else {
-		$db->query('SELECT * FROM `watch_categories` ORDER BY `genre_id` ASC;');
-	}
-
-	if (0 >= $db->num_rows()) {
-	} else {
-		foreach ($db->get_rows() as $rRow) {
-			$rReturn[$rRow['genre_id']] = $rRow;
-		}
-	}
-
-	return $rReturn;
+	return WatchService::getWatchCategories($db, $rType);
 }
 
 function syncDevices($rUserID, $rDeviceID = null) {
@@ -370,18 +329,7 @@ function getArchive($rStreamID) {
 }
 
 function getPlexSections($rIP, $rPort, $rToken) {
-	$URL = 'http://' . $rIP . ':' . $rPort . '/library/sections?X-Plex-Token=' . $rToken;
-	$rSections = json_decode(json_encode(simplexml_load_string(file_get_contents($URL))), true);
-
-	if (!isset($rSections['Directory'])) {
-		return array();
-	}
-
-	if (isset($rSections['Directory']['@attributes'])) {
-		$rSections['Directory'] = array($rSections['Directory']);
-	}
-
-	return $rSections['Directory'];
+	return PlexRepository::getPlexSections($rIP, $rPort, $rToken);
 }
 
 function getMovieTMDB($rID) {
@@ -1755,16 +1703,7 @@ function restoreImages() {
 
 function killWatchFolder() {
 	global $db;
-	$db->query("SELECT DISTINCT(`server_id`) AS `server_id` FROM `watch_folders` WHERE `active` = 11 AND `type` <> 'plex';");
-
-	foreach ($db->get_rows() as $rRow) {
-		if (!CoreUtilities::$rServers[$rRow['server_id']]['server_online']) {
-		} else {
-			systemapirequest($rRow['server_id'], array('action' => 'kill_watch'));
-		}
-	}
-
-	return true;
+	return WatchService::killWatch($db);
 }
 
 function killPlexSync() {
@@ -3243,32 +3182,12 @@ function getEncodeErrors($rID) {
 
 function deleteRecording($rID) {
 	global $db;
-	$db->query('SELECT `created_id`, `source_id` FROM `recordings` WHERE `id` = ?;', $rID);
-
-	if (0 >= $db->num_rows()) {
-	} else {
-		$rRecording = $db->get_row();
-
-		if (!$rRecording['created_id']) {
-		} else {
-			deleteStream($rRecording['created_id'], $rRecording['source_id'], true, true);
-		}
-
-		shell_exec("kill -9 `ps -ef | grep 'Record\\[" . intval($rID) . "\\]' | grep -v grep | awk '{print \$2}'`;");
-		$db->query('DELETE FROM `recordings` WHERE `id` = ?;', $rID);
-	}
+	return WatchService::deleteRecording($db, $rID, 'deleteStream');
 }
 
 function getRecordings() {
 	global $db;
-	$rRecordings = array();
-	$db->query('SELECT * FROM `recordings` ORDER BY `id` DESC;');
-
-	foreach ($db->get_rows() as $rRow) {
-		$rRecordings[] = $rRow;
-	}
-
-	return $rRecordings;
+	return WatchService::getRecordings($db);
 }
 
 function issecure() {
@@ -3340,17 +3259,7 @@ function getSSLLog($rServerID) {
 
 function getWatchdog($rID, $rLimit = 86400) {
 	global $db;
-	$rReturn = array();
-	$db->query('SELECT * FROM `servers_stats` WHERE `server_id` = ? AND UNIX_TIMESTAMP() - `time` <= ? ORDER BY `time` DESC;', $rID, $rLimit);
-
-	if (0 >= $db->num_rows()) {
-	} else {
-		foreach ($db->get_rows() as $rRow) {
-			$rReturn[] = $rRow;
-		}
-	}
-
-	return $rReturn;
+	return WatchdogMonitor::getWatchdog($db, $rID, $rLimit);
 }
 
 function getMemberGroup($rID) {
@@ -3499,11 +3408,11 @@ function convertToCSV($rData) {
 }
 
 function forceWatch($rServerID, $rWatchID) {
-	systemapirequest($rServerID, array('action' => 'watch_force', 'id' => $rWatchID));
+	WatchService::forceWatch($rServerID, $rWatchID);
 }
 
 function forcePlex($rServerID, $rPlexID) {
-	systemapirequest($rServerID, array('action' => 'plex_force', 'id' => $rPlexID));
+	PlexService::forcePlex($rServerID, $rPlexID, 'systemapirequest');
 }
 
 function freeTemp($rServerID) {
diff --git a/src/includes/admin_api.php b/src/includes/admin_api.php
index 06f61d3d..fd54104f 100644
--- a/src/includes/admin_api.php
+++ b/src/includes/admin_api.php
@@ -2854,99 +2854,18 @@ class API {
 	}
 
 	public static function editPlexSettings($rData) {
-		if (self::checkMinimumRequirements($rData)) {
-			foreach ($rData as $rKey => $rValue) {
-				$rSplit = explode('_', $rKey);
-
-				if ($rSplit[0] != 'genre') {
-				} else {
-					if (isset($rData['bouquet_' . $rSplit[1]])) {
-						$rBouquets = '[' . implode(',', array_map('intval', $rData['bouquet_' . $rSplit[1]])) . ']';
-					} else {
-						$rBouquets = '[]';
-					}
-
-					self::$db->query('UPDATE `watch_categories` SET `category_id` = ?, `bouquets` = ? WHERE `genre_id` = ? AND `type` = 3;', $rValue, $rBouquets, $rSplit[1]);
-				}
-			}
-
-			foreach ($rData as $rKey => $rValue) {
-				$rSplit = explode('_', $rKey);
-
-				if ($rSplit[0] != 'genretv') {
-				} else {
-					if (isset($rData['bouquettv_' . $rSplit[1]])) {
-						$rBouquets = '[' . implode(',', array_map('intval', $rData['bouquettv_' . $rSplit[1]])) . ']';
-					} else {
-						$rBouquets = '[]';
-					}
-
-					self::$db->query('UPDATE `watch_categories` SET `category_id` = ?, `bouquets` = ? WHERE `genre_id` = ? AND `type` = 4;', $rValue, $rBouquets, $rSplit[1]);
-				}
-			}
-			self::$db->query('UPDATE `settings` SET `scan_seconds` = ?, `max_genres` = ?, `thread_count_movie` = ?, `thread_count_show` = ?;', $rData['scan_seconds'], $rData['max_genres'], $rData['thread_count_movie'], $rData['thread_count_show']);
-			clearSettingsCache();
-
-			return array('status' => STATUS_SUCCESS);
-		} else {
-
-
-
+		if (!self::checkMinimumRequirements($rData)) {
 			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
 		}
+		return PlexService::editPlexSettings(self::$db, $rData, 'clearSettingsCache');
 	}
 
 	public static function editWatchSettings($rData) {
-		if (self::checkMinimumRequirements($rData)) {
-			foreach ($rData as $rKey => $rValue) {
-				$rSplit = explode('_', $rKey);
-
-				if ($rSplit[0] != 'genre') {
-				} else {
-					if (isset($rData['bouquet_' . $rSplit[1]])) {
-						$rBouquets = '[' . implode(',', array_map('intval', $rData['bouquet_' . $rSplit[1]])) . ']';
-					} else {
-						$rBouquets = '[]';
-					}
-
-					self::$db->query('UPDATE `watch_categories` SET `category_id` = ?, `bouquets` = ? WHERE `genre_id` = ? AND `type` = 1;', $rValue, $rBouquets, $rSplit[1]);
-				}
-			}
-
-			foreach ($rData as $rKey => $rValue) {
-				$rSplit = explode('_', $rKey);
-
-				if ($rSplit[0] != 'genretv') {
-				} else {
-					if (isset($rData['bouquettv_' . $rSplit[1]])) {
-						$rBouquets = '[' . implode(',', array_map('intval', $rData['bouquettv_' . $rSplit[1]])) . ']';
-					} else {
-						$rBouquets = '[]';
-					}
-
-					self::$db->query('UPDATE `watch_categories` SET `category_id` = ?, `bouquets` = ? WHERE `genre_id` = ? AND `type` = 2;', $rValue, $rBouquets, $rSplit[1]);
-				}
-			}
-
-			if (isset($rData['alternative_titles'])) {
-				$rAltTitles = true;
-			} else {
-				$rAltTitles = false;
-			}
-
-			if (isset($rData['fallback_parser'])) {
-				$rFallbackParser = true;
-			} else {
-				$rFallbackParser = false;
-			}
-
-			self::$db->query('UPDATE `settings` SET `percentage_match` = ?, `scan_seconds` = ?, `thread_count` = ?, `max_genres` = ?, `max_items` = ?, `alternative_titles` = ?, `fallback_parser` = ?;', $rData['percentage_match'], $rData['scan_seconds'], $rData['thread_count'], $rData['max_genres'], $rData['max_items'], $rAltTitles, $rFallbackParser);
-			clearSettingsCache();
-
-			return array('status' => STATUS_SUCCESS);
-		} else {
+		if (!self::checkMinimumRequirements($rData)) {
 			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
 		}
+
+		return WatchService::editWatchSettings(self::$db, $rData, 'clearSettingsCache');
 	}
 
 	public static function massEditStreams($rData) {
@@ -3030,144 +2949,18 @@ class API {
 	}
 
 	public static function processPlexSync($rData) {
-		if (self::checkMinimumRequirements($rData)) {
-			if (isset($rData['edit'])) {
-				$rArray = overwriteData(getWatchFolder($rData['edit']), $rData);
-			} else {
-				$rArray = verifyPostTable('watch_folders', $rData);
-				unset($rArray['id']);
-			}
-
-			if (is_array($rData['server_id'])) {
-				$rServers = $rData['server_id'];
-				$rArray['server_id'] = intval(array_shift($rServers));
-				$rArray['server_add'] = '[' . implode(',', array_map('intval', $rServers)) . ']';
-			} else {
-				$rArray['server_id'] = intval($rData['server_id']);
-				$rArray['server_add'] = null;
-			}
-
-			if (isset($rData['edit'])) {
-				self::$db->query('SELECT COUNT(*) AS `count` FROM `watch_folders` WHERE `directory` = ? AND `server_id` = ? AND `plex_ip` = ? AND `id` <> ?;', $rData['library_id'], $rArray['server_id'], $rData['plex_ip'], $rArray['id']);
-			} else {
-				self::$db->query('SELECT COUNT(*) AS `count` FROM `watch_folders` WHERE `directory` = ? AND `server_id` = ? AND `plex_ip` = ?;', $rData['library_id'], $rArray['server_id'], $rData['plex_ip']);
-			}
-
-			if (0 >= self::$db->get_row()['count']) {
-				$rArray['type'] = 'plex';
-				$rArray['directory'] = $rData['library_id'];
-				$rArray['plex_ip'] = $rData['plex_ip'];
-				$rArray['plex_port'] = $rData['plex_port'];
-				$rArray['plex_libraries'] = $rData['libraries'];
-				$rArray['plex_username'] = $rData['username'];
-
-				if (isset($rData['direct_proxy'])) {
-					$rArray['direct_proxy'] = 1;
-				} else {
-					$rArray['direct_proxy'] = 0;
-				}
-
-				if (0 >= strlen($rData['password'])) {
-				} else {
-					$rArray['plex_password'] = $rData['password'];
-				}
-
-				foreach (array('remove_subtitles', 'check_tmdb', 'store_categories', 'scan_missing', 'auto_upgrade', 'read_native', 'movie_symlink', 'auto_encode', 'active') as $rKey) {
-					if (isset($rData[$rKey])) {
-						$rArray[$rKey] = 1;
-					} else {
-						$rArray[$rKey] = 0;
-					}
-				}
-				$overrideBouquets = $rData['override_bouquets'] ?? [];
-				$fallbackBouquets = $rData['fallback_bouquets'] ?? [];
-
-				$rArray['category_id'] = intval($rData['override_category']);
-				$rArray['fb_category_id'] = intval($rData['fallback_category']);
-				$rArray['bouquets'] = '[' . implode(',', array_map('intval', $overrideBouquets)) . ']';
-				$rArray['fb_bouquets'] = '[' . implode(',', array_map('intval', $fallbackBouquets)) . ']';
-				$rArray['target_container'] = ($rData['target_container'] == 'auto' ? null : $rData['target_container']);
-				$rPrepare = prepareArray($rArray);
-				$rQuery = 'REPLACE INTO `watch_folders`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-
-				if (self::$db->query($rQuery, ...$rPrepare['data'])) {
-					$rInsertID = self::$db->last_insert_id();
-
-					return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
-				}
-
-				return array('status' => STATUS_FAILURE, 'data' => $rData);
-			} else {
-				return array('status' => STATUS_EXISTS_DIR, 'data' => $rData);
-			}
-		} else {
+		if (!self::checkMinimumRequirements($rData)) {
 			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
 		}
+		return PlexService::processPlexSync(self::$db, $rData, 'getWatchFolder');
 	}
 
 	public static function processWatchFolder($rData) {
-		if (self::checkMinimumRequirements($rData)) {
-			if (isset($rData['edit'])) {
-				$rArray = overwriteData(getWatchFolder($rData['edit']), $rData);
-			} else {
-				$rArray = verifyPostTable('watch_folders', $rData);
-				unset($rArray['id']);
-			}
-
-			$rPath = $rData['selected_path'];
-
-			if (0 < strlen($rPath) && $rPath != '/') {
-				if (isset($rData['edit'])) {
-					self::$db->query('SELECT COUNT(*) AS `count` FROM `watch_folders` WHERE `directory` = ? AND `server_id` = ? AND `type` = ? AND `id` <> ?;', $rPath, $rArray['server_id'], $rData['folder_type'], $rArray['id']);
-				} else {
-					self::$db->query('SELECT COUNT(*) AS `count` FROM `watch_folders` WHERE `directory` = ? AND `server_id` = ? AND `type` = ?;', $rPath, $rArray['server_id'], $rData['folder_type']);
-				}
-
-				if (0 >= self::$db->get_row()['count']) {
-					$bouquets = is_array($rData['bouquets'] ?? null) ? $rData['bouquets'] : [];
-					$fbBouquets = is_array($rData['fb_bouquets'] ?? null) ? $rData['fb_bouquets'] : [];
-
-					$rArray['type'] = $rData['folder_type'];
-					$rArray['directory'] = $rPath;
-					$rArray['bouquets'] = '[' . implode(',', array_map('intval', $bouquets)) . ']';
-					$rArray['fb_bouquets'] = '[' . implode(',', array_map('intval', $fbBouquets)) . ']';
-
-					if (is_array($rData['allowed_extensions'] ?? null) && count($rData['allowed_extensions']) > 0) {
-						$rArray['allowed_extensions'] = json_encode($rData['allowed_extensions']);
-					} else {
-						$rArray['allowed_extensions'] = '[]';
-					}
-
-					$rArray['target_container'] = ($rData['target_container'] == 'auto' ? null : $rData['target_container']);
-					$rArray['category_id'] = intval($rData['category_id_' . $rData['folder_type']]);
-					$rArray['fb_category_id'] = intval($rData['fb_category_id_' . $rData['folder_type']]);
-
-					foreach (array('remove_subtitles', 'duplicate_tmdb', 'extract_metadata', 'fallback_title', 'disable_tmdb', 'ignore_no_match', 'auto_subtitles', 'auto_upgrade', 'read_native', 'movie_symlink', 'auto_encode', 'ffprobe_input', 'active') as $rKey) {
-						if (isset($rData[$rKey])) {
-							$rArray[$rKey] = 1;
-						} else {
-							$rArray[$rKey] = 0;
-						}
-					}
-					$rPrepare = prepareArray($rArray);
-					$rQuery = 'REPLACE INTO `watch_folders`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-
-					if (self::$db->query($rQuery, ...$rPrepare['data'])) {
-						$rInsertID = self::$db->last_insert_id();
-
-						return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
-					}
-
-					return array('status' => STATUS_FAILURE, 'data' => $rData);
-				} else {
-					return array('status' => STATUS_EXISTS_DIR, 'data' => $rData);
-				}
-			} else {
-				return array('status' => STATUS_INVALID_DIR, 'data' => $rData);
-			}
-		} else {
+		if (!self::checkMinimumRequirements($rData)) {
 			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
 		}
+
+		return WatchService::processWatchFolder(self::$db, $rData, 'getWatchFolder');
 	}
 
 	public static function massEditLines($rData) {
@@ -3872,40 +3665,13 @@ class API {
 	}
 
 	public static function scheduleRecording($rData) {
-		if (self::checkMinimumRequirements($rData)) {
-			if (hasPermissions('adv', 'add_stream')) {
-
-
-				if (!empty($rData['title'])) {
-
-
-					if (!empty($rData['source_id'])) {
-
-
-						$rArray = verifyPostTable('recordings', $rData);
-						$rArray['bouquets'] = '[' . implode(',', array_map('intval', $rData['bouquets'])) . ']';
-						$rArray['category_id'] = '[' . implode(',', array_map('intval', $rData['category_id'])) . ']';
-						$rPrepare = prepareArray($rArray);
-						$rQuery = 'REPLACE INTO `recordings`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-
-						if (self::$db->query($rQuery, ...$rPrepare['data'])) {
-							$rInsertID = self::$db->last_insert_id();
-
-							return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
-						}
-
-						return array('status' => STATUS_FAILURE, 'data' => $rData);
-					}
-
-					return array('status' => STATUS_NO_SOURCE);
-				}
-
-				return array('status' => STATUS_NO_TITLE);
-			}
-
+		if (!self::checkMinimumRequirements($rData)) {
+			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+		}
+		if (!hasPermissions('adv', 'add_stream')) {
 			exit();
 		}
 
-		return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+		return RecordingService::schedule(self::$db, $rData);
 	}
 }
diff --git a/src/includes/cli/plex_item.php b/src/includes/cli/plex_item.php
index b5bc76e0..f05b1ca8 100644
--- a/src/includes/cli/plex_item.php
+++ b/src/includes/cli/plex_item.php
@@ -1,5 +1,10 @@
 <?php
-
+/**
+ * Plex Item CLI — точка входа.
+ *
+ * Логика извлечена в modules/plex/PlexItem.php (Фаза 5.1).
+ * Этот файл содержит только CLI-бутстрап и вызов модуля.
+ */
 setlocale(LC_ALL, 'en_US.UTF-8');
 putenv('LC_ALL=en_US.UTF-8');
 
@@ -24,7 +29,7 @@ if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
 
             set_time_limit($rTimeout);
             ini_set('max_execution_time', $rTimeout);
-            loadcli();
+            PlexItem::run();
         } else {
             exit();
         }
@@ -35,876 +40,6 @@ if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
     exit('Please run as XC_VM!' . "\n");
 }
 
-function preparecolumn($rValue) {
-    return strtolower(preg_replace('/[^a-z0-9_]+/i', '', $rValue));
-}
-
-function prepareArray($rArray) {
-    $UpdateData = $rColumns = $rPlaceholder = $rData = array();
-
-    foreach (array_keys($rArray) as $rKey) {
-        $rColumns[] = '`' . preparecolumn($rKey) . '`';
-        $UpdateData[] = '`' . preparecolumn($rKey) . '` = ?';
-    }
-
-    foreach (array_values($rArray) as $rValue) {
-        if (!is_array($rValue)) {
-        } else {
-            $rValue = json_encode($rValue, JSON_UNESCAPED_UNICODE);
-        }
-
-        $rPlaceholder[] = '?';
-        $rData[] = $rValue;
-    }
-
-    return array('placeholder' => implode(',', $rPlaceholder), 'columns' => implode(',', $rColumns), 'data' => $rData, 'update' => implode(',', $UpdateData));
-}
-
-function verifyPostTable($rTable, $rData = array(), $rOnlyExisting = false) {
-    global $db;
-    $rReturn = array();
-    $db->query('SELECT `column_name`, `column_default`, `is_nullable`, `data_type` FROM `information_schema`.`columns` WHERE `table_schema` = (SELECT DATABASE()) AND `table_name` = ? ORDER BY `ordinal_position`;', $rTable);
-
-    foreach ($db->get_rows() as $rRow) {
-        if ($rRow['column_default'] != 'NULL') {
-        } else {
-            $rRow['column_default'] = null;
-        }
-
-        $rForceDefault = false;
-
-        if ($rRow['is_nullable'] != 'NO' || $rRow['column_default']) {
-        } else {
-            if (in_array($rRow['data_type'], array('int', 'float', 'tinyint', 'double', 'decimal', 'smallint', 'mediumint', 'bigint', 'bit'))) {
-                $rRow['column_default'] = 0;
-            } else {
-                $rRow['column_default'] = '';
-            }
-
-            $rForceDefault = true;
-        }
-
-        if (array_key_exists($rRow['column_name'], $rData)) {
-            if (empty($rData[$rRow['column_name']]) && !is_numeric($rData[$rRow['column_name']]) && is_null($rRow['column_default'])) {
-                $rReturn[$rRow['column_name']] = ($rForceDefault ? $rRow['column_default'] : null);
-            } else {
-                $rReturn[$rRow['column_name']] = $rData[$rRow['column_name']];
-            }
-        } else {
-            if ($rOnlyExisting) {
-            } else {
-                $rReturn[$rRow['column_name']] = $rRow['column_default'];
-            }
-        }
-    }
-
-    return $rReturn;
-}
-
-function getSeriesByID($rPlexID, $rTMDBID) {
-    global $db;
-
-    if (!(file_exists(WATCH_TMP_PATH . 'series_' . $rPlexID . '.data') && time() - filemtime(WATCH_TMP_PATH . 'series_' . $rPlexID . '.data') < 360)) {
-        if (!(file_exists(WATCH_TMP_PATH . 'series_' . intval($rTMDBID) . '.data') && time() - filemtime(WATCH_TMP_PATH . 'series_' . intval($rTMDBID) . '.data') < 360)) {
-            $db->query('SELECT * FROM `streams_series` WHERE `plex_uuid` = ? OR `tmdb_id` = ?;', $rPlexID, $rTMDBID);
-
-            if ($db->num_rows() != 1) {
-            } else {
-                return $db->get_row();
-            }
-        } else {
-            return json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . intval($rTMDBID) . '.data'), true);
-        }
-    } else {
-        return json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . $rPlexID . '.data'), true);
-    }
-}
-
-function getSerie($rID) {
-    global $db;
-    $db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $rID);
-
-    if ($db->num_rows() != 1) {
-    } else {
-        return $db->get_row();
-    }
-}
-
-function getNextOrder() {
-    global $db;
-    $db->query('SELECT MAX(`order`) AS `order` FROM `streams`;');
-
-    if ($db->num_rows() != 1) {
-        return 0;
-    }
-
-    return intval($db->get_row()['order']) + 1;
-}
-
-function addToBouquet($rType, $rBouquetID, $rID) {
-    global $rThreadData;
-    file_put_contents(WATCH_TMP_PATH . md5($rThreadData['uuid'] . '_' . $rThreadData['key'] . '_' . $rType . '_' . $rBouquetID . '_' . $rID) . '.pbouquet', json_encode(array('type' => $rType, 'bouquet_id' => $rBouquetID, 'id' => $rID)));
-}
-
-function loadcli() {
-    global $db;
-    global $rThreadData;
-    global $rStreamDatabase;
-    $rServers = array(SERVER_ID);
-
-    if (empty($rThreadData['server_add'])) {
-    } else {
-        foreach (json_decode($rThreadData['server_add'], true) as $rServerID) {
-            $rServers[] = intval($rServerID);
-        }
-    }
-
-    $rBouquetIDs = $rCategoryIDs = array();
-
-    if (0 >= $rThreadData['category_id']) {
-    } else {
-        $rCategoryIDs = array(intval($rThreadData['category_id']));
-    }
-
-    if (0 >= count(json_decode($rThreadData['bouquets'], true))) {
-    } else {
-        $rBouquetIDs = json_decode($rThreadData['bouquets'], true);
-    }
-
-    $rLanguage = null;
-    $rPlexCategories = $rThreadData['plex_categories'];
-    $rImportArray = verifyPostTable('streams');
-    $rImportArray['type'] = array('movie' => 2, 'show' => 5)[$rThreadData['type']];
-
-    if ($rImportArray['type']) {
-        $rThreadType = array('movie' => 1, 'show' => 2)[$rThreadData['type']];
-
-        // =============================================================
-        // MOVIE PROCESSING
-        // =============================================================
-        if ($rThreadData['type'] == 'movie') {
-            echo "=== [MOVIE] Processing movie: {$rThreadData['key']} ===\n";
-
-            $rURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/library/metadata/' . $rThreadData['key'] . '?X-Plex-Token=' . $rThreadData['token'];
-            echo "LOG: Fetching movie metadata: $rURL\n";
-
-            $rContent = json_decode(json_encode(simplexml_load_string(readURL($rURL))), true);
-
-            if (!$rContent || empty($rContent['Video'])) {
-                echo "ERROR: Failed to get movie metadata from Plex!\n";
-                exit('Failed to get information.' . PHP_EOL);
-            }
-
-            $Video = $rContent['Video'];
-            echo "LOG: Movie title: {$Video['@attributes']['title']} (" . ($Video['@attributes']['year'] ?? 'No year') . ")\n";
-
-            $rTMDBID = null;
-            $rFirstFile = null;
-
-            // TMDB ID
-            $tmdb = getTmdbIdFromPlex($Video);
-            $rTMDBID = $tmdb['tmdb_id'];
-            echo $rTMDBID ? "LOG: TMDB ID detected: $rTMDBID\n" : "LOG: TMDB ID not found — will work without it\n";
-
-            $rFileArray = array('file' => null, 'size' => null, 'data' => null, 'key' => null);
-
-            foreach (makeArray($Video['Media']) as $rMedia) {
-                foreach (makeArray($rMedia['Part']) as $rPart) {
-                    $filePath = $rPart['@attributes']['file'];
-                    $fileSize = intval($rPart['@attributes']['size']);
-                    $fileKey  = $rPart['@attributes']['key'];
-
-                    if (!$rFirstFile) {
-                        $rFirstFile = $filePath;
-                        echo "LOG: First detected file (fallback): $filePath\n";
-                    }
-
-                    $accessible = file_exists($filePath) || $rThreadData['direct_proxy'];
-
-                    if ($accessible && (!$rFileArray['size'] || $fileSize > $rFileArray['size'])) {
-                        $rFileArray = array(
-                            'file' => $filePath,
-                            'size' => $fileSize,
-                            'data' => $rMedia,
-                            'key'  => $fileKey
-                        );
-                        echo "LOG: Selected as best source (largest + accessible): $filePath\n";
-                    }
-                }
-            }
-
-            if (!empty($rFileArray['file'])) {
-                $movieTitle = $Video['@attributes']['title'];
-
-                $rInternalPath = json_encode(array('s:' . SERVER_ID . ':' . $rFileArray['file']), JSON_UNESCAPED_UNICODE);
-                $rDirectURL    = json_encode(array('http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . $rFileArray['key'] . '?X-Plex-Token=' . $rThreadData['token']), JSON_UNESCAPED_UNICODE);
-
-                if (in_array($rInternalPath, $rStreamDatabase) || in_array($rDirectURL, $rStreamDatabase)) {
-                    echo "LOG: Movie already exists in database (source match) — skipping import\n";
-                } else {
-                    echo "LOG: New unique movie detected — preparing import: \"$movieTitle\"\n";
-
-                    $rStreamDatabase[] = $rInternalPath;
-                    $rStreamDatabase[] = $rDirectURL;
-
-                    // Container
-                    if ($rThreadData['target_container'] != 'auto' && $rThreadData['target_container'] && !$rThreadData['direct_proxy']) {
-                        $rImportArray['target_container'] = $rThreadData['target_container'];
-                    } else {
-                        $ext = pathinfo($rFileArray['file'], PATHINFO_EXTENSION) ?: 'mp4';
-                        $rImportArray['target_container'] = $ext;
-                    }
-                    echo "LOG: Target container: {$rImportArray['target_container']}\n";
-
-                    $db->query(
-                        'DELETE FROM `watch_logs` WHERE `filename` = ? AND `type` = ? AND `server_id` = ?;',
-                        htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'),
-                        $rThreadType,
-                        SERVER_ID
-                    );
-
-                    // Poster
-                    if (!empty($Video['@attributes']['thumb'])) {
-                        $rThumbURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=300&height=450&minSize=1&quality=100&upscale=1&url=' . $Video['@attributes']['thumb'] . '&X-Plex-Token=' . $rThreadData['token'];
-                        echo "LOG: Downloading poster: $rThumbURL\n";
-                        $rThumb = CoreUtilities::downloadImage($rThumbURL);
-                    } else {
-                        $rThumb = null;
-                        echo "LOG: No poster available in Plex\n";
-                    }
-
-                    // Backdrop
-                    if (!empty($Video['@attributes']['art'])) {
-                        $rBGURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=1280&height=720&minSize=1&quality=100&upscale=1&url=' . $Video['@attributes']['art'] . '&X-Plex-Token=' . $rThreadData['token'];
-                        echo "LOG: Downloading backdrop: $rBGURL\n";
-                        $rBG = CoreUtilities::downloadImage($rBGURL);
-                    } else {
-                        $rBG = null;
-                        echo "LOG: No backdrop available in Plex\n";
-                    }
-
-                    // Cast, Director, Genre
-                    $rCast = array();
-
-                    foreach (array_slice(makeArray($Video['Role']), 0, 5) as $rMember) {
-                        $rCast[] = $rMember['@attributes']['tag'];
-                    }
-                    $rDirectors = array();
-
-                    foreach (array_slice(makeArray($Video['Director']), 0, 3) as $rMember) {
-                        $rDirectors[] = $rMember['@attributes']['tag'];
-                    }
-                    $rGenres = array();
-                    foreach (array_slice(makeArray($Video['Genre']), 0, $rThreadData['max_genres']) as $rGenre) {
-                        $rGenres[] = $rGenre['@attributes']['tag'];
-                    }
-
-                    echo "LOG: Genres: " . implode(', ', $rGenres) . "\n";
-
-                    $country = makeArray($Video['Country'])[0]['@attributes']['tag'] ?? null;
-                    $rSeconds = intval($Video['@attributes']['duration'] / 1000);
-
-                    $rImportArray['stream_display_name'] = $Video['@attributes']['title'];
-                    $rImportArray['year'] = !empty($Video['@attributes']['year']) ? intval($Video['@attributes']['year']) : null;
-                    $rImportArray['tmdb_id'] = $rTMDBID ?: null;
-                    $rImportArray['movie_properties'] = array(
-                        'tmdb_id' => $rTMDBID,
-                        'release_date' => $Video['@attributes']['originallyAvailableAt'] ?? null,
-                        'plot' => trim($Video['@attributes']['summary'] ?? ''),
-                        'duration_secs' => $rSeconds,
-                        'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60),
-                        'movie_image' => $rThumb,
-                        'cover_big' => $rThumb,
-                        'backdrop_path' => $rBG ? array($rBG) : array(),
-                        'director' => implode(', ', $rDirectors),
-                        'actors' => implode(', ', $rCast),
-                        'cast' => implode(', ', $rCast),
-                        'genre' => implode(', ', $rGenres),
-                        'country' => $country,
-                        'rating' => floatval($Video['@attributes']['rating'] ?? $Video['@attributes']['audienceRating'] ?? 0)
-                    );
-                    $rImportArray['rating'] = floatval($Video['@attributes']['rating'] ?? $Video['@attributes']['audienceRating'] ?? 0);
-
-                    echo "LOG: Movie duration: " . $rImportArray['movie_properties']['duration'] . " | Rating: " . $rImportArray['rating'] . "\n";
-
-                    // Source type
-                    if ($rThreadData['direct_proxy']) {
-                        $rImportArray['stream_source'] = $rDirectURL;
-                        $rImportArray['direct_source'] = 1;
-                        $rImportArray['direct_proxy'] = 1;
-                        echo "LOG: Using direct Plex proxy stream\n";
-                    } else {
-                        $rImportArray['stream_source'] = $rInternalPath;
-                        $rImportArray['direct_source'] = 0;
-                        $rImportArray['direct_proxy'] = 0;
-                        echo "LOG: Using local file path source\n";
-                    }
-
-                    $rImportArray['order'] = getNextOrder();
-                    $rImportArray['added'] = time();
-                    $rImportArray['plex_uuid'] = $rThreadData['uuid'];
-
-                    // Categories & Bouquets (логика осталась прежней, но с логами)
-                    if (empty($rCategoryIDs)) {
-                        echo "LOG: Assigning categories based on genres...\n";
-                        foreach ($rGenres as $rGenreTag) {
-                            if (isset($rPlexCategories[3][$rGenreTag])) {
-                                $catId = intval($rPlexCategories[3][$rGenreTag]['category_id']);
-                                if ($catId > 0 && !in_array($catId, $rCategoryIDs)) {
-                                    $rCategoryIDs[] = $catId;
-                                    echo "LOG: → Added category ID $catId ($rGenreTag)\n";
-                                }
-                            } elseif ($rThreadData['store_categories']) {
-                                echo "LOG: New genre \"$rGenreTag\" — creating category\n";
-                                addCategory($rThreadData['type'], $rGenreTag);
-                            }
-                        }
-                    }
-
-                    if (empty($rCategoryIDs) && !empty($rThreadData['fb_category_id'])) {
-                        $rCategoryIDs = [intval($rThreadData['fb_category_id'])];
-                        echo "LOG: Fallback category applied: {$rCategoryIDs[0]}\n";
-                    }
-
-                    $rImportArray['category_id'] = '[' . implode(',', array_map('intval', $rCategoryIDs)) . ']';
-                    echo "LOG: Final category IDs: " . $rImportArray['category_id'] . "\n";
-
-                    // Check for existing movie (upgrade logic)
-                    $rUpgradeData = getMovie($rThreadData['uuid'], ($rThreadData['check_tmdb'] ? $rTMDBID : null));
-                    if ($rUpgradeData) {
-                        echo "LOG: Movie already exists in DB (ID: {$rUpgradeData['id']})\n";
-                        if ($rUpgradeData['source'] != $rFileArray['file']) {
-                            if ($rThreadData['auto_upgrade']) {
-                                echo "LOG: Better source found → UPGRADING movie (new file: {$rFileArray['file']})\n";
-                                $rImportArray['id'] = $rUpgradeData['id'];
-                            } else {
-                                echo "LOG: Auto-upgrade disabled — skipping\n";
-                                exit();
-                            }
-                        } else {
-                            echo "LOG: Same source file — no changes needed\n";
-                            exit();
-                        }
-                    } else {
-                        echo "LOG: This is a completely new movie → creating fresh entry\n";
-                        if (empty($rCategoryIDs)) {
-                            echo "LOG: No categories assigned → logging as failed (status 3)\n";
-                            $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 3, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'));
-                            exit();
-                        }
-                    }
-
-                    // Final INSERT / REPLACE
-                    $rPrepare = prepareArray($rImportArray);
-                    $rQuery = 'REPLACE INTO `streams`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    echo "LOG: Executing REPLACE INTO `streams` (" . ($rUpgradeData ? "upgrade" : "new") . ")\n";
-
-                    if ($db->last_insert_id() > 0) {
-                        $rInsertID = $db->last_insert_id();
-                    }
-
-                    if ($db->query($rQuery, ...$rPrepare['data'])) {
-                        $rInsertID = $db->last_insert_id() ?: $rImportArray['id'];
-
-                        if ($rUpgradeData) {
-                            echo "LOG: Movie successfully upgraded! Stream ID: $rInsertID\n";
-                            foreach ($rServers as $rServerID) {
-                                $db->query('UPDATE `streams_servers` SET `bitrate` = NULL, `current_source` = NULL, `to_analyze` = 0, `pid` = NULL, `stream_started` = NULL, `stream_info` = NULL, `compatible` = 0, `video_codec` = NULL, `audio_codec` = NULL, `resolution` = NULL, `stream_status` = 0 WHERE `stream_id` = ? AND `server_id` = ?', $rInsertID, $rServerID);
-                            }
-                            if ($rThreadData['auto_encode']) {
-                                foreach ($rServers as $rServerID) {
-                                    CoreUtilities::queueMovie($rInsertID, $rServerID);
-                                }
-                            }
-                            $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 6, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'));
-                        } else {
-                            echo "LOG: New movie imported successfully! Stream ID: $rInsertID\n";
-                            foreach ($rServers as $rServerID) {
-                                $db->query('INSERT INTO `streams_servers`(`stream_id`, `server_id`, `parent_id`) VALUES(?, ?, NULL);', $rInsertID, $rServerID);
-                            }
-                            foreach ($rBouquetIDs as $rBouquet) {
-                                addToBouquet('movie', $rBouquet, $rInsertID);
-                            }
-                            $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 1, ?);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'), $rInsertID);
-                        }
-                    } else {
-                        echo "ERROR: Failed to insert/update movie in `streams` table!\n";
-                        $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 2, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'));
-                    }
-                }
-            } else {
-                echo "LOG: No accessible file parts found for this movie\n";
-            }
-
-            if ($rFirstFile) {
-                echo "LOG: Logging inaccessible file (status 5): $rFirstFile\n";
-                $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 5, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFirstFile, ENT_QUOTES, 'UTF-8'));
-            }
-
-            echo "=== [MOVIE] Processing completed ===\n";
-        }
-
-        // =============================================================
-        // SERIES PROCESSING
-        // =============================================================
-        if ($rThreadData['type'] == 'show') {
-            echo "=== [SHOW] Processing TV show: {$rThreadData['key']} ===\n";
-
-            // Getting the basic metadata of the series
-            $rURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/library/metadata/' . $rThreadData['key'] . '?X-Plex-Token=' . $rThreadData['token'];
-            echo "Fetching show metadata: $rURL\n";
-            $rContent = json_decode(json_encode(simplexml_load_string(readURL($rURL))), true);
-            if (!$rContent || empty($rContent['Directory'])) {
-                echo "ERROR: Failed to get show metadata from Plex!\n";
-                exit('Failed to get information.' . PHP_EOL);
-            }
-            $rShowData = $rContent['Directory'];
-            echo "Show title: {$rShowData['@attributes']['title']}\n";
-
-            // Get TMDB ID and language
-            $tmdbInfo = getTmdbIdFromPlex($rShowData);
-            $rTMDBID = $tmdbInfo['tmdb_id'];
-            $rLanguage = $tmdbInfo['language'];
-            echo $rTMDBID ? "TMDB ID detected: $rTMDBID\n" : "TMDB ID not found — will work without it\n";
-            if ($rLanguage) echo "Detected language: $rLanguage\n";
-
-            // Get a list of seasons and all episodes
-            echo "Fetching seasons...\n";
-            $rURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/library/metadata/' . $rThreadData['key'] . '/children?X-Plex-Token=' . $rThreadData['token'];
-            $rSeasons = makeArray(json_decode(json_encode(simplexml_load_string(readURL($rURL))), true)['Directory']);
-            echo "Fetching all episodes...\n";
-            $rURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/library/metadata/' . $rThreadData['key'] . '/allLeaves?X-Plex-Token=' . $rThreadData['token'];
-            $rEpisodes = makeArray(json_decode(json_encode(simplexml_load_string(readURL($rURL))), true)['Video']);
-            echo "Found " . count($rSeasons) . " season(s), " . count($rEpisodes) . " episode(s)\n";
-
-            // Collecting the release dates of the seasons
-            $rSeasonInfo = [];
-            foreach ($rEpisodes as $rEpisode) {
-                if (!in_array($rEpisode['@attributes']['parentIndex'], array_keys($rSeasonInfo))) {
-                    $rSeasonInfo[$rEpisode['@attributes']['parentIndex']] = $rEpisode['@attributes']['originallyAvailableAt'];
-                    echo "Season {$rEpisode['@attributes']['parentIndex']} first air date set to {$rEpisode['@attributes']['originallyAvailableAt']}\n";
-                }
-            }
-
-            // Creating an array of seasons with covers
-            $rSeasonData = [];
-            foreach ($rSeasons as $rSeason) {
-                if ($rSeason['@attributes']['index']) {
-                    echo "Processing season {$rSeason['@attributes']['index']} — {$rSeason['@attributes']['title']}\n";
-                    $rCover = null;
-                    if ($rSeason['@attributes']['thumb']) {
-                        $rThumbURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=300&height=450&minSize=1&quality=100&upscale=1&url=' . $rSeason['@attributes']['thumb'] . '&X-Plex-Token=' . $rThreadData['token'];
-                        echo "Downloading season cover: $rThumbURL\n";
-                        $rCover = CoreUtilities::downloadImage($rThumbURL);
-                    }
-                    $rSeasonData[] = array(
-                        'name' => $rSeason['@attributes']['title'],
-                        'air_date' => ($rSeasonInfo[$rSeason['@attributes']['index']] ?: ''),
-                        'overview' => (trim($rShowData['@attributes']['summary']) ?: ''),
-                        'cover_big' => $rCover,
-                        'cover' => $rCover,
-                        'episode_count' => $rSeason['@attributes']['leafCount'],
-                        'season_number' => $rSeason['@attributes']['index'],
-                        'id' => $rSeason['@attributes']['ratingKey']
-                    );
-                }
-            }
-
-            // Checking if the series exists in the database
-            $rSeries = getseriesbyid($rThreadData['uuid'], $rTMDBID);
-
-            if (!$rSeries) {
-                echo "Creating new series entry...\n";
-                $rSeriesArray = array(
-                    'title' => $rShowData['@attributes']['title'],
-                    'category_id' => array(),
-                    'episode_run_time' => (intval($rShowData['@attributes']['duration'] / 1000 / 60) ?: 0),
-                    'tmdb_id' => $rTMDBID,
-                    'cover' => '',
-                    'genre' => '',
-                    'plot' => trim($rShowData['@attributes']['summary']),
-                    'cast' => '',
-                    'rating' => ((floatval($rShowData['@attributes']['rating']) ?: floatval($rShowData['@attributes']['audienceRating'])) ?: 0),
-                    'director' => '',
-                    'release_date' => $rShowData['@attributes']['originallyAvailableAt'],
-                    'last_modified' => time(),
-                    'seasons' => $rSeasonData,
-                    'backdrop_path' => array(),
-                    'youtube_trailer' => '',
-                    'year' => null
-                );
-                if ($rSeriesArray['release_date']) {
-                    $rSeriesArray['year'] = intval(substr($rSeriesArray['release_date'], 0, 4));
-                    echo "Series year set to {$rSeriesArray['year']}\n";
-                }
-
-                if ($rShowData['@attributes']['thumb']) {
-                    $rThumbURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=300&height=450&minSize=1&quality=100&upscale=1&url=' . $rShowData['@attributes']['thumb'] . '&X-Plex-Token=' . $rThreadData['token'];
-                    echo "Downloading show poster: $rThumbURL\n";
-                    $rThumb = CoreUtilities::downloadImage($rThumbURL);
-                }
-                if ($rShowData['@attributes']['art']) {
-                    $rBGURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=1280&height=720&minSize=1&quality=100&upscale=1&url=' . $rShowData['@attributes']['art'] . '&X-Plex-Token=' . $rThreadData['token'];
-                    echo "Downloading backdrop: $rBGURL\n";
-                    $rBG = CoreUtilities::downloadImage($rBGURL);
-                }
-
-                $rSeriesArray['cover'] = $rThumb ?? null;
-                $rSeriesArray['cover_big'] = $rThumb ?? null;
-                $rSeriesArray['backdrop_path'] = isset($rBG) ? array($rBG) : array();
-
-                $rSeriesArray['cast'] = extractTags($rShowData, 'Role', 5);
-                $rSeriesArray['director'] = extractTags($rShowData, 'Director', 3);
-                $rSeriesArray['genre'] = extractTags($rShowData, 'Genre', 3);
-
-                if (count($rCategoryIDs) == 0) {
-                    if (0 < $rThreadData['max_genres']) {
-                        $rParsed = array_slice(makeArray($rShowData['Genre']), 0, $rThreadData['max_genres']);
-                    } else {
-                        $rParsed = makeArray($rShowData['Genre']);
-                    }
-                    foreach ($rParsed as $rGenre) {
-                        $rGenreTag = $rGenre['@attributes']['tag'];
-
-                        if (isset($rPlexCategories[4][$rGenreTag])) {
-                            $rCategoryID = intval($rPlexCategories[4][$rGenreTag]['category_id']);
-
-                            if ($rCategoryID > 0) {
-                                if (!in_array($rCategoryID, $rCategoryIDs)) {
-                                    $rCategoryIDs[] = $rCategoryID;
-                                }
-                            }
-                        } else {
-                            if ($rThreadData['store_categories']) {
-                                addCategory($rThreadData['type'], $rGenreTag);
-                            }
-                        }
-                    }
-                }
-
-
-                if (count($rCategoryIDs) == 0 && 0 < intval($rThreadData['fb_category_id'])) {
-                    $rCategoryIDs = array(intval($rThreadData['fb_category_id']));
-                }
-
-                if (count($rBouquetIDs) == 0) {
-                    if (0 < $rThreadData['max_genres']) {
-                        $rParsed = array_slice(makeArray($rShowData['Genre']), 0, $rThreadData['max_genres']);
-                    } else {
-                        $rParsed = makeArray($rShowData['Genre']);
-                    }
-
-                    foreach ($rParsed as $rGenre) {
-                        $rGenreTag = $rGenre['@attributes']['tag'];
-                        $rBouquets = json_decode($rPlexCategories[4][$rGenreTag]['bouquets'], true);
-
-                        foreach ($rBouquets as $rBouquetID) {
-                            if (!in_array($rBouquetID, $rBouquetIDs)) {
-                                $rBouquetIDs[] = $rBouquetID;
-                            }
-                        }
-                    }
-                }
-
-                if (count($rBouquetIDs) == 0) {
-                    $rBouquetIDs = array_map('intval', json_decode($rThreadData['fb_bouquets'], true));
-                }
-
-                if (count($rCategoryIDs) != 0) {
-                    $rSeriesArray['plex_uuid'] = $rThreadData['uuid'];
-                    $rSeriesArray['tmdb_language'] = $rLanguage;
-                    $rSeriesArray['category_id'] = '[' . implode(',', array_map('intval', $rCategoryIDs)) . ']';
-                    echo "Final category IDs: " . $rSeriesArray['category_id'] . "\n";
-
-                    $rPrepare = prepareArray($rSeriesArray);
-                    $rQuery = 'INSERT INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    echo "Executing INSERT into streams_series (ID will be auto-generated)\n";
-                    if ($db->query($rQuery, ...$rPrepare['data'])) {
-                        $rInsertID = $db->last_insert_id();
-                        echo "Series created with ID = $rInsertID\n";
-                        $rSeries = getSerie($rInsertID);
-                        foreach ($rBouquetIDs as $rBouquet) {
-                            echo "Adding series $rInsertID to bouquet $rBouquet\n";
-                            addToBouquet('series', $rBouquet, $rInsertID);
-                        }
-                    } else {
-                        echo "ERROR: Failed to insert series into DB!\n";
-                        $rSeries = null;
-                    }
-                }
-            } else {
-                echo "Series already exists in DB (ID = {$rSeries['id']}), updating seasons only\n";
-                $db->query('UPDATE `streams_series` SET `seasons` = ? WHERE `id` = ?;', json_encode($rSeasonData, JSON_UNESCAPED_UNICODE), $rSeries['id']);
-                echo "Seasons updated for series ID {$rSeries['id']}\n";
-
-                if (!$rSeries['cover']) {
-                    echo "Series has no cover — trying to download from Plex\n";
-                    if ($rShowData['@attributes']['thumb']) {
-                        $rThumbURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=300&height=450&minSize=1&quality=100&upscale=1&url=' . $rShowData['@attributes']['thumb'] . '&X-Plex-Token=' . $rThreadData['token'];
-                        $rThumb = CoreUtilities::downloadImage($rThumbURL);
-                    }
-
-                    if ($rShowData['@attributes']['art']) {
-                        $rBGURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=1280&height=720&minSize=1&quality=100&upscale=1&url=' . $rShowData['@attributes']['art'] . '&X-Plex-Token=' . $rThreadData['token'];
-                        $rBG = CoreUtilities::downloadImage($rBGURL);
-                    }
-
-                    if ($rThumb || $rBG) {
-                        if ($rBG) {
-                            $rBG = array($rBG);
-                        } else {
-                            $rBG = array();
-                        }
-
-                        $db->query('UPDATE `streams_series` SET `cover` = ?, `cover_big` = ?, `backdrop_path` = ? WHERE `id` = ?;', $rThumb, $rThumb, $rBG, $rSeries['id']);
-                    }
-                }
-            }
-
-            // === Processing of all episodes ===
-            echo "Starting episode import (" . count($rEpisodes) . " episodes)\n";
-            foreach ($rEpisodes as $rEpisode) {
-                if ($rEpisode['@attributes']['parentIndex'] && $rEpisode['@attributes']['index']) {
-                    $rReleaseSeason = $rEpisode['@attributes']['parentIndex'];
-                    $rReleaseEpisode = $rEpisode['@attributes']['index'];
-                    echo "Processing S" . sprintf('%02d', $rReleaseSeason) . "E" . sprintf('%02d', $rReleaseEpisode) . " — {$rEpisode['@attributes']['title']}\n";
-
-                    $rFirstFile = null;
-                    $rFileArray = array('file' => null, 'size' => null, 'data' => null, 'key' => null);
-                    foreach (makeArray($rEpisode['Media']) as $rMedia) {
-                        if (!$rFirstFile) $rFirstFile = $rMedia['Part']['@attributes']['file'];
-                        if ($rFileArray['size'] && $rFileArray['size'] >= intval($rMedia['Part']['@attributes']['size'])) {
-                        } else {
-                            if (file_exists($rMedia['Part']['@attributes']['file']) || $rThreadData['direct_proxy']) {
-                                $rFileArray = array('file' => $rMedia['Part']['@attributes']['file'], 'size' => intval($rMedia['Part']['@attributes']['size']), 'data' => $rMedia, 'key' => $rMedia['Part']['@attributes']['key']);
-                            }
-                        }
-                    }
-
-                    if (!empty($rFileArray['file'])) {
-                        $episodeName = $rSeries['title'] . " - S" . sprintf('%02d', $rReleaseSeason) . "E" . sprintf('%02d', $rReleaseEpisode) . " - " . $rEpisode['@attributes']['title'];
-                        $rInternalPath = json_encode(array('s:' . SERVER_ID . ':' . $rFileArray['file']), JSON_UNESCAPED_UNICODE);
-                        $rDirectURL = json_encode(array('http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . $rFileArray['key'] . '?X-Plex-Token=' . $rThreadData['token']), JSON_UNESCAPED_UNICODE);
-
-                        if (in_array($rInternalPath, $rStreamDatabase) || in_array($rDirectURL, $rStreamDatabase)) {
-                            echo "Episode already exists in database — skipping\n";
-                            continue;
-                        }
-
-                        echo "New episode found: $episodeName\n";
-                        $rStreamDatabase[] = $rInternalPath;
-                        $rStreamDatabase[] = $rDirectURL;
-
-                        if ($rThreadData['target_container'] != 'auto' && $rThreadData['target_container'] && !$rThreadData['direct_proxy']) {
-                            $rImportArray['target_container'] = $rThreadData['target_container'];
-                        } else {
-                            $rImportArray['target_container'] = pathinfo($rFileArray['file'])['extension'];
-                        }
-
-                        if (empty($rImportArray['target_container'])) {
-                            $rImportArray['target_container'] = 'mp4';
-                        }
-                        $rUpgradeData = getEpisode($rThreadData['uuid'], ($rThreadData['check_tmdb'] ? $rTMDBID : null), $rReleaseSeason, $rReleaseEpisode);
-                        if (!$rUpgradeData) {
-                            echo "Creating new stream entry for this episode\n";
-                            $db->query('DELETE FROM `watch_logs` WHERE `filename` = ? AND `type` = ? AND `server_id` = ?;', htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'), $rThreadType, SERVER_ID);
-                            $rThumb = null;
-
-                            if ($rEpisode['@attributes']['thumb']) {
-                                $rThumbURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=450&height=253&minSize=1&quality=100&upscale=1&url=' . $rEpisode['@attributes']['thumb'] . '&X-Plex-Token=' . $rThreadData['token'];
-                                $rThumb = CoreUtilities::downloadImage($rThumbURL);
-                            }
-
-                            $rSeconds = intval($rEpisode['@attributes']['duration'] / 1000);
-                            $rImportArray['movie_properties'] = array('tmdb_id' => ($rSeries['tmdb_id'] ?: null), 'release_date' => $rEpisode['@attributes']['originallyAvailableAt'], 'plot' => $rEpisode['@attributes']['summary'], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'movie_image' => $rThumb, 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => ((floatval($rEpisode['@attributes']['rating']) ?: floatval($rEpisode['@attributes']['audienceRating'])) ?: $rSeries['rating']), 'season' => $rReleaseSeason);
-                            $rImportArray['stream_display_name'] = $rSeries['title'] . ' - S' . sprintf('%02d', intval($rReleaseSeason)) . 'E' . sprintf('%02d', $rReleaseEpisode) . ' - ' . $rEpisode['@attributes']['title'];
-                            $rImportArray['read_native'] = $rThreadData['read_native'];
-                            $rImportArray['movie_symlink'] = $rThreadData['movie_symlink'];
-                            $rImportArray['remove_subtitles'] = $rThreadData['remove_subtitles'];
-                            $rImportArray['transcode_profile_id'] = $rThreadData['transcode_profile_id'];
-
-                            if ($rThreadData['direct_proxy']) {
-                                $rImportArray['stream_source'] = $rDirectURL;
-                                $rImportArray['direct_source'] = 1;
-                                $rImportArray['direct_proxy'] = 1;
-                            } else {
-                                $rImportArray['stream_source'] = $rInternalPath;
-                                $rImportArray['direct_source'] = 0;
-                                $rImportArray['direct_proxy'] = 0;
-                            }
-
-                            $rImportArray['order'] = getNextOrder();
-                            $rImportArray['tmdb_language'] = $rLanguage;
-                            $rImportArray['added'] = time();
-                            $rImportArray['uuid'] = $rThreadData['uuid'];
-                            $rImportArray['series_no'] = $rSeries['id'];
-                            $rPrepare = prepareArray($rImportArray);
-                            $rQuery = 'REPLACE INTO `streams`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-
-                            if ($db->query($rQuery, ...$rPrepare['data'])) {
-                                $rInsertID = $db->last_insert_id();
-                                echo "Episode imported successfully! Stream ID = $rInsertID\n";
-                                foreach ($rServers as $rServerID) {
-                                    $db->query('INSERT INTO `streams_servers`(`stream_id`, `server_id`, `parent_id`) VALUES(?, ?, NULL);', $rInsertID, $rServerID);
-                                }
-                                $db->query('INSERT INTO `streams_episodes`(`season_num`, `series_id`, `stream_id`, `episode_num`) VALUES(?, ?, ?, ?);', $rReleaseSeason, $rSeries['id'], $rInsertID, $rReleaseEpisode);
-
-                                if ($rThreadData['auto_encode']) {
-                                    foreach ($rServers as $rServerID) {
-                                        CoreUtilities::queueMovie($rInsertID, $rServerID);
-                                    }
-                                }
-
-                                $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 1, ?);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'), $rInsertID);
-                            } else {
-                                echo "ERROR: Failed to insert episode into `streams`!\n";
-                            }
-                        } else {
-                            if ($rUpgradeData['source'] != $rFileArray['file']) {
-                                if ($rThreadData['auto_upgrade']) {
-                                    echo 'Upgrade episode!' . "\n";
-                                    $db->query('UPDATE `streams` SET `plex_uuid` = ?, `stream_source` = ?, `target_container` = ? WHERE `id` = ?;', $rThreadData['uuid'], $rImportArray['stream_source'], $rImportArray['target_container'], $rUpgradeData['id']);
-
-                                    foreach ($rServers as $rServerID) {
-                                        $db->query('UPDATE `streams_servers` SET `bitrate` = NULL, `current_source` = NULL, `to_analyze` = 0, `pid` = NULL, `stream_started` = NULL, `stream_info` = NULL, `compatible` = 0, `video_codec` = NULL, `audio_codec` = NULL, `resolution` = NULL, `stream_status` = 0 WHERE `stream_id` = ? AND `server_id` = ?', $rUpgradeData['id'], $rServerID);
-                                    }
-
-                                    if ($rThreadData['auto_encode']) {
-                                        foreach ($rServers as $rServerID) {
-                                            CoreUtilities::queueMovie($rUpgradeData['id'], $rServerID);
-                                        }
-                                    }
-
-                                    $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 6, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'));
-                                } else {
-                                    echo 'Upgrade disabled' . "\n";
-                                }
-                            } else {
-                                echo 'File remains unchanged' . "\n";
-                            }
-                        }
-                    } else {
-                        echo "No accessible file parts for this episode (possibly not mounted)\n";
-                        if ($rFirstFile) {
-                            $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 5, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFirstFile, ENT_QUOTES, 'UTF-8'));
-                        } else {
-                            exit();
-                        }
-                    }
-                }
-            }
-            echo "=== [SHOW] TV show processing completed ===\n";
-        }
-    } else {
-        exit();
-    }
-}
-
-function getMovie($rPlexID, $rTMDBID) {
-    if (file_exists(WATCH_TMP_PATH . 'movie_' . $rPlexID . '.pcache')) {
-        return json_decode(file_get_contents(WATCH_TMP_PATH . 'movie_' . $rPlexID . '.pcache'), true);
-    }
-
-    if (file_exists(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.pcache')) {
-        return json_decode(file_get_contents(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.pcache'), true);
-    }
-}
-
-function getEpisode($rPlexID, $rTMDBID, $rSeason, $rEpisode) {
-    if (file_exists(WATCH_TMP_PATH . 'series_' . $rPlexID . '.pcache')) {
-        $rData = json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . $rPlexID . '.pcache'), true);
-
-        if (isset($rData[$rSeason . '_' . $rEpisode])) {
-            return $rData[$rSeason . '_' . $rEpisode];
-        }
-    }
-
-    if (file_exists(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.pcache')) {
-        $rData = json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.pcache'), true);
-
-        if (isset($rData[$rSeason . '_' . $rEpisode])) {
-            return $rData[$rSeason . '_' . $rEpisode];
-        }
-    }
-}
-
-function addCategory($rType, $rGenreTag) {
-    file_put_contents(WATCH_TMP_PATH . md5($rType . '_' . $rGenreTag) . '.pcat', json_encode(array('type' => $rType, 'title' => $rGenreTag)));
-}
-
-function readURL($rURL) {
-    $rCurl = curl_init($rURL);
-    curl_setopt($rCurl, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($rCurl, CURLOPT_CONNECTTIMEOUT, 10);
-    curl_setopt($rCurl, CURLOPT_TIMEOUT, 10);
-
-    return curl_exec($rCurl);
-}
-
-function makeArray($rArray) {
-    if (isset($rArray['@attributes'])) {
-        $rArray = array($rArray);
-    }
-
-    return $rArray;
-}
-
-function extractTags(array $data, string $tag, int $limit): string {
-    $items = [];
-    foreach (makeArray($data[$tag] ?? []) as $item) {
-        if (count($items) >= $limit) break;
-        $items[] = $item['@attributes']['tag'] ?? '';
-    }
-    return implode(', ', $items);
-}
-
-// Universal TMDB ID search function (works for movies and shows)
-function getTmdbIdFromPlex($rContent) {
-    $tmdbId = null;
-    $language = null;
-
-    // 1. Try a new format: separate <Guid id="tmdb://12345"/>
-    if (isset($rContent['Guid']) && is_array($rContent['Guid'])) {
-        foreach (makeArray($rContent['Guid']) as $guid) {
-            $id = $guid['@attributes']['id'] ?? '';
-            if (strpos($id, 'tmdb://') === 0) {
-                $tmdbId = intval(substr($id, 7)); // убираем "tmdb://"
-                echo "TMDB ID found (new format): $tmdbId\n";
-                break;
-            }
-        }
-    }
-
-    // 2. Old format (just in case, for old libraries)
-    if (!$tmdbId && !empty($rContent['@attributes']['guid'])) {
-        $guid = $rContent['@attributes']['guid'];
-        if (strpos($guid, 'com.plexapp.agents.themoviedb://') !== false) {
-            preg_match('/com\.plexapp\.agents\.themoviedb:\/\/(\d+)/', $guid, $m);
-            if (!empty($m[1])) {
-                $tmdbId = intval($m[1]);
-                if (strpos($guid, '?lang=') !== false) {
-                    $language = substr($guid, strpos($guid, '?lang=') + 6);
-                }
-                echo "TMDB ID found (old format): $tmdbId\n";
-            }
-        }
-    }
-
-    // 3. Another old option: tmdb:// in Guid as a string
-    if (!$tmdbId && isset($rContent['Guid']) && is_array($rContent['Guid'])) {
-        foreach (makeArray($rContent['Guid']) as $guid) {
-            $id = $guid['@attributes']['id'] ?? '';
-            if (strpos($id, 'tmdb://') === 0) {
-                $tmdbId = intval(substr($id, 7));
-                echo "TMDB ID found (direct tmdb:// in Guid): $tmdbId\n";
-                break;
-            }
-        }
-    }
-
-    return ['tmdb_id' => $tmdbId, 'language' => $language];
-}
-
 function shutdown() {
     global $db;
 
diff --git a/src/includes/cli/watch_item.php b/src/includes/cli/watch_item.php
index 1a0901ba..fbe09237 100644
--- a/src/includes/cli/watch_item.php
+++ b/src/includes/cli/watch_item.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Watch Item CLI — точка входа.
+ *
+ * Логика извлечена в modules/watch/WatchItem.php (Фаза 5.2).
+ * Этот файл содержит только CLI-бутстрап и вызов модуля.
+ */
 setlocale(LC_ALL, 'en_US.UTF-8');
 putenv('LC_ALL=en_US.UTF-8');
 if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
@@ -8,12 +14,13 @@ if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
         ini_set('max_execution_time', $rTimeout);
         register_shutdown_function('shutdown');
         require str_replace('\\', '/', dirname($argv[0])) . '/../../www/init.php';
+        require str_replace('\\', '/', dirname($argv[0])) . '/../../modules/watch/WatchItem.php';
         require INCLUDES_PATH . 'libs/tmdb.php';
         require INCLUDES_PATH . 'libs/tmdb_release.php';
         $rThreadData = json_decode(base64_decode($argv[1]), true);
         if ($rThreadData) {
             file_put_contents(WATCH_TMP_PATH . getmypid() . '.wpid', time());
-            loadcli();
+            WatchItem::run();
         } else {
             exit();
         }
@@ -23,877 +30,6 @@ if (posix_getpwuid(posix_geteuid())['name'] == 'xc_vm') {
 } else {
     exit('Please run as XC_VM!' . "\n");
 }
-function loadcli() {
-    global $db;
-    global $rThreadData;
-    global $rTimeout;
-    if (strpos($rThreadData['file'], $rThreadData['directory']) === 0 || $rThreadData['import']) {
-        $rWatchCategories = $rThreadData['watch_categories'];
-        $rLanguage = null;
-        $rReleaseSeason = NULL;
-        $rReleaseEpisode = NULL;
-        $rYear = null;
-
-        if (!empty($rThreadData['language'])) {
-            $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], $rThreadData['language']);
-            $rLanguage = $rThreadData['language'];
-        } else {
-            if (!empty(CoreUtilities::$rSettings['tmdb_language'])) {
-                $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], CoreUtilities::$rSettings['tmdb_language']);
-            } else {
-                $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key']);
-            }
-        }
-        if ($rThreadData['type'] != 'movie') {
-            $rThreadData['extract_metadata'] = false;
-        }
-        $rImportArray = verifyPostTable('streams');
-        $rImportArray['type'] = array('movie' => 2, 'series' => 5)[$rThreadData['type']];
-        if ($rImportArray['type']) {
-            $rThreadType = array('movie' => 1, 'series' => 2)[$rThreadData['type']];
-            $rFile = $rThreadData['file'];
-            if ($rThreadData['import']) {
-                $rImportArray['stream_source'] = json_encode(array($rFile), JSON_UNESCAPED_UNICODE);
-            } else {
-                $rImportArray['stream_source'] = json_encode(array('s:' . SERVER_ID . ':' . $rFile), JSON_UNESCAPED_UNICODE);
-                $db->query('DELETE FROM `watch_logs` WHERE `filename` = ? AND `type` = ? AND `server_id` = ?;', htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'), $rThreadType, SERVER_ID);
-            }
-            if ($rThreadData['target_container'] != 'auto' && $rThreadData['target_container']) {
-                $rImportArray['target_container'] = $rThreadData['target_container'];
-            } else {
-                $rImportArray['target_container'] = pathinfo(explode('?', $rFile)[0])['extension'];
-            }
-            if (empty($rImportArray['target_container'])) {
-                $rImportArray['target_container'] = 'mp4';
-            }
-            $rSourceData = null;
-            if ($rThreadData['ffprobe_input'] || $rThreadData['extract_metadata']) {
-                $rSourceData = checksource($rFile);
-            }
-            if (!$rThreadData['ffprobe_input'] || isset($rSourceData['streams'])) {
-                $rMatch = $rPaths = null;
-                $rMetaMatch = false;
-                if ($rThreadData['extract_metadata'] && isset($rSourceData['format']) && $rSourceData['tags']['title']) {
-                    $rYear = (intval(explode('-', $rSourceData['tags']['date'])[0]));
-                    $rPaths = array($rSourceData['tags']['title']);
-                    $rMetaMatch = true;
-                }
-                if (!$rPaths) {
-                    if ($rThreadData['fallback_title']) {
-                        $rPaths = array(pathinfo($rFile)['filename'], basename(pathinfo($rFile)['dirname']));
-                    } else {
-                        $rPaths = array(pathinfo($rFile)['filename']);
-                    }
-                    $rMetaMatch = false;
-                }
-                foreach ($rPaths as $rFilename) {
-                    echo 'Scanning: ' . $rFilename . "\n";
-                    $rTitle = null;
-                    $rAltTitle = null;
-                    if ($rThreadData['import']) {
-                        $rFilename = $rThreadData['title'];
-                    }
-                    if ($rThreadData['fallback_parser'] && !$rThreadData['disable_tmdb'] && !$rMetaMatch) {
-                        $rParseTypes = array(CoreUtilities::$rSettings['parse_type'], (CoreUtilities::$rSettings['parse_type'] == 'guessit' ? 'ptn' : 'guessit'));
-                    } else {
-                        $rParseTypes = array(CoreUtilities::$rSettings['parse_type']);
-                    }
-                    foreach ($rParseTypes as $rParseType) {
-                        if ($rThreadData['disable_tmdb'] || $rMetaMatch) {
-                        } else {
-                            $rRelease = parserelease($rFilename, $rParseType);
-                            $rTitle = $rRelease['title'];
-                            if (isset($rRelease['excess'])) {
-                                $rTitle = trim($rTitle, (is_array($rRelease['excess']) ? $rRelease['excess'][0] : $rRelease['excess']));
-                            }
-                            if (isset($rRelease['group'])) {
-                                $rAltTitle = $rTitle . '-' . $rRelease['group'];
-                            } else {
-                                if (isset($rRelease['alternative_title'])) {
-                                    $rAltTitle = $rTitle . ' - ' . $rRelease['alternative_title'];
-                                }
-                            }
-                            if (isset($rRelease['year'])) {
-                                if (!$rYear) {
-                                    $rYear = intval($rRelease['year']);
-                                }
-                            }
-
-                            if ($rThreadData['type'] != 'movie') {
-                                if ($rReleaseSeason == null && isset($rRelease['season'])) {
-                                    $rReleaseSeason = $rRelease['season'];
-                                }
-                                if ($rReleaseEpisode == null && isset($rRelease['episode'])) {
-                                    if (is_array($rRelease['episode'])) {
-                                        $rReleaseEpisode = $rRelease['episode'][0];
-                                    } else {
-                                        $rReleaseEpisode = $rRelease['episode'];
-                                    }
-                                }
-                            }
-                        }
-                        if (!($rThreadData['type'] == 'series' && (!$rReleaseSeason || !$rReleaseEpisode))) {
-                            if (!$rTitle) {
-                                $rTitle = $rFilename;
-                            }
-                            echo 'Title: ' . $rTitle . "\n";
-                            if (!$rThreadData['disable_tmdb']) {
-                                $rMatches = array();
-                                $rSearchYear = $rYear;
-                                foreach (range(0, 1) as $rIgnoreYear) {
-                                    if ($rIgnoreYear) {
-                                        if ($rSearchYear) {
-                                            $rSearchYear = null;
-                                        } else {
-                                            break;
-                                        }
-                                    }
-                                    if ($rThreadData['type'] == 'movie') {
-                                        print_r('Searching Movie: ' . $rTitle . ' Year: ' . $rSearchYear . "\n");
-                                        $rResults = $rTMDB->searchMovie($rTitle, $rSearchYear);
-                                    } else {
-                                        print_r('Searching TV Show: ' . $rTitle . ' Year: ' . $rSearchYear . "\n");
-                                        $rResults = $rTMDB->searchTVShow($rTitle, $rSearchYear);
-                                    }
-                                    foreach ($rResults as $rResultArr) {
-                                        $tmdbTitles = [];
-
-                                        if ($rThreadData['type'] === 'movie') {
-                                            $tmdbTitles[] = $rResultArr->get('title');
-                                            $tmdbTitles[] = $rResultArr->get('original_title');
-                                        } else {
-                                            $tmdbTitles[] = $rResultArr->get('name');
-                                            $tmdbTitles[] = $rResultArr->get('original_name');
-                                        }
-
-                                        $tmdbTitles = array_filter($tmdbTitles);
-
-                                        $rPercentage = 0;
-                                        $rPercentageAlt = 0;
-
-                                        foreach ($tmdbTitles as $tmdbTitle) {
-                                            similar_text(parseTitle($rTitle), parseTitle($tmdbTitle), $p);
-                                            $rPercentage = max($rPercentage, $p);
-
-                                            if ($rAltTitle) {
-                                                similar_text(parseTitle($rAltTitle), parseTitle($tmdbTitle), $pAlt);
-                                                $rPercentageAlt = max($rPercentageAlt, $pAlt);
-                                            }
-                                        }
-
-
-                                        $rPercentageAlt = 0;
-                                        if ($rAltTitle) {
-                                            similar_text(parseTitle($rAltTitle), parseTitle(($rResultArr->get('title') ?: $rResultArr->get('name'))), $rPercentageAlt);
-                                        }
-                                        if (CoreUtilities::$rSettings['percentage_match'] <= $rPercentage || CoreUtilities::$rSettings['percentage_match'] <= $rPercentageAlt) {
-                                            if ($rSearchYear && !in_array(intval(substr(($rResultArr->get('release_date') ?: $rResultArr->get('first_air_date')), 0, 4)), range(intval($rSearchYear) - 1, intval($rSearchYear) + 1))) {
-                                            } else {
-                                                if ($rAltTitle && parseTitle(($rResultArr->get('title') ?: $rResultArr->get('name'))) == parseTitle($rAltTitle)) {
-                                                    $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
-                                                    break;
-                                                }
-                                                foreach ($tmdbTitles as $tmdbTitle) {
-                                                    if ($rAltTitle && parseTitle($tmdbTitle) === parseTitle($rAltTitle)) {
-                                                        $rMatches = [['percentage' => 100, 'data' => $rResultArr]];
-                                                        break 2;
-                                                    }
-
-                                                    if (!$rAltTitle && parseTitle($tmdbTitle) === parseTitle($rTitle)) {
-                                                        $rMatches = [['percentage' => 100, 'data' => $rResultArr]];
-                                                        break 2;
-                                                    }
-                                                }
-                                                $rMatches[] = array('percentage' => $rPercentage, 'data' => $rResultArr);
-                                            }
-                                        } else {
-                                            if ($rThreadData['alternative_titles'] && in_array(intval(substr(($rResultArr->get('release_date') ?: $rResultArr->get('first_air_date')), 0, 4)), range(intval($rSearchYear) - 1, intval($rSearchYear) + 1))) {
-                                                $rPartialMatch = false;
-
-                                                foreach ($tmdbTitles as $tmdbTitle) {
-                                                    if (strpos(parseTitle($rTitle), parseTitle($tmdbTitle)) === 0) {
-                                                        $rPartialMatch = true;
-                                                        break;
-                                                    }
-
-                                                    if ($rAltTitle && strpos(parseTitle($rAltTitle), parseTitle($tmdbTitle)) === 0) {
-                                                        $rPartialMatch = true;
-                                                        break;
-                                                    }
-                                                }
-                                                if ($rPartialMatch) {
-                                                    if ($rThreadData['type'] == 'movie') {
-                                                        $rAlternativeTitles = $rTMDB->getMovieTitles($rResultArr->get('id'))['titles'];
-                                                    } else {
-                                                        $rAlternativeTitles = $rTMDB->getSeriesTitles($rResultArr->get('id'))['titles'];
-                                                    }
-                                                    foreach ($rAlternativeTitles as $rAlternativeTitle) {
-                                                        if ($rAltTitle && parseTitle($rAlternativeTitle['title']) == parseTitle($rAltTitle)) {
-                                                            $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
-                                                            break;
-                                                        }
-                                                        if (parseTitle($rAlternativeTitle['title']) != parseTitle($rTitle) || $rAltTitle) {
-                                                        } else {
-                                                            $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
-                                                            break;
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                    if (count($rMatches) > 0) {
-                                        break;
-                                    }
-                                }
-                                if (count($rMatches) > 0) {
-                                    $rMax = max(array_column($rMatches, 'percentage'));
-                                    $rKeys = array_filter(array_map(function ($rMatches) use ($rMax) {
-                                        return ($rMatches['percentage'] == $rMax ? $rMatches['data'] : null);
-                                    }, $rMatches));
-                                    list($rMatch) = array_values($rKeys);
-                                }
-                            }
-                            if ($rMatch) {
-                                break;
-                            }
-                        } else {
-                            $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 4, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
-                            exit();
-                        }
-                    }
-                }
-                if (!$rMatch && !$rThreadData['ignore_no_match']) {
-                    echo 'No match!' . "\n";
-                    $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 4, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
-                    exit();
-                }
-                $rBouquetIDs = array();
-                $rCategoryIDs = array();
-                if (!empty($rThreadData['category_id'])) {
-                    if (is_array($rThreadData['category_id'])) {
-                        $rCategoryIDs = array_map('intval', $rThreadData['category_id']);
-                    } else {
-                        $rCategoryIDs = array(intval($rThreadData['category_id']));
-                    }
-                }
-                if (!empty($rThreadData['bouquets'])) {
-                    if (is_array($rThreadData['bouquets'])) {
-                        $rBouquetIDs = array_map('intval', $rThreadData['bouquets']);
-                    } else {
-                        $rBouquetIDs = json_decode($rThreadData['bouquets'], true);
-                    }
-                }
-                if ($rMatch) {
-                    if ($rThreadData['type'] == 'movie') {
-                        if ($rThreadData['duplicate_tmdb']) {
-                            $rUpgradeData = null;
-                        } else {
-                            $rUpgradeData = getMovie($rMatch->get('id'));
-                        }
-
-                        if ($rUpgradeData) {
-                            if ($rThreadData['auto_upgrade']) {
-                                if (substr($rUpgradeData['source'], 0, 3 + strlen(strval(SERVER_ID))) != 's:' . SERVER_ID . ':') {
-                                    echo "Old file path doesn't match this server, don't upgrade." . "\n";
-                                    exit();
-                                }
-                                list(, $rActualPath) = explode('s:' . SERVER_ID . ':', $rUpgradeData['source']);
-                                if (!file_exists($rActualPath) || filesize($rActualPath) < filesize($rFile)) {
-                                    echo 'Upgrade movie!' . "\n";
-                                    $db->query('UPDATE `streams` SET `stream_source` = ?, `target_container` = ? WHERE `id` = ?;', $rImportArray['stream_source'], $rImportArray['target_container'], $rUpgradeData['id']);
-                                    $db->query('UPDATE `streams_servers` SET `bitrate` = NULL, `current_source` = NULL, `to_analyze` = 0, `pid` = NULL, `stream_started` = NULL, `stream_info` = NULL, `compatible` = 0, `video_codec` = NULL, `audio_codec` = NULL, `resolution` = NULL, `stream_status` = 0 WHERE `stream_id` = ? AND `server_id` = ?', $rUpgradeData['id'], SERVER_ID);
-                                    if ($rThreadData['auto_encode']) {
-                                        CoreUtilities::queueMovie($rUpgradeData['id']);
-                                    }
-                                    $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 6, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
-                                    file_put_contents(WATCH_TMP_PATH . 'movie_' . $rMatch->get('id') . '.cache', json_encode(array('id' => $rUpgradeData['id'], 'source' => 's:' . SERVER_ID . ':' . $rFile)));
-                                    exit();
-                                }
-                                echo "File isn't a better source, don't upgrade." . "\n";
-                                exit();
-                            }
-                            echo 'Upgrade disabled' . "\n";
-                            exit();
-                        }
-                        $rMovie = $rTMDB->getMovie($rMatch->get('id'));
-                        $rMovieData = json_decode($rMovie->getJSON(), true);
-                        $rMovieData['trailer'] = $rMovie->getTrailer();
-                        $rThumb = 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rMovieData['poster_path'];
-                        $rBG = 'https://image.tmdb.org/t/p/w1280' . $rMovieData['backdrop_path'];
-                        if (CoreUtilities::$rSettings['download_images']) {
-                            $rThumb = CoreUtilities::downloadImage($rThumb);
-                            $rBG = CoreUtilities::downloadImage($rBG);
-                        }
-                        $rCast = array();
-                        foreach ($rMovieData['credits']['cast'] as $rMember) {
-                            if (count($rCast) >= 5) {
-                            } else {
-                                $rCast[] = $rMember['name'];
-                            }
-                        }
-                        $rDirectors = array();
-                        foreach ($rMovieData['credits']['crew'] as $rMember) {
-                            if (!(count($rDirectors) < 5 && ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing')) || in_array($rMember['name'], $rDirectors)) {
-                            } else {
-                                $rDirectors[] = $rMember['name'];
-                            }
-                        }
-                        $rCountry = '';
-                        if (isset($rMovieData['production_countries'][0]['name'])) {
-                            $rCountry = $rMovieData['production_countries'][0]['name'];
-                        }
-                        $rGenres = array();
-                        foreach ($rMovieData['genres'] as $rGenre) {
-                            if (count($rGenres) >= 3) {
-                            } else {
-                                $rGenres[] = $rGenre['name'];
-                            }
-                        }
-                        $rSeconds = intval($rMovieData['runtime']) * 60;
-                        $rImportArray['stream_display_name'] = $rMovieData['title'];
-                        if (strlen($rMovieData['release_date']) > 0) {
-                            $rImportArray['year'] = intval(substr($rMovieData['release_date'], 0, 4));
-                        }
-                        $rImportArray['tmdb_id'] = ($rMovieData['id'] ?: null);
-                        $rImportArray['movie_properties'] = array('kinopoisk_url' => 'https://www.themoviedb.org/movie/' . $rMovieData['id'], 'tmdb_id' => $rMovieData['id'], 'name' => $rMovieData['title'], 'o_name' => $rMovieData['original_title'], 'cover_big' => $rThumb, 'movie_image' => $rThumb, 'release_date' => $rMovieData['release_date'], 'episode_run_time' => $rMovieData['runtime'], 'youtube_trailer' => $rMovieData['trailer'], 'director' => implode(', ', $rDirectors), 'actors' => implode(', ', $rCast), 'cast' => implode(', ', $rCast), 'description' => $rMovieData['overview'], 'plot' => $rMovieData['overview'], 'age' => '', 'mpaa_rating' => '', 'rating_count_kinopoisk' => 0, 'country' => $rCountry, 'genre' => implode(', ', $rGenres), 'backdrop_path' => array($rBG), 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => $rMovieData['vote_average']);
-                        $rImportArray['rating'] = ($rImportArray['movie_properties']['rating'] ?: 0);
-                        $rImportArray['read_native'] = $rThreadData['read_native'];
-                        $rImportArray['movie_symlink'] = $rThreadData['movie_symlink'];
-                        $rImportArray['remove_subtitles'] = $rThreadData['remove_subtitles'];
-                        $rImportArray['transcode_profile_id'] = $rThreadData['transcode_profile_id'];
-                        if ($rThreadData['import']) {
-                            $rImportArray['direct_source'] = $rThreadData['direct_source'];
-                            $rImportArray['direct_proxy'] = $rThreadData['direct_proxy'];
-                        }
-                        $rImportArray['order'] = getNextOrder();
-                        $rImportArray['tmdb_language'] = $rLanguage;
-                        if (count($rCategoryIDs) == 0 && !empty($rMovieData['genres']) && is_array($rMovieData['genres'])) {
-                            if (0 < $rThreadData['max_genres']) {
-                                $rParsed = array_slice($rMovieData['genres'], 0, (int) $rThreadData['max_genres']);
-                            } else {
-                                $rParsed = $rMovieData['genres'];
-                            }
-
-                            foreach ($rParsed as $rGenre) {
-                                $rGenreId = (int) ($rGenre['id'] ?? 0);
-                                if ($rGenreId > 0 && isset($rWatchCategories[1][$rGenreId]['category_id'])) {
-                                    $rCategoryID = (int) $rWatchCategories[1][$rGenreId]['category_id'];
-                                    if ($rCategoryID > 0 && !in_array($rCategoryID, $rCategoryIDs, true)) {
-                                        $rCategoryIDs[] = $rCategoryID;
-                                    }
-                                }
-                            }
-                        }
-                        if (count($rBouquetIDs) == 0) {
-                            if (0 < $rThreadData['max_genres']) {
-                                $rParsed = array_slice($rMovieData['genres'], 0, $rThreadData['max_genres']);
-                            } else {
-                                $rParsed = $rMovieData['genres'];
-                            }
-                            foreach ($rParsed as $rGenre) {
-                                $rBouquets = json_decode($rWatchCategories[1][intval($rGenre['id'])]['bouquets'], true);
-                                foreach ($rBouquets as $rBouquetID) {
-                                    if (!in_array($rBouquetID, $rBouquetIDs)) {
-                                        $rBouquetIDs[] = $rBouquetID;
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        $rShow = $rTMDB->getTVShow($rMatch->get('id'));
-                        if ($rThreadData['duplicate_tmdb']) {
-                            $rUpgradeData = null;
-                        } else {
-                            $rUpgradeData = getEpisode($rMatch->get('id'), $rReleaseSeason, $rReleaseEpisode);
-                        }
-                        if ($rUpgradeData) {
-                            if ($rThreadData['auto_upgrade']) {
-                                if (substr($rUpgradeData['source'], 0, 3 + strlen(strval(SERVER_ID))) != 's:' . SERVER_ID . ':') {
-                                    echo "Old file path doesn't match this server, don't upgrade." . "\n";
-                                    exit();
-                                }
-                                list(, $rActualPath) = explode('s:' . SERVER_ID . ':', $rUpgradeData['source']);
-                                if (!file_exists($rActualPath) || filesize($rActualPath) < filesize($rFile)) {
-                                    echo 'Upgrade episode!' . "\n";
-                                    $db->query('UPDATE `streams` SET `stream_source` = ?, `target_container` = ? WHERE `id` = ?;', $rImportArray['stream_source'], $rImportArray['target_container'], $rUpgradeData['id']);
-                                    $db->query('UPDATE `streams_servers` SET `bitrate` = NULL, `current_source` = NULL, `to_analyze` = 0, `pid` = NULL, `stream_started` = NULL, `stream_info` = NULL, `compatible` = 0, `video_codec` = NULL, `audio_codec` = NULL, `resolution` = NULL, `stream_status` = 0 WHERE `stream_id` = ? AND `server_id` = ?', $rUpgradeData['id'], SERVER_ID);
-                                    if ($rThreadData['auto_encode']) {
-                                        CoreUtilities::queueMovie($rUpgradeData['id']);
-                                    }
-                                    $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 6, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
-                                    $rCacheData = json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . $rMatch->get('id') . '.cache'), true);
-                                    $rCacheData[$rReleaseSeason . '_' . $rReleaseEpisode] = array('id' => $rUpgradeData['id'], 'source' => 's:' . SERVER_ID . ':' . $rFile);
-                                    file_put_contents(WATCH_TMP_PATH . 'series_' . $rMatch->get('id') . '.cache', json_encode($rCacheData));
-                                    exit();
-                                }
-                                echo "File isn't a better source, don't upgrade." . "\n";
-                                exit();
-                            }
-                            echo 'Upgrade disabled' . "\n";
-                            exit();
-                        }
-                        $rShowData = json_decode($rShow->getJSON(), true);
-                        if ($rShowData['id']) {
-                            while (file_exists(WATCH_TMP_PATH . 'lock_' . intval($rShowData['id']))) {
-                                if ($rTimeout >= time() - filemtime(WATCH_TMP_PATH . 'lock_' . intval($rShowData['id']))) {
-                                } else {
-                                    unlink(WATCH_TMP_PATH . 'lock_' . intval($rShowData['id']));
-                                }
-                                usleep(100000);
-                            }
-                            $rFileLock = fopen(WATCH_TMP_PATH . 'lock_' . intval($rShowData['id']), 'w');
-                            while (!flock($rFileLock, LOCK_EX)) {
-                                usleep(100000);
-                            }
-                            fwrite($rFileLock, time());
-                            $rSeasonData = array();
-                            foreach ($rShowData['seasons'] as $rSeason) {
-                                $rSeason['cover'] = 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rSeason['poster_path'];
-                                if (CoreUtilities::$rSettings['download_images']) {
-                                    $rSeason['cover'] = CoreUtilities::downloadImage($rSeason['cover'], 2);
-                                }
-                                $rSeason['cover_big'] = $rSeason['cover'];
-                                unset($rSeason['poster_path']);
-                                $rSeasonData[] = $rSeason;
-                            }
-                            $rSeries = getSeriesByTMDB($rShowData['id']);
-                            if (!$rSeries) {
-                                $rSeriesArray = array('title' => $rShowData['name'], 'category_id' => array(), 'episode_run_time' => 0, 'tmdb_id' => $rShowData['id'], 'cover' => '', 'genre' => '', 'plot' => $rShowData['overview'], 'cast' => '', 'rating' => $rShowData['vote_average'], 'director' => '', 'release_date' => $rShowData['first_air_date'], 'last_modified' => time(), 'seasons' => $rSeasonData, 'backdrop_path' => array(), 'youtube_trailer' => '', 'year' => null);
-                                $rSeriesArray['youtube_trailer'] = getSeriesTrailer($rShowData['id'], (!empty($rThreadData['language']) ? $rThreadData['language'] : CoreUtilities::$rSettings['tmdb_language']));
-                                $rSeriesArray['cover'] = 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rShowData['poster_path'];
-                                $rSeriesArray['cover_big'] = $rSeriesArray['cover'];
-                                $rSeriesArray['backdrop_path'] = array('https://image.tmdb.org/t/p/w1280' . $rShowData['backdrop_path']);
-                                if (CoreUtilities::$rSettings['download_images']) {
-                                    $rSeriesArray['cover'] = CoreUtilities::downloadImage($rSeriesArray['cover'], 2);
-                                    $rSeriesArray['backdrop_path'] = array(CoreUtilities::downloadImage($rSeriesArray['backdrop_path'][0]));
-                                }
-                                $rCast = array();
-                                foreach ($rShowData['credits']['cast'] as $rMember) {
-                                    if (count($rCast) >= 5) {
-                                    } else {
-                                        $rCast[] = $rMember['name'];
-                                    }
-                                }
-                                $rSeriesArray['cast'] = implode(', ', $rCast);
-                                $rDirectors = array();
-                                foreach ($rShowData['credits']['crew'] as $rMember) {
-                                    if (!(count($rDirectors) < 5 && ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing')) || in_array($rMember['name'], $rDirectors)) {
-                                    } else {
-                                        $rDirectors[] = $rMember['name'];
-                                    }
-                                }
-                                $rSeriesArray['director'] = implode(', ', $rDirectors);
-                                $rGenres = array();
-                                foreach ($rShowData['genres'] as $rGenre) {
-                                    if (count($rGenres) >= $rThreadData['max_genres']) {
-                                    } else {
-                                        $rGenres[] = $rGenre['name'];
-                                    }
-                                }
-                                if ($rShowData['first_air_date']) {
-                                    $rSeriesArray['year'] = intval(substr($rShowData['first_air_date'], 0, 4));
-                                }
-                                $rSeriesArray['genre'] = implode(', ', $rGenres);
-                                $rSeriesArray['episode_run_time'] = intval($rShowData['episode_run_time'][0]);
-                                if (count($rCategoryIDs) == 0) {
-                                    if (0 < $rThreadData['max_genres']) {
-                                        $rParsed = array_slice($rShowData['genres'], 0, $rThreadData['max_genres']);
-                                    } else {
-                                        $rParsed = $rShowData['genres'];
-                                    }
-                                    foreach ($rParsed as $rGenre) {
-                                        $rCategoryID = intval($rWatchCategories[2][intval($rGenre['id'])]['category_id']);
-                                        if ($rCategoryID > 0) {
-                                            if (!in_array($rCategoryID, $rCategoryIDs)) {
-                                                $rCategoryIDs[] = $rCategoryID;
-                                            }
-                                        }
-                                    }
-                                }
-                                if (count($rCategoryIDs) == 0 && !empty($rThreadData['fb_category_id'])) {
-                                    if (is_array($rThreadData['fb_category_id'])) {
-                                        $rCategoryIDs = array_map('intval', $rThreadData['fb_category_id']);
-                                    } else {
-                                        $rCategoryIDs = array(intval($rThreadData['fb_category_id']));
-                                    }
-                                }
-                                if (count($rBouquetIDs) == 0) {
-                                    if (0 < $rThreadData['max_genres']) {
-                                        $rParsed = array_slice($rShowData['genres'], 0, $rThreadData['max_genres']);
-                                    } else {
-                                        $rParsed = $rShowData['genres'];
-                                    }
-                                    foreach ($rParsed as $rGenre) {
-                                        $rBouquets = json_decode($rWatchCategories[2][intval($rGenre['id'])]['bouquets'], true);
-                                        foreach ($rBouquets as $rBouquetID) {
-                                            if (!in_array($rBouquetID, $rBouquetIDs)) {
-                                                $rBouquetIDs[] = $rBouquetID;
-                                            }
-                                        }
-                                    }
-                                }
-                                if (count($rBouquetIDs) == 0 && !empty($rThreadData['fb_bouquets'])) {
-                                    if (is_array($rThreadData['fb_bouquets'])) {
-                                        $rBouquetIDs = array_map('intval', $rThreadData['fb_bouquets']);
-                                    } else {
-                                        $rBouquetIDs = json_decode($rThreadData['fb_bouquets'], true);
-                                    }
-                                }
-                                if (count($rCategoryIDs) != 0) {
-                                    $rSeriesArray['tmdb_language'] = $rLanguage;
-                                    $rSeriesArray['category_id'] = '[' . implode(',', array_map('intval', $rCategoryIDs)) . ']';
-                                    $rPrepare = prepareArray($rSeriesArray);
-                                    $rQuery = 'INSERT INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                                    if ($db->query($rQuery, ...$rPrepare['data'])) {
-                                        $rInsertID = $db->last_insert_id();
-                                        $rSeries = getSerie($rInsertID);
-                                        file_put_contents(WATCH_TMP_PATH . 'series_' . intval($rShowData['id']), json_encode($rSeries));
-                                        foreach ($rBouquetIDs as $rBouquet) {
-                                            addToBouquet('series', $rBouquet, $rInsertID);
-                                        }
-                                    } else {
-                                        $rSeries = null;
-                                    }
-                                } else {
-                                    $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 3, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
-                                    exit();
-                                }
-                            } else {
-                                $db->query('UPDATE `streams_series` SET `seasons` = ? WHERE `id` = ?;', json_encode($rSeasonData, JSON_UNESCAPED_UNICODE), $rSeries['id']);
-                                if (file_exists(WATCH_TMP_PATH . 'series_' . intval($rShowData['id']))) {
-                                } else {
-                                    file_put_contents(WATCH_TMP_PATH . 'series_' . intval($rShowData['id']), json_encode($rSeries));
-                                }
-                            }
-                            flock($rFileLock, LOCK_UN);
-                            unlink(WATCH_TMP_PATH . 'lock_' . intval($rShowData['id']));
-                            $rImportArray['read_native'] = $rThreadData['read_native'];
-                            $rImportArray['movie_symlink'] = $rThreadData['movie_symlink'];
-                            $rImportArray['remove_subtitles'] = $rThreadData['remove_subtitles'];
-                            $rImportArray['transcode_profile_id'] = $rThreadData['transcode_profile_id'];
-                            if ($rThreadData['import']) {
-                                $rImportArray['direct_source'] = $rThreadData['direct_source'];
-                                $rImportArray['direct_proxy'] = $rThreadData['direct_proxy'];
-                            }
-                            $rImportArray['order'] = getNextOrder();
-                            if ($rReleaseSeason && $rReleaseEpisode) {
-                                if (is_array($rRelease['episode']) && count($rRelease['episode']) == 2) {
-                                    $rImportArray['stream_display_name'] = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason)) . 'E' . sprintf('%02d', $rRelease['episode'][0]) . '-' . sprintf('%02d', $rRelease['episode'][1]);
-                                } else {
-                                    $rImportArray['stream_display_name'] = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason)) . 'E' . sprintf('%02d', $rReleaseEpisode);
-                                }
-                                $rEpisodes = json_decode($rTMDB->getSeason($rShowData['id'], intval($rReleaseSeason))->getJSON(), true);
-                                foreach ($rEpisodes['episodes'] as $rEpisode) {
-                                    if (intval($rEpisode['episode_number']) == $rReleaseEpisode) {
-                                        if (strlen($rEpisode['still_path']) > 0) {
-                                            $rImage = 'https://image.tmdb.org/t/p/w1280' . $rEpisode['still_path'];
-                                            if (CoreUtilities::$rSettings['download_images']) {
-                                                $rImage = CoreUtilities::downloadImage($rImage, 5);
-                                            }
-                                        }
-                                        if (strlen($rEpisode['name']) > 0) {
-                                            $rImportArray['stream_display_name'] .= ' - ' . $rEpisode['name'];
-                                        }
-                                        $rSeconds = intval($rShowData['episode_run_time'][0]) * 60;
-                                        $rImportArray['movie_properties'] = array('tmdb_id' => $rEpisode['id'], 'release_date' => $rEpisode['air_date'], 'plot' => $rEpisode['overview'], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'movie_image' => $rImage, 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => $rEpisode['vote_average'], 'season' => $rReleaseSeason);
-                                        if (strlen($rImportArray['movie_properties']['movie_image'][0]) == 0) {
-                                            unset($rImportArray['movie_properties']['movie_image']);
-                                        }
-                                    }
-                                }
-                                if (strlen($rImportArray['stream_display_name']) == 0) {
-                                    $rImportArray['stream_display_name'] = 'No Episode Title';
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    if ($rThreadData['type'] == 'movie') {
-                        $rImportArray['stream_display_name'] = $rTitle;
-                        if ($rYear) {
-                            $rImportArray['year'] = $rYear;
-                        }
-                    } else {
-                        if ($rReleaseSeason && $rReleaseEpisode) {
-                            $rImportArray['stream_display_name'] = $rTitle . ' - S' . sprintf('%02d', intval($rReleaseSeason)) . 'E' . sprintf('%02d', $rReleaseEpisode) . ' - ';
-                        }
-                    }
-                    $rImportArray['read_native'] = $rThreadData['read_native'];
-                    $rImportArray['movie_symlink'] = $rThreadData['movie_symlink'];
-                    $rImportArray['remove_subtitles'] = $rThreadData['remove_subtitles'];
-                    $rImportArray['transcode_profile_id'] = $rThreadData['transcode_profile_id'];
-                    if ($rThreadData['import']) {
-                        $rImportArray['direct_source'] = $rThreadData['direct_source'];
-                        $rImportArray['direct_proxy'] = $rThreadData['direct_proxy'];
-                    }
-                    $rImportArray['order'] = getNextOrder();
-                    $rImportArray['tmdb_language'] = $rLanguage;
-                }
-                if ($rThreadData['type'] == 'movie') {
-                    if (count($rCategoryIDs) == 0 && !empty($rThreadData['fb_category_id'])) {
-                        if (is_array($rThreadData['fb_category_id'])) {
-                            $rCategoryIDs = array_map('intval', $rThreadData['fb_category_id']);
-                        } else {
-                            $rCategoryIDs = array(intval($rThreadData['fb_category_id']));
-                        }
-                    }
-                    if (count($rBouquetIDs) == 0 && !empty($rThreadData['fb_bouquets'])) {
-                        if (is_array($rThreadData['fb_bouquets'])) {
-                            $rBouquetIDs = array_map('intval', $rThreadData['fb_bouquets']);
-                        } else {
-                            $rBouquetIDs = json_decode($rThreadData['fb_bouquets'], true);
-                        }
-                    }
-                    $rImportArray['category_id'] = '[' . implode(',', array_map('intval', $rCategoryIDs)) . ']';
-                    if (count($rCategoryIDs) == 0) {
-                        $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 3, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
-                        exit();
-                    }
-                } else {
-                    if ($rSeries) {
-                        $rImportArray['series_no'] = $rSeries['id'];
-                    } else {
-                        $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 4, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
-                        exit();
-                    }
-                }
-                if ($rThreadData['subtitles']) {
-                    $rImportArray['movie_subtitles'] = $rThreadData['subtitles'];
-                }
-                $rImportArray['added'] = time();
-                $rPrepare = prepareArray($rImportArray);
-                $rQuery = 'INSERT INTO `streams`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                if ($db->query($rQuery, ...$rPrepare['data'])) {
-                    $rInsertID = $db->last_insert_id();
-                    if ($rThreadData['import']) {
-                        foreach ($rThreadData['servers'] as $rServerID) {
-                            $db->query('INSERT INTO `streams_servers`(`stream_id`, `server_id`, `parent_id`) VALUES(?, ?, NULL);', $rInsertID, $rServerID);
-                        }
-                    } else {
-                        $db->query('INSERT INTO `streams_servers`(`stream_id`, `server_id`, `parent_id`) VALUES(?, ?, NULL);', $rInsertID, SERVER_ID);
-                    }
-                    if ($rThreadData['type'] == 'movie') {
-                        if (!$rMatch || $rThreadData['import']) {
-                        } else {
-                            file_put_contents(WATCH_TMP_PATH . 'movie_' . $rMatch->get('id') . '.cache', json_encode(array('id' => $rInsertID, 'source' => 's:' . SERVER_ID . ':' . $rFile)));
-                        }
-                        foreach ($rBouquetIDs as $rBouquet) {
-                            addToBouquet('movie', $rBouquet, $rInsertID);
-                        }
-                    } else {
-                        $db->query('INSERT INTO `streams_episodes`(`season_num`, `series_id`, `stream_id`, `episode_num`) VALUES(?, ?, ?, ?);', $rReleaseSeason, $rSeries['id'], $rInsertID, $rReleaseEpisode);
-                    }
-                    if ($rThreadData['auto_encode']) {
-                        if ($rThreadData['import']) {
-                            foreach ($rThreadData['servers'] as $rServerID) {
-                                CoreUtilities::queueMovie($rInsertID, $rServerID);
-                            }
-                        } else {
-                            CoreUtilities::queueMovie($rInsertID);
-                        }
-                    }
-                    echo 'Success!' . "\n";
-                    $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 1, ?);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'), $rInsertID);
-                    exit();
-                } else {
-                    echo 'Insert failed!' . "\n";
-                    $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 2, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
-                    exit();
-                }
-            } else {
-                echo 'File is broken!' . "\n";
-                $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 5, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
-                exit();
-            }
-        } else {
-            exit();
-        }
-    } else {
-        echo 'Incorrect root directory!';
-        exit();
-    }
-}
-
-function addToBouquet($rType, $rBouquetID, $rID) {
-    global $db;
-    global $rThreadData;
-    if ($rThreadData['import']) {
-        $rBouquet = getBouquet($rBouquetID);
-        if ($rBouquet) {
-            if ($rType == 'stream') {
-                $rColumn = 'bouquet_channels';
-            } elseif ($rType == 'movie') {
-                $rColumn = 'bouquet_movies';
-            } elseif ($rType == 'radio') {
-                $rColumn = 'bouquet_radios';
-            } else {
-                $rColumn = 'bouquet_series';
-            }
-            $rChannels = confirmIDs(json_decode($rBouquet[$rColumn], true));
-            if (0 >= intval($rID) || in_array($rID, $rChannels)) {
-            } else {
-                $rChannels[] = $rID;
-                if (count($rChannels) > 0) {
-                    $db->query('UPDATE `bouquets` SET `' . $rColumn . '` = ? WHERE `id` = ?;', '[' . implode(',', array_map('intval', $rChannels)) . ']', $rBouquetID);
-                }
-            }
-        }
-    } else {
-        file_put_contents(WATCH_TMP_PATH . md5($rThreadData['file'] . '_' . $rType . '_' . $rBouquetID . '_' . $rID) . '.bouquet', json_encode(array('type' => $rType, 'bouquet_id' => $rBouquetID, 'id' => $rID)));
-    }
-}
-
-function parserelease($rRelease, $rType = 'guessit') {
-    if ($rType == 'guessit') {
-        $rCommand = MAIN_HOME . 'bin/guess ' . escapeshellarg($rRelease . '.mkv');
-    } else {
-        $rCommand = '/usr/bin/python3 ' . MAIN_HOME . 'includes/python/release.py ' . escapeshellarg(str_replace('-', '_', $rRelease));
-    }
-    return json_decode(shell_exec($rCommand), true);
-}
-
-function getMovie($rTMDBID) {
-    if (file_exists(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.cache')) {
-        return json_decode(file_get_contents(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.cache'), true);
-    }
-}
-
-function getEpisode($rTMDBID, $rSeason, $rEpisode) {
-    if (file_exists(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.cache')) {
-        $rData = json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.cache'), true);
-        if (isset($rData[$rSeason . '_' . $rEpisode])) {
-            return $rData[$rSeason . '_' . $rEpisode];
-        }
-    }
-}
-
-function parseTitle($rTitle) {
-    return strtolower(preg_replace("/(?![.=\$'€%-])\\p{P}/u", '', $rTitle));
-}
-
-function checksource($rFilename) {
-    $rCommand = 'timeout 10 ' . CoreUtilities::$rFFPROBE . ' -show_streams -show_format -v quiet ' . escapeshellarg($rFilename) . ' -of json';
-    return json_decode(shell_exec($rCommand), true);
-}
-
-function preparecolumn($rValue) {
-    return strtolower(preg_replace('/[^a-z0-9_]+/i', '', $rValue));
-}
-
-function prepareArray($rArray) {
-    $UpdateData = $rColumns = $rPlaceholder = $rData = array();
-    foreach (array_keys($rArray) as $rKey) {
-        $rColumns[] = '`' . preparecolumn($rKey) . '`';
-        $UpdateData[] = '`' . preparecolumn($rKey) . '` = ?';
-    }
-    foreach (array_values($rArray) as $rValue) {
-        if (is_array($rValue)) {
-            $rValue = json_encode($rValue, JSON_UNESCAPED_UNICODE);
-        }
-        $rPlaceholder[] = '?';
-        $rData[] = $rValue;
-    }
-    return array('placeholder' => implode(',', $rPlaceholder), 'columns' => implode(',', $rColumns), 'data' => $rData, 'update' => implode(',', $UpdateData));
-}
-
-function verifyPostTable($rTable, $rData = array(), $rOnlyExisting = false) {
-    global $db;
-    $rReturn = array();
-    $db->query('SELECT `column_name`, `column_default`, `is_nullable`, `data_type` FROM `information_schema`.`columns` WHERE `table_schema` = (SELECT DATABASE()) AND `table_name` = ? ORDER BY `ordinal_position`;', $rTable);
-    foreach ($db->get_rows() as $rRow) {
-        if ($rRow['column_default'] == 'NULL') {
-            $rRow['column_default'] = null;
-        }
-        $rForceDefault = false;
-        if ($rRow['is_nullable'] != 'NO' || $rRow['column_default']) {
-        } else {
-            if (in_array($rRow['data_type'], array('int', 'float', 'tinyint', 'double', 'decimal', 'smallint', 'mediumint', 'bigint', 'bit'))) {
-                $rRow['column_default'] = 0;
-            } else {
-                $rRow['column_default'] = '';
-            }
-            $rForceDefault = true;
-        }
-        if (array_key_exists($rRow['column_name'], $rData)) {
-            if (empty($rData[$rRow['column_name']]) && !is_numeric($rData[$rRow['column_name']]) && is_null($rRow['column_default'])) {
-                $rReturn[$rRow['column_name']] = ($rForceDefault ? $rRow['column_default'] : null);
-            } else {
-                $rReturn[$rRow['column_name']] = $rData[$rRow['column_name']];
-            }
-        } else {
-            if (!$rOnlyExisting) {
-                $rReturn[$rRow['column_name']] = $rRow['column_default'];
-            }
-        }
-    }
-    return $rReturn;
-}
-
-function getSeriesByTMDB($rID) {
-    global $db;
-    if (!(file_exists(WATCH_TMP_PATH . 'series_' . intval($rID) . '.data') && time() - filemtime(WATCH_TMP_PATH . 'series_' . intval($rID) . '.data') < 360)) {
-        $db->query('SELECT * FROM `streams_series` WHERE `tmdb_id` = ?;', $rID);
-        if ($db->num_rows() == 1) {
-            return $db->get_row();
-        }
-    } else {
-        return json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . intval($rID) . '.data'), true);
-    }
-}
-
-function getSeriesTrailer($rTMDBID, $rLanguage = null) {
-    $rURL = 'https://api.themoviedb.org/3/tv/' . intval($rTMDBID) . '/videos?api_key=' . urlencode(CoreUtilities::$rSettings['tmdb_api_key']);
-    if ($rLanguage) {
-        $rURL .= '&language=' . urlencode($rLanguage);
-    } else {
-        if (strlen(CoreUtilities::$rSettings['tmdb_language']) > 0) {
-            $rURL .= '&language=' . urlencode(CoreUtilities::$rSettings['tmdb_language']);
-        }
-    }
-    $rJSON = json_decode(file_get_contents($rURL), true);
-    foreach ($rJSON['results'] as $rVideo) {
-        if (strtolower($rVideo['type']) == 'trailer' && strtolower($rVideo['site']) == 'youtube') {
-            return $rVideo['key'];
-        }
-    }
-    return '';
-}
-
-function getSerie($rID) {
-    global $db;
-    $db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $rID);
-    if ($db->num_rows() == 1) {
-        return $db->get_row();
-    }
-}
-
-function getNextOrder() {
-    global $db;
-    $db->query('SELECT MAX(`order`) AS `order` FROM `streams`;');
-    if ($db->num_rows() != 1) {
-        return 0;
-    }
-    return intval($db->get_row()['order']) + 1;
-}
-
-function confirmIDs($rIDs) {
-    $rReturn = array();
-    foreach ($rIDs as $rID) {
-        if (intval($rID) > 0) {
-            $rReturn[] = $rID;
-        }
-    }
-    return $rReturn;
-}
-
-function getBouquet($rID) {
-    global $db;
-    $db->query('SELECT * FROM `bouquets` WHERE `id` = ?;', $rID);
-    if ($db->num_rows() == 1) {
-        return $db->get_row();
-    }
-}
 
 function shutdown() {
     global $db;
@@ -906,3 +42,4 @@ function shutdown() {
     }
     @unlink(WATCH_TMP_PATH . @getmypid() . '.wpid');
 }
+
diff --git a/src/config/plex/.gitkeep b/src/infrastructure/nginx/templates/.gitkeep
similarity index 100%
rename from src/config/plex/.gitkeep
rename to src/infrastructure/nginx/templates/.gitkeep
diff --git a/src/infrastructure/service/.gitkeep b/src/infrastructure/service/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/ministra/portal.php b/src/ministra/portal.php
index e96fe38e..1c8efc0e 100644
--- a/src/ministra/portal.php
+++ b/src/ministra/portal.php
@@ -7,121 +7,11 @@ header('Pragma: no-cache');
 $rReqType = (!empty($_REQUEST['type']) ? $_REQUEST['type'] : null);
 $rReqAction = (!empty($_REQUEST['action']) ? $_REQUEST['action'] : null);
 
-if ($rReqType && $rReqAction) {
-	switch ($rReqType) {
-		case 'stb':
-			switch ($rReqAction) {
-				case 'get_ad':
-					exit(json_encode(array('js' => array())));
+require __DIR__ . '/../modules/ministra/PortalHandler.php';
 
-				case 'get_storages':
-					exit(json_encode(array('js' => array())));
+// Phase 1: Pre-init stub responses (no DB needed)
+PortalHandler::handlePreInit($rReqType, $rReqAction);
 
-				case 'log':
-					exit(json_encode(array('js' => true)));
-
-				case 'get_countries':
-					exit(json_encode(array('js' => array())));
-
-				case 'get_timezones':
-					exit(json_encode(array('js' => array())));
-
-				case 'get_cities':
-					exit(json_encode(array('js' => array())));
-
-				case 'search_cities':
-					exit(json_encode(array('js' => array())));
-			}
-
-			break;
-
-		case 'remote_pvr':
-			switch ($rReqAction) {
-				case 'start_record_on_stb':
-					exit(json_encode(array('js' => true)));
-
-				case 'stop_record_on_stb':
-					exit(json_encode(array('js' => true)));
-
-				case 'get_active_recordings':
-					exit(json_encode(array('js' => array())));
-			}
-
-			break;
-
-		case 'media_favorites':
-			exit(json_encode(array('js' => '')));
-
-		case 'tvreminder':
-			exit(json_encode(array('js' => array())));
-
-		case 'series':
-		case 'vod':
-			switch ($rReqAction) {
-				case 'set_not_ended':
-					exit(json_encode(array('js' => true)));
-
-				case 'del_link':
-					exit(json_encode(array('js' => true)));
-
-				case 'log':
-					exit(json_encode(array('js' => 1)));
-			}
-
-			break;
-
-		case 'downloads':
-			exit(json_encode(array('js' => true)));
-
-		case 'weatherco':
-			exit(json_encode(array('js' => false)));
-
-		case 'course':
-			exit(json_encode(array('js' => true)));
-
-		case 'account_info':
-			switch ($rReqAction) {
-				case 'get_terms_info':
-					exit(json_encode(array('js' => true)));
-
-				case 'get_payment_info':
-					exit(json_encode(array('js' => true)));
-
-				case 'get_demo_video_parts':
-					exit(json_encode(array('js' => true)));
-
-				case 'get_agreement_info':
-					exit(json_encode(array('js' => true)));
-			}
-
-			break;
-
-		case 'tv_archive':
-			switch ($rReqAction) {
-				case 'set_played_timeshift':
-					exit(json_encode(array('js' => true)));
-
-				case 'set_played':
-					exit(json_encode(array('js' => true)));
-
-				case 'update_played_timeshift_end_time':
-					exit(json_encode(array('js' => true)));
-			}
-
-			break;
-
-		case 'itv':
-			switch ($rReqAction) {
-				case 'set_fav_status':
-					exit(json_encode(array('js' => array())));
-
-				case 'set_played':
-					exit(json_encode(array('js' => true)));
-			}
-
-			break;
-	}
-}
 register_shutdown_function('shutdown');
 require '/home/xc_vm/www/stream/init.php';
 
@@ -339,10 +229,46 @@ if (!StreamingUtilities::$rSettings['disable_ministra']) {
 			$rLanguage['en_GB.utf8']['off'] = 'off';
 		}
 
-		switch ($rReqType) {
-			case 'stb':
-				switch ($rReqAction) {
-					case 'get_profile':
+		// Build context for PortalHandler
+		$ctx = [
+			'device'        => &$rDevice,
+			'profile'       => $rProfile,
+			'language'      => $rLanguage,
+			'magData'       => $rMagData,
+			'locales'       => $rLocales,
+			'timezone'      => $rTimezone,
+			'theme'         => $rTheme,
+			'pageItems'     => $rPageItems,
+			'forceProtocol' => $rForceProtocol,
+			'player'        => '',
+			'mac'           => $rMAC,
+			'ip'            => $rIP,
+			'authenticated' => $rAuthenticated,
+			'gMode'         => $rGMode,
+			'debug'         => $rDebug,
+		];
+
+		// Phase 4: Unauthenticated STB actions (get_profile, get_localization, get_modules)
+		if ($rReqType == 'stb') {
+			PortalHandler::handleStbPublic($rReqAction, $ctx);
+		}
+
+		// Phase 5: Authenticated actions
+		if ($rAuthenticated) {
+			PortalHandler::handleAuthenticated($rReqType, $rReqAction, $ctx);
+		} else {
+			// Phase 6: Unauthenticated — bruteforce check
+			PortalHandler::handleUnauthenticated($rReqType, $rReqAction, $ctx);
+		}
+	} else {
+		// Phase 7: Handshake
+		PortalHandler::handleHandshake($rMAC);
+	}
+} else {
+	exit();
+}
+
+/* REPLACED BLOCK START — original dispatch code moved to PortalHandler.php
 						$rTotal = ($rAuthenticated ? array_merge($rProfile, $rDevice['get_profile_vars']) : $rProfile);
 						$rTotal['status'] = intval(!$rAuthenticated);
 						$rTotal['update_url'] = (empty(StreamingUtilities::$rSettings['update_url']) ? '' : StreamingUtilities::$rSettings['update_url']);
@@ -1375,6 +1301,7 @@ if (!StreamingUtilities::$rSettings['disable_ministra']) {
 } else {
 	exit();
 }
+REPLACED BLOCK END */
 
 function getSeriesItems($rUserID, $rType = 'series', $rCategoryID = null, $rFav = null, $rOrderBy = null, $rSearchBy = null, $rPicking = array()) {
 	global $rDevice;
diff --git a/src/modules/fingerprint/FingerprintModule.php b/src/modules/fingerprint/FingerprintModule.php
new file mode 100644
index 00000000..98ddd281
--- /dev/null
+++ b/src/modules/fingerprint/FingerprintModule.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * XC_VM — Fingerprint Module
+ *
+ * Модуль «Отпечаток стрима» (Fingerprint Stream).
+ * Позволяет администратору накладывать текст (ID активности, имя пользователя
+ * или произвольное сообщение) поверх живых потоков для идентификации зрителя.
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Что включает:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   Страницы:
+ *     - fingerprint     — выбор потока (поиск + категория + DataTable)
+ *                         + активация отпечатка (тип/размер/цвет/позиция)
+ *                         + таблица активности
+ *
+ *   API-действия:
+ *     - fingerprint     — отправка сигнала на активные серверы
+ *     - line_activity   — принудительное завершение соединения
+ *
+ * @see admin/fingerprint.php
+ */
+
+class FingerprintModule implements ModuleInterface {
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName(): string {
+        return 'fingerprint';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVersion(): string {
+        return '1.0.0';
+    }
+
+    /**
+     * Регистрация сервисов модуля в DI-контейнере
+     *
+     * Fingerprint использует общую инфраструктуру admin-панели
+     * (session, functions.php, api.php) — отдельные сервисы не нужны.
+     *
+     * @param ServiceContainer $container
+     */
+    public function boot(ServiceContainer $container): void {
+        // Собственных сервисов нет — используется общая admin-инфраструктура
+    }
+
+    /**
+     * Регистрация маршрутов модуля
+     *
+     * Маршрутизация осуществляется через навигацию admin-панели
+     * (fingerprint.php загружается напрямую).
+     *
+     * @param Router $router
+     */
+    public function registerRoutes(Router $router): void {
+        // Маршрутизация — через admin page navigation (fingerprint.php)
+    }
+
+    /**
+     * Крон-задачи модуля
+     *
+     * Fingerprint не имеет собственных крон-задач.
+     *
+     * @return array
+     */
+    public function registerCrons(): array {
+        return [];
+    }
+
+    /**
+     * Подписки на события ядра
+     *
+     * @return array
+     */
+    public function getEventSubscribers(): array {
+        return [];
+    }
+}
diff --git a/src/modules/fingerprint/module.json b/src/modules/fingerprint/module.json
new file mode 100644
index 00000000..71ca03d5
--- /dev/null
+++ b/src/modules/fingerprint/module.json
@@ -0,0 +1,7 @@
+{
+    "name": "fingerprint",
+    "version": "1.0.0",
+    "description": "Stream fingerprinting for viewer identification",
+    "requires_core": ">=2.0",
+    "dependencies": []
+}
diff --git a/src/modules/magscan/MagscanModule.php b/src/modules/magscan/MagscanModule.php
new file mode 100644
index 00000000..bbe9cb91
--- /dev/null
+++ b/src/modules/magscan/MagscanModule.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * XC_VM — MAGSCAN Module
+ *
+ * Модуль настроек MAGSCAN.
+ * Управляет белыми/чёрными списками для сканирования MAG-устройств
+ * (MAC-адреса и IP-адреса).
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Что включает:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   Страницы:
+ *     - magscan_settings — управление белым/чёрным списком MAC
+ *                          + белый список IP (три вкладки)
+ *
+ *   Обработчик формы:
+ *     - submit_magscan   — POST-обработка сохранения настроек
+ *
+ * @see admin/magscan_settings.php
+ */
+
+class MagscanModule implements ModuleInterface {
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName(): string {
+        return 'magscan';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVersion(): string {
+        return '1.0.0';
+    }
+
+    /**
+     * Регистрация сервисов модуля в DI-контейнере
+     *
+     * MAGSCAN использует общую инфраструктуру admin-панели —
+     * отдельные сервисы не регистрируются.
+     *
+     * @param ServiceContainer $container
+     */
+    public function boot(ServiceContainer $container): void {
+        // Собственных сервисов нет — используется общая admin-инфраструктура
+    }
+
+    /**
+     * Регистрация маршрутов модуля
+     *
+     * Маршрутизация осуществляется через навигацию admin-панели
+     * (magscan_settings.php загружается напрямую).
+     *
+     * @param Router $router
+     */
+    public function registerRoutes(Router $router): void {
+        // Маршрутизация — через admin page navigation (magscan_settings.php)
+    }
+
+    /**
+     * Крон-задачи модуля
+     *
+     * MAGSCAN не имеет собственных крон-задач.
+     *
+     * @return array
+     */
+    public function registerCrons(): array {
+        return [];
+    }
+
+    /**
+     * Подписки на события ядра
+     *
+     * @return array
+     */
+    public function getEventSubscribers(): array {
+        return [];
+    }
+}
diff --git a/src/modules/magscan/module.json b/src/modules/magscan/module.json
new file mode 100644
index 00000000..d4d778e4
--- /dev/null
+++ b/src/modules/magscan/module.json
@@ -0,0 +1,7 @@
+{
+    "name": "magscan",
+    "version": "1.0.0",
+    "description": "MAG device scanning whitelist/blacklist management",
+    "requires_core": ">=2.0",
+    "dependencies": []
+}
diff --git a/src/modules/ministra/MinistraModule.php b/src/modules/ministra/MinistraModule.php
new file mode 100644
index 00000000..9c65414f
--- /dev/null
+++ b/src/modules/ministra/MinistraModule.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * XC_VM — Ministra (Stalker Portal) Module
+ *
+ * Модуль MAG/Ministra-портала для STB-устройств.
+ * Обрабатывает HTTP-запросы от MAG-приставок через portal.php.
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Что включает:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   Обработчики:
+ *     - PortalHandler    — диспетчер switch/case для type+action запросов
+ *                          (pre-init, stb, itv, vod, series, epg, radio,
+ *                           tv_archive, watchdog, audioclub, account_info,
+ *                           handshake)
+ *
+ *   Хелперы:
+ *     - PortalHelpers    — вспомогательные функции портала
+ *                          (getDevice, updateCache, getEPG, getItems,
+ *                           getMovies, getSeries, getStreams, getStations,
+ *                           getSeriesItems, sort*, getHeaders, shutdown)
+ *
+ *   Точка входа:
+ *     - ministra/portal.php — тонкая обёртка: init/auth → PortalHandler
+ *
+ * @see PortalHandler
+ * @see PortalHelpers
+ */
+
+class MinistraModule implements ModuleInterface {
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName(): string {
+        return 'ministra';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVersion(): string {
+        return '1.0.0';
+    }
+
+    /**
+     * Регистрация сервисов модуля в DI-контейнере
+     *
+     * Ministra — автономный портал (отдельная точка входа portal.php),
+     * не использует общий DI-контейнер напрямую.
+     *
+     * @param ServiceContainer $container
+     */
+    public function boot(ServiceContainer $container): void {
+        // Ministra — standalone endpoint, сервисы не регистрируются
+    }
+
+    /**
+     * Регистрация маршрутов модуля
+     *
+     * Ministra обслуживается через ministra/portal.php (прямой HTTP),
+     * не через Router admin-панели.
+     *
+     * @param Router $router
+     */
+    public function registerRoutes(Router $router): void {
+        // Маршрутизация Ministra — через portal.php напрямую
+    }
+
+    /**
+     * Крон-задачи модуля
+     *
+     * Ministra не имеет собственных крон-задач.
+     *
+     * @return array
+     */
+    public function registerCrons(): array {
+        return [];
+    }
+
+    /**
+     * Подписки на события ядра
+     *
+     * @return array
+     */
+    public function getEventSubscribers(): array {
+        return [];
+    }
+}
diff --git a/src/modules/ministra/PortalHandler.php b/src/modules/ministra/PortalHandler.php
new file mode 100644
index 00000000..c65783b3
--- /dev/null
+++ b/src/modules/ministra/PortalHandler.php
@@ -0,0 +1,1344 @@
+<?php
+
+class PortalHandler
+{
+    /**
+     * Phase 1: Pre-init stub responses (no DB needed).
+     * Exits immediately if the action is handled, otherwise returns void.
+     *
+     * @param string|null $rReqType
+     * @param string|null $rReqAction
+     */
+    public static function handlePreInit($rReqType, $rReqAction)
+    {
+        if ($rReqType && $rReqAction) {
+            switch ($rReqType) {
+                case 'stb':
+                    switch ($rReqAction) {
+                        case 'get_ad':
+                            exit(json_encode(array('js' => array())));
+
+                        case 'get_storages':
+                            exit(json_encode(array('js' => array())));
+
+                        case 'log':
+                            exit(json_encode(array('js' => true)));
+
+                        case 'get_countries':
+                            exit(json_encode(array('js' => array())));
+
+                        case 'get_timezones':
+                            exit(json_encode(array('js' => array())));
+
+                        case 'get_cities':
+                            exit(json_encode(array('js' => array())));
+
+                        case 'search_cities':
+                            exit(json_encode(array('js' => array())));
+                    }
+
+                    break;
+
+                case 'remote_pvr':
+                    switch ($rReqAction) {
+                        case 'start_record_on_stb':
+                            exit(json_encode(array('js' => true)));
+
+                        case 'stop_record_on_stb':
+                            exit(json_encode(array('js' => true)));
+
+                        case 'get_active_recordings':
+                            exit(json_encode(array('js' => array())));
+                    }
+
+                    break;
+
+                case 'media_favorites':
+                    exit(json_encode(array('js' => '')));
+
+                case 'tvreminder':
+                    exit(json_encode(array('js' => array())));
+
+                case 'series':
+                case 'vod':
+                    switch ($rReqAction) {
+                        case 'set_not_ended':
+                            exit(json_encode(array('js' => true)));
+
+                        case 'del_link':
+                            exit(json_encode(array('js' => true)));
+
+                        case 'log':
+                            exit(json_encode(array('js' => 1)));
+                    }
+
+                    break;
+
+                case 'downloads':
+                    exit(json_encode(array('js' => true)));
+
+                case 'weatherco':
+                    exit(json_encode(array('js' => false)));
+
+                case 'course':
+                    exit(json_encode(array('js' => true)));
+
+                case 'account_info':
+                    switch ($rReqAction) {
+                        case 'get_terms_info':
+                            exit(json_encode(array('js' => true)));
+
+                        case 'get_payment_info':
+                            exit(json_encode(array('js' => true)));
+
+                        case 'get_demo_video_parts':
+                            exit(json_encode(array('js' => true)));
+
+                        case 'get_agreement_info':
+                            exit(json_encode(array('js' => true)));
+                    }
+
+                    break;
+
+                case 'tv_archive':
+                    switch ($rReqAction) {
+                        case 'set_played_timeshift':
+                            exit(json_encode(array('js' => true)));
+
+                        case 'set_played':
+                            exit(json_encode(array('js' => true)));
+
+                        case 'update_played_timeshift_end_time':
+                            exit(json_encode(array('js' => true)));
+                    }
+
+                    break;
+
+                case 'itv':
+                    switch ($rReqAction) {
+                        case 'set_fav_status':
+                            exit(json_encode(array('js' => array())));
+
+                        case 'set_played':
+                            exit(json_encode(array('js' => true)));
+                    }
+
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Phase 4: Unauthenticated STB actions (get_profile, get_localization, log, get_modules).
+     * Called when $rReqType == 'stb' from the outer switch.
+     * Exits if action is handled, otherwise returns void.
+     *
+     * @param string $rReqAction
+     * @param array  &$ctx Context array with device, profile, language, theme, authenticated, etc.
+     */
+    public static function handleStbPublic($rReqAction, &$ctx)
+    {
+        switch ($rReqAction) {
+            case 'get_profile':
+                $rTotal = ($ctx['authenticated'] ? array_merge($ctx['profile'], $ctx['device']['get_profile_vars']) : $ctx['profile']);
+                $rTotal['status'] = intval(!$ctx['authenticated']);
+                $rTotal['update_url'] = (empty(StreamingUtilities::$rSettings['update_url']) ? '' : StreamingUtilities::$rSettings['update_url']);
+                $rTotal['test_download_url'] = (empty(StreamingUtilities::$rSettings['test_download_url']) ? '' : StreamingUtilities::$rSettings['test_download_url']);
+                $rTotal['default_timezone'] = StreamingUtilities::$rSettings['default_timezone'];
+                $rTotal['default_locale'] = $ctx['device']['locale'];
+                $rTotal['allowed_stb_types'] = StreamingUtilities::$rSettings['allowed_stb_types'];
+                $rTotal['allowed_stb_types_for_local_recording'] = StreamingUtilities::$rSettings['allowed_stb_types'];
+                $rTotal['storages'] = array();
+                $rTotal['tv_channel_default_aspect'] = (empty(StreamingUtilities::$rSettings['tv_channel_default_aspect']) ? 'fit' : StreamingUtilities::$rSettings['tv_channel_default_aspect']);
+                $rTotal['playback_limit'] = (empty(StreamingUtilities::$rSettings['playback_limit']) ? false : intval(StreamingUtilities::$rSettings['playback_limit']));
+
+                if (!empty($rTotal['playback_limit'])) {
+                } else {
+                    $rTotal['enable_playback_limit'] = false;
+                }
+
+                $rTotal['show_tv_channel_logo'] = !empty(StreamingUtilities::$rSettings['show_tv_channel_logo']);
+                $rTotal['show_channel_logo_in_preview'] = !empty(StreamingUtilities::$rSettings['show_channel_logo_in_preview']);
+                $rTotal['enable_connection_problem_indication'] = !empty(StreamingUtilities::$rSettings['enable_connection_problem_indication']);
+                $rTotal['hls_fast_start'] = '1';
+                $rTotal['check_ssl_certificate'] = 0;
+                $rTotal['enable_buffering_indication'] = 1;
+                $rTotal['watchdog_timeout'] = mt_rand(80, 120);
+
+                if (!(empty($rTotal['aspect']) && StreamingUtilities::$rServers[SERVER_ID]['server_protocol'] == 'https')) {
+                } else {
+                    $rTotal['aspect'] = '16';
+                }
+
+                exit(json_encode(array('js' => $rTotal), JSON_PARTIAL_OUTPUT_ON_ERROR));
+
+            case 'get_localization':
+                exit(json_encode(array('js' => $ctx['language'][$ctx['device']['locale']])));
+
+            case 'log':
+                exit(json_encode(array('js' => true)));
+
+            case 'get_modules':
+                $rModules = array('all_modules' => array('media_browser', 'vclub', 'tv', 'sclub', 'radio', 'dvb', 'tv_archive', 'time_shift', 'time_shift_local', 'epg.reminder', 'epg.recorder', 'epg', 'epg.simple', 'downloads_dialog', 'downloads', 'records', 'pvr_local', 'settings.parent', 'settings.localization', 'settings.update', 'settings.playback', 'settings.common', 'settings.network_status', 'settings', 'account', 'internet', 'logout', 'account_menu'), 'switchable_modules' => array('sclub', 'vlub'), 'disabled_modules' => array('records', 'downloads', 'settings.update', 'settings.common', 'pvr_local', 'media_browser'), 'restricted_modules' => array(), 'template' => $ctx['theme'], 'launcher_url' => '', 'launcher_profile_url' => '');
+
+                exit(json_encode(array('js' => $rModules)));
+        }
+    }
+
+    /**
+     * Phase 5: Authenticated action dispatcher.
+     * Sets up player, then dispatches to the appropriate sub-handler.
+     *
+     * @param string $rReqType
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleAuthenticated($rReqType, $rReqAction, &$ctx)
+    {
+        $ctx['device']['mag_player'] = trim($ctx['device']['mag_player'], "'\"");
+        $ctx['player'] = (!empty($ctx['device']['mag_player']) ? $ctx['device']['mag_player'] . ' ' : 'ffmpeg ');
+
+        switch ($rReqType) {
+            case 'stb':
+                self::handleStbSettings($rReqAction, $ctx);
+
+                break;
+
+            case 'watchdog':
+                self::handleWatchdog($rReqAction, $ctx);
+
+                break;
+
+            case 'audioclub':
+                self::handleAudioclub($rReqAction, $ctx);
+
+                break;
+
+            case 'itv':
+                self::handleItv($rReqAction, $ctx);
+
+                break;
+
+            case 'vod':
+                self::handleVod($rReqAction, $ctx);
+
+                break;
+
+            case 'series':
+                self::handleSeries($rReqAction, $ctx);
+
+                break;
+
+            case 'account_info':
+                self::handleAccountInfo($rReqAction, $ctx);
+
+                break;
+
+            case 'radio':
+                self::handleRadio($rReqAction, $ctx);
+
+                break;
+
+            case 'tv_archive':
+                self::handleTvArchive($rReqAction, $ctx);
+
+                break;
+
+            case 'epg':
+                self::handleEpg($rReqAction, $ctx);
+
+                break;
+        }
+    }
+
+    /**
+     * Phase 5 sub-handler: Authenticated STB settings actions.
+     * Actions: set_modern, set_legacy, get_preload_images, get_settings_profile,
+     *          get_locales, get_tv_aspects, set_volume, set_aspect, set_stream_error,
+     *          set_screensaver_delay, set_playback_buffer, set_plasma_saving,
+     *          set_parent_password, set_locale, set_hdmi_reaction.
+     *
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleStbSettings($rReqAction, &$ctx)
+    {
+        global $db;
+
+        switch ($rReqAction) {
+            case 'set_modern':
+                $ctx['device']['theme_type'] = 0;
+                $db->query('UPDATE `mag_devices` SET `theme_type` = 0 WHERE `mag_id` = ?', $ctx['device']['mag_id']);
+                updatecache();
+
+                exit(json_encode(array('data' => true)));
+
+            case 'set_legacy':
+                $ctx['device']['theme_type'] = 1;
+                $db->query('UPDATE `mag_devices` SET `theme_type` = 1 WHERE `mag_id` = ?', $ctx['device']['mag_id']);
+                updatecache();
+
+                exit(json_encode(array('data' => true)));
+
+            case 'get_preload_images':
+                $rMode = (is_numeric($ctx['gMode']) ? 'i_' . $ctx['gMode'] : 'i');
+                $rImages = array('template/' . $ctx['theme'] . '/' . $rMode . '/alert_triangle.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/archive.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/archive_white.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/bg.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/bg2.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/ears_arrow_l.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/ears_arrow_r.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/hd.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/hd_white.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/mb_prev_bg.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/mm_hor_surround.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/mm_ico_account.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/mm_ico_default.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/mm_ico_internet.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/mm_ico_mb.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/mm_ico_radio.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/mm_ico_setting.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/mm_ico_tv.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/mm_ico_video.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/mm_ico_youtube.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/left_white.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/logo.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/play.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/play_white.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/rec.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/rec_white.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/right_white.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/star.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/star_white.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/tv_prev_bg.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/volume_bar.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/volume_bg.png', 'template/' . $ctx['theme'] . '/' . $rMode . '/volume_off.png');
+
+                exit(json_encode(array('js' => $rImages)));
+
+            case 'get_settings_profile':
+                $db->query('SELECT * FROM `mag_devices` WHERE `mag_id` = ?', $ctx['device']['mag_id']);
+                $rInfo = $db->get_row();
+                $rSettings = array('js' => array('modules' => array(array('name' => 'lock'), array('name' => 'lang'), array('name' => 'update'), array('name' => 'net_info', 'sub' => array(array('name' => 'wired'), array('name' => 'pppoe', 'sub' => array(array('name' => 'dhcp'), array('name' => 'dhcp_manual'), array('name' => 'disable'))), array('name' => 'wireless'), array('name' => 'speed'))), array('name' => 'video'), array('name' => 'audio'), array('name' => 'net', 'sub' => array(array('name' => 'ethernet', 'sub' => array(array('name' => 'dhcp'), array('name' => 'dhcp_manual'), array('name' => 'manual'), array('name' => 'no_ip'))), array('name' => 'pppoe', 'sub' => array(array('name' => 'dhcp'), array('name' => 'dhcp_manual'), array('name' => 'disable'))), array('name' => 'wifi', 'sub' => array(array('name' => 'dhcp'), array('name' => 'dhcp_manual'), array('name' => 'manual'))), array('name' => 'speed'))), array('name' => 'advanced'), array('name' => 'dev_info'), array('name' => 'reload'), array('name' => 'internal_portal'), array('name' => 'reboot'))));
+                $rSettings['js']['parent_password'] = $rInfo['parent_password'];
+                $rSettings['js']['update_url'] = StreamingUtilities::$rSettings['update_url'];
+                $rSettings['js']['test_download_url'] = StreamingUtilities::$rSettings['test_download_url'];
+                $rSettings['js']['playback_buffer_size'] = $rInfo['playback_buffer_size'];
+                $rSettings['js']['screensaver_delay'] = $rInfo['screensaver_delay'];
+                $rSettings['js']['plasma_saving'] = $rInfo['plasma_saving'];
+                $rSettings['js']['spdif_mode'] = $rInfo['spdif_mode'];
+                $rSettings['js']['ts_enabled'] = $rInfo['ts_enabled'];
+                $rSettings['js']['ts_enable_icon'] = $rInfo['ts_enable_icon'];
+                $rSettings['js']['ts_path'] = $rInfo['ts_path'];
+                $rSettings['js']['ts_max_length'] = $rInfo['ts_max_length'];
+                $rSettings['js']['ts_buffer_use'] = $rInfo['ts_buffer_use'];
+                $rSettings['js']['ts_action_on_exit'] = $rInfo['ts_action_on_exit'];
+                $rSettings['js']['ts_delay'] = $rInfo['ts_delay'];
+                $rSettings['js']['hdmi_event_reaction'] = $rInfo['hdmi_event_reaction'];
+                $rSettings['js']['pri_audio_lang'] = $ctx['profile']['pri_audio_lang'];
+                $rSettings['js']['show_after_loading'] = $rInfo['show_after_loading'];
+                $rSettings['js']['sec_audio_lang'] = $ctx['profile']['sec_audio_lang'];
+
+                if (StreamingUtilities::$rSettings['always_enabled_subtitles'] == 1) {
+                    $rSettings['js']['pri_subtitle_lang'] = $ctx['profile']['pri_subtitle_lang'];
+                    $rSettings['js']['sec_subtitle_lang'] = $ctx['profile']['sec_subtitle_lang'];
+                } else {
+                    $rSettings['js']['sec_subtitle_lang'] = '';
+                    $rSettings['js']['pri_subtitle_lang'] = $rSettings['js']['sec_subtitle_lang'];
+                }
+
+                exit(json_encode($rSettings));
+
+            case 'get_locales':
+                $db->query('SELECT `locale` FROM `mag_devices` WHERE `mag_id` = ?', $ctx['device']['mag_id']);
+                $rSelected = $db->get_row();
+                $rOutput = array();
+
+                foreach ($ctx['locales']['get_locales'] as $country => $code) {
+                    $rSelected = ($rSelected['locale'] == $code ? 1 : 0);
+                    $rOutput[] = array('label' => $country, 'value' => $code, 'selected' => $rSelected);
+                }
+
+                exit(json_encode(array('js' => $rOutput)));
+
+            case 'get_tv_aspects':
+                if (!empty($ctx['device']['aspect'])) {
+                    exit($ctx['device']['aspect']);
+                }
+
+                exit(json_encode($ctx['device']['aspect']));
+
+            case 'set_volume':
+                $rVolume = StreamingUtilities::$rRequest['vol'];
+
+                if (empty($rVolume)) {
+                    break;
+                }
+
+                $ctx['device']['volume'] = $rVolume;
+                $db->query('UPDATE `mag_devices` SET `volume` = ? WHERE `mag_id` = ?', $rVolume, $ctx['device']['mag_id']);
+                updatecache();
+
+                exit(json_encode(array('data' => true)));
+
+            case 'set_aspect':
+                $rChannelID = StreamingUtilities::$rRequest['ch_id'];
+                $rAspect = StreamingUtilities::$rRequest['aspect'];
+                $rDeviceAspect = $ctx['device']['aspect'];
+
+                if (empty($rDeviceAspect)) {
+                    $ctx['device']['aspect'] = array('js' => array($rChannelID => $rAspect));
+                    $db->query('UPDATE `mag_devices` SET `aspect` = ? WHERE mag_id = ?', json_encode(array('js' => array($rChannelID => $rAspect))), $ctx['device']['mag_id']);
+                } else {
+                    $rDeviceAspect = json_decode($rDeviceAspect, true);
+                    $rDeviceAspect['js'][$rChannelID] = $rAspect;
+                    $ctx['device']['aspect'] = $rDeviceAspect;
+                    $db->query('UPDATE `mag_devices` SET `aspect` = ? WHERE mag_id = ?', json_encode($rDeviceAspect), $ctx['device']['mag_id']);
+                }
+
+                updatecache();
+
+                exit(json_encode(array('js' => true)));
+
+            case 'set_stream_error':
+                exit(json_encode(array('js' => true)));
+
+            case 'set_screensaver_delay':
+                if (empty($_SERVER['HTTP_COOKIE'])) {
+                } else {
+                    $rDelay = intval(StreamingUtilities::$rRequest['screensaver_delay']);
+                    $ctx['device']['screensaver_delay'] = $rDelay;
+                    $db->query('UPDATE `mag_devices` SET `screensaver_delay` = ? WHERE `mag_id` = ?', $rDelay, $ctx['device']['mag_id']);
+                    updatecache();
+                }
+
+                exit(json_encode(array('js' => true)));
+
+            case 'set_playback_buffer':
+                if (empty($_SERVER['HTTP_COOKIE'])) {
+                } else {
+                    $rBufferBytes = intval(StreamingUtilities::$rRequest['playback_buffer_bytes']);
+                    $rBufferSize = intval(StreamingUtilities::$rRequest['playback_buffer_size']);
+                    $ctx['device']['playback_buffer_bytes'] = $rBufferBytes;
+                    $ctx['device']['playback_buffer_size'] = $rBufferSize;
+                    $db->query('UPDATE `mag_devices` SET `playback_buffer_bytes` = ? , `playback_buffer_size` = ? WHERE `mag_id` = ?', $rBufferBytes, $rBufferSize, $ctx['device']['mag_id']);
+                    updatecache();
+                }
+
+                exit(json_encode(array('js' => true)));
+
+            case 'set_plasma_saving':
+                $rPlasmaSaving = intval(StreamingUtilities::$rRequest['plasma_saving']);
+                $ctx['device']['plasma_saving'] = $rPlasmaSaving;
+                $db->query('UPDATE `mag_devices` SET `plasma_saving` = ? WHERE `mag_id` = ?', $rPlasmaSaving, $ctx['device']['mag_id']);
+                updatecache();
+
+                exit(json_encode(array('js' => true)));
+
+            case 'set_parent_password':
+                if (isset(StreamingUtilities::$rRequest['parent_password']) && isset(StreamingUtilities::$rRequest['pass']) && isset(StreamingUtilities::$rRequest['repeat_pass']) && StreamingUtilities::$rRequest['pass'] == StreamingUtilities::$rRequest['repeat_pass']) {
+                    $ctx['device']['parent_password'] = StreamingUtilities::$rRequest['pass'];
+                    $db->query('UPDATE `mag_devices` SET `parent_password` = ? WHERE `mag_id` = ?', StreamingUtilities::$rRequest['pass'], $ctx['device']['mag_id']);
+                    updatecache();
+
+                    exit(json_encode(array('js' => true)));
+                }
+
+                exit(json_encode(array('js' => true)));
+
+            case 'set_locale':
+                if (empty(StreamingUtilities::$rRequest['locale'])) {
+                } else {
+                    $ctx['device']['locale'] = StreamingUtilities::$rRequest['locale'];
+                    $db->query('UPDATE `mag_devices` SET `locale` = ? WHERE `mag_id` = ?', StreamingUtilities::$rRequest['locale'], $ctx['device']['mag_id']);
+                    updatecache();
+                }
+
+                exit(json_encode(array('js' => array())));
+
+            case 'set_hdmi_reaction':
+                if (empty($_SERVER['HTTP_COOKIE']) || !isset(StreamingUtilities::$rRequest['data'])) {
+                } else {
+                    $rReaction = StreamingUtilities::$rRequest['data'];
+                    $ctx['device']['hdmi_event_reaction'] = $rReaction;
+                    $db->query('UPDATE `mag_devices` SET `hdmi_event_reaction` = ? WHERE `mag_id` = ?', $rReaction, $ctx['device']['mag_id']);
+                    updatecache();
+                }
+
+                exit(json_encode(array('js' => true)));
+        }
+    }
+
+    /**
+     * Phase 5 sub-handler: Watchdog actions.
+     * Actions: get_events, confirm_event.
+     * Also updates last_watchdog before processing action.
+     *
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleWatchdog($rReqAction, &$ctx)
+    {
+        global $db;
+
+        $ctx['device']['last_watchdog'] = time();
+        $db->query('UPDATE `mag_devices` SET `last_watchdog` = ? WHERE `mag_id` = ?', time(), $ctx['device']['mag_id']);
+        updatecache();
+
+        switch ($rReqAction) {
+            case 'get_events':
+                $db->query('SELECT * FROM `mag_events` WHERE `mag_device_id` = ? AND `status` = 0 ORDER BY `id` ASC LIMIT 1', $ctx['device']['mag_id']);
+                $rData = array('data' => array('msgs' => 0, 'additional_services_on' => 1));
+
+                if (0 >= $db->num_rows()) {
+                } else {
+                    $rEvents = $db->get_row();
+                    $db->query('SELECT count(*) FROM `mag_events` WHERE `mag_device_id` = ? AND `status` = 0 ', $ctx['device']['mag_id']);
+                    $rMessages = $db->get_col();
+                    $rData = array('data' => array('msgs' => $rMessages, 'id' => $rEvents['id'], 'event' => $rEvents['event'], 'need_confirm' => $rEvents['need_confirm'], 'msg' => $rEvents['msg'], 'reboot_after_ok' => $rEvents['reboot_after_ok'], 'auto_hide_timeout' => $rEvents['auto_hide_timeout'], 'send_time' => date('d-m-Y H:i:s', $rEvents['send_time']), 'additional_services_on' => $rEvents['additional_services_on'], 'updated' => array('anec' => $rEvents['anec'], 'vclub' => $rEvents['vclub'])));
+                    $rAutoStatus = array('reboot', 'reload_portal', 'play_channel', 'cut_off');
+
+                    if (!in_array($rEvents['event'], $rAutoStatus)) {
+                    } else {
+                        $db->query('UPDATE `mag_events` SET `status` = 1 WHERE `id` = ?', $rEvents['id']);
+                    }
+                }
+
+                exit(json_encode(array('js' => $rData), JSON_PARTIAL_OUTPUT_ON_ERROR));
+
+            case 'confirm_event':
+                if (empty(StreamingUtilities::$rRequest['event_active_id'])) {
+                    break;
+                }
+
+                $rActiveID = StreamingUtilities::$rRequest['event_active_id'];
+                $db->query('UPDATE `mag_events` SET `status` = 1 WHERE `id` = ?', $rActiveID);
+
+                exit(json_encode(array('js' => array('data' => 'ok'))));
+        }
+    }
+
+    /**
+     * Phase 5 sub-handler: Audioclub actions.
+     * Actions: get_categories.
+     *
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleAudioclub($rReqAction, &$ctx)
+    {
+        switch ($rReqAction) {
+            case 'get_categories':
+                $rOutput = array();
+                $rOutput['js'] = array();
+
+                if (StreamingUtilities::$rSettings['show_all_category_mag'] != 1) {
+                } else {
+                    $rOutput['js'][] = array('id' => '*', 'title' => 'All', 'alias' => '*', 'censored' => 0);
+                }
+
+                foreach (StreamingUtilities::$rCategories as $rCategoryID => $rCategory) {
+                    if ($rCategory['category_type'] == 'movie' && in_array($rCategory['id'], $ctx['device']['category_ids'])) {
+                        $rOutput['js'][] = array('id' => $rCategory['id'], 'title' => $rCategory['category_name'], 'alias' => $rCategory['category_name'], 'censored' => intval($rCategory['is_adult']));
+                    }
+                }
+
+                exit(json_encode($rOutput));
+        }
+    }
+
+    /**
+     * Phase 5 sub-handler: ITV (live TV) actions.
+     * Actions: create_link, set_claim, set_fav, get_fav_ids, get_all_channels,
+     *          get_ordered_list, get_all_fav_channels, get_epg_info, get_short_epg,
+     *          set_last_id, get_genres.
+     *
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleItv($rReqAction, &$ctx)
+    {
+        global $db;
+
+        switch ($rReqAction) {
+            case 'create_link':
+                $rCommand = StreamingUtilities::$rRequest['cmd'];
+                $rValue = 'http://localhost/ch/';
+                list($rStreamID, $rStreamValue) = explode('_', substr($rCommand, strpos($rCommand, $rValue) + strlen($rValue)));
+
+                if (empty($rStreamValue)) {
+                    $rEncData = 'ministra::live/' . $ctx['device']['username'] . '/' . $ctx['device']['password'] . '/' . $rStreamID . '/' . StreamingUtilities::$rSettings['mag_container'] . '/' . $ctx['device']['token'];
+                    $rToken = StreamingUtilities::encryptData($rEncData, StreamingUtilities::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+                    $rURL = $ctx['player'] . ((StreamingUtilities::$rSettings['mag_disable_ssl'] ? StreamingUtilities::$rServers[SERVER_ID]['http_url'] : StreamingUtilities::$rServers[SERVER_ID]['site_url'])) . 'play/' . $rToken;
+
+                    if (!StreamingUtilities::$rSettings['mag_keep_extension']) {
+                    } else {
+                        $rURL .= '?ext=.' . StreamingUtilities::$rSettings['mag_container'];
+                    }
+                } else {
+                    $rURL = $ctx['player'] . $rStreamValue;
+                }
+
+                exit(json_encode(array('js' => array('id' => $rStreamID, 'cmd' => $rURL), 'streamer_id' => 0, 'link_id' => 0, 'load' => 0, 'error' => '')));
+
+            case 'set_claim':
+                if (empty(StreamingUtilities::$rRequest['id']) || empty(StreamingUtilities::$rRequest['real_type'])) {
+                } else {
+                    $rID = intval(StreamingUtilities::$rRequest['id']);
+                    $rRealType = StreamingUtilities::$rRequest['real_type'];
+                    $rDate = date('Y-m-d H:i:s');
+                    $db->query('INSERT INTO `mag_claims` (`stream_id`,`mag_id`,`real_type`,`date`) VALUES(?,?,?,?)', $rID, $ctx['device']['mag_id'], $rRealType, $rDate);
+                }
+
+                exit(json_encode(array('js' => true)));
+
+            case 'set_fav':
+                $rChannels = (empty(StreamingUtilities::$rRequest['fav_ch']) ? '' : StreamingUtilities::$rRequest['fav_ch']);
+                $rChannels = array_filter(array_map('intval', explode(',', $rChannels)));
+                $ctx['device']['fav_channels']['live'] = $rChannels;
+                $db->query('UPDATE `mag_devices` SET `fav_channels` = ? WHERE `mag_id` = ?', json_encode($ctx['device']['fav_channels']), $ctx['device']['mag_id']);
+                updatecache();
+
+                exit(json_encode(array('js' => true)));
+
+            case 'get_fav_ids':
+                exit(json_encode(array('js' => $ctx['device']['fav_channels']['live'])));
+
+            case 'get_all_channels':
+                $rGenre = (empty(StreamingUtilities::$rRequest['genre']) || !is_numeric(StreamingUtilities::$rRequest['genre']) ? null : intval(StreamingUtilities::$rRequest['genre']));
+
+                exit(getStreams($rGenre, true));
+
+            case 'get_ordered_list':
+                $rFav = (!empty(StreamingUtilities::$rRequest['fav']) ? 1 : null);
+                $rSortBy = (!empty(StreamingUtilities::$rRequest['sortby']) ? StreamingUtilities::$rRequest['sortby'] : null);
+                $rGenre = (empty(StreamingUtilities::$rRequest['genre']) || !is_numeric(StreamingUtilities::$rRequest['genre']) ? null : intval(StreamingUtilities::$rRequest['genre']));
+                $rSearch = (!empty(StreamingUtilities::$rRequest['search']) ? StreamingUtilities::$rRequest['search'] : null);
+
+                exit(getStreams($rGenre, false, $rFav, $rSortBy, $rSearch));
+
+            case 'get_all_fav_channels':
+                $rGenre = (empty(StreamingUtilities::$rRequest['genre']) || !is_numeric(StreamingUtilities::$rRequest['genre']) ? null : intval(StreamingUtilities::$rRequest['genre']));
+
+                exit(getStreams($rGenre, true, 1));
+
+            case 'get_epg_info':
+                exit(json_encode(array('js' => array('data' => array())), JSON_PARTIAL_OUTPUT_ON_ERROR));
+
+            case 'get_short_epg':
+                if (empty(StreamingUtilities::$rRequest['ch_id'])) {
+                } else {
+                    $rChannelID = StreamingUtilities::$rRequest['ch_id'];
+                    $rEPG = array('js' => array());
+                    $rTime = time();
+                    $rEPGData = array();
+
+                    if (!file_exists(EPG_PATH . 'stream_' . intval($rChannelID))) {
+                    } else {
+                        $rRows = igbinary_unserialize(file_get_contents(EPG_PATH . 'stream_' . $rChannelID));
+
+                        foreach ($rRows as $rRow) {
+                            if (!($rRow['start'] <= $rTime && $rTime <= $rRow['end'] || $rTime <= $rRow['start'])) {
+                            } else {
+                                $rRow['start_timestamp'] = $rRow['start'];
+                                $rRow['stop_timestamp'] = $rRow['end'];
+                                $rEPGData[] = $rRow;
+                            }
+                        }
+                    }
+
+                    if (empty($rEPGData)) {
+                    } else {
+                        $rTimeDifference = (StreamingUtilities::getDiffTimezone($ctx['timezone']) ?: 0);
+                        $i = 0;
+
+                        for ($n = 0; $n < count($rEPGData); $n++) {
+                            if ($rEPGData[$n]['end'] >= time()) {
+                                $rStartTime = new DateTime();
+                                $rStartTime->setTimestamp($rEPGData[$n]['start']);
+                                $rStartTime->modify((string) $rTimeDifference . ' seconds');
+                                $rEndTime = new DateTime();
+                                $rEndTime->setTimestamp($rEPGData[$n]['end']);
+                                $rEndTime->modify((string) $rTimeDifference . ' seconds');
+                                $rEPG['js'][$i]['id'] = $rEPGData[$n]['id'];
+                                $rEPG['js'][$i]['ch_id'] = $rChannelID;
+                                $rEPG['js'][$i]['correct'] = $rStartTime->format('Y-m-d H:i:s');
+                                $rEPG['js'][$i]['time'] = $rStartTime->format('Y-m-d H:i:s');
+                                $rEPG['js'][$i]['time_to'] = $rEndTime->format('Y-m-d H:i:s');
+                                $rEPG['js'][$i]['duration'] = $rEPGData[$n]['stop_timestamp'] - $rEPGData[$n]['start_timestamp'];
+                                $rEPG['js'][$i]['name'] = $rEPGData[$n]['title'];
+                                $rEPG['js'][$i]['descr'] = $rEPGData[$n]['description'];
+                                $rEPG['js'][$i]['real_id'] = $rChannelID . '_' . $rEPGData[$n]['start_timestamp'];
+                                $rEPG['js'][$i]['category'] = '';
+                                $rEPG['js'][$i]['director'] = '';
+                                $rEPG['js'][$i]['actor'] = '';
+                                $rEPG['js'][$i]['start_timestamp'] = $rStartTime->getTimestamp();
+                                $rEPG['js'][$i]['stop_timestamp'] = $rEndTime->getTimestamp();
+                                $rEPG['js'][$i]['t_time'] = $rStartTime->format('H:i');
+                                $rEPG['js'][$i]['t_time_to'] = $rEndTime->format('H:i');
+                                $rEPG['js'][$i]['mark_memo'] = 0;
+                                $rEPG['js'][$i]['mark_archive'] = 0;
+
+                                if (count($rEPG['js']) != ((intval(StreamingUtilities::$rRequest['size']) ?: 4))) {
+                                    $i++;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                exit(json_encode($rEPG, JSON_PARTIAL_OUTPUT_ON_ERROR));
+
+            case 'set_last_id':
+                $rChannelID = intval(StreamingUtilities::$rRequest['id']);
+
+                if (0 >= $rChannelID) {
+                } else {
+                    $ctx['device']['last_itv_id'] = $rChannelID;
+                    $db->query('UPDATE `mag_devices` SET `last_itv_id` = ? WHERE `mag_id` = ?', $rChannelID, $ctx['device']['mag_id']);
+                    updatecache();
+                }
+
+                exit(json_encode(array('js' => true)));
+
+            case 'get_genres':
+                $rOutput = array();
+                $rNumber = 1;
+
+                if (StreamingUtilities::$rSettings['show_all_category_mag'] != 1) {
+                } else {
+                    $rOutput['js'][] = array('id' => '*', 'title' => 'All', 'alias' => 'All', 'active_sub' => true, 'censored' => 0);
+                }
+
+                foreach (StreamingUtilities::$rCategories as $rCategoryID => $rCategory) {
+                    if ($rCategory['category_type'] == 'live' && in_array($rCategory['id'], $ctx['device']['category_ids'])) {
+                        $rOutput['js'][] = array('id' => $rCategory['id'], 'title' => $rCategory['category_name'], 'modified' => '', 'number' => $rNumber++, 'alias' => strtolower($rCategory['category_name']), 'censored' => intval($rCategory['is_adult']));
+                    }
+                }
+
+                exit(json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR));
+        }
+    }
+
+    /**
+     * Phase 5 sub-handler: VOD (Video On Demand) actions.
+     * Actions: set_claim, set_fav, del_fav, get_categories, get_genres_by_category_alias,
+     *          get_years, get_ordered_list, create_link, get_abc.
+     *
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleVod($rReqAction, &$ctx)
+    {
+        global $db;
+
+        switch ($rReqAction) {
+            case 'set_claim':
+                if (empty(StreamingUtilities::$rRequest['id']) || empty(StreamingUtilities::$rRequest['real_type'])) {
+                } else {
+                    $rID = intval(StreamingUtilities::$rRequest['id']);
+                    $rRealType = StreamingUtilities::$rRequest['real_type'];
+                    $rDate = date('Y-m-d H:i:s');
+                    $db->query('INSERT INTO `mag_claims` (`stream_id`,`mag_id`,`real_type`,`date`) VALUES(?,?,?,?)', $rID, $ctx['device']['mag_id'], $rRealType, $rDate);
+                }
+
+                exit(json_encode(array('js' => true)));
+
+            case 'set_fav':
+                if (empty(StreamingUtilities::$rRequest['video_id'])) {
+                } else {
+                    $rVideoID = intval(StreamingUtilities::$rRequest['video_id']);
+
+                    if (in_array($rVideoID, $ctx['device']['fav_channels']['movie'])) {
+                    } else {
+                        $ctx['device']['fav_channels']['movie'][] = $rVideoID;
+                    }
+
+                    $db->query('UPDATE `mag_devices` SET `fav_channels` = ? WHERE `mag_id` = ?', json_encode($ctx['device']['fav_channels']), $ctx['device']['mag_id']);
+                    updatecache();
+                }
+
+                exit(json_encode(array('js' => true)));
+
+            case 'del_fav':
+                if (empty(StreamingUtilities::$rRequest['video_id'])) {
+                } else {
+                    $rVideoID = intval(StreamingUtilities::$rRequest['video_id']);
+
+                    foreach ($ctx['device']['fav_channels']['movie'] as $rKey => $rValue) {
+                        if ($rValue != $rVideoID) {
+                        } else {
+                            unset($ctx['device']['fav_channels']['movie'][$rKey]);
+
+                            goto B79ca0d52db6b02d; //break;
+                        }
+                    }
+                    B79ca0d52db6b02d:
+                    $db->query('UPDATE `mag_devices` SET `fav_channels` = ? WHERE `mag_id` = ?', json_encode($ctx['device']['fav_channels']), $ctx['device']['mag_id']);
+                    updatecache();
+                }
+
+                exit(json_encode(array('js' => true)));
+
+            case 'get_categories':
+                $rOutput = array();
+                $rOutput['js'] = array();
+
+                if (StreamingUtilities::$rSettings['show_all_category_mag'] != 1) {
+                } else {
+                    $rOutput['js'][] = array('id' => '*', 'title' => 'All', 'alias' => '*', 'censored' => 0);
+                }
+
+                foreach (StreamingUtilities::$rCategories as $rCategoryID => $rCategory) {
+                    if ($rCategory['category_type'] == 'movie' && in_array($rCategory['id'], $ctx['device']['category_ids'])) {
+                        $rOutput['js'][] = array('id' => $rCategory['id'], 'title' => $rCategory['category_name'], 'alias' => $rCategory['category_name'], 'censored' => intval($rCategory['is_adult']));
+                    }
+                }
+
+                exit(json_encode($rOutput));
+
+            case 'get_genres_by_category_alias':
+                $rOutput = array();
+                $rOutput['js'][] = array('id' => '*', 'title' => '*');
+
+                foreach (StreamingUtilities::$rCategories as $rCategoryID => $rCategory) {
+                    if ($rCategory['category_type'] == 'movie' && in_array($rCategory['id'], $ctx['device']['category_ids'])) {
+                        $rOutput['js'][] = array('id' => $rCategory['id'], 'title' => $rCategory['category_name']);
+                    }
+                }
+
+                exit(json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR));
+
+            case 'get_years':
+                exit(json_encode($ctx['magData']['get_years']));
+
+            case 'get_ordered_list':
+                $rCategory = (!empty(StreamingUtilities::$rRequest['category']) && is_numeric(StreamingUtilities::$rRequest['category']) ? StreamingUtilities::$rRequest['category'] : null);
+                $rFav = (!empty(StreamingUtilities::$rRequest['fav']) ? 1 : null);
+                $rSortBy = (!empty(StreamingUtilities::$rRequest['sortby']) ? StreamingUtilities::$rRequest['sortby'] : 'added');
+                $rSearch = (!empty(StreamingUtilities::$rRequest['search']) ? StreamingUtilities::$rRequest['search'] : null);
+                $rPicking = array();
+                $rPicking['abc'] = (!empty(StreamingUtilities::$rRequest['abc']) ? StreamingUtilities::$rRequest['abc'] : '*');
+                $rPicking['genre'] = (!empty(StreamingUtilities::$rRequest['genre']) ? StreamingUtilities::$rRequest['genre'] : '*');
+                $rPicking['years'] = (!empty(StreamingUtilities::$rRequest['years']) ? StreamingUtilities::$rRequest['years'] : '*');
+
+                exit(getMovies($rCategory, $rFav, $rSortBy, $rSearch, $rPicking));
+
+            case 'create_link':
+                $rCommand = StreamingUtilities::$rRequest['cmd'];
+                $rSeries = (!empty(StreamingUtilities::$rRequest['series']) ? (int) StreamingUtilities::$rRequest['series'] : 0);
+                $rError = '';
+
+                if (!stristr($rCommand, '/media/')) {
+                    $rCommand = json_decode(base64_decode($rCommand), true);
+                } else {
+                    $rCommand = array('series_data' => $rCommand, 'type' => 'series');
+                }
+
+                if (!$rSeries) {
+                } else {
+                    $rCommand['type'] = 'series';
+                }
+
+                $rValid = false;
+
+                switch ($rCommand['type']) {
+                    case 'movie':
+                        $rValid = in_array($rCommand['stream_id'], $ctx['device']['vod_ids']);
+
+                        break;
+
+                    case 'series':
+                        if (empty($rCommand['series_data'])) {
+                        } else {
+                            list($rCommand['series_id'], $rCommand['season_num']) = explode(':', basename($rCommand['series_data'], '.mpg'));
+                        }
+
+                        $db->query('SELECT t1.stream_id,t2.target_container FROM `streams_episodes` t1 INNER JOIN `streams` t2 ON t2.id = t1.stream_id WHERE t1.`series_id` = ? AND t1.`season_num` = ? ORDER BY `episode_num` ASC LIMIT ' . intval($rSeries - 1) . ', 1', $rCommand['series_id'], $rCommand['season_num']);
+
+                        if (0 < $db->num_rows()) {
+                            $rRow = $db->get_row();
+                            $rCommand['stream_id'] = $rRow['stream_id'];
+                            $rCommand['target_container'] = $rRow['target_container'];
+                            $rValid = in_array($rCommand['series_id'], $ctx['device']['series_ids']);
+                        } else {
+                            $rError = 'player_file_missing';
+                        }
+                }
+                $rEncData = 'ministra::' . $rCommand['type'] . '/' . $ctx['device']['username'] . '/' . $ctx['device']['password'] . '/' . $rCommand['stream_id'] . '/' . $rCommand['target_container'] . '/' . $ctx['device']['token'];
+                $rToken = StreamingUtilities::encryptData($rEncData, StreamingUtilities::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+                $rURL = ((StreamingUtilities::$rSettings['mag_disable_ssl'] ? StreamingUtilities::$rServers[SERVER_ID]['http_url'] : StreamingUtilities::$rServers[SERVER_ID]['site_url'])) . 'play/' . $rToken;
+
+                if (!StreamingUtilities::$rSettings['mag_keep_extension']) {
+                } else {
+                    $rURL .= '?ext=.' . $rCommand['target_container'];
+                }
+
+                $rOutput = array('js' => array('id' => $rCommand['stream_id'], 'cmd' => $ctx['player'] . $rURL, 'load' => '', 'subtitles' => array(), 'error' => $rError));
+
+                exit(json_encode($rOutput));
+
+            case 'get_abc':
+                exit(json_encode($ctx['magData']['get_abc']));
+        }
+    }
+
+    /**
+     * Phase 5 sub-handler: Series actions.
+     * Actions: set_claim, set_fav, del_fav, get_categories, get_genres_by_category_alias,
+     *          get_years, get_ordered_list, get_abc.
+     *
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleSeries($rReqAction, &$ctx)
+    {
+        global $db;
+
+        switch ($rReqAction) {
+            case 'set_claim':
+                if (empty(StreamingUtilities::$rRequest['id']) || empty(StreamingUtilities::$rRequest['real_type'])) {
+                } else {
+                    $rID = intval(StreamingUtilities::$rRequest['id']);
+                    $rRealType = StreamingUtilities::$rRequest['real_type'];
+                    $rDate = date('Y-m-d H:i:s');
+                    $db->query('INSERT INTO `mag_claims` (`stream_id`,`mag_id`,`real_type`,`date`) VALUES(?,?,?,?)', $rID, $ctx['device']['mag_id'], $rRealType, $rDate);
+                }
+
+                exit(json_encode(array('js' => true)));
+
+            case 'set_fav':
+                if (empty(StreamingUtilities::$rRequest['video_id'])) {
+                } else {
+                    $rVideoID = intval(StreamingUtilities::$rRequest['video_id']);
+
+                    if (in_array($rVideoID, $ctx['device']['fav_channels']['series'])) {
+                    } else {
+                        $ctx['device']['fav_channels']['series'][] = $rVideoID;
+                    }
+
+                    $db->query('UPDATE `mag_devices` SET `fav_channels` = ? WHERE `mag_id` = ?', json_encode($ctx['device']['fav_channels']), $ctx['device']['mag_id']);
+                    updatecache();
+                }
+
+                exit(json_encode(array('js' => true)));
+
+            case 'del_fav':
+                if (empty(StreamingUtilities::$rRequest['video_id'])) {
+                } else {
+                    $rVideoID = intval(StreamingUtilities::$rRequest['video_id']);
+
+                    foreach ($ctx['device']['fav_channels']['series'] as $rKey => $rValue) {
+                        if ($rValue != $rVideoID) {
+                        } else {
+                            unset($ctx['device']['fav_channels']['series'][$rKey]);
+
+                            goto c2cd03c4f6bdbdea; //break;
+                        }
+                    }
+                    c2cd03c4f6bdbdea:
+                    $db->query('UPDATE `mag_devices` SET `fav_channels` = ? WHERE `mag_id` = ?', json_encode($ctx['device']['fav_channels']), $ctx['device']['mag_id']);
+                    updatecache();
+                }
+
+                exit(json_encode(array('js' => true)));
+
+            case 'get_categories':
+                $rOutput = array();
+                $rOutput['js'] = array();
+
+                if (StreamingUtilities::$rSettings['show_all_category_mag'] != 1) {
+                } else {
+                    $rOutput['js'][] = array('id' => '*', 'title' => 'All', 'alias' => '*', 'censored' => 0);
+                }
+
+                foreach (StreamingUtilities::$rCategories as $rCategoryID => $rCategory) {
+                    if ($rCategory['category_type'] == 'series' && in_array($rCategory['id'], $ctx['device']['category_ids'])) {
+                        $rOutput['js'][] = array('id' => $rCategory['id'], 'title' => $rCategory['category_name'], 'alias' => $rCategory['category_name'], 'censored' => intval($rCategory['is_adult']));
+                    }
+                }
+
+                exit(json_encode($rOutput));
+
+            case 'get_genres_by_category_alias':
+                $rOutput = array();
+                $rOutput['js'][] = array('id' => '*', 'title' => '*');
+
+                foreach (StreamingUtilities::$rCategories as $rCategoryID => $rCategory) {
+                    if ($rCategory['category_type'] == 'series' && in_array($rCategory['id'], $ctx['device']['category_ids'])) {
+                        $rOutput['js'][] = array('id' => $rCategory['id'], 'title' => $rCategory['category_name']);
+                    }
+                }
+
+                exit(json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR));
+
+            case 'get_years':
+                exit(json_encode($ctx['magData']['get_years']));
+
+            case 'get_ordered_list':
+                $rCategory = (!empty(StreamingUtilities::$rRequest['category']) && is_numeric(StreamingUtilities::$rRequest['category']) ? StreamingUtilities::$rRequest['category'] : null);
+                $rFav = (!empty(StreamingUtilities::$rRequest['fav']) ? 1 : null);
+                $rSortBy = (!empty(StreamingUtilities::$rRequest['sortby']) ? StreamingUtilities::$rRequest['sortby'] : 'added');
+                $rSearch = (!empty(StreamingUtilities::$rRequest['search']) ? StreamingUtilities::$rRequest['search'] : null);
+                $rMovieID = (!empty(StreamingUtilities::$rRequest['movie_id']) ? (int) StreamingUtilities::$rRequest['movie_id'] : null);
+                $rPicking = array();
+                $rPicking['abc'] = (!empty(StreamingUtilities::$rRequest['abc']) ? StreamingUtilities::$rRequest['abc'] : '*');
+                $rPicking['genre'] = (!empty(StreamingUtilities::$rRequest['genre']) ? StreamingUtilities::$rRequest['genre'] : '*');
+                $rPicking['years'] = (!empty(StreamingUtilities::$rRequest['years']) ? StreamingUtilities::$rRequest['years'] : '*');
+
+                exit(getSeries($rMovieID, $rCategory, $rFav, $rSortBy, $rSearch, $rPicking));
+
+            case 'get_abc':
+                exit(json_encode($ctx['magData']['get_abc']));
+        }
+    }
+
+    /**
+     * Phase 5 sub-handler: Account info actions.
+     * Actions: get_main_info.
+     *
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleAccountInfo($rReqAction, &$ctx)
+    {
+        switch ($rReqAction) {
+            case 'get_main_info':
+                if (empty($ctx['device']['exp_date'])) {
+                    $rExpiry = 'Unlimited';
+                } else {
+                    $rExpiry = date('F j, Y, g:i a', $ctx['device']['exp_date']);
+                }
+
+                exit(json_encode(array('js' => array('mac' => $ctx['mac'], 'phone' => $rExpiry, 'message' => htmlspecialchars_decode(str_replace("\n", '<br/>', StreamingUtilities::$rSettings['mag_message']))))));
+        }
+    }
+
+    /**
+     * Phase 5 sub-handler: Radio actions.
+     * Actions: get_ordered_list, get_all_fav_radio, set_fav, get_fav_ids.
+     *
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleRadio($rReqAction, &$ctx)
+    {
+        global $db;
+
+        switch ($rReqAction) {
+            case 'get_ordered_list':
+                $rFav = (!empty(StreamingUtilities::$rRequest['fav']) ? 1 : null);
+                $rSortBy = (!empty(StreamingUtilities::$rRequest['sortby']) ? StreamingUtilities::$rRequest['sortby'] : 'added');
+
+                exit(getStations(null, $rFav, $rSortBy));
+
+            case 'get_all_fav_radio':
+                exit(getStations(null, 1, null));
+
+            case 'set_fav':
+                $f3f9f9fa3c58c22b = (empty(StreamingUtilities::$rRequest['fav_radio']) ? '' : StreamingUtilities::$rRequest['fav_radio']);
+                $f3f9f9fa3c58c22b = array_filter(array_map('intval', explode(',', $f3f9f9fa3c58c22b)));
+                $ctx['device']['fav_channels']['radio_streams'] = $f3f9f9fa3c58c22b;
+                $db->query('UPDATE `mag_devices` SET `fav_channels` = ? WHERE `mag_id` = ?', json_encode($ctx['device']['fav_channels']), $ctx['device']['mag_id']);
+                updatecache();
+
+                exit(json_encode(array('js' => true)));
+
+            case 'get_fav_ids':
+                exit(json_encode(array('js' => $ctx['device']['fav_channels']['radio_streams'])));
+        }
+    }
+
+    /**
+     * Phase 5 sub-handler: TV Archive actions.
+     * Actions: get_next_part_url, create_link, get_link_for_channel.
+     *
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleTvArchive($rReqAction, &$ctx)
+    {
+        global $db;
+
+        switch ($rReqAction) {
+            case 'get_next_part_url':
+                if (empty(StreamingUtilities::$rRequest['id'])) {
+                } else {
+                    $rID = StreamingUtilities::$rRequest['id'];
+                    $rStreamID = substr($rID, 0, strpos($rID, '_'));
+                    $rDate = strtotime(substr($rID, strpos($rID, '_') + 1));
+                    $rRow = (getepg($rStreamID, $rDate, $rDate + 86400)[0] ?: null);
+
+                    if (!$rRow) {
+                    } else {
+                        $rRow = $db->get_row();
+                        $rProgramStart = $rRow['start'];
+                        $rDuration = intval(($rRow['end'] - $rRow['start']) / 60);
+                        $rTitle = $rRow['title'];
+                        $rEncData = 'ministra::timeshift/' . $ctx['device']['username'] . '/' . $ctx['device']['password'] . '/' . $rDuration . '/' . $rProgramStart . '/' . $rStreamID . '/' . $ctx['device']['token'];
+                        $rToken = StreamingUtilities::encryptData($rEncData, StreamingUtilities::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+                        $rURL = ((StreamingUtilities::$rSettings['mag_disable_ssl'] ? StreamingUtilities::$rServers[SERVER_ID]['http_url'] : StreamingUtilities::$rServers[SERVER_ID]['site_url'])) . 'play/' . $rToken . '?&osd_title=' . $rTitle;
+
+                        if (!StreamingUtilities::$rSettings['mag_keep_extension']) {
+                        } else {
+                            $rURL .= '&ext=.ts';
+                        }
+
+                        exit(json_encode(array('js' => $ctx['player'] . $rURL)));
+                    }
+                }
+
+                exit(json_encode(array('js' => false)));
+
+            case 'create_link':
+                $rCommand = (empty(StreamingUtilities::$rRequest['cmd']) ? '' : StreamingUtilities::$rRequest['cmd']);
+                list($rEPGDataID, $rStreamID) = explode('_', pathinfo($rCommand)['filename']);
+                $rRow = (getprogramme($rStreamID, $rEPGDataID) ?: null);
+
+                if (!$rRow) {
+                    break;
+                }
+
+                $rStart = $rRow['start'];
+                $rDuration = intval(($rRow['end'] - $rRow['start']) / 60);
+                $rEncData = 'ministra::timeshift/' . $ctx['device']['username'] . '/' . $ctx['device']['password'] . '/' . $rDuration . '/' . $rStart . '/' . $rStreamID . '/' . $ctx['device']['token'];
+                $rToken = StreamingUtilities::encryptData($rEncData, StreamingUtilities::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+                $rURL = ((StreamingUtilities::$rSettings['mag_disable_ssl'] ? StreamingUtilities::$rServers[SERVER_ID]['http_url'] : StreamingUtilities::$rServers[SERVER_ID]['site_url'])) . 'play/' . $rToken;
+
+                if (!StreamingUtilities::$rSettings['mag_keep_extension']) {
+                } else {
+                    $rURL .= '?ext=.ts';
+                }
+
+                $rOutput['js'] = array('id' => 0, 'cmd' => $ctx['player'] . $rURL, 'storage_id' => '', 'load' => 0, 'error' => '', 'download_cmd' => $rURL, 'to_file' => '');
+
+                exit(json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR));
+
+            case 'get_link_for_channel':
+                $rOutput = array();
+                $rChannelID = (!empty(StreamingUtilities::$rRequest['ch_id']) ? intval(StreamingUtilities::$rRequest['ch_id']) : 0);
+                $rStart = strtotime(date('Ymd-H'));
+                $rEncData = 'ministra::timeshift/' . $ctx['device']['username'] . '/' . $ctx['device']['password'] . '/60/' . $rStart . '/' . $rChannelID . '/' . $ctx['device']['token'];
+                $rToken = StreamingUtilities::encryptData($rEncData, StreamingUtilities::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+                $rURL = ((StreamingUtilities::$rSettings['mag_disable_ssl'] ? StreamingUtilities::$rServers[SERVER_ID]['http_url'] : StreamingUtilities::$rServers[SERVER_ID]['site_url'])) . 'play/' . $rToken . ((StreamingUtilities::$rSettings['mag_keep_extension'] ? '?ext=.ts' : '')) . ' position:' . (intval(date('i')) * 60 + intval(date('s'))) . ' media_len:' . (intval(date('H')) * 3600 + intval(date('i')) * 60 + intval(date('s')));
+                $rOutput['js'] = array('id' => 0, 'cmd' => $ctx['player'] . $rURL, 'storage_id' => '', 'load' => 0, 'error' => '');
+
+                exit(json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR));
+        }
+    }
+
+    /**
+     * Phase 5 sub-handler: EPG (Electronic Program Guide) actions.
+     * Actions: get_week, get_data_table, get_simple_data_table, get_all_program_for_ch.
+     *
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleEpg($rReqAction, &$ctx)
+    {
+        global $db;
+
+        switch ($rReqAction) {
+            case 'get_week':
+                $k = -16;
+                $i = 0;
+                $rEPGWeek = array();
+                $rCurDate = strtotime(date('Y-m-d'));
+
+                while ($k < 10) { // >=  fixed???
+                    $rThisDate = $rCurDate + $k * 86400;
+                    $rEPGWeek['js'][$i]['f_human'] = date('D d F', $rThisDate);
+                    $rEPGWeek['js'][$i]['f_mysql'] = date('Y-m-d', $rThisDate);
+                    $rEPGWeek['js'][$i]['today'] = ($k == 0 ? 1 : 0);
+                    $k++;
+                    $i++;
+                }
+
+                exit(json_encode($rEPGWeek));
+
+            case 'get_data_table':
+                exit(json_encode(array('js' => array()), JSON_PARTIAL_OUTPUT_ON_ERROR));
+
+            case 'get_simple_data_table':
+                if (empty(StreamingUtilities::$rRequest['ch_id']) || empty(StreamingUtilities::$rRequest['date'])) {
+                    exit();
+                }
+
+                $rChannelID = StreamingUtilities::$rRequest['ch_id'];
+                $rReqDate = StreamingUtilities::$rRequest['date'];
+                $rPage = intval(StreamingUtilities::$rRequest['p']);
+                $rPageItems = ($ctx['theme'] == 'xc_vm' ? 7 : 10);
+                $rDefaultPage = false;
+                $rEPGDatas = array();
+                $rStartTime = strtotime($rReqDate . ' 00:00:00');
+                $rEndTime = strtotime($rReqDate . ' 23:59:59');
+
+                if (!file_exists(EPG_PATH . 'stream_' . intval($rChannelID))) {
+                } else {
+                    $rRows = igbinary_unserialize(file_get_contents(EPG_PATH . 'stream_' . $rChannelID));
+
+                    foreach ($rRows as $rRow) {
+                        if (!($rStartTime <= $rRow['start'] && $rRow['start'] <= $rEndTime)) {
+                        } else {
+                            $rRow['start_timestamp'] = $rRow['start'];
+                            $rRow['stop_timestamp'] = $rRow['end'];
+                            $rEPGDatas[] = $rRow;
+                        }
+                    }
+                }
+
+                if (file_exists(STREAMS_TMP_PATH . 'stream_' . intval($rChannelID))) {
+                    $rStreamRow = igbinary_unserialize(file_get_contents(STREAMS_TMP_PATH . 'stream_' . intval($rChannelID)))['info'];
+                } else {
+                    $db->query('SELECT `tv_archive_duration` FROM `streams` WHERE `id` = ?;', StreamingUtilities::$rRequest['ch_id']);
+
+                    if (0 >= $db->num_rows()) {
+                    } else {
+                        $rStreamRow = $db->get_row();
+                    }
+                }
+
+                $rChannelIDx = 0;
+
+                foreach ($rEPGDatas as $rKey => $rEPGData) {
+                    if (!($rEPGData['start_timestamp'] <= time() && time() <= $rEPGData['stop_timestamp'])) {
+                    } else {
+                        $rChannelIDx = $rKey + 1;
+
+                        goto Aeb56a67ad642976; //break;
+                    }
+                }
+                Aeb56a67ad642976:
+                if ($rPage != 0) {
+                } else {
+                    $rDefaultPage = true;
+                    $rPage = ceil($rChannelIDx / $rPageItems);
+
+                    if ($rPage != 0) {
+                    } else {
+                        $rPage = 1;
+                    }
+
+                    if ($rReqDate == date('Y-m-d')) {
+                    } else {
+                        $rPage = 1;
+                        $rDefaultPage = false;
+                    }
+                }
+
+                $rProgram = array_slice($rEPGDatas, ($rPage - 1) * $rPageItems, $rPageItems);
+                $rData = array();
+                $rTimeDifference = StreamingUtilities::getDiffTimezone($ctx['timezone']);
+
+                for ($i = 0; $i < count($rProgram); $i++) {
+                    $open = 0;
+
+                    if (time() > $rProgram[$i]['stop_timestamp']) {
+                    } else {
+                        $open = 1;
+                    }
+
+                    $rStartTime = new DateTime();
+                    $rStartTime->setTimestamp($rProgram[$i]['start']);
+                    $rStartTime->modify((string) $rTimeDifference . ' seconds');
+                    $rEndTime = new DateTime();
+                    $rEndTime->setTimestamp($rProgram[$i]['end']);
+                    $rEndTime->modify((string) $rTimeDifference . ' seconds');
+                    $rData[$i]['id'] = $rProgram[$i]['id'] . '_' . $rChannelID;
+                    $rData[$i]['ch_id'] = $rChannelID;
+                    $rData[$i]['time'] = $rStartTime->format('Y-m-d H:i:s');
+                    $rData[$i]['time_to'] = $rEndTime->format('Y-m-d H:i:s');
+                    $rData[$i]['duration'] = $rProgram[$i]['stop_timestamp'] - $rProgram[$i]['start_timestamp'];
+                    $rData[$i]['name'] = $rProgram[$i]['title'];
+                    $rData[$i]['descr'] = $rProgram[$i]['description'];
+                    $rData[$i]['real_id'] = $rChannelID . '_' . $rProgram[$i]['start'];
+                    $rData[$i]['category'] = '';
+                    $rData[$i]['director'] = '';
+                    $rData[$i]['actor'] = '';
+                    $rData[$i]['start_timestamp'] = $rStartTime->getTimestamp();
+                    $rData[$i]['stop_timestamp'] = $rEndTime->getTimestamp();
+                    $rData[$i]['t_time'] = $rStartTime->format('H:i');
+                    $rData[$i]['t_time_to'] = $rEndTime->format('H:i');
+                    $rData[$i]['open'] = $open;
+                    $rData[$i]['mark_memo'] = 0;
+                    $rData[$i]['mark_rec'] = 0;
+                    $rData[$i]['mark_archive'] = (!empty($rStreamRow['tv_archive_duration']) && $rEndTime->getTimestamp() < time() && strtotime('-' . $rStreamRow['tv_archive_duration'] . ' days') <= $rEndTime->getTimestamp() ? 1 : 0);
+                }
+
+                if ($rDefaultPage) {
+                    $rCurrentPage = $rPage;
+                    $rSelectedItem = $rChannelIDx - ($rPage - 1) * $rPageItems;
+                } else {
+                    $rCurrentPage = 0;
+                    $rSelectedItem = 0;
+                }
+
+                $rOutput = array();
+                $rOutput['js']['cur_page'] = $rCurrentPage;
+                $rOutput['js']['selected_item'] = $rSelectedItem;
+                $rOutput['js']['total_items'] = count($rEPGDatas);
+                $rOutput['js']['max_page_items'] = $rPageItems;
+                $rOutput['js']['data'] = $rData;
+
+                exit(json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR));
+
+            case 'get_all_program_for_ch':
+                $rOutput = array();
+                $rOutput['js'] = array();
+                $rChannelID = (empty(StreamingUtilities::$rRequest['ch_id']) ? 0 : intval(StreamingUtilities::$rRequest['ch_id']));
+                $rTimeDifference = StreamingUtilities::getDiffTimezone($ctx['timezone']);
+
+                if (file_exists(STREAMS_TMP_PATH . 'stream_' . intval($rChannelID))) {
+                    $rStreamRow = igbinary_unserialize(file_get_contents(STREAMS_TMP_PATH . 'stream_' . intval($rChannelID)))['info'];
+                } else {
+                    $db->query('SELECT `tv_archive_duration` FROM `streams` WHERE `id` = ?;', StreamingUtilities::$rRequest['ch_id']);
+
+                    if (0 >= $db->num_rows()) {
+                    } else {
+                        $rStreamRow = $db->get_row();
+                    }
+                }
+
+                $rTime = strtotime(date('Y-m-d 00:00:00'));
+
+                if (!file_exists(EPG_PATH . 'stream_' . intval($rChannelID))) {
+                } else {
+                    $rRows = igbinary_unserialize(file_get_contents(EPG_PATH . 'stream_' . $rChannelID));
+
+                    foreach ($rRows as $rRow) {
+                        if ($rTime > $rRow['start']) {
+                        } else {
+                            $rRow['start_timestamp'] = $rRow['start'];
+                            $rRow['stop_timestamp'] = $rRow['end'];
+                            $rStartTime = new DateTime();
+                            $rStartTime->setTimestamp($rRow['start']);
+                            $rStartTime->modify((string) $rTimeDifference . ' seconds');
+                            $rEndTime = new DateTime();
+                            $rEndTime->setTimestamp($rRow['end']);
+                            $rEndTime->modify((string) $rTimeDifference . ' seconds');
+                            $rOutput['js'][] = array('start_timestamp' => $rStartTime->getTimestamp(), 'stop_timestamp' => $rEndTime->getTimestamp(), 'name' => $rRow['title']);
+                        }
+                    }
+                }
+
+                exit(json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR));
+        }
+    }
+
+    /**
+     * Phase 6: Unauthenticated fallthrough handler.
+     * If not authenticated and action is stb/get_profile, performs bruteforce check.
+     * Then exits.
+     *
+     * @param string $rReqType
+     * @param string $rReqAction
+     * @param array  &$ctx Context array
+     */
+    public static function handleUnauthenticated($rReqType, $rReqAction, &$ctx)
+    {
+        if (!($rReqType == 'stb' && $rReqAction == 'get_profile')) {
+        } else {
+            BruteforceGuard::checkBruteforce($ctx['ip'], $ctx['mac']);
+            BruteforceGuard::checkFlood();
+        }
+
+        exit();
+    }
+
+    /**
+     * Phase 7: Handshake — token generation.
+     * Generates a new token for the device identified by MAC, updates DB, and exits with token.
+     *
+     * @param string $rMAC
+     */
+    public static function handleHandshake($rMAC)
+    {
+        global $db;
+
+        $rDevice = getdevice(null, $rMAC);
+        $rVerifyToken = null;
+
+        if ($rDevice) {
+            $rDevice['token'] = strtoupper(md5(uniqid(rand(), true)));
+            $rVerifyToken = StreamingUtilities::encryptData(igbinary_serialize(array('id' => $rDevice['mag_id'], 'token' => $rDevice['token'])), StreamingUtilities::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+            $rDevice['authenticated'] = false;
+            $db->query('UPDATE `mag_devices` SET `token` = ? WHERE `mag_id` = ?', $rDevice['token'], $rDevice['mag_id']);
+            $db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', SERVER_ID, time(), json_encode(array('type' => 'update_line', 'id' => $rDevice['user_id'])));
+            updatecache();
+        } else {
+            $rDevice = array();
+        }
+
+        exit(json_encode(array('js' => array('token' => $rVerifyToken))));
+    }
+}
diff --git a/src/modules/ministra/PortalHelpers.php b/src/modules/ministra/PortalHelpers.php
new file mode 100644
index 00000000..52ed79f1
--- /dev/null
+++ b/src/modules/ministra/PortalHelpers.php
@@ -0,0 +1,858 @@
+<?php
+/**
+ * PortalHelpers — статические хелперы для Ministra/Stalker портала.
+ *
+ * Извлечено из ministra/portal.php — функции для получения контента
+ * (каналы, фильмы, сериалы, радио, EPG) и управления устройствами.
+ */
+class PortalHelpers
+{
+    // ─── Устройство / кэш ───────────────────────────────────────────
+
+    /**
+     * Получить устройство MAG по ID или MAC.
+     * Загружает из кэша (igbinary) или БД, собирает права из букетов.
+     */
+    public static function getDevice($rID = null, $rMAC = null)
+    {
+        global $db;
+        global $rIP;
+        StreamingUtilities::$rBouquets = StreamingUtilities::getCache('bouquets');
+        $rDevice = ($rID && file_exists(MINISTRA_TMP_PATH . 'ministra_' . $rID)
+            ? igbinary_unserialize(file_get_contents(MINISTRA_TMP_PATH . 'ministra_' . $rID))
+            : null);
+
+        if (!$rDevice && $rMAC || $rDevice && 600 < time() - $rDevice['generated']) {
+            if ($rMAC) {
+                $db->query('SELECT * FROM `mag_devices` WHERE `mac` = ? LIMIT 1', $rMAC);
+            } else {
+                if ($rDevice) {
+                    $db->query('SELECT * FROM `mag_devices` WHERE `mac` = ? LIMIT 1', $rDevice['get_profile_vars']['mac']);
+                }
+            }
+
+            if (0 >= $db->num_rows()) {
+            } else {
+                $rDevice = $db->get_row();
+                $rUserInfo = StreamingUtilities::getUserInfo($rDevice['user_id'], null, null, true, false, $rIP);
+                $rDevice = array_merge($rDevice, $rUserInfo);
+                if (is_string($rDevice['allowed_ips'])) {
+                    $rDevice['allowed_ips'] = json_decode($rDevice['allowed_ips'], true);
+                }
+                $rDevice['fav_channels'] = (!empty($rDevice['fav_channels']) ? json_decode($rDevice['fav_channels'], true) : array());
+
+                if (!empty($rDevice['fav_channels']['live'])) {
+                } else {
+                    $rDevice['fav_channels']['live'] = array();
+                }
+
+                if (!empty($rDevice['fav_channels']['movie'])) {
+                } else {
+                    $rDevice['fav_channels']['movie'] = array();
+                }
+
+                if (!empty($rDevice['fav_channels']['series'])) {
+                } else {
+                    $rDevice['fav_channels']['series'] = array();
+                }
+
+                if (!empty($rDevice['fav_channels']['radio_streams'])) {
+                } else {
+                    $rDevice['fav_channels']['radio_streams'] = array();
+                }
+
+                $rDevice['mag_player'] = trim($rDevice['mag_player']);
+                unset($rDevice['channel_ids']);
+                $rDevice['get_profile_vars'] = array('id' => $rDevice['mag_id'], 'name' => $rDevice['mag_id'], 'parent_password' => ($rDevice['parent_password'] ?: '0000'), 'bright' => ($rDevice['bright'] ?: '200'), 'contrast' => ($rDevice['contrast'] ?: '127'), 'saturation' => ($rDevice['saturation'] ?: '127'), 'video_out' => ($rDevice['video_out'] ?: ''), 'volume' => ($rDevice['volume'] ?: '70'), 'playback_buffer_bytes' => ($rDevice['playback_buffer_bytes'] ?: '0'), 'playback_buffer_size' => ($rDevice['playback_buffer_size'] ?: '0'), 'audio_out' => ($rDevice['audio_out'] ?: '1'), 'mac' => $rDevice['mac'], 'ip' => '127.0.0.1', 'ls' => ($rDevice['ls'] ?: ''), 'lang' => ($rDevice['lang'] ?: ''), 'locale' => ($rDevice['locale'] ?: 'en_GB.utf8'), 'city_id' => ($rDevice['city_id'] ?: '0'), 'hd' => ($rDevice['hd'] ?: '1'), 'main_notify' => ($rDevice['main_notify'] ?: '1'), 'fav_itv_on' => ($rDevice['fav_itv_on'] ?: '0'), 'now_playing_start' => ($rDevice['now_playing_start'] ? date('Y-m-d H:i:s', $rDevice['now_playing_start']) : date('Y-m-d H:i:s')), 'now_playing_type' => ($rDevice['now_playing_type'] ?: '1'), 'now_playing_content' => ($rDevice['now_playing_content'] ?: ''), 'time_last_play_tv' => ($rDevice['time_last_play_tv'] ? date('Y-m-d H:i:s', $rDevice['time_last_play_tv']) : '0000-00-00 00:00:00'), 'time_last_play_video' => ($rDevice['time_last_play_video'] ? date('Y-m-d H:i:s', $rDevice['time_last_play_video']) : '0000-00-00 00:00:00'), 'hd_content' => ($rDevice['hd_content'] ?: '0'), 'image_version' => $rDevice['image_version'], 'last_change_status' => ($rDevice['last_change_status'] ? date('Y-m-d H:i:s', $rDevice['last_change_status']) : '0000-00-00 00:00:00'), 'last_start' => ($rDevice['last_start'] ? date('Y-m-d H:i:s', $rDevice['last_start']) : date('Y-m-d H:i:s')), 'last_active' => ($rDevice['last_active'] ? date('Y-m-d H:i:s', $rDevice['last_active']) : date('Y-m-d H:i:s')), 'keep_alive' => ($rDevice['keep_alive'] ? date('Y-m-d H:i:s', $rDevice['keep_alive']) : date('Y-m-d H:i:s')), 'screensaver_delay' => ($rDevice['screensaver_delay'] ?: '10'), 'stb_type' => $rDevice['stb_type'], 'now_playing_link_id' => ($rDevice['now_playing_link_id'] ?: '0'), 'now_playing_streamer_id' => ($rDevice['now_playing_streamer_id'] ?: '0'), 'last_watchdog' => ($rDevice['last_watchdog'] ? date('Y-m-d H:i:s', $rDevice['last_watchdog']) : date('Y-m-d H:i:s')), 'created' => ($rDevice['created'] ? date('Y-m-d H:i:s', $rDevice['created']) : date('Y-m-d H:i:s')), 'plasma_saving' => ($rDevice['plasma_saving'] ?: '0'), 'ts_enabled' => ($rDevice['ts_enabled'] ?: '0'), 'ts_enable_icon' => ($rDevice['ts_enable_icon'] ?: '1'), 'ts_path' => ($rDevice['ts_path'] ?: ''), 'ts_max_length' => ($rDevice['ts_max_length'] ?: '3600'), 'ts_buffer_use' => ($rDevice['ts_buffer_use'] ?: 'cyclic'), 'ts_action_on_exit' => ($rDevice['ts_action_on_exit'] ?: 'no_save'), 'ts_delay' => ($rDevice['ts_delay'] ?: 'on_pause'), 'video_clock' => ($rDevice['video_clock'] == 'On' ? 'On' : 'Off'), 'hdmi_event_reaction' => ($rDevice['hdmi_event_reaction'] ?: 1), 'show_after_loading' => ($rDevice['show_after_loading'] ?: ''), 'play_in_preview_by_ok' => ($rDevice['play_in_preview_by_ok'] ?: null), 'hw_version' => $rDevice['hw_version'], 'units' => ($rDevice['units'] ?: 'metric'), 'last_itv_id' => ($rDevice['last_itv_id'] ?: 0), 'rtsp_type' => ($rDevice['rtsp_type'] ?: '4'), 'rtsp_flags' => ($rDevice['rtsp_flags'] ?: '0'), 'stb_lang' => ($rDevice['stb_lang'] ?: 'en'), 'display_menu_after_loading' => ($rDevice['display_menu_after_loading'] ?: ''), 'record_max_length' => ($rDevice['record_max_length'] ?: 180), 'play_in_preview_only_by_ok' => ($rDevice['play_in_preview_only_by_ok'] ?: false), 'tv_archive_continued' => ($rDevice['tv_archive_continued'] ?: ''), 'plasma_saving_timeout' => ($rDevice['plasma_saving_timeout'] ?: '600'));
+                $rDevice['mac'] = base64_encode($rDevice['mac']);
+                $rDevice['generated'] = time();
+            }
+        } else {
+            if (!$rDevice) {
+            } else {
+                $rLiveIDs = $rVODIDs = $rRadioIDs = $rCategoryIDs = $rChannelIDs = $rSeriesIDs = array();
+
+                foreach ($rDevice['bouquet'] as $rID) {
+                    if (!isset(StreamingUtilities::$rBouquets[$rID]['streams'])) {
+                    } else {
+                        $rChannelIDs = array_merge($rChannelIDs, StreamingUtilities::$rBouquets[$rID]['streams']);
+                    }
+
+                    if (!isset(StreamingUtilities::$rBouquets[$rID]['series'])) {
+                    } else {
+                        $rSeriesIDs = array_merge($rSeriesIDs, StreamingUtilities::$rBouquets[$rID]['series']);
+                    }
+
+                    if (!isset(StreamingUtilities::$rBouquets[$rID]['channels'])) {
+                    } else {
+                        $rLiveIDs = array_merge($rLiveIDs, StreamingUtilities::$rBouquets[$rID]['channels']);
+                    }
+
+                    if (!isset(StreamingUtilities::$rBouquets[$rID]['movies'])) {
+                    } else {
+                        $rVODIDs = array_merge($rVODIDs, StreamingUtilities::$rBouquets[$rID]['movies']);
+                    }
+
+                    if (!isset(StreamingUtilities::$rBouquets[$rID]['radios'])) {
+                    } else {
+                        $rRadioIDs = array_merge($rRadioIDs, StreamingUtilities::$rBouquets[$rID]['radios']);
+                    }
+                }
+                $rDevice['channel_ids'] = array_map('intval', array_unique($rChannelIDs));
+                $rDevice['series_ids'] = array_map('intval', array_unique($rSeriesIDs));
+                $rDevice['vod_ids'] = array_map('intval', array_unique($rVODIDs));
+                $rDevice['live_ids'] = array_map('intval', array_unique($rLiveIDs));
+                $rDevice['radio_ids'] = array_map('intval', array_unique($rRadioIDs));
+            }
+        }
+
+        return $rDevice;
+    }
+
+    /**
+     * Сохранить кэш устройства в файл.
+     */
+    public static function updateCache(&$rDevice)
+    {
+        file_put_contents(MINISTRA_TMP_PATH . 'ministra_' . $rDevice['mag_id'], igbinary_serialize($rDevice));
+    }
+
+    // ─── EPG ─────────────────────────────────────────────────────────
+
+    /**
+     * Получить EPG для стрима.
+     */
+    public static function getEPG($rStreamID, $rStartDate = null, $rFinishDate = null, $rByID = false)
+    {
+        $rReturn = array();
+        $rData = (file_exists(EPG_PATH . 'stream_' . $rStreamID)
+            ? igbinary_unserialize(file_get_contents(EPG_PATH . 'stream_' . $rStreamID))
+            : array());
+
+        foreach ($rData as $rItem) {
+            if ($rStartDate && !($rStartDate < $rItem['end'] && $rItem['start'] < $rFinishDate)) {
+            } else {
+                if ($rByID) {
+                    $rReturn[$rItem['id']] = $rItem;
+                } else {
+                    $rReturn[] = $rItem;
+                }
+            }
+        }
+
+        return $rReturn;
+    }
+
+    /**
+     * Получить EPG для нескольких стримов.
+     */
+    public static function getEPGs($rStreamIDs, $rStartDate = null, $rFinishDate = null)
+    {
+        $rReturn = array();
+
+        foreach ($rStreamIDs as $rStreamID) {
+            $rReturn[$rStreamID] = self::getEPG($rStreamID, $rStartDate, $rFinishDate);
+        }
+
+        return $rReturn;
+    }
+
+    /**
+     * Получить конкретную программу.
+     */
+    public static function getProgramme($rStreamID, $rProgrammeID)
+    {
+        $rData = self::getEPG($rStreamID, null, null, true);
+
+        if (!isset($rData[$rProgrammeID])) {
+        } else {
+            return $rData[$rProgrammeID];
+        }
+    }
+
+    // ─── Контент: общий запрос ───────────────────────────────────────
+
+    /**
+     * Преобразовать строковые типы в числовые.
+     */
+    public static function convertTypes($rTypes)
+    {
+        $rReturn = array();
+        $rTypeInt = array('live' => 1, 'movie' => 2, 'created_live' => 3, 'radio_streams' => 4, 'series' => 5);
+
+        foreach ($rTypes as $rType) {
+            $rReturn[] = $rTypeInt[$rType];
+        }
+
+        return $rReturn;
+    }
+
+    /**
+     * Универсальный запрос контента.
+     * Используется для каналов, фильмов, радио, эпизодов.
+     */
+    public static function getItems($rDevice, $rTypes = array(), $rCategoryID = null, $rFav = null, $rOrderBy = null, $rSearchBy = null, $rPicking = array(), $rStart = 0, $rLimit = 10, $additionalOptions = null)
+    {
+        global $db;
+        $rAdded = false;
+        $rChannels = array();
+
+        foreach ($rTypes as $rType) {
+            switch ($rType) {
+                case 'live':
+                case 'created_live':
+                    if (!$rAdded) {
+                        $rChannels = array_merge($rChannels, $rDevice['live_ids']);
+                        $rAdded = true;
+                    }
+                    break;
+
+                case 'movie':
+                    $rChannels = array_merge($rChannels, $rDevice['vod_ids']);
+                    break;
+
+                case 'radio_streams':
+                    $rChannels = array_merge($rChannels, $rDevice['radio_ids']);
+                    break;
+
+                case 'series':
+                    $rChannels = array_merge($rChannels, $rDevice['episode_ids']);
+                    break;
+            }
+        }
+        $rStreams = array('count' => 0, 'streams' => array());
+        $rAdultCategories = StreamingUtilities::getAdultCategories();
+        $rKey = $rStart + 1;
+        $rWhereV = $rWhere = array();
+
+        if (0 >= count($rTypes)) {
+        } else {
+            $rWhere[] = '`type` IN (' . implode(',', self::convertTypes($rTypes)) . ')';
+        }
+
+        if (empty($rCategoryID)) {
+        } else {
+            $rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
+            $rWhereV[] = $rCategoryID;
+        }
+
+        if (empty($rPicking['genre']) || $rPicking['genre'] == '*') {
+        } else {
+            $rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
+            $rWhereV[] = $rPicking['genre'];
+        }
+
+        $rChannels = StreamingUtilities::sortChannels($rChannels);
+
+        if (empty($rFav)) {
+        } else {
+            $favoriteChannelIds = array();
+
+            foreach ($rTypes as $rType) {
+                foreach ($rDevice['fav_channels'][$rType] as $rStreamID) {
+                    $favoriteChannelIds[] = intval($rStreamID);
+                }
+            }
+            $rChannels = array_intersect($favoriteChannelIds, $rChannels);
+        }
+
+        if (empty($rSearchBy)) {
+        } else {
+            $rWhere[] = '`stream_display_name` LIKE ?';
+            $rWhereV[] = '%' . $rSearchBy . '%';
+        }
+
+        if (empty($rPicking['abc']) || $rPicking['abc'] == '*') {
+        } else {
+            $rWhere[] = 'UCASE(LEFT(`stream_display_name`, 1)) = ?';
+            $rWhereV[] = strtoupper($rPicking['abc']);
+        }
+
+        if (empty($rPicking['years']) || $rPicking['years'] == '*') {
+        } else {
+            $rWhere[] = '`year` = ?';
+            $rWhereV[] = $rPicking['years'];
+        }
+
+        $rWhere[] = '`id` IN (' . implode(',', $rChannels) . ')';
+
+        $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+
+        switch ($rOrderBy) {
+            case 'name':
+                $rOrder = '`stream_display_name` ASC';
+                break;
+
+            case 'top':
+            case 'rating':
+                $rOrder = '`rating` DESC';
+                break;
+
+            case 'added':
+                $rOrder = '`added` DESC';
+                break;
+
+            case 'number':
+            default:
+                if (StreamingUtilities::$rSettings['channel_number_type'] != 'manual') {
+                    $rOrder = 'FIELD(id,' . implode(',', $rChannels) . ')';
+                } else {
+                    $rOrder = '`order` ASC';
+                }
+                break;
+        }
+        if (0 < count($rChannels)) {
+            if (!$additionalOptions) {
+                $db->query("SELECT COUNT(`id`) AS `count` FROM `streams` " . $rWhereString . ";", ...$rWhereV);
+                $rStreams["count"] = $db->get_row()["count"];
+                if ($rLimit) {
+                    $rQuery = "SELECT (SELECT `stream_info` FROM `streams_servers` WHERE `streams_servers`.`pid` IS NOT NULL AND `streams_servers`.`stream_id` = `streams`.`id` LIMIT 1) AS `stream_info`, `id`, `stream_display_name`, `movie_properties`, `target_container`, `added`, `year`, `category_id`, `channel_id`, `epg_id`, `tv_archive_duration`, `stream_icon`, `allow_record`, `type` FROM `streams` " . $rWhereString . " ORDER BY " . $rOrder . " LIMIT " . $rStart . ", " . $rLimit . ";";
+                } else {
+                    $rQuery = "SELECT (SELECT `stream_info` FROM `streams_servers` WHERE `streams_servers`.`pid` IS NOT NULL AND `streams_servers`.`stream_id` = `streams`.`id` LIMIT 1) AS `stream_info`, `id`, `stream_display_name`, `movie_properties`, `target_container`, `added`, `year`, `category_id`, `channel_id`, `epg_id`, `tv_archive_duration`, `stream_icon`, `allow_record`, `type` FROM `streams` " . $rWhereString . " ORDER BY " . $rOrder . ";";
+                }
+                $db->query($rQuery, ...$rWhereV);
+                $rRows = $db->get_rows();
+            } else {
+                $rWhereV[] = $additionalOptions;
+                $db->query("SELECT * FROM (SELECT @row_number:=@row_number+1 AS `pos`, `id` FROM `streams`, (SELECT @row_number:=0) AS `t` " . $rWhereString . " ORDER BY " . $rOrder . ") `ids` WHERE `ids`.`id` = ?;", ...$rWhereV);
+                return $db->get_row()["pos"] ?: null;
+            }
+        } else {
+            if ($additionalOptions) {
+                return null;
+            }
+            $rRows = [];
+        }
+        foreach ($rRows as $rStream) {
+            $rStream["snumber"] = $rKey;
+            $rStream["number"] = $rStream["snumber"];
+
+            if (in_array($rCategoryID, json_decode($rStream["category_id"], true))) {
+                $rStream["category_id"] = $rCategoryID;
+            } else {
+                list($rStream["category_id"]) = json_decode($rStream["category_id"], true);
+            }
+
+            if (in_array($rStream["category_id"], $rAdultCategories)) {
+                $rStream["is_adult"] = 1;
+            } else {
+                $rStream["is_adult"] = 0;
+            }
+
+            $rStream["now_playing"] = self::getEPG($rStream["id"], time(), time() + 86400)[0] ?: null;
+            $rStream["stream_info"] = json_decode($rStream["stream_info"], true);
+            $rStreams["streams"][$rStream["id"]] = $rStream;
+            $rKey++;
+        }
+        return $rStreams;
+    }
+
+    // ─── Контент: сериалы ────────────────────────────────────────────
+
+    /**
+     * Получить список сериалов с фильтрацией и сортировкой.
+     */
+    public static function getSeriesItems($rDevice, $rUserID, $rType = 'series', $rCategoryID = null, $rFav = null, $rOrderBy = null, $rSearchBy = null, $rPicking = array())
+    {
+        global $db;
+
+        if (0 < count($rDevice['series_ids'])) {
+            $db->query('SELECT *, (SELECT MAX(`streams`.`added`) FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` WHERE `streams_episodes`.`series_id` = `streams_series`.`id`) AS `last_modified_stream` FROM `streams_series` WHERE `id` IN (' . implode(',', array_map('intval', $rDevice['series_ids'])) . ') ORDER BY `last_modified_stream` DESC, `last_modified` DESC;');
+            $rSeries = $db->get_rows(true, 'id');
+        } else {
+            $rSeries = array();
+        }
+
+        $rOutputSeries = array();
+
+        foreach ($rSeries as $rSeriesID => $rSeriesO) {
+            $rSeriesO['last_modified'] = $rSeriesO['last_modified_stream'];
+
+            if (!empty($rCategoryID) && !in_array($rCategoryID, json_decode($rSeriesO['category_id'], true))) {
+            } else {
+                if (in_array($rCategoryID, json_decode($rSeriesO['category_id'], true))) {
+                    $rSeriesO['category_id'] = $rCategoryID;
+                } else {
+                    list($rSeriesO['category_id']) = json_decode($rSeriesO['category_id'], true);
+                }
+
+                if ((empty($rSearchBy) || stristr($rSeriesO['title'], $rSearchBy)) && !(!empty($rPicking['abc']) && $rPicking['abc'] != '*' && strtoupper(substr($rSeriesO['title'], 0, 1)) != $rPicking['abc']) && !(!empty($rPicking['genre']) && $rPicking['genre'] != '*' && $rSeriesO['category_id'] != $rPicking['genre']) && !(!empty($rPicking['years']) && $rPicking['years'] != '*' && $rSeriesO['year'] != $rPicking['years'])) {
+                    if (empty($rFav)) {
+                    } else {
+                        $rFound = false;
+
+                        if (empty($rDevice['fav_channels'][$rType]) || !in_array($rSeriesID, $rDevice['fav_channels'][$rType])) {
+                        } else {
+                            $rFound = true;
+                        }
+
+                        if (!$rFound) {
+                            continue;
+                        }
+                    }
+                    $rOutputSeries[$rSeriesID] = $rSeriesO;
+                }
+            }
+        }
+
+        switch ($rOrderBy) {
+            case 'name':
+                uasort($rOutputSeries, [self::class, 'sortArrayStreamName']);
+                break;
+
+            case 'rating':
+            case 'top':
+                uasort($rOutputSeries, [self::class, 'sortArrayStreamRating']);
+                break;
+
+            case 'number':
+                uasort($rOutputSeries, [self::class, 'sortArrayStreamNumber']);
+                break;
+
+            default:
+                uasort($rOutputSeries, [self::class, 'sortArrayStreamAdded']);
+        }
+
+        return $rOutputSeries;
+    }
+
+    /**
+     * Получить сезоны определённого сериала.
+     */
+    public static function getSeasons($rSeriesID)
+    {
+        global $db;
+        $db->query('SELECT * FROM `streams_episodes` t1 INNER JOIN `streams` t2 ON t2.id=t1.stream_id WHERE t1.series_id = ? ORDER BY t1.season_num DESC, t1.episode_num ASC', $rSeriesID);
+
+        return $db->get_rows(true, 'season_num', false);
+    }
+
+    // ─── Вывод: фильмы ──────────────────────────────────────────────
+
+    /**
+     * Получить список фильмов в формате Stalker API.
+     */
+    public static function getMovies($rDevice, $rPageItems, $rForceProtocol, $rCategoryID = null, $rFav = null, $rOrderBy = null, $rSearchBy = null, $rPicking = array())
+    {
+        $rDefaultPage = false;
+        $rPage = (!empty(StreamingUtilities::$rRequest['p']) ? StreamingUtilities::$rRequest['p'] : 0);
+
+        if ($rPage != 0) {
+        } else {
+            $rDefaultPage = true;
+            $rPage = 1;
+        }
+
+        $rStart = ($rPage - 1) * $rPageItems;
+        $rStreams = self::getItems($rDevice, array('movie'), $rCategoryID, $rFav, $rOrderBy, $rSearchBy, $rPicking, $rStart, $rPageItems);
+        $rDatas = array();
+
+        foreach ($rStreams['streams'] as $rMovie) {
+            $rProperties = (!is_array($rMovie['movie_properties']) ? json_decode($rMovie['movie_properties'], true) : $rMovie['movie_properties']);
+            $rHD = intval(1200 < $rMovie['stream_info']['codecs']['video']['width']);
+            $rPostData = array('type' => 'movie', 'stream_id' => $rMovie['id'], 'target_container' => $rMovie['target_container']);
+            $rThisMM = date('m');
+            $rThisDD = date('d');
+            $rThisYY = date('Y');
+
+            if (mktime(0, 0, 0, $rThisMM, $rThisDD, $rThisYY) < $rMovie['added']) {
+                $rAddedKey = 'today';
+                $rAddedVal = 'Today';
+            } else {
+                if (mktime(0, 0, 0, $rThisMM, $rThisDD - 1, $rThisYY) < $rMovie['added']) {
+                    $rAddedKey = 'yesterday';
+                    $rAddedVal = 'Yesterday';
+                } else {
+                    if (0 < $rMovie['added']) {
+                        $rAddedKey = 'week_and_more';
+                        $rDay = date('d', $rMovie['added']);
+
+                        if (11 <= $rDay % 100 && $rDay % 100 <= 13) {
+                            $rAbb = $rDay . 'th';
+                        } else {
+                            $rAbb = $rDay . array('th', 'st', 'nd', 'rd', 'th', 'th', 'th', 'th', 'th', 'th')[$rDay % 10];
+                        }
+
+                        $rAddedVal = date('M', $rMovie['added']) . ' ' . $rAbb . ' ' . date('Y', $rMovie['added']);
+                    } else {
+                        $rAddedKey = 'week_and_more';
+                        $rAddedVal = 'Unknown';
+                    }
+                }
+            }
+
+            $rDuration = (isset($rProperties['duration_secs']) ? $rProperties['duration_secs'] : 60);
+            $rDatas[] = array('id' => $rMovie['id'], 'owner' => '', 'name' => $rMovie['stream_display_name'], 'tmdb_id' => $rProperties['tmdb_id'], 'old_name' => '', 'o_name' => $rMovie['stream_display_name'], 'fname' => '', 'description' => (empty($rProperties['plot']) ? 'N/A' : $rProperties['plot']), 'pic' => '', 'cost' => 0, 'time' => intval($rDuration / 60), 'file' => '', 'path' => str_replace(' ', '_', $rMovie['stream_display_name']), 'protocol' => '', 'rtsp_url' => '', 'censored' => intval($rMovie['is_adult']), 'series' => array(), 'volume_correction' => 0, 'category_id' => $rMovie['category_id'], 'genre_id' => 0, 'genre_id_1' => 0, 'genre_id_2' => 0, 'genre_id_3' => 0, 'hd' => $rHD, 'genre_id_4' => 0, 'cat_genre_id_1' => $rMovie['category_id'], 'cat_genre_id_2' => 0, 'cat_genre_id_3' => 0, 'cat_genre_id_4' => 0, 'director' => (empty($rProperties['director']) ? 'N/A' : $rProperties['director']), 'actors' => (empty($rProperties['cast']) ? 'N/A' : $rProperties['cast']), 'year' => $rMovie['year'], 'accessed' => 1, 'status' => 1, 'disable_for_hd_devices' => 0, 'added' => date('Y-m-d H:i:s', $rMovie['added']), 'count' => 0, 'count_first_0_5' => 0, 'count_second_0_5' => 0, 'vote_sound_good' => 0, 'vote_sound_bad' => 0, 'vote_video_good' => 0, 'vote_video_bad' => 0, 'rate' => '', 'last_rate_update' => '', 'last_played' => '', 'for_sd_stb' => 0, 'rating_im' => (empty($rProperties['rating']) ? 'N/A' : $rProperties['rating']), 'rating_count_im' => '', 'rating_last_update' => '0000-00-00 00:00:00', 'age' => '12+', 'high_quality' => 0, 'rating_kinopoisk' => (empty($rProperties['rating']) ? 'N/A' : $rProperties['rating']), 'comments' => '', 'low_quality' => 0, 'is_series' => 0, 'year_end' => 0, 'autocomplete_provider' => 'im', 'screenshots' => '', 'is_movie' => 1, 'lock' => $rMovie['is_adult'], 'fav' => (in_array($rMovie['id'], $rDevice['fav_channels']['movie']) ? 1 : 0), 'for_rent' => 0, 'screenshot_uri' => (empty($rProperties['movie_image']) ? '' : StreamingUtilities::validateImage($rProperties['movie_image'], $rForceProtocol)), 'genres_str' => (empty($rProperties['genre']) ? 'N/A' : $rProperties['genre']), 'cmd' => base64_encode(json_encode($rPostData, JSON_PARTIAL_OUTPUT_ON_ERROR)), $rAddedKey => $rAddedVal, 'has_files' => 0);
+        }
+
+        if ($rDefaultPage) {
+        } else {
+            $rPage = 0;
+        }
+
+        $rOutput = array('js' => array('total_items' => intval($rStreams['count']), 'max_page_items' => $rPageItems, 'selected_item' => 0, 'cur_page' => $rPage, 'data' => $rDatas));
+
+        return json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR);
+    }
+
+    // ─── Вывод: сериалы ──────────────────────────────────────────────
+
+    /**
+     * Получить список сериалов/сезонов в формате Stalker API.
+     */
+    public static function getSeries($rDevice, $rPageItems, $rForceProtocol, $rMovieID = null, $rCategoryID = null, $rFav = null, $rOrderBy = null, $rSearchBy = null, $rPicking = array())
+    {
+        global $db;
+        $rPage = (!empty(StreamingUtilities::$rRequest['p']) ? StreamingUtilities::$rRequest['p'] : 0);
+        $rDefaultPage = false;
+
+        if (empty($rMovieID)) {
+            $rItems = self::getSeriesItems($rDevice, $rDevice['user_id'], 'series', $rCategoryID, $rFav, $rOrderBy, $rSearchBy, $rPicking);
+        } else {
+            $rItems = self::getSeasons($rMovieID);
+            $db->query('SELECT * FROM `streams_series` WHERE `id` = ?', $rMovieID);
+            $rSeriesInfo = $db->get_row();
+        }
+
+        $rCounter = count($rItems);
+        $rChannelIDx = 0;
+
+        if ($rPage != 0) {
+        } else {
+            $rDefaultPage = true;
+            $rPage = ceil($rChannelIDx / $rPageItems);
+
+            if ($rPage != 0) {
+            } else {
+                $rPage = 1;
+            }
+        }
+
+        $rItems = array_slice($rItems, ($rPage - 1) * $rPageItems, $rPageItems, true);
+        $rDatas = array();
+
+        foreach ($rItems as $rKey => $rMovie) {
+            if (is_null($rFav) || $rFav != 1) {
+            } else {
+                if (in_array($rMovie['id'], $rDevice['fav_channels']['series'])) {
+                } else {
+                    $rCounter--;
+                }
+            }
+
+            if (!empty($rSeriesInfo)) {
+                $rProperties = $rSeriesInfo;
+                $rMaxAdded = 0;
+
+                foreach ($rMovie as $vod) {
+                    if ($rMaxAdded >= $vod['added']) {
+                    } else {
+                        $rMaxAdded = $vod['added'];
+                    }
+                }
+            } else {
+                $rProperties = $rMovie;
+                $rMaxAdded = $rMovie['last_modified'];
+            }
+
+            $rPostData = array('series_id' => $rMovieID, 'season_num' => $rKey, 'type' => 'series');
+            $rThisMM = date('m');
+            $rThisDD = date('d');
+            $rThisYY = date('Y');
+
+            if (mktime(0, 0, 0, $rThisMM, $rThisDD, $rThisYY) < $rMaxAdded) {
+                $rAddedKey = 'today';
+                $rAddedVal = 'Today';
+            } else {
+                if (mktime(0, 0, 0, $rThisMM, $rThisDD - 1, $rThisYY) < $rMaxAdded) {
+                    $rAddedKey = 'yesterday';
+                    $rAddedVal = 'Yesterday';
+                } else {
+                    if (mktime(0, 0, 0, $rThisMM, $rThisDD - 7, $rThisYY) < $rMaxAdded) {
+                        $rAddedKey = 'week_and_more';
+                        $rAddedVal = 'Last Week';
+                    } else {
+                        $rAddedKey = 'week_and_more';
+
+                        if (0 < $rMaxAdded) {
+                            $rAddedVal = date('F', $rMaxAdded) . ' ' . date('Y', $rMaxAdded);
+                        } else {
+                            $rAddedVal = 'Unknown';
+                        }
+                    }
+                }
+            }
+
+            if (!empty($rSeriesInfo)) {
+                if ($rKey == 0) {
+                    $rTitle = 'Specials';
+                } else {
+                    $rTitle = 'Season ' . $rKey;
+                }
+            } else {
+                $rTitle = $rMovie['title'];
+            }
+
+            $rDatas[] = array('id' => $rProperties['id'], 'owner' => '', 'name' => $rTitle, 'tmdb_id' => $rProperties['tmdb_id'], 'old_name' => '', 'o_name' => $rTitle, 'fname' => '', 'description' => (empty($rProperties['plot']) ? 'N/A' : $rProperties['plot']), 'pic' => '', 'cost' => 0, 'time' => 'N/a', 'file' => '', 'path' => str_replace(' ', '_', $rProperties['title']), 'protocol' => '', 'rtsp_url' => '', 'censored' => 0, 'series' => (!empty($rSeriesInfo) ? range(1, count($rMovie)) : array()), 'volume_correction' => 0, 'category_id' => $rProperties['category_id'], 'genre_id' => 0, 'genre_id_1' => 0, 'genre_id_2' => 0, 'genre_id_3' => 0, 'hd' => 1, 'genre_id_4' => 0, 'cat_genre_id_1' => $rProperties['category_id'], 'cat_genre_id_2' => 0, 'cat_genre_id_3' => 0, 'cat_genre_id_4' => 0, 'director' => (empty($rProperties['director']) ? 'N/A' : $rProperties['director']), 'actors' => (empty($rProperties['cast']) ? 'N/A' : $rProperties['cast']), 'year' => (empty($rProperties['release_date']) ? 'N/A' : $rProperties['release_date']), 'accessed' => 1, 'status' => 1, 'disable_for_hd_devices' => 0, 'added' => date('Y-m-d H:i:s', $rMaxAdded), 'count' => 0, 'count_first_0_5' => 0, 'count_second_0_5' => 0, 'vote_sound_good' => 0, 'vote_sound_bad' => 0, 'vote_video_good' => 0, 'vote_video_bad' => 0, 'rate' => '', 'last_rate_update' => '', 'last_played' => '', 'for_sd_stb' => 0, 'rating_im' => (empty($rProperties['rating']) ? 'N/A' : $rProperties['rating']), 'rating_count_im' => '', 'rating_last_update' => '0000-00-00 00:00:00', 'age' => '12+', 'high_quality' => 0, 'rating_kinopoisk' => (empty($rProperties['rating']) ? 'N/A' : $rProperties['rating']), 'comments' => '', 'low_quality' => 0, 'is_series' => 1, 'year_end' => 0, 'autocomplete_provider' => 'im', 'screenshots' => '', 'is_movie' => 1, 'lock' => 0, 'fav' => (in_array($rProperties['id'], $rDevice['fav_channels']['series']) ? 1 : 0), 'for_rent' => 0, 'screenshot_uri' => (empty($rProperties['cover']) ? '' : StreamingUtilities::validateImage($rProperties['cover'], $rForceProtocol)), 'genres_str' => (empty($rProperties['genre']) ? 'N/A' : $rProperties['genre']), 'cmd' => (!empty($rSeriesInfo) ? base64_encode(json_encode($rPostData, JSON_PARTIAL_OUTPUT_ON_ERROR)) : ''), $rAddedKey => $rAddedVal, 'has_files' => (empty($rMovieID) ? 1 : 0));
+        }
+
+        if ($rDefaultPage) {
+            $rCurrentPage = $rPage;
+            $rSelectedItem = $rChannelIDx - ($rPage - 1) * $rPageItems;
+        } else {
+            $rCurrentPage = 0;
+            $rSelectedItem = 0;
+        }
+
+        $rOutput = array('js' => array('total_items' => $rCounter, 'max_page_items' => $rPageItems, 'selected_item' => $rSelectedItem, 'cur_page' => $rCurrentPage, 'data' => $rDatas));
+
+        return json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR);
+    }
+
+    // ─── Вывод: радио ────────────────────────────────────────────────
+
+    /**
+     * Получить список радиостанций в формате Stalker API.
+     */
+    public static function getStations($rDevice, $rPlayer, $rPageItems, $rCategoryID = null, $rFav = null, $rOrderBy = null)
+    {
+        $rDefaultPage = false;
+        $rPage = (!empty(StreamingUtilities::$rRequest['p']) ? StreamingUtilities::$rRequest['p'] : 0);
+
+        if ($rPage != 0) {
+        } else {
+            $rDefaultPage = true;
+            $rPage = 1;
+        }
+
+        $rStart = ($rPage - 1) * $rPageItems;
+        $rStreams = self::getItems($rDevice, array('radio_streams'), $rCategoryID, $rFav, $rOrderBy, null, null, $rStart, $rPageItems);
+        $rDatas = array();
+        $i = 0;
+
+        foreach ($rStreams['streams'] as $rStream) {
+            if (StreamingUtilities::$rSettings['mag_security'] == 0) {
+                $rEncData = 'ministra::live/' . $rDevice['username'] . '/' . $rDevice['password'] . '/' . $rStream['id'] . '/' . StreamingUtilities::$rSettings['mag_container'] . '/' . $rDevice['token'];
+                $rToken = StreamingUtilities::encryptData($rEncData, StreamingUtilities::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+                $rStreamURL = ((StreamingUtilities::$rSettings['mag_disable_ssl'] ? StreamingUtilities::$rServers[SERVER_ID]['http_url'] : StreamingUtilities::$rServers[SERVER_ID]['site_url'])) . 'play/' . $rToken;
+
+                if (!StreamingUtilities::$rSettings['mag_keep_extension']) {
+                } else {
+                    $rStreamURL .= '?ext=.' . StreamingUtilities::$rSettings['mag_container'];
+                }
+
+                $rStreamSourceSt = 0;
+            } else {
+                $rStreamURL = 'http://localhost/ch/' . $rStream['id'] . '_';
+                $rStreamSourceSt = 1;
+            }
+
+            $rDatas[] = array('id' => $rStream['id'], 'name' => $rStream['stream_display_name'], 'number' => $i++, 'cmd' => $rPlayer . $rStreamURL, 'count' => 0, 'open' => 1, 'status' => 1, 'volume_correction' => 0, 'use_http_tmp_link' => (string) $rStreamSourceSt, 'fav' => (in_array($rStream['id'], $rDevice['fav_channels']['radio_streams']) ? 1 : 0));
+        }
+
+        if ($rDefaultPage) {
+        } else {
+            $rPage = 0;
+        }
+
+        $rOutput = array('js' => array('total_items' => intval($rStreams['count']), 'max_page_items' => $rPageItems, 'selected_item' => 0, 'cur_page' => $rPage, 'data' => $rDatas));
+
+        return json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR);
+    }
+
+    // ─── Вывод: live каналы ──────────────────────────────────────────
+
+    /**
+     * Получить список live-каналов в формате Stalker API.
+     */
+    public static function getStreams($rDevice, $rPlayer, $rPageItems, $rTimezone, $rForceProtocol, $rCategoryID = null, $rAll = false, $rFav = null, $rOrderBy = null, $rSearchBy = null)
+    {
+        $rDefaultPage = false;
+        $rPage = (isset(StreamingUtilities::$rRequest['p']) ? intval(StreamingUtilities::$rRequest['p']) : 0);
+        $rPosition = 0;
+
+        if (!($rPage == 0 && $rCategoryID != -1)) {
+        } else {
+            $rDefaultPage = true;
+
+            if (StreamingUtilities::$rRequest['p'] != 0 || empty($rDevice['last_itv_id'])) {
+            } else {
+                $rPosition = self::getItems($rDevice, array('live', 'created_live'), $rCategoryID, $rFav, $rOrderBy, $rSearchBy, null, 0, 0, $rDevice['last_itv_id']);
+
+                if ($rPosition) {
+                    $rPage = floor(($rPosition - 1) / $rPageItems) + 1;
+                    $rPosition = $rPosition - ($rPage - 1) * $rPageItems;
+                } else {
+                    $rPosition = 0;
+                }
+            }
+
+            if ($rPage != 0) {
+            } else {
+                $rPage = 1;
+            }
+        }
+
+        $rStart = ($rPage - 1) * $rPageItems;
+
+        if ($rCategoryID == -1) {
+            if (StreamingUtilities::$rSettings['mag_load_all_channels']) {
+                $rStreams = self::getItems($rDevice, array('live', 'created_live'), (0 < $rCategoryID ? $rCategoryID : null), $rFav, $rOrderBy, $rSearchBy, null, 0, 0);
+            } else {
+                return '{"js":{"total_items":0,"max_page_items":14,"selected_item":0,"cur_page":0,"data":[]}}';
+            }
+        } else {
+            if ($rAll) {
+                $rStreams = self::getItems($rDevice, array('live', 'created_live'), $rCategoryID, $rFav, $rOrderBy, $rSearchBy, null, 0, 0);
+            } else {
+                $rStreams = self::getItems($rDevice, array('live', 'created_live'), $rCategoryID, $rFav, $rOrderBy, $rSearchBy, null, $rStart, $rPageItems);
+            }
+        }
+
+        $rDatas = array();
+        $rTimeDifference = StreamingUtilities::getDiffTimezone($rTimezone);
+
+        foreach ($rStreams['streams'] as $rStream) {
+            $rHD = intval(1200 < $rStream['stream_info']['codecs']['video']['width']);
+
+            if (StreamingUtilities::$rSettings['mag_security'] == 0) {
+                $rEncData = 'ministra::live/' . $rDevice['username'] . '/' . $rDevice['password'] . '/' . $rStream['id'] . '/' . StreamingUtilities::$rSettings['mag_container'] . '/' . $rDevice['token'];
+                $rToken = StreamingUtilities::encryptData($rEncData, StreamingUtilities::$rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+                $rStreamURL = ((StreamingUtilities::$rSettings['mag_disable_ssl'] ? StreamingUtilities::$rServers[SERVER_ID]['http_url'] : StreamingUtilities::$rServers[SERVER_ID]['site_url'])) . 'play/' . $rToken;
+
+                if (!StreamingUtilities::$rSettings['mag_keep_extension']) {
+                } else {
+                    $rStreamURL .= '?ext=.' . StreamingUtilities::$rSettings['mag_container'];
+                }
+
+                $rStreamSourceSt = 0;
+            } else {
+                $rStreamURL = 'http://localhost/ch/' . $rStream['id'] . '_';
+                $rStreamSourceSt = 1;
+            }
+
+            if ($rStream['now_playing']) {
+                $rStartTime = new DateTime();
+                $rStartTime->setTimestamp($rStream['now_playing']['start']);
+                $rStartTime->modify((string) $rTimeDifference . ' seconds');
+                $rEndTime = new DateTime();
+                $rEndTime->setTimestamp($rStream['now_playing']['end']);
+                $rEndTime->modify((string) $rTimeDifference . ' seconds');
+                $rNowPlaying = $rStartTime->format('H:i') . ' - ' . $rEndTime->format('H:i') . ': ' . $rStream['now_playing']['title'];
+            } else {
+                $rNowPlaying = 'No channel information is available...';
+            }
+
+            $rDatas[] = array('id' => intval($rStream['id']), 'name' => $rStream['stream_display_name'], 'number' => (string) $rStream['number'], 'snumber' => (string) $rStream['number'], 'censored' => ($rStream['is_adult'] == 1 ? 1 : 0), 'cmd' => $rPlayer . $rStreamURL, 'cost' => '0', 'count' => '0', 'status' => 1, 'tv_genre_id' => $rStream['category_id'], 'base_ch' => '1', 'hd' => $rHD, 'xmltv_id' => (!empty($rStream['channel_id']) ? $rStream['channel_id'] : ''), 'service_id' => '', 'bonus_ch' => '0', 'volume_correction' => '0', 'use_http_tmp_link' => $rStreamSourceSt, 'mc_cmd' => '', 'enable_tv_archive' => (0 < $rStream['tv_archive_duration'] ? 1 : 0), 'wowza_tmp_link' => '0', 'wowza_dvr' => '0', 'monitoring_status' => '1', 'enable_monitoring' => '0', 'enable_wowza_load_balancing' => '0', 'cmd_1' => '', 'cmd_2' => '', 'cmd_3' => '', 'logo' => StreamingUtilities::validateImage($rStream['stream_icon'], $rForceProtocol), 'correct_time' => '0', 'nimble_dvr' => '0', 'allow_pvr' => (int) $rStream['allow_record'], 'allow_local_pvr' => (int) $rStream['allow_record'], 'allow_remote_pvr' => 0, 'modified' => '', 'allow_local_timeshift' => '1', 'nginx_secure_link' => $rStreamSourceSt, 'tv_archive_duration' => (0 < $rStream['tv_archive_duration'] ? $rStream['tv_archive_duration'] * 24 : 0), 'locked' => 0, 'lock' => $rStream['is_adult'], 'fav' => (in_array($rStream['id'], $rDevice['fav_channels']['live']) ? 1 : 0), 'archive' => (0 < $rStream['tv_archive_duration'] ? 1 : 0), 'genres_str' => '', 'cur_playing' => $rNowPlaying, 'epg' => array(), 'open' => 1, 'cmds' => array(array('id' => (string) $rStream['id'], 'ch_id' => (string) $rStream['id'], 'priority' => '0', 'url' => $rPlayer . $rStreamURL, 'status' => '1', 'use_http_tmp_link' => $rStreamSourceSt, 'wowza_tmp_link' => '0', 'user_agent_filter' => '', 'use_load_balancing' => '0', 'changed' => '', 'enable_monitoring' => '0', 'enable_balancer_monitoring' => '0', 'nginx_secure_link' => $rStreamSourceSt, 'flussonic_tmp_link' => '0')), 'use_load_balancing' => 0, 'pvr' => (int) $rStream['allow_record']);
+        }
+
+        if ($rDefaultPage) {
+        } else {
+            $rPage = 0;
+            $rPosition = 0;
+        }
+
+        $rOutput = array('js' => array('total_items' => intval($rStreams['count']), 'max_page_items' => intval($rPageItems), 'selected_item' => $rPosition, 'cur_page' => ($rAll ? 0 : $rPage), 'data' => $rDatas));
+
+        return json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR);
+    }
+
+    // ─── Сортировка ──────────────────────────────────────────────────
+
+    public static function sortArrayStreamRating($a, $b)
+    {
+        if (isset($a['rating'])) {
+        } else {
+            if (isset($a['movie_properties']) && isset($b['movie_properties'])) {
+                if (!is_array($a['movie_properties'])) {
+                    $a = json_decode($a['movie_properties'], true);
+                } else {
+                    $a = $a['movie_properties'];
+                }
+
+                if (!is_array($b['movie_properties'])) {
+                    $b = json_decode($b['movie_properties'], true);
+                } else {
+                    $b = $b['movie_properties'];
+                }
+            } else {
+                return 0;
+            }
+        }
+
+        if ($a['rating'] != $b['rating']) {
+            return ($b['rating'] < $a['rating'] ? -1 : 1);
+        }
+
+        return 0;
+    }
+
+    public static function sortArrayStreamAdded($a, $b)
+    {
+        $rColumn = (isset($a['added']) ? 'added' : 'last_modified');
+
+        if (is_numeric($a[$rColumn])) {
+        } else {
+            $a[$rColumn] = strtotime($a['added']);
+        }
+
+        if (is_numeric($b[$rColumn])) {
+        } else {
+            $b[$rColumn] = strtotime($b[$rColumn]);
+        }
+
+        if ($a[$rColumn] != $b[$rColumn]) {
+            return ($b[$rColumn] < $a[$rColumn] ? -1 : 1);
+        }
+
+        return 0;
+    }
+
+    public static function sortArrayStreamNumber($a, $b)
+    {
+        if ($a['number'] != $b['number']) {
+            return ($a['number'] < $b['number'] ? -1 : 1);
+        }
+
+        return 0;
+    }
+
+    public static function sortArrayStreamName($a, $b)
+    {
+        $rColumn = (isset($a['stream_display_name']) ? 'stream_display_name' : 'title');
+
+        return strcmp($a[$rColumn], $b[$rColumn]);
+    }
+
+    // ─── Утилиты ─────────────────────────────────────────────────────
+
+    /**
+     * Извлечь HTTP-заголовки из $_SERVER.
+     */
+    public static function getHeaders()
+    {
+        $rHeaders = array();
+
+        foreach ($_SERVER as $rName => $rValue) {
+            if (substr($rName, 0, 5) != 'HTTP_') {
+            } else {
+                $rHeaders[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($rName, 5)))))] = $rValue;
+            }
+        }
+
+        return $rHeaders;
+    }
+
+    /**
+     * Shutdown callback: закрыть MySQL-соединение.
+     */
+    public static function shutdown()
+    {
+        global $db;
+
+        if (!is_object($db)) {
+        } else {
+            $db->close_mysql();
+        }
+    }
+}
diff --git a/src/modules/ministra/module.json b/src/modules/ministra/module.json
new file mode 100644
index 00000000..fca4be92
--- /dev/null
+++ b/src/modules/ministra/module.json
@@ -0,0 +1,7 @@
+{
+    "name": "ministra",
+    "version": "1.0.0",
+    "description": "Ministra (Stalker Portal) for MAG STB devices",
+    "requires_core": ">=2.0",
+    "dependencies": []
+}
diff --git a/src/modules/plex/PlexAuth.php b/src/modules/plex/PlexAuth.php
new file mode 100644
index 00000000..58a97f3e
--- /dev/null
+++ b/src/modules/plex/PlexAuth.php
@@ -0,0 +1,113 @@
+<?php
+
+class PlexAuth {
+	public static function getPlexToken($plexIP = null, $plexPort = null, $plexUsername = null, $plexPassword = null) {
+		$serverKey = self::getPlexServerCacheKey($plexIP, $plexPort, $plexUsername, $plexPassword);
+		$rToken = self::getCachedPlexToken($serverKey);
+		if ($rToken) {
+			$rToken = self::checkPlexToken($plexIP, $plexPort, $rToken);
+		}
+		if (!$rToken) {
+			echo "Plex token not found in cache or invalid, logging in for server {$plexIP}:{$plexPort}...\n";
+			$rData = self::getPlexLogin($plexUsername, $plexPassword);
+			if (isset($rData['user']['authToken'])) {
+				$rToken = self::checkPlexToken($plexIP, $plexPort, $rData['user']['authToken']);
+				if ($rToken) {
+					self::cachePlexToken($serverKey, $rToken);
+					echo "New Plex token successfully cached for key: $serverKey\n";
+				}
+			} else {
+				echo "Failed to login to Plex (wrong credentials or network issue)!\n";
+				$rToken = false;
+			}
+		}
+		return $rToken;
+	}
+
+	public static function getPlexServerCacheKey($ip, $port, $username = null, $password = null) {
+		if ($username && $password) {
+			return md5($ip . ':' . $port . ':' . $username . ':' . $password);
+		}
+		return md5($ip . ':' . $port);
+	}
+
+	public static function getCachedPlexToken($serverKey) {
+		$cacheFile = CONFIG_PATH . 'plex/plex_token_' . $serverKey . '.json';
+		if (!file_exists($cacheFile)) {
+			return null;
+		}
+		$data = json_decode(file_get_contents($cacheFile), true);
+		if (!$data || !isset($data['token']) || !isset($data['expires'])) {
+			return null;
+		}
+		if ($data['expires'] < time() + 86400) {
+			@unlink($cacheFile);
+			return null;
+		}
+		return $data['token'];
+	}
+
+	public static function getPlexLogin($rUsername, $rPassword) {
+		$headers = [
+			'Content-Type: application/xml; charset=utf-8',
+			'X-Plex-Client-Identifier: 526e163c-8dbd-11eb-8dcd-0242ac130003',
+			'X-Plex-Product: XC_VM',
+			'X-Plex-Version: v' . XC_VM_VERSION
+		];
+
+		$ch = curl_init('https://plex.tv/users/sign_in.json');
+		curl_setopt_array($ch, [
+			CURLOPT_HTTPHEADER     => $headers,
+			CURLOPT_HEADER         => false,
+			CURLOPT_HTTPAUTH       => CURLAUTH_BASIC,
+			CURLOPT_USERPWD        => $rUsername . ':' . $rPassword,
+			CURLOPT_TIMEOUT        => 30,
+			CURLOPT_SSL_VERIFYPEER => false,
+			CURLOPT_POST           => true,
+			CURLOPT_RETURNTRANSFER => true,
+		]);
+
+		$response = curl_exec($ch);
+		curl_close($ch);
+
+		return json_decode($response, true);
+	}
+
+	public static function checkPlexToken($rIP, $rPort, $rToken) {
+		$checkURL = 'http://' . $rIP . ':' . $rPort . '/myplex/account?X-Plex-Token=' . $rToken;
+
+		$ch = curl_init($checkURL);
+		curl_setopt_array($ch, [
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_CONNECTTIMEOUT => 10,
+			CURLOPT_TIMEOUT        => 10,
+			CURLOPT_SSL_VERIFYPEER => false,
+		]);
+
+		$data = curl_exec($ch);
+		curl_close($ch);
+
+		$xml = simplexml_load_string($data);
+		if ($xml === false) {
+			return '';
+		}
+
+		$json = json_decode(json_encode($xml), true);
+
+		return (isset($json['@attributes']['signInState']) && $json['@attributes']['signInState'] === 'ok') ? $rToken : '';
+	}
+
+	public static function cachePlexToken($serverKey, $token) {
+		$cacheFile = CONFIG_PATH . 'plex/plex_token_' . $serverKey . '.json';
+		$data = [
+			'token'     => $token,
+			'cached_at' => time(),
+			'expires'   => time() + 30 * 86400
+		];
+		if (!is_dir(dirname($cacheFile))) {
+			mkdir(dirname($cacheFile), 0755, true);
+		}
+		file_put_contents($cacheFile, json_encode($data, JSON_PRETTY_PRINT));
+		@chmod($cacheFile, 0600);
+	}
+}
diff --git a/src/modules/plex/PlexController.php b/src/modules/plex/PlexController.php
new file mode 100644
index 00000000..bd68c259
--- /dev/null
+++ b/src/modules/plex/PlexController.php
@@ -0,0 +1,203 @@
+<?php
+
+/**
+ * XC_VM — Plex Module Controller
+ *
+ * Обрабатывает все маршруты модуля Plex:
+ * - Список Plex Sync серверов (index)
+ * - Добавление/редактирование библиотеки (add)
+ * - Настройки Plex (settings)
+ * - API: enable/disable/kill/library/sections actions
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Заменяет:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   admin/plex.php           → index()
+ *   admin/plex_add.php       → add()
+ *   admin/settings_plex.php  → settings()
+ *   admin/api.php actions:
+ *     enable_plex  → apiEnable()
+ *     disable_plex → apiDisable()
+ *     kill_plex    → apiKill()
+ *     library (sub=delete|force) → apiLibrary()
+ *     plex_sections → apiSections()
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Использование (через Router):
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   $router->group('plex', function(Router $r) {
+ *       $r->get('',         [PlexController::class, 'index']);
+ *       $r->get('add',      [PlexController::class, 'add']);
+ *       $r->get('settings', [PlexController::class, 'settings']);
+ *   });
+ *
+ * @see PlexService
+ * @see PlexRepository
+ * @see PlexModule
+ */
+
+class PlexController {
+
+    /**
+     * Путь к директории views модуля
+     * @var string
+     */
+    protected $viewsPath;
+
+    public function __construct() {
+        $this->viewsPath = dirname(__DIR__) . '/modules/plex/views';
+    }
+
+    // ───────────────────────────────────────────────────────────
+    //  Страницы (GET)
+    // ───────────────────────────────────────────────────────────
+
+    /**
+     * Список Plex Sync серверов
+     *
+     * Заменяет admin/plex.php
+     * Подготавливает: $rPlexServers
+     */
+    public function index() {
+        global $db;
+
+        $rPlexServers = PlexRepository::getPlexServers($db);
+        $_TITLE = 'Plex Sync';
+
+        include 'header.php';
+        include $this->viewsPath . '/index.php';
+        include 'footer.php';
+        include $this->viewsPath . '/library_scripts.php';
+    }
+
+    /**
+     * Добавление/редактирование Plex библиотеки
+     *
+     * Заменяет admin/plex_add.php
+     * Подготавливает: $rFolder (при edit), $rBouquets
+     */
+    public function add() {
+        if (isset(CoreUtilities::$rRequest['id'])) {
+            $rFolder = getWatchFolder(CoreUtilities::$rRequest['id']);
+            if (!$rFolder) {
+                goHome();
+                return;
+            }
+        }
+
+        $rBouquets = getBouquets();
+        $_TITLE = isset($rFolder) ? 'Edit Library' : 'Add Library';
+
+        include 'header.php';
+        include $this->viewsPath . '/library_edit.php';
+        include 'footer.php';
+        include $this->viewsPath . '/library_edit_scripts.php';
+    }
+
+    /**
+     * Настройки Plex Sync
+     *
+     * Заменяет admin/settings_plex.php
+     * Подготавливает: $rBouquets
+     */
+    public function settings() {
+        $rBouquets = getBouquets();
+        $_TITLE = 'Plex Settings';
+
+        include 'header.php';
+        include $this->viewsPath . '/settings.php';
+        include 'footer.php';
+        include $this->viewsPath . '/settings_scripts.php';
+    }
+
+    // ───────────────────────────────────────────────────────────
+    //  API-действия (JSON)
+    // ───────────────────────────────────────────────────────────
+
+    /**
+     * Включить все Plex Sync серверы
+     *
+     * Заменяет admin/api.php action=enable_plex
+     */
+    public function apiEnable() {
+        global $db;
+        $db->query("UPDATE `watch_folders` SET `active` = 1 WHERE `type` = 'plex';");
+        echo json_encode(['result' => true]);
+        exit();
+    }
+
+    /**
+     * Отключить все Plex Sync серверы
+     *
+     * Заменяет admin/api.php action=disable_plex
+     */
+    public function apiDisable() {
+        global $db;
+        $db->query("UPDATE `watch_folders` SET `active` = 0 WHERE `type` = 'plex';");
+        echo json_encode(['result' => true]);
+        exit();
+    }
+
+    /**
+     * Убить все процессы Plex Sync
+     *
+     * Заменяет admin/api.php action=kill_plex
+     */
+    public function apiKill() {
+        killPlexSync();
+        echo json_encode(['result' => true]);
+        exit();
+    }
+
+    /**
+     * Действия с отдельной библиотекой (delete / force)
+     *
+     * Заменяет admin/api.php action=library&sub=delete|force
+     */
+    public function apiLibrary() {
+        $rSub = CoreUtilities::$rRequest['sub'] ?? '';
+        $rFolderID = CoreUtilities::$rRequest['folder_id'] ?? 0;
+
+        if ($rSub === 'delete') {
+            deleteWatchFolder($rFolderID);
+            echo json_encode(['result' => true]);
+            exit();
+        }
+
+        if ($rSub === 'force') {
+            $rFolder = getWatchFolder($rFolderID);
+            if ($rFolder) {
+                PlexService::forcePlex($rFolder['server_id'], $rFolder['id'], 'systemapirequest');
+                echo json_encode(['result' => true]);
+                exit();
+            }
+        }
+
+        echo json_encode(['result' => false]);
+        exit();
+    }
+
+    /**
+     * Получить секции Plex сервера (AJAX)
+     *
+     * Заменяет admin/api.php action=plex_sections
+     */
+    public function apiSections() {
+        $rIP       = CoreUtilities::$rRequest['ip'] ?? '';
+        $rPort     = CoreUtilities::$rRequest['port'] ?? '';
+        $rUsername  = CoreUtilities::$rRequest['username'] ?? '';
+        $rPassword = CoreUtilities::$rRequest['password'] ?? '';
+
+        $rToken = PlexAuth::getPlexToken($rIP, $rPort, $rUsername, $rPassword);
+        $rSections = PlexRepository::getPlexSections($rIP, $rPort, $rToken);
+
+        if ($rSections && count($rSections) > 0) {
+            echo json_encode(['result' => true, 'data' => $rSections]);
+        } else {
+            echo json_encode(['result' => false]);
+        }
+        exit();
+    }
+}
diff --git a/src/modules/plex/PlexCron.php b/src/modules/plex/PlexCron.php
new file mode 100644
index 00000000..27599f40
--- /dev/null
+++ b/src/modules/plex/PlexCron.php
@@ -0,0 +1,355 @@
+<?php
+/**
+ * PlexCron — модуль синхронизации Plex (крон-задача).
+ *
+ * Извлечён из crons/plex.php (Фаза 5.1).
+ * Thread/Multithread вынесены в core/Process/ (Фаза 5 аудит).
+ */
+
+require_once __DIR__ . '/../../core/Process/Thread.php';
+require_once __DIR__ . '/../../core/Process/Multithread.php';
+
+class PlexCron {
+    /**
+     * Получить категории Plex из БД.
+     *
+     * @param int|null $rType Тип категории (3=movie, 4=show)
+     * @return array
+     */
+    public static function getPlexCategories($rType = null) {
+        global $db;
+        $rReturn = array();
+        if ($rType) {
+            $db->query('SELECT * FROM `watch_categories` WHERE `type` = ? ORDER BY `genre_id` ASC;', $rType);
+        } else {
+            $db->query('SELECT * FROM `watch_categories` ORDER BY `genre_id` ASC;');
+        }
+        foreach ($db->get_rows() as $rRow) {
+            $rReturn[$rRow['genre']] = $rRow;
+        }
+        return $rReturn;
+    }
+
+    /**
+     * Выполнить HTTP-запрос через cURL.
+     *
+     * @param string $rURL
+     * @return string|false
+     */
+    public static function readURL($rURL) {
+        $rCurl = curl_init($rURL);
+        curl_setopt($rCurl, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($rCurl, CURLOPT_CONNECTTIMEOUT, 10);
+        curl_setopt($rCurl, CURLOPT_TIMEOUT, 10);
+        return curl_exec($rCurl);
+    }
+
+    /**
+     * Нормализовать XML-массив (одиночный элемент → массив элементов).
+     *
+     * @param array $rArray
+     * @return array
+     */
+    public static function makeArray($rArray) {
+        if (isset($rArray['@attributes'])) {
+            $rArray = array($rArray);
+        }
+        return $rArray;
+    }
+
+    /**
+     * Получить букет по ID.
+     *
+     * @param int $rID
+     * @return array|null
+     */
+    public static function getBouquet($rID) {
+        global $db;
+        $db->query('SELECT * FROM `bouquets` WHERE `id` = ?;', $rID);
+        if ($db->num_rows() == 1) {
+            return $db->get_row();
+        }
+    }
+
+    /**
+     * Проверить и создать новые категории из временных файлов.
+     */
+    public static function checkCategories() {
+        global $db;
+        $rPlexCategories = array('movie' => self::getPlexCategories(3), 'show' => self::getPlexCategories(4));
+        $rCategories = glob(WATCH_TMP_PATH . '*.pcat');
+        $rCatID = array('movie' => 1, 'show' => 1);
+        $db->query('SELECT MAX(`genre_id`) AS `max` FROM `watch_categories` WHERE `type` = 3;');
+        $rCatID['movie'] = intval($db->get_row()['max']);
+        $db->query('SELECT MAX(`genre_id`) AS `max` FROM `watch_categories` WHERE `type` = 4;');
+        $rCatID['show'] = intval($db->get_row()['max']);
+        foreach ($rCategories as $a539efc67de58f76) {
+            $rCategory = json_decode(file_get_contents($a539efc67de58f76), true);
+            if (in_array($rCategory['title'], array_keys($rPlexCategories[$rCategory['type']]))) {
+            } else {
+                $rCatID[$rCategory['type']] += 1;
+                $db->query("INSERT INTO `watch_categories` (`type`, `genre_id`, `genre`, `category_id`, `bouquets`) VALUES (?, ?, ?, 0, '[]');", array('movie' => 3, 'show' => 4)[$rCategory['type']], $rCatID[$rCategory['type']], $rCategory['title']);
+            }
+            unlink($a539efc67de58f76);
+        }
+    }
+
+    /**
+     * Обработать файлы букетов во временной директории.
+     */
+    public static function checkBouquets() {
+        global $db;
+        $a39a336ad3894348 = array();
+        $rBouquets = glob(WATCH_TMP_PATH . '*.pbouquet');
+        foreach ($rBouquets as $D3e2134ebfab5c71) {
+            $rBouquet = json_decode(file_get_contents($D3e2134ebfab5c71), true);
+            if (isset($a39a336ad3894348[$rBouquet['bouquet_id']])) {
+            } else {
+                $a39a336ad3894348[$rBouquet['bouquet_id']] = array('movie' => array(), 'series' => array());
+            }
+            $a39a336ad3894348[$rBouquet['bouquet_id']][$rBouquet['type']][] = $rBouquet['id'];
+            unlink($D3e2134ebfab5c71);
+        }
+        foreach ($a39a336ad3894348 as $rBouquetID => $rBouquetData) {
+            $rBouquet = self::getBouquet($rBouquetID);
+            if ($rBouquet) {
+                foreach (array_keys($rBouquetData) as $rType) {
+                    if ($rType == 'movie') {
+                        $rColumn = 'bouquet_movies';
+                    } else {
+                        $rColumn = 'bouquet_series';
+                    }
+                    $rChannels = json_decode($rBouquet[$rColumn], true);
+                    foreach ($rBouquetData[$rType] as $rID) {
+                        if (0 >= intval($rID) || in_array($rID, $rChannels)) {
+                        } else {
+                            $rChannels[] = $rID;
+                        }
+                    }
+                    $db->query('UPDATE `bouquets` SET `' . $rColumn . '` = ? WHERE `id` = ?;', '[' . implode(',', array_map('intval', $rChannels)) . ']', $rBouquetID);
+                }
+            }
+        }
+    }
+
+    /**
+     * Основная точка входа крона Plex.
+     * Заменяет loadCron().
+     */
+    public static function run() {
+        global $db;
+        global $rScanOffset;
+        global $rForce;
+        $rPlexCategories = array(3 => self::getPlexCategories(3), 4 => self::getPlexCategories(4));
+        self::checkBouquets();
+        self::checkCategories();
+        if (!$rForce) {
+            $db->query("SELECT * FROM `watch_folders` WHERE `type` = 'plex' AND `server_id` = ? AND `active` = 1 AND (UNIX_TIMESTAMP() - `last_run` > ? OR `last_run` IS NULL) ORDER BY `id` ASC;", SERVER_ID, $rScanOffset);
+        } else {
+            $db->query("SELECT * FROM `watch_folders` WHERE `type` = 'plex' AND `server_id` = ? AND `id` = ?;", SERVER_ID, $rForce);
+        }
+        $rRows = $db->get_rows();
+        if (count($rRows) > 0) {
+            shell_exec('rm -f ' . WATCH_TMP_PATH . '*.ppid');
+            $rLeafCount = $rUUIDs = $rSeriesTMDB = $rStreamDatabase = array();
+            $rTMDBDatabase = array('movie' => array(), 'series' => array());
+            $rPlexDatabase = array('movie' => array(), 'series' => array());
+            echo 'Generating cache...' . "\n";
+            $db->query('SELECT `id`, `tmdb_id`, `plex_uuid` FROM `streams_series` WHERE `tmdb_id` IS NOT NULL AND `tmdb_id` > 0;');
+            foreach ($db->get_rows() as $rRow) {
+                $rSeriesTMDB[$rRow['id']] = $rRow['tmdb_id'];
+                if (!empty($rRow['plex_uuid'])) {
+                    $rUUIDs[] = $rRow['plex_uuid'];
+                }
+            }
+            $db->query('SELECT `streams`.`id`, `streams_series`.`plex_uuid`, `streams_episodes`.`series_id`, `streams_episodes`.`season_num`, `streams_episodes`.`episode_num`, `streams`.`stream_source` FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` LEFT JOIN `streams_series` ON `streams_series`.`id` = `streams_episodes`.`series_id` WHERE `streams_servers`.`server_id` = ?;', SERVER_ID);
+            foreach ($db->get_rows() as $rRow) {
+                $rStreamDatabase[] = $rRow['stream_source'];
+                $rTMDBID = ($rSeriesTMDB[$rRow['series_id']] ?: null);
+                list($rSource) = json_decode($rRow['stream_source'], true);
+                if ($rTMDBID) {
+                    $rTMDBDatabase['series'][$rTMDBID][$rRow['season_num'] . '_' . $rRow['episode_num']] = array('id' => $rRow['id'], 'source' => $rSource);
+                }
+                if (!empty($rRow['plex_uuid'])) {
+                    $rPlexDatabase['series'][$rRow['plex_uuid']][$rRow['season_num'] . '_' . $rRow['episode_num']] = array('id' => $rRow['id'], 'source' => $rSource);
+                    $rLeafCount[$rRow['plex_uuid']]++;
+                }
+            }
+            $db->query('SELECT `streams`.`id`, `streams`.`plex_uuid`, `streams`.`stream_source`, `streams`.`movie_properties` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`type` = 2 AND `streams_servers`.`server_id` = ?;', SERVER_ID);
+            foreach ($db->get_rows() as $rRow) {
+                $rStreamDatabase[] = $rRow['stream_source'];
+                $rTMDBID = (json_decode($rRow['movie_properties'], true)['tmdb_id'] ?: null);
+                list($rSource) = json_decode($rRow['stream_source'], true);
+                if ($rTMDBID) {
+                    $rTMDBDatabase['movie'][$rTMDBID] = array('id' => $rRow['id'], 'source' => $rSource);
+                }
+                if (!empty($rRow['plex_uuid'])) {
+                    $rPlexDatabase['movie'][$rRow['plex_uuid']] = array('id' => $rRow['id'], 'source' => $rSource);
+                    $rUUIDs[] = $rRow['plex_uuid'];
+                }
+            }
+            exec('find ' . WATCH_TMP_PATH . ' -maxdepth 1 -name "*.pcache" -print0 | xargs -0 rm');
+            file_put_contents(WATCH_TMP_PATH . 'stream_database.pcache', json_encode($rStreamDatabase));
+            foreach ($rTMDBDatabase['series'] as $rTMDBID => $rData) {
+                file_put_contents(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.pcache', json_encode($rData));
+            }
+            foreach ($rTMDBDatabase['movie'] as $rTMDBID => $rData) {
+                file_put_contents(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.pcache', json_encode($rData));
+            }
+            foreach ($rPlexDatabase['series'] as $rPlexID => $rData) {
+                file_put_contents(WATCH_TMP_PATH . 'series_' . $rPlexID . '.pcache', json_encode($rData));
+            }
+            foreach ($rPlexDatabase['movie'] as $rPlexID => $rData) {
+                file_put_contents(WATCH_TMP_PATH . 'movie_' . $rPlexID . '.pcache', json_encode($rData));
+            }
+            unset($rTMDBDatabase, $rPlexDatabase);
+            echo 'Finished generating cache!' . "\n";
+        }
+        foreach ($rRows as $rRow) {
+            $rLimit = 100;
+            $rThreadData = array();
+
+            // Get a Plex token (with caching)
+            $rToken = CoreUtilities::getPlexToken($rRow['plex_ip'], $rRow['plex_port'], $rRow['plex_username'], $rRow['plex_password']);
+
+            $db->query('UPDATE `watch_folders` SET `last_run` = UNIX_TIMESTAMP() WHERE `id` = ?;', $rRow['id']);
+
+            $rSectionURL = 'http://' . $rRow['plex_ip'] . ':' . $rRow['plex_port'] . '/library/sections?X-Plex-Token=' . $rToken;
+            $rSections = json_decode(json_encode(simplexml_load_string(self::readURL($rSectionURL))), true);
+            $rThreadCount = 1;
+            foreach (self::makeArray($rSections['Directory']) as $F24f1be2729b363d) {
+                if ($F24f1be2729b363d['@attributes']['type'] == 'movie') {
+                    $rThreadCount = (intval(CoreUtilities::$rSettings['thread_count_movie']) ?: 25);
+                } else {
+                    $rThreadCount = (intval(CoreUtilities::$rSettings['thread_count_show']) ?: 5);
+                }
+                $rKey = $F24f1be2729b363d['@attributes']['key'];
+                if ($rKey == $rRow['directory']) {
+                    $B9690335cedc4164 = 'http://' . $rRow['plex_ip'] . ':' . $rRow['plex_port'] . '/library/sections/' . $rKey . '/all?X-Plex-Token=' . $rToken . '&X-Plex-Container-Start=0&X-Plex-Container-Size=1';
+                    $rCount = (intval(json_decode(json_encode(simplexml_load_string(self::readURL($B9690335cedc4164))), true)['@attributes']['totalSize']) ?: 0);
+                    echo 'Count: ' . $rCount . "\n";
+                    if ($rCount > 0) {
+                        $rSteps = [];
+                        for ($i = 0; $i <= $rCount; $i += $rLimit) {
+                            $rSteps[] = $i;
+                        }
+
+                        if (!$rSteps) {
+                            $rSteps = [0];
+                        }
+                        foreach ($rSteps as $rStart) {
+                            $d7bd8e11c885f937 = 'http://' . $rRow['plex_ip'] . ':' . $rRow['plex_port'] . '/library/sections/' . $rKey . '/all?X-Plex-Token=' . $rToken . '&X-Plex-Container-Start=' . $rStart . '&X-Plex-Container-Size=' . $rLimit . '&sort=updatedAt%3Adesc';
+                            $rContent = json_decode(json_encode(simplexml_load_string(self::readURL($d7bd8e11c885f937))), true);
+                            if (!isset($rContent['Video'])) {
+                                $rContent['Video'] = $rContent['Directory'];
+                            }
+                            foreach (self::makeArray($rContent['Video']) as $rItem) {
+                                $rUUID = $rKey . '_' . $rItem['@attributes']['ratingKey'];
+                                $rUpdatedAt = intval($rItem['@attributes']['updatedAt'] ?? 0);
+                                $lastRun = intval($rRow['last_run'] ?? 0);
+                                $rIsNewOrUpdated = !$lastRun || $rUpdatedAt === 0 || $lastRun < $rUpdatedAt;
+
+                                if ($F24f1be2729b363d['@attributes']['type'] == 'movie') {
+                                    // Movies
+                                    $rIsMissing = $rRow['scan_missing'] && !in_array($rUUID, $rUUIDs, true);
+                                    if ($rIsNewOrUpdated || $rIsMissing || $rForce) {
+                                        $rThreadData[] = [
+                                            'folder_id' => $rRow['id'],
+                                            'type' => 'movie',
+                                            'key' => $rItem['@attributes']['ratingKey'],
+                                            'uuid' => $rUUID,
+                                            'plex_categories' => $rPlexCategories,
+                                            'read_native' => $rRow['read_native'],
+                                            'movie_symlink' => $rRow['movie_symlink'],
+                                            'remove_subtitles' => $rRow['remove_subtitles'],
+                                            'auto_encode' => $rRow['auto_encode'],
+                                            'auto_upgrade' => $rRow['auto_upgrade'],
+                                            'transcode_profile_id' => $rRow['transcode_profile_id'],
+                                            'max_genres' => intval(CoreUtilities::$rSettings['max_genres'] ?? 5),
+                                            'plex' => true,
+                                            'ip' => $rRow['plex_ip'],
+                                            'port' => $rRow['plex_port'],
+                                            'token' => $rToken,
+                                            'fb_bouquets' => $rRow['fb_bouquets'],
+                                            'store_categories' => $rRow['store_categories'],
+                                            'category_id' => $rRow['category_id'],
+                                            'bouquets' => $rRow['bouquets'],
+                                            'fb_category_id' => $rRow['fb_category_id'],
+                                            'check_tmdb' => $rRow['check_tmdb'],
+                                            'target_container' => $rRow['target_container'],
+                                            'server_add' => $rRow['server_add'],
+                                            'direct_proxy' => $rRow['direct_proxy']
+                                        ];
+                                    }
+                                } else {
+                                    // TV series
+                                    $rCurrentLeafCount = intval($rItem['@attributes']['leafCount'] ?? 0);
+                                    $rPreviousLeafCount = $rLeafCount[$rUUID] ?? 0;
+                                    $rLeafCountChanged = $rCurrentLeafCount != $rPreviousLeafCount;
+                                    $rIsMissing = $rRow['scan_missing'] && empty($rLeafCount[$rUUID]);
+
+                                    if ($rIsNewOrUpdated || $rLeafCountChanged || $rIsMissing) {
+                                        $rThreadData[] = [
+                                            'folder_id' => $rRow['id'],
+                                            'type' => $F24f1be2729b363d['@attributes']['type'],
+                                            'key' => $rItem['@attributes']['ratingKey'],
+                                            'uuid' => $rUUID,
+                                            'plex_categories' => $rPlexCategories,
+                                            'read_native' => $rRow['read_native'],
+                                            'movie_symlink' => $rRow['movie_symlink'],
+                                            'remove_subtitles' => $rRow['remove_subtitles'],
+                                            'auto_encode' => $rRow['auto_encode'],
+                                            'auto_upgrade' => $rRow['auto_upgrade'],
+                                            'transcode_profile_id' => $rRow['transcode_profile_id'],
+                                            'max_genres' => intval(CoreUtilities::$rSettings['max_genres'] ?? 5),
+                                            'plex' => true,
+                                            'ip' => $rRow['plex_ip'],
+                                            'port' => $rRow['plex_port'],
+                                            'token' => $rToken,
+                                            'fb_bouquets' => $rRow['fb_bouquets'],
+                                            'store_categories' => $rRow['store_categories'],
+                                            'category_id' => $rRow['category_id'],
+                                            'bouquets' => $rRow['bouquets'],
+                                            'fb_category_id' => $rRow['fb_category_id'],
+                                            'check_tmdb' => $rRow['check_tmdb'],
+                                            'target_container' => $rRow['target_container'],
+                                            'server_add' => $rRow['server_add'],
+                                            'direct_proxy' => $rRow['direct_proxy']
+                                        ];
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    break;
+                }
+            }
+            if (count($rThreadData) > 0) {
+                echo 'Scan complete! Adding ' . count($rThreadData) . ' files...' . "\n";
+            }
+
+            $cacheDataKey = array();
+            foreach ($rThreadData as $rData) {
+                if ($rData['type'] == 'movie') {
+                    $rCommand = '/usr/bin/timeout 20 ' . PHP_BIN . ' ' . INCLUDES_PATH . 'cli/plex_item.php "' . base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . '"';
+                } else {
+                    $rCommand = '/usr/bin/timeout 300 ' . PHP_BIN . ' ' . INCLUDES_PATH . 'cli/plex_item.php "' . base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . '"';
+                }
+                $cacheDataKey[] = $rCommand;
+            }
+            unset($rThreadData);
+            $db->close_mysql();
+            if ($rThreadCount <= 1) {
+                foreach ($cacheDataKey as $rCommand) {
+                    shell_exec($rCommand);
+                }
+            } else {
+                $cacheMetadataKey = new Multithread($cacheDataKey, $rThreadCount);
+                $cacheMetadataKey->run();
+            }
+            $db->db_connect();
+            self::checkBouquets();
+            self::checkCategories();
+        }
+    }
+}
diff --git a/src/modules/plex/PlexItem.php b/src/modules/plex/PlexItem.php
new file mode 100644
index 00000000..10ed8788
--- /dev/null
+++ b/src/modules/plex/PlexItem.php
@@ -0,0 +1,975 @@
+<?php
+/**
+ * PlexItem — модуль обработки отдельного элемента Plex (фильм/сериал).
+ *
+ * Извлечён из includes/cli/plex_item.php (Фаза 5.1).
+ * Содержит логику импорта/обновления фильмов и эпизодов из Plex.
+ */
+
+class PlexItem {
+    /**
+     * Подготовить имя колонки (только буквы, цифры, подчёркивание).
+     *
+     * @param string $rValue
+     * @return string
+     */
+    public static function prepareColumn($rValue) {
+        return strtolower(preg_replace('/[^a-z0-9_]+/i', '', $rValue));
+    }
+
+    /**
+     * Подготовить массив данных для SQL INSERT/UPDATE.
+     *
+     * @param array $rArray
+     * @return array
+     */
+    public static function prepareArray($rArray) {
+        $UpdateData = $rColumns = $rPlaceholder = $rData = array();
+
+        foreach (array_keys($rArray) as $rKey) {
+            $rColumns[] = '`' . self::prepareColumn($rKey) . '`';
+            $UpdateData[] = '`' . self::prepareColumn($rKey) . '` = ?';
+        }
+
+        foreach (array_values($rArray) as $rValue) {
+            if (!is_array($rValue)) {
+            } else {
+                $rValue = json_encode($rValue, JSON_UNESCAPED_UNICODE);
+            }
+
+            $rPlaceholder[] = '?';
+            $rData[] = $rValue;
+        }
+
+        return array('placeholder' => implode(',', $rPlaceholder), 'columns' => implode(',', $rColumns), 'data' => $rData, 'update' => implode(',', $UpdateData));
+    }
+
+    /**
+     * Верифицировать данные по схеме таблицы.
+     *
+     * @param string $rTable
+     * @param array $rData
+     * @param bool $rOnlyExisting
+     * @return array
+     */
+    public static function verifyPostTable($rTable, $rData = array(), $rOnlyExisting = false) {
+        global $db;
+        $rReturn = array();
+        $db->query('SELECT `column_name`, `column_default`, `is_nullable`, `data_type` FROM `information_schema`.`columns` WHERE `table_schema` = (SELECT DATABASE()) AND `table_name` = ? ORDER BY `ordinal_position`;', $rTable);
+
+        foreach ($db->get_rows() as $rRow) {
+            if ($rRow['column_default'] != 'NULL') {
+            } else {
+                $rRow['column_default'] = null;
+            }
+
+            $rForceDefault = false;
+
+            if ($rRow['is_nullable'] != 'NO' || $rRow['column_default']) {
+            } else {
+                if (in_array($rRow['data_type'], array('int', 'float', 'tinyint', 'double', 'decimal', 'smallint', 'mediumint', 'bigint', 'bit'))) {
+                    $rRow['column_default'] = 0;
+                } else {
+                    $rRow['column_default'] = '';
+                }
+
+                $rForceDefault = true;
+            }
+
+            if (array_key_exists($rRow['column_name'], $rData)) {
+                if (empty($rData[$rRow['column_name']]) && !is_numeric($rData[$rRow['column_name']]) && is_null($rRow['column_default'])) {
+                    $rReturn[$rRow['column_name']] = ($rForceDefault ? $rRow['column_default'] : null);
+                } else {
+                    $rReturn[$rRow['column_name']] = $rData[$rRow['column_name']];
+                }
+            } else {
+                if ($rOnlyExisting) {
+                } else {
+                    $rReturn[$rRow['column_name']] = $rRow['column_default'];
+                }
+            }
+        }
+
+        return $rReturn;
+    }
+
+    /**
+     * Получить сериал по Plex UUID или TMDB ID.
+     *
+     * @param string $rPlexID
+     * @param int|null $rTMDBID
+     * @return array|null
+     */
+    public static function getSeriesByID($rPlexID, $rTMDBID) {
+        global $db;
+
+        if (!(file_exists(WATCH_TMP_PATH . 'series_' . $rPlexID . '.data') && time() - filemtime(WATCH_TMP_PATH . 'series_' . $rPlexID . '.data') < 360)) {
+            if (!(file_exists(WATCH_TMP_PATH . 'series_' . intval($rTMDBID) . '.data') && time() - filemtime(WATCH_TMP_PATH . 'series_' . intval($rTMDBID) . '.data') < 360)) {
+                $db->query('SELECT * FROM `streams_series` WHERE `plex_uuid` = ? OR `tmdb_id` = ?;', $rPlexID, $rTMDBID);
+
+                if ($db->num_rows() != 1) {
+                } else {
+                    return $db->get_row();
+                }
+            } else {
+                return json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . intval($rTMDBID) . '.data'), true);
+            }
+        } else {
+            return json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . $rPlexID . '.data'), true);
+        }
+    }
+
+    /**
+     * Получить сериал по ID.
+     *
+     * @param int $rID
+     * @return array|null
+     */
+    public static function getSerie($rID) {
+        global $db;
+        $db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $rID);
+
+        if ($db->num_rows() != 1) {
+        } else {
+            return $db->get_row();
+        }
+    }
+
+    /**
+     * Получить следующий порядковый номер для streams.
+     *
+     * @return int
+     */
+    public static function getNextOrder() {
+        global $db;
+        $db->query('SELECT MAX(`order`) AS `order` FROM `streams`;');
+
+        if ($db->num_rows() != 1) {
+            return 0;
+        }
+
+        return intval($db->get_row()['order']) + 1;
+    }
+
+    /**
+     * Записать файл букета во временную директорию.
+     *
+     * @param string $rType
+     * @param int $rBouquetID
+     * @param int $rID
+     */
+    public static function addToBouquet($rType, $rBouquetID, $rID) {
+        global $rThreadData;
+        file_put_contents(WATCH_TMP_PATH . md5($rThreadData['uuid'] . '_' . $rThreadData['key'] . '_' . $rType . '_' . $rBouquetID . '_' . $rID) . '.pbouquet', json_encode(array('type' => $rType, 'bouquet_id' => $rBouquetID, 'id' => $rID)));
+    }
+
+    /**
+     * Получить фильм из кэша по Plex UUID или TMDB ID.
+     *
+     * @param string $rPlexID
+     * @param int|null $rTMDBID
+     * @return array|null
+     */
+    public static function getMovie($rPlexID, $rTMDBID) {
+        if (file_exists(WATCH_TMP_PATH . 'movie_' . $rPlexID . '.pcache')) {
+            return json_decode(file_get_contents(WATCH_TMP_PATH . 'movie_' . $rPlexID . '.pcache'), true);
+        }
+
+        if (file_exists(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.pcache')) {
+            return json_decode(file_get_contents(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.pcache'), true);
+        }
+    }
+
+    /**
+     * Получить эпизод из кэша.
+     *
+     * @param string $rPlexID
+     * @param int|null $rTMDBID
+     * @param int $rSeason
+     * @param int $rEpisode
+     * @return array|null
+     */
+    public static function getEpisode($rPlexID, $rTMDBID, $rSeason, $rEpisode) {
+        if (file_exists(WATCH_TMP_PATH . 'series_' . $rPlexID . '.pcache')) {
+            $rData = json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . $rPlexID . '.pcache'), true);
+
+            if (isset($rData[$rSeason . '_' . $rEpisode])) {
+                return $rData[$rSeason . '_' . $rEpisode];
+            }
+        }
+
+        if (file_exists(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.pcache')) {
+            $rData = json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.pcache'), true);
+
+            if (isset($rData[$rSeason . '_' . $rEpisode])) {
+                return $rData[$rSeason . '_' . $rEpisode];
+            }
+        }
+    }
+
+    /**
+     * Сохранить категорию во временный файл.
+     *
+     * @param string $rType
+     * @param string $rGenreTag
+     */
+    public static function addCategory($rType, $rGenreTag) {
+        file_put_contents(WATCH_TMP_PATH . md5($rType . '_' . $rGenreTag) . '.pcat', json_encode(array('type' => $rType, 'title' => $rGenreTag)));
+    }
+
+    /**
+     * Выполнить HTTP-запрос через cURL.
+     *
+     * @param string $rURL
+     * @return string|false
+     */
+    public static function readURL($rURL) {
+        $rCurl = curl_init($rURL);
+        curl_setopt($rCurl, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($rCurl, CURLOPT_CONNECTTIMEOUT, 10);
+        curl_setopt($rCurl, CURLOPT_TIMEOUT, 10);
+
+        return curl_exec($rCurl);
+    }
+
+    /**
+     * Нормализовать XML-массив.
+     *
+     * @param array $rArray
+     * @return array
+     */
+    public static function makeArray($rArray) {
+        if (isset($rArray['@attributes'])) {
+            $rArray = array($rArray);
+        }
+
+        return $rArray;
+    }
+
+    /**
+     * Извлечь теги из XML-данных Plex.
+     *
+     * @param array $data
+     * @param string $tag
+     * @param int $limit
+     * @return string
+     */
+    public static function extractTags(array $data, string $tag, int $limit): string {
+        $items = [];
+        foreach (self::makeArray($data[$tag] ?? []) as $item) {
+            if (count($items) >= $limit) break;
+            $items[] = $item['@attributes']['tag'] ?? '';
+        }
+        return implode(', ', $items);
+    }
+
+    /**
+     * Универсальная функция поиска TMDB ID из данных Plex.
+     *
+     * @param array $rContent
+     * @return array ['tmdb_id' => int|null, 'language' => string|null]
+     */
+    public static function getTmdbIdFromPlex($rContent) {
+        $tmdbId = null;
+        $language = null;
+
+        // 1. Try a new format: separate <Guid id="tmdb://12345"/>
+        if (isset($rContent['Guid']) && is_array($rContent['Guid'])) {
+            foreach (self::makeArray($rContent['Guid']) as $guid) {
+                $id = $guid['@attributes']['id'] ?? '';
+                if (strpos($id, 'tmdb://') === 0) {
+                    $tmdbId = intval(substr($id, 7));
+                    echo "TMDB ID found (new format): $tmdbId\n";
+                    break;
+                }
+            }
+        }
+
+        // 2. Old format (just in case, for old libraries)
+        if (!$tmdbId && !empty($rContent['@attributes']['guid'])) {
+            $guid = $rContent['@attributes']['guid'];
+            if (strpos($guid, 'com.plexapp.agents.themoviedb://') !== false) {
+                preg_match('/com\.plexapp\.agents\.themoviedb:\/\/(\d+)/', $guid, $m);
+                if (!empty($m[1])) {
+                    $tmdbId = intval($m[1]);
+                    if (strpos($guid, '?lang=') !== false) {
+                        $language = substr($guid, strpos($guid, '?lang=') + 6);
+                    }
+                    echo "TMDB ID found (old format): $tmdbId\n";
+                }
+            }
+        }
+
+        // 3. Another old option: tmdb:// in Guid as a string
+        if (!$tmdbId && isset($rContent['Guid']) && is_array($rContent['Guid'])) {
+            foreach (self::makeArray($rContent['Guid']) as $guid) {
+                $id = $guid['@attributes']['id'] ?? '';
+                if (strpos($id, 'tmdb://') === 0) {
+                    $tmdbId = intval(substr($id, 7));
+                    echo "TMDB ID found (direct tmdb:// in Guid): $tmdbId\n";
+                    break;
+                }
+            }
+        }
+
+        return ['tmdb_id' => $tmdbId, 'language' => $language];
+    }
+
+    /**
+     * Основная точка входа обработки элемента Plex.
+     * Заменяет loadcli().
+     */
+    public static function run() {
+        global $db;
+        global $rThreadData;
+        global $rStreamDatabase;
+        $rServers = array(SERVER_ID);
+
+        if (empty($rThreadData['server_add'])) {
+        } else {
+            foreach (json_decode($rThreadData['server_add'], true) as $rServerID) {
+                $rServers[] = intval($rServerID);
+            }
+        }
+
+        $rBouquetIDs = $rCategoryIDs = array();
+
+        if (0 >= $rThreadData['category_id']) {
+        } else {
+            $rCategoryIDs = array(intval($rThreadData['category_id']));
+        }
+
+        if (0 >= count(json_decode($rThreadData['bouquets'], true))) {
+        } else {
+            $rBouquetIDs = json_decode($rThreadData['bouquets'], true);
+        }
+
+        $rLanguage = null;
+        $rPlexCategories = $rThreadData['plex_categories'];
+        $rImportArray = self::verifyPostTable('streams');
+        $rImportArray['type'] = array('movie' => 2, 'show' => 5)[$rThreadData['type']];
+
+        if ($rImportArray['type']) {
+            $rThreadType = array('movie' => 1, 'show' => 2)[$rThreadData['type']];
+
+            // =============================================================
+            // MOVIE PROCESSING
+            // =============================================================
+            if ($rThreadData['type'] == 'movie') {
+                echo "=== [MOVIE] Processing movie: {$rThreadData['key']} ===\n";
+
+                $rURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/library/metadata/' . $rThreadData['key'] . '?X-Plex-Token=' . $rThreadData['token'];
+                echo "LOG: Fetching movie metadata: $rURL\n";
+
+                $rContent = json_decode(json_encode(simplexml_load_string(self::readURL($rURL))), true);
+
+                if (!$rContent || empty($rContent['Video'])) {
+                    echo "ERROR: Failed to get movie metadata from Plex!\n";
+                    exit('Failed to get information.' . PHP_EOL);
+                }
+
+                $Video = $rContent['Video'];
+                echo "LOG: Movie title: {$Video['@attributes']['title']} (" . ($Video['@attributes']['year'] ?? 'No year') . ")\n";
+
+                $rTMDBID = null;
+                $rFirstFile = null;
+
+                // TMDB ID
+                $tmdb = self::getTmdbIdFromPlex($Video);
+                $rTMDBID = $tmdb['tmdb_id'];
+                echo $rTMDBID ? "LOG: TMDB ID detected: $rTMDBID\n" : "LOG: TMDB ID not found — will work without it\n";
+
+                $rFileArray = array('file' => null, 'size' => null, 'data' => null, 'key' => null);
+
+                foreach (self::makeArray($Video['Media']) as $rMedia) {
+                    foreach (self::makeArray($rMedia['Part']) as $rPart) {
+                        $filePath = $rPart['@attributes']['file'];
+                        $fileSize = intval($rPart['@attributes']['size']);
+                        $fileKey  = $rPart['@attributes']['key'];
+
+                        if (!$rFirstFile) {
+                            $rFirstFile = $filePath;
+                            echo "LOG: First detected file (fallback): $filePath\n";
+                        }
+
+                        $accessible = file_exists($filePath) || $rThreadData['direct_proxy'];
+
+                        if ($accessible && (!$rFileArray['size'] || $fileSize > $rFileArray['size'])) {
+                            $rFileArray = array(
+                                'file' => $filePath,
+                                'size' => $fileSize,
+                                'data' => $rMedia,
+                                'key'  => $fileKey
+                            );
+                            echo "LOG: Selected as best source (largest + accessible): $filePath\n";
+                        }
+                    }
+                }
+
+                if (!empty($rFileArray['file'])) {
+                    $movieTitle = $Video['@attributes']['title'];
+
+                    $rInternalPath = json_encode(array('s:' . SERVER_ID . ':' . $rFileArray['file']), JSON_UNESCAPED_UNICODE);
+                    $rDirectURL    = json_encode(array('http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . $rFileArray['key'] . '?X-Plex-Token=' . $rThreadData['token']), JSON_UNESCAPED_UNICODE);
+
+                    if (in_array($rInternalPath, $rStreamDatabase) || in_array($rDirectURL, $rStreamDatabase)) {
+                        echo "LOG: Movie already exists in database (source match) — skipping import\n";
+                    } else {
+                        echo "LOG: New unique movie detected — preparing import: \"$movieTitle\"\n";
+
+                        $rStreamDatabase[] = $rInternalPath;
+                        $rStreamDatabase[] = $rDirectURL;
+
+                        // Container
+                        if ($rThreadData['target_container'] != 'auto' && $rThreadData['target_container'] && !$rThreadData['direct_proxy']) {
+                            $rImportArray['target_container'] = $rThreadData['target_container'];
+                        } else {
+                            $ext = pathinfo($rFileArray['file'], PATHINFO_EXTENSION) ?: 'mp4';
+                            $rImportArray['target_container'] = $ext;
+                        }
+                        echo "LOG: Target container: {$rImportArray['target_container']}\n";
+
+                        $db->query(
+                            'DELETE FROM `watch_logs` WHERE `filename` = ? AND `type` = ? AND `server_id` = ?;',
+                            htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'),
+                            $rThreadType,
+                            SERVER_ID
+                        );
+
+                        // Poster
+                        if (!empty($Video['@attributes']['thumb'])) {
+                            $rThumbURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=300&height=450&minSize=1&quality=100&upscale=1&url=' . $Video['@attributes']['thumb'] . '&X-Plex-Token=' . $rThreadData['token'];
+                            echo "LOG: Downloading poster: $rThumbURL\n";
+                            $rThumb = CoreUtilities::downloadImage($rThumbURL);
+                        } else {
+                            $rThumb = null;
+                            echo "LOG: No poster available in Plex\n";
+                        }
+
+                        // Backdrop
+                        if (!empty($Video['@attributes']['art'])) {
+                            $rBGURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=1280&height=720&minSize=1&quality=100&upscale=1&url=' . $Video['@attributes']['art'] . '&X-Plex-Token=' . $rThreadData['token'];
+                            echo "LOG: Downloading backdrop: $rBGURL\n";
+                            $rBG = CoreUtilities::downloadImage($rBGURL);
+                        } else {
+                            $rBG = null;
+                            echo "LOG: No backdrop available in Plex\n";
+                        }
+
+                        // Cast, Director, Genre
+                        $rCast = array();
+
+                        foreach (array_slice(self::makeArray($Video['Role']), 0, 5) as $rMember) {
+                            $rCast[] = $rMember['@attributes']['tag'];
+                        }
+                        $rDirectors = array();
+
+                        foreach (array_slice(self::makeArray($Video['Director']), 0, 3) as $rMember) {
+                            $rDirectors[] = $rMember['@attributes']['tag'];
+                        }
+                        $rGenres = array();
+                        foreach (array_slice(self::makeArray($Video['Genre']), 0, $rThreadData['max_genres']) as $rGenre) {
+                            $rGenres[] = $rGenre['@attributes']['tag'];
+                        }
+
+                        echo "LOG: Genres: " . implode(', ', $rGenres) . "\n";
+
+                        $country = self::makeArray($Video['Country'])[0]['@attributes']['tag'] ?? null;
+                        $rSeconds = intval($Video['@attributes']['duration'] / 1000);
+
+                        $rImportArray['stream_display_name'] = $Video['@attributes']['title'];
+                        $rImportArray['year'] = !empty($Video['@attributes']['year']) ? intval($Video['@attributes']['year']) : null;
+                        $rImportArray['tmdb_id'] = $rTMDBID ?: null;
+                        $rImportArray['movie_properties'] = array(
+                            'tmdb_id' => $rTMDBID,
+                            'release_date' => $Video['@attributes']['originallyAvailableAt'] ?? null,
+                            'plot' => trim($Video['@attributes']['summary'] ?? ''),
+                            'duration_secs' => $rSeconds,
+                            'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60),
+                            'movie_image' => $rThumb,
+                            'cover_big' => $rThumb,
+                            'backdrop_path' => $rBG ? array($rBG) : array(),
+                            'director' => implode(', ', $rDirectors),
+                            'actors' => implode(', ', $rCast),
+                            'cast' => implode(', ', $rCast),
+                            'genre' => implode(', ', $rGenres),
+                            'country' => $country,
+                            'rating' => floatval($Video['@attributes']['rating'] ?? $Video['@attributes']['audienceRating'] ?? 0)
+                        );
+                        $rImportArray['rating'] = floatval($Video['@attributes']['rating'] ?? $Video['@attributes']['audienceRating'] ?? 0);
+
+                        echo "LOG: Movie duration: " . $rImportArray['movie_properties']['duration'] . " | Rating: " . $rImportArray['rating'] . "\n";
+
+                        // Source type
+                        if ($rThreadData['direct_proxy']) {
+                            $rImportArray['stream_source'] = $rDirectURL;
+                            $rImportArray['direct_source'] = 1;
+                            $rImportArray['direct_proxy'] = 1;
+                            echo "LOG: Using direct Plex proxy stream\n";
+                        } else {
+                            $rImportArray['stream_source'] = $rInternalPath;
+                            $rImportArray['direct_source'] = 0;
+                            $rImportArray['direct_proxy'] = 0;
+                            echo "LOG: Using local file path source\n";
+                        }
+
+                        $rImportArray['order'] = self::getNextOrder();
+                        $rImportArray['added'] = time();
+                        $rImportArray['plex_uuid'] = $rThreadData['uuid'];
+
+                        // Categories & Bouquets
+                        if (empty($rCategoryIDs)) {
+                            echo "LOG: Assigning categories based on genres...\n";
+                            foreach ($rGenres as $rGenreTag) {
+                                if (isset($rPlexCategories[3][$rGenreTag])) {
+                                    $catId = intval($rPlexCategories[3][$rGenreTag]['category_id']);
+                                    if ($catId > 0 && !in_array($catId, $rCategoryIDs)) {
+                                        $rCategoryIDs[] = $catId;
+                                        echo "LOG: → Added category ID $catId ($rGenreTag)\n";
+                                    }
+                                } elseif ($rThreadData['store_categories']) {
+                                    echo "LOG: New genre \"$rGenreTag\" — creating category\n";
+                                    self::addCategory($rThreadData['type'], $rGenreTag);
+                                }
+                            }
+                        }
+
+                        if (empty($rCategoryIDs) && !empty($rThreadData['fb_category_id'])) {
+                            $rCategoryIDs = [intval($rThreadData['fb_category_id'])];
+                            echo "LOG: Fallback category applied: {$rCategoryIDs[0]}\n";
+                        }
+
+                        $rImportArray['category_id'] = '[' . implode(',', array_map('intval', $rCategoryIDs)) . ']';
+                        echo "LOG: Final category IDs: " . $rImportArray['category_id'] . "\n";
+
+                        // Check for existing movie (upgrade logic)
+                        $rUpgradeData = self::getMovie($rThreadData['uuid'], ($rThreadData['check_tmdb'] ? $rTMDBID : null));
+                        if ($rUpgradeData) {
+                            echo "LOG: Movie already exists in DB (ID: {$rUpgradeData['id']})\n";
+                            if ($rUpgradeData['source'] != $rFileArray['file']) {
+                                if ($rThreadData['auto_upgrade']) {
+                                    echo "LOG: Better source found → UPGRADING movie (new file: {$rFileArray['file']})\n";
+                                    $rImportArray['id'] = $rUpgradeData['id'];
+                                } else {
+                                    echo "LOG: Auto-upgrade disabled — skipping\n";
+                                    exit();
+                                }
+                            } else {
+                                echo "LOG: Same source file — no changes needed\n";
+                                exit();
+                            }
+                        } else {
+                            echo "LOG: This is a completely new movie → creating fresh entry\n";
+                            if (empty($rCategoryIDs)) {
+                                echo "LOG: No categories assigned → logging as failed (status 3)\n";
+                                $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 3, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'));
+                                exit();
+                            }
+                        }
+
+                        // Final INSERT / REPLACE
+                        $rPrepare = self::prepareArray($rImportArray);
+                        $rQuery = 'REPLACE INTO `streams`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+                        echo "LOG: Executing REPLACE INTO `streams` (" . ($rUpgradeData ? "upgrade" : "new") . ")\n";
+
+                        if ($db->last_insert_id() > 0) {
+                            $rInsertID = $db->last_insert_id();
+                        }
+
+                        if ($db->query($rQuery, ...$rPrepare['data'])) {
+                            $rInsertID = $db->last_insert_id() ?: $rImportArray['id'];
+
+                            if ($rUpgradeData) {
+                                echo "LOG: Movie successfully upgraded! Stream ID: $rInsertID\n";
+                                foreach ($rServers as $rServerID) {
+                                    $db->query('UPDATE `streams_servers` SET `bitrate` = NULL, `current_source` = NULL, `to_analyze` = 0, `pid` = NULL, `stream_started` = NULL, `stream_info` = NULL, `compatible` = 0, `video_codec` = NULL, `audio_codec` = NULL, `resolution` = NULL, `stream_status` = 0 WHERE `stream_id` = ? AND `server_id` = ?', $rInsertID, $rServerID);
+                                }
+                                if ($rThreadData['auto_encode']) {
+                                    foreach ($rServers as $rServerID) {
+                                        CoreUtilities::queueMovie($rInsertID, $rServerID);
+                                    }
+                                }
+                                $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 6, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'));
+                            } else {
+                                echo "LOG: New movie imported successfully! Stream ID: $rInsertID\n";
+                                foreach ($rServers as $rServerID) {
+                                    $db->query('INSERT INTO `streams_servers`(`stream_id`, `server_id`, `parent_id`) VALUES(?, ?, NULL);', $rInsertID, $rServerID);
+                                }
+                                foreach ($rBouquetIDs as $rBouquet) {
+                                    self::addToBouquet('movie', $rBouquet, $rInsertID);
+                                }
+                                $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 1, ?);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'), $rInsertID);
+                            }
+                        } else {
+                            echo "ERROR: Failed to insert/update movie in `streams` table!\n";
+                            $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 2, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'));
+                        }
+                    }
+                } else {
+                    echo "LOG: No accessible file parts found for this movie\n";
+                }
+
+                if ($rFirstFile) {
+                    echo "LOG: Logging inaccessible file (status 5): $rFirstFile\n";
+                    $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 5, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFirstFile, ENT_QUOTES, 'UTF-8'));
+                }
+
+                echo "=== [MOVIE] Processing completed ===\n";
+            }
+
+            // =============================================================
+            // SERIES PROCESSING
+            // =============================================================
+            if ($rThreadData['type'] == 'show') {
+                echo "=== [SHOW] Processing TV show: {$rThreadData['key']} ===\n";
+
+                // Getting the basic metadata of the series
+                $rURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/library/metadata/' . $rThreadData['key'] . '?X-Plex-Token=' . $rThreadData['token'];
+                echo "Fetching show metadata: $rURL\n";
+                $rContent = json_decode(json_encode(simplexml_load_string(self::readURL($rURL))), true);
+                if (!$rContent || empty($rContent['Directory'])) {
+                    echo "ERROR: Failed to get show metadata from Plex!\n";
+                    exit('Failed to get information.' . PHP_EOL);
+                }
+                $rShowData = $rContent['Directory'];
+                echo "Show title: {$rShowData['@attributes']['title']}\n";
+
+                // Get TMDB ID and language
+                $tmdbInfo = self::getTmdbIdFromPlex($rShowData);
+                $rTMDBID = $tmdbInfo['tmdb_id'];
+                $rLanguage = $tmdbInfo['language'];
+                echo $rTMDBID ? "TMDB ID detected: $rTMDBID\n" : "TMDB ID not found — will work without it\n";
+                if ($rLanguage) echo "Detected language: $rLanguage\n";
+
+                // Get a list of seasons and all episodes
+                echo "Fetching seasons...\n";
+                $rURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/library/metadata/' . $rThreadData['key'] . '/children?X-Plex-Token=' . $rThreadData['token'];
+                $rSeasons = self::makeArray(json_decode(json_encode(simplexml_load_string(self::readURL($rURL))), true)['Directory']);
+                echo "Fetching all episodes...\n";
+                $rURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/library/metadata/' . $rThreadData['key'] . '/allLeaves?X-Plex-Token=' . $rThreadData['token'];
+                $rEpisodes = self::makeArray(json_decode(json_encode(simplexml_load_string(self::readURL($rURL))), true)['Video']);
+                echo "Found " . count($rSeasons) . " season(s), " . count($rEpisodes) . " episode(s)\n";
+
+                // Collecting the release dates of the seasons
+                $rSeasonInfo = [];
+                foreach ($rEpisodes as $rEpisode) {
+                    if (!in_array($rEpisode['@attributes']['parentIndex'], array_keys($rSeasonInfo))) {
+                        $rSeasonInfo[$rEpisode['@attributes']['parentIndex']] = $rEpisode['@attributes']['originallyAvailableAt'];
+                        echo "Season {$rEpisode['@attributes']['parentIndex']} first air date set to {$rEpisode['@attributes']['originallyAvailableAt']}\n";
+                    }
+                }
+
+                // Creating an array of seasons with covers
+                $rSeasonData = [];
+                foreach ($rSeasons as $rSeason) {
+                    if ($rSeason['@attributes']['index']) {
+                        echo "Processing season {$rSeason['@attributes']['index']} — {$rSeason['@attributes']['title']}\n";
+                        $rCover = null;
+                        if ($rSeason['@attributes']['thumb']) {
+                            $rThumbURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=300&height=450&minSize=1&quality=100&upscale=1&url=' . $rSeason['@attributes']['thumb'] . '&X-Plex-Token=' . $rThreadData['token'];
+                            echo "Downloading season cover: $rThumbURL\n";
+                            $rCover = CoreUtilities::downloadImage($rThumbURL);
+                        }
+                        $rSeasonData[] = array(
+                            'name' => $rSeason['@attributes']['title'],
+                            'air_date' => ($rSeasonInfo[$rSeason['@attributes']['index']] ?: ''),
+                            'overview' => (trim($rShowData['@attributes']['summary']) ?: ''),
+                            'cover_big' => $rCover,
+                            'cover' => $rCover,
+                            'episode_count' => $rSeason['@attributes']['leafCount'],
+                            'season_number' => $rSeason['@attributes']['index'],
+                            'id' => $rSeason['@attributes']['ratingKey']
+                        );
+                    }
+                }
+
+                // Checking if the series exists in the database
+                $rSeries = self::getSeriesByID($rThreadData['uuid'], $rTMDBID);
+
+                if (!$rSeries) {
+                    echo "Creating new series entry...\n";
+                    $rSeriesArray = array(
+                        'title' => $rShowData['@attributes']['title'],
+                        'category_id' => array(),
+                        'episode_run_time' => (intval($rShowData['@attributes']['duration'] / 1000 / 60) ?: 0),
+                        'tmdb_id' => $rTMDBID,
+                        'cover' => '',
+                        'genre' => '',
+                        'plot' => trim($rShowData['@attributes']['summary']),
+                        'cast' => '',
+                        'rating' => ((floatval($rShowData['@attributes']['rating']) ?: floatval($rShowData['@attributes']['audienceRating'])) ?: 0),
+                        'director' => '',
+                        'release_date' => $rShowData['@attributes']['originallyAvailableAt'],
+                        'last_modified' => time(),
+                        'seasons' => $rSeasonData,
+                        'backdrop_path' => array(),
+                        'youtube_trailer' => '',
+                        'year' => null
+                    );
+                    if ($rSeriesArray['release_date']) {
+                        $rSeriesArray['year'] = intval(substr($rSeriesArray['release_date'], 0, 4));
+                        echo "Series year set to {$rSeriesArray['year']}\n";
+                    }
+
+                    if ($rShowData['@attributes']['thumb']) {
+                        $rThumbURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=300&height=450&minSize=1&quality=100&upscale=1&url=' . $rShowData['@attributes']['thumb'] . '&X-Plex-Token=' . $rThreadData['token'];
+                        echo "Downloading show poster: $rThumbURL\n";
+                        $rThumb = CoreUtilities::downloadImage($rThumbURL);
+                    }
+                    if ($rShowData['@attributes']['art']) {
+                        $rBGURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=1280&height=720&minSize=1&quality=100&upscale=1&url=' . $rShowData['@attributes']['art'] . '&X-Plex-Token=' . $rThreadData['token'];
+                        echo "Downloading backdrop: $rBGURL\n";
+                        $rBG = CoreUtilities::downloadImage($rBGURL);
+                    }
+
+                    $rSeriesArray['cover'] = $rThumb ?? null;
+                    $rSeriesArray['cover_big'] = $rThumb ?? null;
+                    $rSeriesArray['backdrop_path'] = isset($rBG) ? array($rBG) : array();
+
+                    $rSeriesArray['cast'] = self::extractTags($rShowData, 'Role', 5);
+                    $rSeriesArray['director'] = self::extractTags($rShowData, 'Director', 3);
+                    $rSeriesArray['genre'] = self::extractTags($rShowData, 'Genre', 3);
+
+                    if (count($rCategoryIDs) == 0) {
+                        if (0 < $rThreadData['max_genres']) {
+                            $rParsed = array_slice(self::makeArray($rShowData['Genre']), 0, $rThreadData['max_genres']);
+                        } else {
+                            $rParsed = self::makeArray($rShowData['Genre']);
+                        }
+                        foreach ($rParsed as $rGenre) {
+                            $rGenreTag = $rGenre['@attributes']['tag'];
+
+                            if (isset($rPlexCategories[4][$rGenreTag])) {
+                                $rCategoryID = intval($rPlexCategories[4][$rGenreTag]['category_id']);
+
+                                if ($rCategoryID > 0) {
+                                    if (!in_array($rCategoryID, $rCategoryIDs)) {
+                                        $rCategoryIDs[] = $rCategoryID;
+                                    }
+                                }
+                            } else {
+                                if ($rThreadData['store_categories']) {
+                                    self::addCategory($rThreadData['type'], $rGenreTag);
+                                }
+                            }
+                        }
+                    }
+
+
+                    if (count($rCategoryIDs) == 0 && 0 < intval($rThreadData['fb_category_id'])) {
+                        $rCategoryIDs = array(intval($rThreadData['fb_category_id']));
+                    }
+
+                    if (count($rBouquetIDs) == 0) {
+                        if (0 < $rThreadData['max_genres']) {
+                            $rParsed = array_slice(self::makeArray($rShowData['Genre']), 0, $rThreadData['max_genres']);
+                        } else {
+                            $rParsed = self::makeArray($rShowData['Genre']);
+                        }
+
+                        foreach ($rParsed as $rGenre) {
+                            $rGenreTag = $rGenre['@attributes']['tag'];
+                            $rBouquets = json_decode($rPlexCategories[4][$rGenreTag]['bouquets'], true);
+
+                            foreach ($rBouquets as $rBouquetID) {
+                                if (!in_array($rBouquetID, $rBouquetIDs)) {
+                                    $rBouquetIDs[] = $rBouquetID;
+                                }
+                            }
+                        }
+                    }
+
+                    if (count($rBouquetIDs) == 0) {
+                        $rBouquetIDs = array_map('intval', json_decode($rThreadData['fb_bouquets'], true));
+                    }
+
+                    if (count($rCategoryIDs) != 0) {
+                        $rSeriesArray['plex_uuid'] = $rThreadData['uuid'];
+                        $rSeriesArray['tmdb_language'] = $rLanguage;
+                        $rSeriesArray['category_id'] = '[' . implode(',', array_map('intval', $rCategoryIDs)) . ']';
+                        echo "Final category IDs: " . $rSeriesArray['category_id'] . "\n";
+
+                        $rPrepare = self::prepareArray($rSeriesArray);
+                        $rQuery = 'INSERT INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+                        echo "Executing INSERT into streams_series (ID will be auto-generated)\n";
+                        if ($db->query($rQuery, ...$rPrepare['data'])) {
+                            $rInsertID = $db->last_insert_id();
+                            echo "Series created with ID = $rInsertID\n";
+                            $rSeries = self::getSerie($rInsertID);
+                            foreach ($rBouquetIDs as $rBouquet) {
+                                echo "Adding series $rInsertID to bouquet $rBouquet\n";
+                                self::addToBouquet('series', $rBouquet, $rInsertID);
+                            }
+                        } else {
+                            echo "ERROR: Failed to insert series into DB!\n";
+                            $rSeries = null;
+                        }
+                    }
+                } else {
+                    echo "Series already exists in DB (ID = {$rSeries['id']}), updating seasons only\n";
+                    $db->query('UPDATE `streams_series` SET `seasons` = ? WHERE `id` = ?;', json_encode($rSeasonData, JSON_UNESCAPED_UNICODE), $rSeries['id']);
+                    echo "Seasons updated for series ID {$rSeries['id']}\n";
+
+                    if (!$rSeries['cover']) {
+                        echo "Series has no cover — trying to download from Plex\n";
+                        if ($rShowData['@attributes']['thumb']) {
+                            $rThumbURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=300&height=450&minSize=1&quality=100&upscale=1&url=' . $rShowData['@attributes']['thumb'] . '&X-Plex-Token=' . $rThreadData['token'];
+                            $rThumb = CoreUtilities::downloadImage($rThumbURL);
+                        }
+
+                        if ($rShowData['@attributes']['art']) {
+                            $rBGURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=1280&height=720&minSize=1&quality=100&upscale=1&url=' . $rShowData['@attributes']['art'] . '&X-Plex-Token=' . $rThreadData['token'];
+                            $rBG = CoreUtilities::downloadImage($rBGURL);
+                        }
+
+                        if ($rThumb || $rBG) {
+                            if ($rBG) {
+                                $rBG = array($rBG);
+                            } else {
+                                $rBG = array();
+                            }
+
+                            $db->query('UPDATE `streams_series` SET `cover` = ?, `cover_big` = ?, `backdrop_path` = ? WHERE `id` = ?;', $rThumb, $rThumb, $rBG, $rSeries['id']);
+                        }
+                    }
+                }
+
+                // === Processing of all episodes ===
+                echo "Starting episode import (" . count($rEpisodes) . " episodes)\n";
+                foreach ($rEpisodes as $rEpisode) {
+                    if ($rEpisode['@attributes']['parentIndex'] && $rEpisode['@attributes']['index']) {
+                        $rReleaseSeason = $rEpisode['@attributes']['parentIndex'];
+                        $rReleaseEpisode = $rEpisode['@attributes']['index'];
+                        echo "Processing S" . sprintf('%02d', $rReleaseSeason) . "E" . sprintf('%02d', $rReleaseEpisode) . " — {$rEpisode['@attributes']['title']}\n";
+
+                        $rFirstFile = null;
+                        $rFileArray = array('file' => null, 'size' => null, 'data' => null, 'key' => null);
+                        foreach (self::makeArray($rEpisode['Media']) as $rMedia) {
+                            if (!$rFirstFile) $rFirstFile = $rMedia['Part']['@attributes']['file'];
+                            if ($rFileArray['size'] && $rFileArray['size'] >= intval($rMedia['Part']['@attributes']['size'])) {
+                            } else {
+                                if (file_exists($rMedia['Part']['@attributes']['file']) || $rThreadData['direct_proxy']) {
+                                    $rFileArray = array('file' => $rMedia['Part']['@attributes']['file'], 'size' => intval($rMedia['Part']['@attributes']['size']), 'data' => $rMedia, 'key' => $rMedia['Part']['@attributes']['key']);
+                                }
+                            }
+                        }
+
+                        if (!empty($rFileArray['file'])) {
+                            $episodeName = $rSeries['title'] . " - S" . sprintf('%02d', $rReleaseSeason) . "E" . sprintf('%02d', $rReleaseEpisode) . " - " . $rEpisode['@attributes']['title'];
+                            $rInternalPath = json_encode(array('s:' . SERVER_ID . ':' . $rFileArray['file']), JSON_UNESCAPED_UNICODE);
+                            $rDirectURL = json_encode(array('http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . $rFileArray['key'] . '?X-Plex-Token=' . $rThreadData['token']), JSON_UNESCAPED_UNICODE);
+
+                            if (in_array($rInternalPath, $rStreamDatabase) || in_array($rDirectURL, $rStreamDatabase)) {
+                                echo "Episode already exists in database — skipping\n";
+                                continue;
+                            }
+
+                            echo "New episode found: $episodeName\n";
+                            $rStreamDatabase[] = $rInternalPath;
+                            $rStreamDatabase[] = $rDirectURL;
+
+                            if ($rThreadData['target_container'] != 'auto' && $rThreadData['target_container'] && !$rThreadData['direct_proxy']) {
+                                $rImportArray['target_container'] = $rThreadData['target_container'];
+                            } else {
+                                $rImportArray['target_container'] = pathinfo($rFileArray['file'])['extension'];
+                            }
+
+                            if (empty($rImportArray['target_container'])) {
+                                $rImportArray['target_container'] = 'mp4';
+                            }
+                            $rUpgradeData = self::getEpisode($rThreadData['uuid'], ($rThreadData['check_tmdb'] ? $rTMDBID : null), $rReleaseSeason, $rReleaseEpisode);
+                            if (!$rUpgradeData) {
+                                echo "Creating new stream entry for this episode\n";
+                                $db->query('DELETE FROM `watch_logs` WHERE `filename` = ? AND `type` = ? AND `server_id` = ?;', htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'), $rThreadType, SERVER_ID);
+                                $rThumb = null;
+
+                                if ($rEpisode['@attributes']['thumb']) {
+                                    $rThumbURL = 'http://' . $rThreadData['ip'] . ':' . $rThreadData['port'] . '/photo/:/transcode?width=450&height=253&minSize=1&quality=100&upscale=1&url=' . $rEpisode['@attributes']['thumb'] . '&X-Plex-Token=' . $rThreadData['token'];
+                                    $rThumb = CoreUtilities::downloadImage($rThumbURL);
+                                }
+
+                                $rSeconds = intval($rEpisode['@attributes']['duration'] / 1000);
+                                $rImportArray['movie_properties'] = array('tmdb_id' => ($rSeries['tmdb_id'] ?: null), 'release_date' => $rEpisode['@attributes']['originallyAvailableAt'], 'plot' => $rEpisode['@attributes']['summary'], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'movie_image' => $rThumb, 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => ((floatval($rEpisode['@attributes']['rating']) ?: floatval($rEpisode['@attributes']['audienceRating'])) ?: $rSeries['rating']), 'season' => $rReleaseSeason);
+                                $rImportArray['stream_display_name'] = $rSeries['title'] . ' - S' . sprintf('%02d', intval($rReleaseSeason)) . 'E' . sprintf('%02d', $rReleaseEpisode) . ' - ' . $rEpisode['@attributes']['title'];
+                                $rImportArray['read_native'] = $rThreadData['read_native'];
+                                $rImportArray['movie_symlink'] = $rThreadData['movie_symlink'];
+                                $rImportArray['remove_subtitles'] = $rThreadData['remove_subtitles'];
+                                $rImportArray['transcode_profile_id'] = $rThreadData['transcode_profile_id'];
+
+                                if ($rThreadData['direct_proxy']) {
+                                    $rImportArray['stream_source'] = $rDirectURL;
+                                    $rImportArray['direct_source'] = 1;
+                                    $rImportArray['direct_proxy'] = 1;
+                                } else {
+                                    $rImportArray['stream_source'] = $rInternalPath;
+                                    $rImportArray['direct_source'] = 0;
+                                    $rImportArray['direct_proxy'] = 0;
+                                }
+
+                                $rImportArray['order'] = self::getNextOrder();
+                                $rImportArray['tmdb_language'] = $rLanguage;
+                                $rImportArray['added'] = time();
+                                $rImportArray['uuid'] = $rThreadData['uuid'];
+                                $rImportArray['series_no'] = $rSeries['id'];
+                                $rPrepare = self::prepareArray($rImportArray);
+                                $rQuery = 'REPLACE INTO `streams`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+
+                                if ($db->query($rQuery, ...$rPrepare['data'])) {
+                                    $rInsertID = $db->last_insert_id();
+                                    echo "Episode imported successfully! Stream ID = $rInsertID\n";
+                                    foreach ($rServers as $rServerID) {
+                                        $db->query('INSERT INTO `streams_servers`(`stream_id`, `server_id`, `parent_id`) VALUES(?, ?, NULL);', $rInsertID, $rServerID);
+                                    }
+                                    $db->query('INSERT INTO `streams_episodes`(`season_num`, `series_id`, `stream_id`, `episode_num`) VALUES(?, ?, ?, ?);', $rReleaseSeason, $rSeries['id'], $rInsertID, $rReleaseEpisode);
+
+                                    if ($rThreadData['auto_encode']) {
+                                        foreach ($rServers as $rServerID) {
+                                            CoreUtilities::queueMovie($rInsertID, $rServerID);
+                                        }
+                                    }
+
+                                    $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 1, ?);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'), $rInsertID);
+                                } else {
+                                    echo "ERROR: Failed to insert episode into `streams`!\n";
+                                }
+                            } else {
+                                if ($rUpgradeData['source'] != $rFileArray['file']) {
+                                    if ($rThreadData['auto_upgrade']) {
+                                        echo 'Upgrade episode!' . "\n";
+                                        $db->query('UPDATE `streams` SET `plex_uuid` = ?, `stream_source` = ?, `target_container` = ? WHERE `id` = ?;', $rThreadData['uuid'], $rImportArray['stream_source'], $rImportArray['target_container'], $rUpgradeData['id']);
+
+                                        foreach ($rServers as $rServerID) {
+                                            $db->query('UPDATE `streams_servers` SET `bitrate` = NULL, `current_source` = NULL, `to_analyze` = 0, `pid` = NULL, `stream_started` = NULL, `stream_info` = NULL, `compatible` = 0, `video_codec` = NULL, `audio_codec` = NULL, `resolution` = NULL, `stream_status` = 0 WHERE `stream_id` = ? AND `server_id` = ?', $rUpgradeData['id'], $rServerID);
+                                        }
+
+                                        if ($rThreadData['auto_encode']) {
+                                            foreach ($rServers as $rServerID) {
+                                                CoreUtilities::queueMovie($rUpgradeData['id'], $rServerID);
+                                            }
+                                        }
+
+                                        $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 6, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFileArray['file'], ENT_QUOTES, 'UTF-8'));
+                                    } else {
+                                        echo 'Upgrade disabled' . "\n";
+                                    }
+                                } else {
+                                    echo 'File remains unchanged' . "\n";
+                                }
+                            }
+                        } else {
+                            echo "No accessible file parts for this episode (possibly not mounted)\n";
+                            if ($rFirstFile) {
+                                $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 5, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFirstFile, ENT_QUOTES, 'UTF-8'));
+                            } else {
+                                exit();
+                            }
+                        }
+                    }
+                }
+                echo "=== [SHOW] TV show processing completed ===\n";
+            }
+        } else {
+            exit();
+        }
+    }
+}
diff --git a/src/modules/plex/PlexModule.php b/src/modules/plex/PlexModule.php
new file mode 100644
index 00000000..0bce5995
--- /dev/null
+++ b/src/modules/plex/PlexModule.php
@@ -0,0 +1,145 @@
+<?php
+
+/**
+ * XC_VM — Plex Module
+ *
+ * Модуль Plex Sync Integration.
+ * Регистрирует сервисы, маршруты, API-действия и крон-задачи.
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Что включает:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   Сервисы:
+ *     - PlexService     — CRUD Plex Sync, настройки, force
+ *     - PlexRepository  — получение Plex серверов и секций
+ *     - PlexAuth        — аутентификация Plex (getToken, checkToken)
+ *     - PlexCron        — крон синхронизации
+ *     - PlexItem        — CLI обработка элементов
+ *
+ *   Контроллер:
+ *     - PlexController  — обработка HTTP-запросов и API
+ *
+ *   Страницы:
+ *     - plex            — список Plex серверов
+ *     - plex/add        — добавление/редактирование библиотеки
+ *     - plex/settings   — настройки Plex (settings_plex)
+ *
+ *   API-действия:
+ *     - enable_plex     — включить все серверы
+ *     - disable_plex    — отключить все серверы
+ *     - kill_plex       — убить процессы
+ *     - library         — удалить/запустить библиотеку
+ *     - plex_sections   — получить секции Plex-сервера
+ *
+ * @see PlexService
+ * @see PlexRepository
+ * @see PlexAuth
+ * @see PlexController
+ */
+
+class PlexModule implements ModuleInterface {
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName(): string {
+        return 'plex';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVersion(): string {
+        return '1.0.0';
+    }
+
+    /**
+     * Регистрация сервисов модуля в DI-контейнере
+     *
+     * @param ServiceContainer $container
+     */
+    public function boot(ServiceContainer $container): void {
+        $container->set('plex.service', 'PlexService');
+        $container->set('plex.repository', 'PlexRepository');
+        $container->set('plex.auth', 'PlexAuth');
+        $container->set('plex.controller', function ($c) {
+            return new PlexController();
+        });
+    }
+
+    /**
+     * Регистрация маршрутов модуля
+     *
+     * Страницы:
+     *   GET plex              → PlexController::index
+     *   GET plex/add          → PlexController::add
+     *   GET settings/plex     → PlexController::settings
+     *
+     * API:
+     *   enable_plex           → PlexController::apiEnable
+     *   disable_plex          → PlexController::apiDisable
+     *   kill_plex             → PlexController::apiKill
+     *   library               → PlexController::apiLibrary
+     *   plex_sections         → PlexController::apiSections
+     *
+     * @param Router $router
+     */
+    public function registerRoutes(Router $router): void {
+        // ── Страницы ──────────────────────────────────────────
+        $router->group('plex', function (Router $r) {
+            $r->get('', [PlexController::class, 'index'], [
+                'permission' => ['adv', 'folder_watch'],
+            ]);
+            $r->get('add', [PlexController::class, 'add'], [
+                'permission' => ['adv', 'folder_watch'],
+            ]);
+        });
+
+        // settings_plex → settings/plex (через normalizePage)
+        $router->get('settings/plex', [PlexController::class, 'settings'], [
+            'permission' => ['adv', 'folder_watch_settings'],
+        ]);
+
+        // ── API-действия ──────────────────────────────────────
+        $router->api('enable_plex', [PlexController::class, 'apiEnable'], [
+            'permission' => ['adv', 'folder_watch_settings'],
+        ]);
+        $router->api('disable_plex', [PlexController::class, 'apiDisable'], [
+            'permission' => ['adv', 'folder_watch_settings'],
+        ]);
+        $router->api('kill_plex', [PlexController::class, 'apiKill'], [
+            'permission' => ['adv', 'folder_watch'],
+        ]);
+        $router->api('library', [PlexController::class, 'apiLibrary'], [
+            'permission' => ['adv', 'folder_watch'],
+        ]);
+        $router->api('plex_sections', [PlexController::class, 'apiSections'], [
+            'permission' => ['adv', 'folder_watch_settings'],
+        ]);
+    }
+
+    /**
+     * Крон-задачи модуля
+     *
+     * @return array
+     */
+    public function registerCrons(): array {
+        return [
+            [
+                'class'    => PlexCron::class,
+                'method'   => 'run',
+                'interval' => 60,
+            ],
+        ];
+    }
+
+    /**
+     * Подписки на события ядра
+     *
+     * @return array
+     */
+    public function getEventSubscribers(): array {
+        return [];
+    }
+}
diff --git a/src/modules/plex/PlexRepository.php b/src/modules/plex/PlexRepository.php
new file mode 100644
index 00000000..a04850a5
--- /dev/null
+++ b/src/modules/plex/PlexRepository.php
@@ -0,0 +1,26 @@
+<?php
+
+class PlexRepository {
+	public static function getPlexServers($db) {
+		$rReturn = array();
+		$db->query("SELECT * FROM `watch_folders` WHERE `type` = 'plex' ORDER BY `id` ASC;");
+		if (0 < $db->num_rows()) {
+			foreach ($db->get_rows() as $rRow) {
+				$rReturn[] = $rRow;
+			}
+		}
+		return $rReturn;
+	}
+
+	public static function getPlexSections($rIP, $rPort, $rToken) {
+		$URL = 'http://' . $rIP . ':' . $rPort . '/library/sections?X-Plex-Token=' . $rToken;
+		$rSections = json_decode(json_encode(simplexml_load_string(file_get_contents($URL))), true);
+		if (!isset($rSections['Directory'])) {
+			return array();
+		}
+		if (isset($rSections['Directory']['@attributes'])) {
+			$rSections['Directory'] = array($rSections['Directory']);
+		}
+		return $rSections['Directory'];
+	}
+}
diff --git a/src/modules/plex/PlexService.php b/src/modules/plex/PlexService.php
new file mode 100644
index 00000000..6f37d3a7
--- /dev/null
+++ b/src/modules/plex/PlexService.php
@@ -0,0 +1,96 @@
+<?php
+
+class PlexService {
+	public static function editPlexSettings($db, $rData, $clearSettingsCacheCallback = null) {
+		foreach ($rData as $rKey => $rValue) {
+			$rSplit = explode('_', $rKey);
+			if ($rSplit[0] == 'genre') {
+				if (isset($rData['bouquet_' . $rSplit[1]])) {
+					$rBouquets = '[' . implode(',', array_map('intval', $rData['bouquet_' . $rSplit[1]])) . ']';
+				} else {
+					$rBouquets = '[]';
+				}
+				$db->query('UPDATE `watch_categories` SET `category_id` = ?, `bouquets` = ? WHERE `genre_id` = ? AND `type` = 3;', $rValue, $rBouquets, $rSplit[1]);
+			}
+		}
+
+		foreach ($rData as $rKey => $rValue) {
+			$rSplit = explode('_', $rKey);
+			if ($rSplit[0] == 'genretv') {
+				if (isset($rData['bouquettv_' . $rSplit[1]])) {
+					$rBouquets = '[' . implode(',', array_map('intval', $rData['bouquettv_' . $rSplit[1]])) . ']';
+				} else {
+					$rBouquets = '[]';
+				}
+				$db->query('UPDATE `watch_categories` SET `category_id` = ?, `bouquets` = ? WHERE `genre_id` = ? AND `type` = 4;', $rValue, $rBouquets, $rSplit[1]);
+			}
+		}
+
+		$db->query('UPDATE `settings` SET `scan_seconds` = ?, `max_genres` = ?, `thread_count_movie` = ?, `thread_count_show` = ?;', $rData['scan_seconds'], $rData['max_genres'], $rData['thread_count_movie'], $rData['thread_count_show']);
+		call_user_func($clearSettingsCacheCallback);
+		return array('status' => STATUS_SUCCESS);
+	}
+
+	public static function processPlexSync($db, $rData, $getWatchFolderCallback = null) {
+		if (isset($rData['edit'])) {
+			$rArray = overwriteData(call_user_func($getWatchFolderCallback, $rData['edit']), $rData);
+		} else {
+			$rArray = verifyPostTable('watch_folders', $rData);
+			unset($rArray['id']);
+		}
+
+		if (is_array($rData['server_id'])) {
+			$rServers = $rData['server_id'];
+			$rArray['server_id'] = intval(array_shift($rServers));
+			$rArray['server_add'] = '[' . implode(',', array_map('intval', $rServers)) . ']';
+		} else {
+			$rArray['server_id'] = intval($rData['server_id']);
+			$rArray['server_add'] = null;
+		}
+
+		if (isset($rData['edit'])) {
+			$db->query('SELECT COUNT(*) AS `count` FROM `watch_folders` WHERE `directory` = ? AND `server_id` = ? AND `plex_ip` = ? AND `id` <> ?;', $rData['library_id'], $rArray['server_id'], $rData['plex_ip'], $rArray['id']);
+		} else {
+			$db->query('SELECT COUNT(*) AS `count` FROM `watch_folders` WHERE `directory` = ? AND `server_id` = ? AND `plex_ip` = ?;', $rData['library_id'], $rArray['server_id'], $rData['plex_ip']);
+		}
+
+		if (0 < $db->get_row()['count']) {
+			return array('status' => STATUS_EXISTS_DIR, 'data' => $rData);
+		}
+
+		$rArray['type'] = 'plex';
+		$rArray['directory'] = $rData['library_id'];
+		$rArray['plex_ip'] = $rData['plex_ip'];
+		$rArray['plex_port'] = $rData['plex_port'];
+		$rArray['plex_libraries'] = $rData['libraries'];
+		$rArray['plex_username'] = $rData['username'];
+		$rArray['direct_proxy'] = isset($rData['direct_proxy']) ? 1 : 0;
+		if (0 < strlen($rData['password'])) {
+			$rArray['plex_password'] = $rData['password'];
+		}
+
+		foreach (array('remove_subtitles', 'check_tmdb', 'store_categories', 'scan_missing', 'auto_upgrade', 'read_native', 'movie_symlink', 'auto_encode', 'active') as $rKey) {
+			$rArray[$rKey] = isset($rData[$rKey]) ? 1 : 0;
+		}
+
+		$overrideBouquets = $rData['override_bouquets'] ?? [];
+		$fallbackBouquets = $rData['fallback_bouquets'] ?? [];
+		$rArray['category_id'] = intval($rData['override_category']);
+		$rArray['fb_category_id'] = intval($rData['fallback_category']);
+		$rArray['bouquets'] = '[' . implode(',', array_map('intval', $overrideBouquets)) . ']';
+		$rArray['fb_bouquets'] = '[' . implode(',', array_map('intval', $fallbackBouquets)) . ']';
+		$rArray['target_container'] = ($rData['target_container'] == 'auto' ? null : $rData['target_container']);
+		$rPrepare = prepareArray($rArray);
+		$rQuery = 'REPLACE INTO `watch_folders`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+
+		if ($db->query($rQuery, ...$rPrepare['data'])) {
+			$rInsertID = $db->last_insert_id();
+			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+		}
+		return array('status' => STATUS_FAILURE, 'data' => $rData);
+	}
+
+	public static function forcePlex($rServerID, $rPlexID, $systemApiRequestCallback = null) {
+		call_user_func($systemApiRequestCallback, $rServerID, array('action' => 'plex_force', 'id' => $rPlexID));
+	}
+}
diff --git a/src/modules/plex/config/.gitkeep b/src/modules/plex/config/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/modules/plex/module.json b/src/modules/plex/module.json
new file mode 100644
index 00000000..945bffb2
--- /dev/null
+++ b/src/modules/plex/module.json
@@ -0,0 +1,7 @@
+{
+    "name": "plex",
+    "version": "1.0.0",
+    "description": "Plex Media Server integration and sync",
+    "requires_core": ">=2.0",
+    "dependencies": []
+}
diff --git a/src/modules/plex/views/index.php b/src/modules/plex/views/index.php
new file mode 100644
index 00000000..fe426c38
--- /dev/null
+++ b/src/modules/plex/views/index.php
@@ -0,0 +1,82 @@
+<div class="wrapper boxed-layout-ext" <?php if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
+	echo ' style="display: none;"';
+} ?>>
+	<div class="container-fluid">
+		<div class="row">
+			<div class="col-12">
+				<div class="page-title-box">
+					<div class="page-title-right">
+						<?php include 'topbar.php'; ?>
+					</div>
+					<h4 class="page-title">Plex Sync</h4>
+				</div>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-12">
+				<?php if (isset($_STATUS) && $_STATUS == STATUS_SUCCESS) : ?>
+					<div class="alert alert-success alert-dismissible fade show" role="alert">
+						<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+							<span aria-hidden="true">&times;</span>
+						</button>
+						The server is now being synced. It will be scanned during the next Plex Sync run.
+					</div>
+				<?php endif; ?>
+				<div class="card">
+					<div class="card-body" style="overflow-x:auto;">
+						<table id="datatable" class="table table-striped table-borderless dt-responsive nowrap">
+							<thead>
+								<tr>
+									<th class="text-center">ID</th>
+									<th class="text-center">Status</th>
+									<th class="text-center">Plex IP</th>
+									<th>Server Name</th>
+									<th>Library</th>
+									<th class="text-center">Last Run</th>
+									<th class="text-center">Actions</th>
+								</tr>
+							</thead>
+							<tbody>
+								<?php foreach ($rPlexServers as $rServer) :
+									$rDate = ($rServer['last_run'] > 0) ? date('Y-m-d H:i:s', $rServer['last_run']) : 'Never';
+									$rLibraryName = 'Unknown';
+									foreach (json_decode($rServer['plex_libraries'], true) as $rLibrary) {
+										if (intval($rLibrary['key']) == intval($rServer['directory'])) {
+											$rLibraryName = $rLibrary['title'];
+											break;
+										}
+									}
+									$rServerAdd = is_null($rServer['server_add']) ? 0 : count(json_decode($rServer['server_add'], true));
+								?>
+									<tr id="folder-<?= intval($rServer['id']); ?>">
+										<td class="text-center"><?= intval($rServer['id']); ?></td>
+										<td class="text-center">
+											<?php if ($rServer['active']) : ?>
+												<i class="text-success fas fa-square"></i>
+											<?php else : ?>
+												<i class="text-secondary fas fa-square"></i>
+											<?php endif; ?>
+										</td>
+										<td class="text-center"><?= $rServer['plex_ip']; ?></td>
+										<td>
+											<?= $rServers[$rServer['server_id']]['server_name'] . ($rServerAdd > 0 ? "&nbsp; <button type='button' class='btn btn-info btn-xs waves-effect waves-light'>+ " . $rServerAdd . "</button>" : ""); ?>
+										</td>
+										<td><?= $rLibraryName; ?></td>
+										<td class="text-center"><?= $rDate; ?></td>
+										<td class="text-center">
+											<div class="btn-group">
+												<a href="./plex_add?id=<?= intval($rServer['id']); ?>"><button type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-pencil-outline"></i></button></a>
+												<button type="button" class="btn btn-light waves-effect waves-light btn-xs" onClick="api(<?= intval($rServer['id']); ?>, 'force');"><i class="mdi mdi-refresh"></i></button>
+												<button type="button" class="btn btn-light waves-effect waves-light btn-xs" onClick="api(<?= intval($rServer['id']); ?>, 'delete');"><i class="mdi mdi-close"></i></button>
+											</div>
+										</td>
+									</tr>
+								<?php endforeach; ?>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/modules/plex/views/library_edit.php b/src/modules/plex/views/library_edit.php
new file mode 100644
index 00000000..0ce5072d
--- /dev/null
+++ b/src/modules/plex/views/library_edit.php
@@ -0,0 +1,383 @@
+<div class="wrapper boxed-layout-ext"
+    <?php if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') {
+        echo '';
+    } else {
+        echo ' style="display: none;"';
+    } ?>>
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-12">
+                <div class="page-title-box">
+                    <div class="page-title-right">
+                        <?php include 'topbar.php'; ?>
+                    </div>
+                    <h4 class="page-title">
+                        <?= isset($rFolder) ? 'Edit' : 'Add' ?> Library
+                    </h4>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-xl-12">
+                <div class="card">
+                    <div class="card-body">
+                        <form action="#" method="POST" data-parsley-validate="">
+                            <?php if (isset($rFolder)) : ?>
+                                <input type="hidden" name="edit" value="<?= intval($rFolder['id']); ?>" />
+                            <?php endif; ?>
+                            <input type="hidden" name="libraries" id="libraries"
+                                value="<?= isset($rFolder['plex_libraries']) ? htmlspecialchars($rFolder['plex_libraries']) : ''; ?>" />
+                            <div id="basicwizard">
+                                <ul class="nav nav-pills bg-light nav-justified form-wizard-header mb-4">
+                                    <li class="nav-item">
+                                        <a href="#folder-details" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
+                                            <i class="mdi mdi-account-card-details-outline mr-1"></i>
+                                            <span class="d-none d-sm-inline">Details</span>
+                                        </a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a href="#settings" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
+                                            <i class="mdi mdi-wrench mr-1"></i>
+                                            <span class="d-none d-sm-inline">Settings</span>
+                                        </a>
+                                    </li>
+                                </ul>
+                                <div class="tab-content b-0 mb-0 pt-0">
+                                    <div class="tab-pane" id="folder-details">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="server_id">Server
+                                                        Name</label>
+                                                    <div class="col-md-8">
+                                                        <select name="server_id[]" id="server_id"
+                                                            class="form-control select2-multiple" data-toggle="select2"
+                                                            multiple="multiple" data-placeholder="Choose...">
+                                                            <?php
+                                                            $rActiveServers = array();
+                                                            if (isset($rFolder)) {
+                                                                if ($rFolder['server_id']) {
+                                                                    $rActiveServers[] = $rFolder['server_id'];
+                                                                    echo '<option value="' . $rFolder['server_id'] . '" selected>' . CoreUtilities::$rServers[$rFolder['server_id']]['server_name'] . '</option>';
+                                                                }
+
+                                                                if ($rFolder['server_add']) {
+                                                                    foreach (json_decode($rFolder['server_add'], true) as $rServerID) {
+                                                                        $rActiveServers[] = $rServerID;
+                                                                        echo '<option value="' . $rServerID['server_id'] . '" selected>' . CoreUtilities::$rServers[$rServerID]['server_name'] . '</option>';
+                                                                    }
+                                                                }
+                                                            }
+                                                            foreach (getStreamingServers() as $rServer) {
+                                                                if (!in_array($rServer['id'], $rActiveServers)) {
+                                                                    echo '<option value="' . $rServer['id'] . '">' . $rServer['server_name'] . '</option>';
+                                                                }
+                                                            }
+                                                            ?>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="plex_ip">Plex Server</label>
+                                                    <div class="col-md-6">
+                                                        <input type="text" id="plex_ip" name="plex_ip" class="form-control"
+                                                            value="<?= isset($rFolder) ? $rFolder['plex_ip'] : ''; ?>" placeholder="Server IP" required
+                                                            data-parsley-trigger="change">
+                                                    </div>
+                                                    <div class="col-md-2">
+                                                        <input type="text" id="plex_port" name="plex_port" class="form-control text-center"
+                                                            value="<?= isset($rFolder) ? $rFolder['plex_port'] : ''; ?>" placeholder="Port" required
+                                                            data-parsley-trigger="change">
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="username">Credentials</label>
+                                                    <div class="col-md-4">
+                                                        <input type="text" id="username" name="username" class="form-control"
+                                                            value="<?= isset($rFolder) ? $rFolder['plex_username'] : ''; ?>" placeholder="Username" required
+                                                            data-parsley-trigger="change">
+                                                    </div>
+                                                    <div class="col-md-4">
+                                                        <input type="password" id="password" name="password" class="form-control"
+                                                            value="<?= isset($rFolder) ? $rFolder['plex_password'] : ''; ?>" placeholder="Password">
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="library_id">Library</label>
+                                                    <div class="col-md-7">
+                                                        <select id="library_id" name="library_id" class="form-control" data-toggle="select2">
+                                                            <?php
+                                                            $rLibraries = isset($rFolder['plex_libraries']) ? json_decode($rFolder['plex_libraries'], true) : array();
+                                                            foreach ($rLibraries as $rLibrary) {
+                                                                if ($rFolder['directory'] == $rLibrary['key']) {
+                                                                    echo '<option selected value="' . $rLibrary['key'] . '">' . $rLibrary['title'] . '</option>';
+                                                                } else {
+                                                                    echo '<option value="' . $rLibrary['key'] . '">' . $rLibrary['title'] . '</option>';
+                                                                }
+                                                            }
+                                                            ?>
+                                                        </select>
+                                                    </div>
+                                                    <div class="col-md-1">
+                                                        <button class="btn btn-primary waves-effect waves-light" type="button" id="scanPlex"><i
+                                                                class="mdi mdi-reload"></i></button>
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="active">Enabled</label>
+                                                    <div class="col-md-2">
+                                                        <input name="active" id="active" type="checkbox"
+                                                            <?php if (!isset($rFolder) || (isset($rFolder) && $rFolder['active'])) {
+                                                                echo 'checked ';
+                                                            } ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
+                                                    </div>
+                                                    <label class="col-md-4 col-form-label" for="direct_proxy">Direct Stream <i
+                                                            title="When using direct source, hide the original Plex URL by proxying the movie through your servers. This will consume bandwidth but won't require the movie to be saved to your servers permanently."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input name="direct_proxy" id="direct_proxy" type="checkbox"
+                                                            <?php if (!isset($rFolder) || (isset($rFolder) && $rFolder['direct_proxy'])) {
+                                                                echo 'checked ';
+                                                            } ?>data-plugin="switchery" class="js-switch" data-color="#039cfd" />
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <ul class="list-inline wizard mb-0">
+                                            <li class="nextb list-inline-item float-right">
+                                                <a href="javascript: void(0);" class="btn btn-secondary">Next</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <div class="tab-pane" id="settings">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="read_native">Native
+                                                        Frames <i title="Read input video at native frame rate."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input name="read_native" id="read_native" type="checkbox"
+                                                            <?php if (isset($rFolder) && $rFolder['read_native']) {
+                                                                echo 'checked ';
+                                                            } ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
+                                                    </div>
+                                                    <label class="col-md-4 col-form-label" for="movie_symlink">Create
+                                                        Symlink <i
+                                                            title="Generate a symlink to the original file instead of encoding. File needs to exist on all selected servers."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input name="movie_symlink" id="movie_symlink" type="checkbox"
+                                                            <?php if (!isset($rFolder) || (isset($rFolder) && $rFolder['movie_symlink'])) {
+                                                                echo 'checked ';
+                                                            } ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="auto_encode">Auto-Encode
+                                                        <i title="Start encoding as soon as the movie is added."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input name="auto_encode" id="auto_encode" type="checkbox"
+                                                            <?php if (!isset($rFolder) || (isset($rFolder) && $rFolder['auto_encode'])) {
+                                                                echo 'checked ';
+                                                            } ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
+                                                    </div>
+                                                    <label class="col-md-4 col-form-label" for="scan_missing">Scan Missing
+                                                        ID's <i
+                                                            title="Check all Plex ID's in the XC_VM database against Plex database and scan missing items too. If this is off, XC_VM will only request items modified after the last scan date. Turning this on will increase time taken to scan as the entire library needs to be scanned instead of the recent items."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input name="scan_missing" id="scan_missing" type="checkbox"
+                                                            <?php if (isset($rFolder) && $rFolder['scan_missing']) {
+                                                                echo 'checked ';
+                                                            } ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="auto_upgrade">Auto-Upgrade
+                                                        Quality <i
+                                                            title="Automatically upgrade quality if the system finds a new file with better quality that has the same Plex or TMDb ID."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input name="auto_upgrade" id="auto_upgrade" type="checkbox"
+                                                            <?php if (!isset($rFolder) || (isset($rFolder) && $rFolder['auto_upgrade'])) {
+                                                                echo 'checked ';
+                                                            } ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
+                                                    </div>
+                                                    <label class="col-md-4 col-form-label" for="store_categories">Store
+                                                        Categories <i
+                                                            title="Save unrecognised categories to Plex Settings, this will allow you to allocate a category after the first run and it will then be added on the second run."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input name="store_categories" id="store_categories" type="checkbox"
+                                                            <?php if (!isset($rFolder) || (isset($rFolder) && $rFolder['store_categories'])) {
+                                                                echo 'checked ';
+                                                            } ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="check_tmdb">Check Against
+                                                        TMDb <i
+                                                            title="If the item has a TMDb ID, check it against the database to ensure duplicates aren't created due to previous content in the XC_VM system."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input name="check_tmdb" id="check_tmdb" type="checkbox"
+                                                            <?php if (!isset($rFolder) || (isset($rFolder) && $rFolder['check_tmdb'])) {
+                                                                echo 'checked ';
+                                                            } ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
+                                                    </div>
+                                                    <label class="col-md-4 col-form-label" for="remove_subtitles">Remove
+                                                        Existing Subtitles <i
+                                                            title="Remove existing subtitles from file before encoding. You can't remove hardcoded subtitles using this method."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input name="remove_subtitles" id="remove_subtitles" type="checkbox"
+                                                            <?php if (isset($rFolder) && $rFolder['remove_subtitles']) {
+                                                                echo 'checked ';
+                                                            } ?> data-plugin="switchery" class="js-switch" data-color="#039cfd" />
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="target_container">
+                                                        <?= $language::get('target_container'); ?> <i
+                                                            title="Which container to use when transcoding files."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <select name="target_container" id="target_container" class="form-control"
+                                                            data-toggle="select2">
+                                                            <?php foreach (array('auto', 'mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts') as $container) { ?>
+                                                                <option <?php if (isset($rFolder) && $rFolder['target_container']) {
+                                                                    echo 'checked ';
+                                                                } ?> value="<?= $container; ?>"><?= $container; ?></option>
+                                                            <?php } ?>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="override_bouquets">Override
+                                                        Bouquets</label>
+                                                    <div class="col-md-8">
+                                                        <select name="override_bouquets[]" id="override_bouquets"
+                                                            class="form-control select2-multiple" data-toggle="select2"
+                                                            multiple="multiple" data-placeholder="Choose...">
+                                                            <?php foreach ($rBouquets as $rBouquet) { ?>
+                                                                <?php $folderBouquets = json_decode($rFolder['bouquets'] ?? '[]', true); ?>
+                                                                <option <?php if (in_array(intval($rBouquet['id']), $folderBouquets)) {
+                                                                    echo 'selected ';
+                                                                } ?> value="<?= $rBouquet['id']; ?>"><?= $rBouquet['bouquet_name']; ?>
+                                                                </option>
+                                                            <?php } ?>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="fallback_bouquets">Fallback
+                                                        Bouquets</label>
+                                                    <div class="col-md-8">
+                                                        <select name="fallback_bouquets[]" id="fallback_bouquets"
+                                                            class="form-control select2-multiple" data-toggle="select2"
+                                                            multiple="multiple" data-placeholder="Choose...">
+                                                            <?php foreach ($rBouquets as $rBouquet) { ?>
+                                                                <?php $folderBouquets = json_decode($rFolder['fb_bouquets'] ?? '[]', true); ?>
+                                                                <option <?php if (in_array(intval($rBouquet['id']), $folderBouquets)) {
+                                                                    echo 'selected';
+                                                                } ?> value="<?= $rBouquet['id']; ?>"><?= $rBouquet['bouquet_name']; ?>
+                                                                </option>
+                                                            <?php } ?>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4" id="override_category">
+                                                    <label class="col-md-4 col-form-label" for="override_category">Override
+                                                        Category</label>
+                                                    <div class="col-md-8">
+                                                        <select name="override_category" id="override_category"
+                                                            class="form-control select2" data-toggle="select2">
+                                                            <option <?php if (isset($rFolder) && intval($rFolder['category_id']) == 0) {
+                                                                echo 'selected ';
+                                                            } ?> value="0">Do Not Use</option>
+                                                            <optgroup label="Movies">
+                                                                <?php foreach (getCategories('movie') as $rCategory) { ?>
+                                                                    <option <?php if (isset($rFolder) && intval($rFolder['category_id']) == intval($rCategory['id'])) {
+                                                                        echo 'selected ';
+                                                                    } ?> value="<?= intval($rCategory['id']); ?>"><?= $rCategory['category_name']; ?>
+                                                                    </option>
+                                                                <?php } ?>
+                                                            <optgroup label="Series">
+                                                                <?php foreach (getCategories('series') as $rCategory) { ?>
+                                                                    <option <?php if (isset($rFolder) && intval($rFolder['category_id']) == intval($rCategory['id'])) {
+                                                                        echo 'selected ';
+                                                                    } ?> value="<?= intval($rCategory['id']); ?>"><?= $rCategory['category_name']; ?>
+                                                                    </option>
+                                                                <?php } ?>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4" id="fallback_category">
+                                                    <label class="col-md-4 col-form-label" for="fallback_category">Fallback
+                                                        Category</label>
+                                                    <div class="col-md-8">
+                                                        <select name="fallback_category" id="fallback_category"
+                                                            class="form-control select2" data-toggle="select2">
+                                                            <option <?php if (isset($rFolder) && intval($rFolder['fb_category_id']) == 0) {
+                                                                echo 'selected ';
+                                                            } ?> value="0">Do Not Use</option>
+                                                            <optgroup label="Movies">
+                                                                <?php foreach (getCategories('movie') as $rCategory) { ?>
+                                                                    <option <?php if (isset($rFolder) && intval($rFolder['fb_category_id']) == intval($rCategory['id'])) {
+                                                                        echo 'selected ';
+                                                                    } ?> value="<?= intval($rCategory['id']); ?>"><?= $rCategory['category_name']; ?>
+                                                                    </option>
+                                                                <?php } ?>
+                                                            <optgroup label="Series">
+                                                                <?php foreach (getCategories('series') as $rCategory) { ?>
+                                                                    <option <?php if (isset($rFolder) && intval($rFolder['fb_category_id']) == intval($rCategory['id'])) {
+                                                                        echo 'selected ';
+                                                                    } ?> value="<?= intval($rCategory['id']); ?>"><?= $rCategory['category_name']; ?>
+                                                                    </option>
+                                                                <?php } ?>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="transcode_profile_id">Transcoding
+                                                        Profile <i
+                                                            title="Select a transcoding profile to autoamtically encode videos."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-8">
+                                                        <select name="transcode_profile_id" id="transcode_profile_id"
+                                                            class="form-control" data-toggle="select2">
+                                                            <option <?php if (isset($rFolder) && intval($rFolder['transcode_profile_id']) == 0) {
+                                                                echo 'selected ';
+                                                            } ?>value="0">Transcoding Disabled</option>
+                                                            <?php foreach (getTranscodeProfiles() as $rProfile) { ?>
+                                                                <option <?php if (isset($rFolder) && intval($rFolder['transcode_profile_id']) == intval($rProfile['profile_id'])) {
+                                                                    echo 'selected ';
+                                                                } ?> value="<?= $rProfile['profile_id']; ?>"><?= $rProfile['profile_name']; ?>
+                                                                </option>
+                                                            <?php } ?>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <ul class="list-inline wizard mb-0">
+                                            <li class="prevb list-inline-item">
+                                                <a href="javascript: void(0);" class="btn btn-secondary">Previous</a>
+                                            </li>
+                                            <li class="list-inline-item float-right">
+                                                <input name="submit_folder" type="submit" class="btn btn-primary"
+                                                    value="<?= isset($rFolder) ? 'Edit' : 'Add'; ?>" />
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/modules/plex/views/library_edit_scripts.php b/src/modules/plex/views/library_edit_scripts.php
new file mode 100644
index 00000000..c0252dd4
--- /dev/null
+++ b/src/modules/plex/views/library_edit_scripts.php
@@ -0,0 +1,196 @@
+<script id="scripts">
+    var resizeObserver = new ResizeObserver(entries => $(window).scroll());
+    $(document).ready(function() {
+        resizeObserver.observe(document.body)
+        $("form").attr('autocomplete', 'off');
+        $(document).keypress(function(event) {
+            if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
+        });
+        $.fn.dataTable.ext.errMode = 'none';
+        var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
+        elems.forEach(function(html) {
+            var switchery = new Switchery(html, {
+                'color': '#414d5f'
+            });
+            window.rSwitches[$(html).attr("id")] = switchery;
+        });
+        setTimeout(pingSession, 30000);
+        <?php if (!$rMobile && $rSettings['header_stats']): ?>
+            headerStats();
+        <?php endif; ?>
+        bindHref();
+        refreshTooltips();
+        $(window).scroll(function() {
+            if ($(this).scrollTop() > 200) {
+                if ($(document).height() > $(window).height()) {
+                    $('#scrollToBottom').fadeOut();
+                }
+                $('#scrollToTop').fadeIn();
+            } else {
+                $('#scrollToTop').fadeOut();
+                if ($(document).height() > $(window).height()) {
+                    $('#scrollToBottom').fadeIn();
+                } else {
+                    $('#scrollToBottom').hide();
+                }
+            }
+        });
+        $("#scrollToTop").unbind("click");
+        $('#scrollToTop').click(function() {
+            $('html, body').animate({
+                scrollTop: 0
+            }, 800);
+            return false;
+        });
+        $("#scrollToBottom").unbind("click");
+        $('#scrollToBottom').click(function() {
+            $('html, body').animate({
+                scrollTop: $(document).height()
+            }, 800);
+            return false;
+        });
+        $(window).scroll();
+        $(".nextb").unbind("click");
+        $(".nextb").click(function() {
+            var rPos = 0;
+            var rActive = null;
+            $(".nav .nav-item").each(function() {
+                if ($(this).find(".nav-link").hasClass("active")) {
+                    rActive = rPos;
+                }
+                if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+                    $(this).find(".nav-link").trigger("click");
+                    return false;
+                }
+                rPos += 1;
+            });
+        });
+        $(".prevb").unbind("click");
+        $(".prevb").click(function() {
+            var rPos = 0;
+            var rActive = null;
+            $($(".nav .nav-item").get().reverse()).each(function() {
+                if ($(this).find(".nav-link").hasClass("active")) {
+                    rActive = rPos;
+                }
+                if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+                    $(this).find(".nav-link").trigger("click");
+                    return false;
+                }
+                rPos += 1;
+            });
+        });
+        (function($) {
+            $.fn.inputFilter = function(inputFilter) {
+                return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
+                    if (inputFilter(this.value)) {
+                        this.oldValue = this.value;
+                        this.oldSelectionStart = this.selectionStart;
+                        this.oldSelectionEnd = this.selectionEnd;
+                    } else if (this.hasOwnProperty("oldValue")) {
+                        this.value = this.oldValue;
+                        this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
+                    }
+                });
+            };
+        }(jQuery));
+        <?php if ($rSettings['js_navigate']): ?>
+            $(".navigation-menu li").mouseenter(function() {
+                $(this).find(".submenu").show();
+            });
+            delParam("status");
+            $(window).on("popstate", function() {
+                if (window.rRealURL) {
+                    if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
+                        navigate(window.location.href.split("/").reverse()[0]);
+                    }
+                }
+            });
+        <?php endif; ?>
+        $(document).keydown(function(e) {
+            if (e.keyCode == 16) {
+                window.rShiftHeld = true;
+            }
+        });
+        $(document).keyup(function(e) {
+            if (e.keyCode == 16) {
+                window.rShiftHeld = false;
+            }
+        });
+        document.onselectstart = function() {
+            if (window.rShiftHeld) {
+                return false;
+            }
+        }
+    });
+
+
+
+    function evaluateDirectSource() {
+        $( ["read_native", "movie_symlink", "auto_encode", "auto_upgrade", "remove_subtitles", "target_container", "transcode_profile_id"] ).each(function(rID, rElement) {
+            if ($(rElement)) {
+                if ($("#direct_proxy").is(":checked")) {
+                    if (window.rSwitches[rElement]) {
+                        setSwitch(window.rSwitches[rElement], false);
+                        window.rSwitches[rElement].disable();
+                    } else {
+                        $("#" + rElement).prop("disabled", true);
+                    }
+                } else {
+                    if (window.rSwitches[rElement]) {
+                        window.rSwitches[rElement].enable();
+                    } else {
+                        $("#" + rElement).prop("disabled", false);
+                    }
+                }
+            }
+        });
+    }
+
+    $(document).ready(function() {
+        $('select').select2({
+            width: '100%'
+        });
+        $("#scanPlex").click(function() {
+            if (($("#plex_ip").val().length > 0) && ($("#plex_port").val().length > 0) && ($("#username").val().length > 0) && ($("#password").val().length > 0)) {
+                $("#library_id").empty().trigger("change");
+                $.getJSON("./api?action=plex_sections&ip=" + encodeURIComponent($("#plex_ip").val()) + "&port=" + encodeURIComponent($("#plex_port").val()) + "&username=" + encodeURIComponent($("#username").val()) + "&password=" + encodeURIComponent($("#password").val()), function(data) {
+                    rLibraries = [];
+                    if (data.result == true) {
+                        for (i in data.data) {
+                            rLibraries.push({
+                                "key": data.data[i]["@attributes"]["key"],
+                                "title": data.data[i]["@attributes"]["title"]
+                            });
+                            $("#library_id").append(new Option(data.data[i]["@attributes"]["title"], data.data[i]["@attributes"]["key"])).trigger('change');
+                        }
+                        $.toast("Libraries have been scanned and added to the list.");
+                    } else {
+                        $.toast("Failed to get libraries! Check your server credentials.");
+                    }
+                    $("#libraries").val(JSON.stringify(rLibraries));
+                });
+            } else {
+                $.toast("Please fill in all Plex server information and credentials.");
+            }
+        });
+        $("#direct_proxy").change(function() {
+            evaluateDirectSource();
+        });
+        evaluateDirectSource();
+        $("form").submit(function(e) {
+            e.preventDefault();
+            $(':input[type="submit"]').prop('disabled', true);
+            submitForm(window.rCurrentPage, new FormData($("form")[0]));
+        });
+        $("#plex_port").inputFilter(function(value) {
+            return /^\d*$/.test(value);
+        });
+    });
+    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
+        $(document).ready(function() {
+            initSearch();
+        });
+    <?php endif; ?>
+</script>
+<script src="assets/js/listings.js"></script>
diff --git a/src/modules/plex/views/library_scripts.php b/src/modules/plex/views/library_scripts.php
new file mode 100644
index 00000000..d64edeb2
--- /dev/null
+++ b/src/modules/plex/views/library_scripts.php
@@ -0,0 +1,254 @@
+<script id="scripts">
+	var resizeObserver = new ResizeObserver(entries => $(window).scroll());
+	$(document).ready(function() {
+		resizeObserver.observe(document.body)
+		$("form").attr('autocomplete', 'off');
+		$(document).keypress(function(event) {
+			if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
+		});
+		$.fn.dataTable.ext.errMode = 'none';
+		var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
+		elems.forEach(function(html) {
+			var switchery = new Switchery(html, {
+				'color': '#414d5f'
+			});
+			window.rSwitches[$(html).attr("id")] = switchery;
+		});
+		setTimeout(pingSession, 30000);
+		<?php if (!$rMobile && $rSettings['header_stats']): ?>
+			headerStats();
+		<?php endif; ?>
+		bindHref();
+		refreshTooltips();
+		$(window).scroll(function() {
+			if ($(this).scrollTop() > 200) {
+				if ($(document).height() > $(window).height()) {
+					$('#scrollToBottom').fadeOut();
+				}
+				$('#scrollToTop').fadeIn();
+			} else {
+				$('#scrollToTop').fadeOut();
+				if ($(document).height() > $(window).height()) {
+					$('#scrollToBottom').fadeIn();
+				} else {
+					$('#scrollToBottom').hide();
+				}
+			}
+		});
+		$("#scrollToTop").unbind("click");
+		$('#scrollToTop').click(function() {
+			$('html, body').animate({
+				scrollTop: 0
+			}, 800);
+			return false;
+		});
+		$("#scrollToBottom").unbind("click");
+		$('#scrollToBottom').click(function() {
+			$('html, body').animate({
+				scrollTop: $(document).height()
+			}, 800);
+			return false;
+		});
+		$(window).scroll();
+		$(".nextb").unbind("click");
+		$(".nextb").click(function() {
+			var rPos = 0;
+			var rActive = null;
+			$(".nav .nav-item").each(function() {
+				if ($(this).find(".nav-link").hasClass("active")) {
+					rActive = rPos;
+				}
+				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+					$(this).find(".nav-link").trigger("click");
+					return false;
+				}
+				rPos += 1;
+			});
+		});
+		$(".prevb").unbind("click");
+		$(".prevb").click(function() {
+			var rPos = 0;
+			var rActive = null;
+			$($(".nav .nav-item").get().reverse()).each(function() {
+				if ($(this).find(".nav-link").hasClass("active")) {
+					rActive = rPos;
+				}
+				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+					$(this).find(".nav-link").trigger("click");
+					return false;
+				}
+				rPos += 1;
+			});
+		});
+		(function($) {
+			$.fn.inputFilter = function(inputFilter) {
+				return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
+					if (inputFilter(this.value)) {
+						this.oldValue = this.value;
+						this.oldSelectionStart = this.selectionStart;
+						this.oldSelectionEnd = this.selectionEnd;
+					} else if (this.hasOwnProperty("oldValue")) {
+						this.value = this.oldValue;
+						this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
+					}
+				});
+			};
+		}(jQuery));
+		<?php if ($rSettings['js_navigate']): ?>
+			$(".navigation-menu li").mouseenter(function() {
+				$(this).find(".submenu").show();
+			});
+			delParam("status");
+			$(window).on("popstate", function() {
+				if (window.rRealURL) {
+					if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
+						navigate(window.location.href.split("/").reverse()[0]);
+					}
+				}
+			});
+		<?php endif; ?>
+		$(document).keydown(function(e) {
+			if (e.keyCode == 16) {
+				window.rShiftHeld = true;
+			}
+		});
+		$(document).keyup(function(e) {
+			if (e.keyCode == 16) {
+				window.rShiftHeld = false;
+			}
+		});
+		document.onselectstart = function() {
+			if (window.rShiftHeld) {
+				return false;
+			}
+		}
+	});
+
+
+
+	function disableAll(rConfirm = false) {
+		if (!rConfirm) {
+			new jBox("Confirm", {
+				confirmButton: "Disable",
+				cancelButton: "Cancel",
+				content: "Are you sure you want to disable all libraries?",
+				confirm: function() {
+					disableAll(true);
+				}
+			}).open();
+		} else {
+			$.getJSON("./api?action=disable_plex", function(data) {
+				$.toast("Libraries have been disabled.");
+			});
+		}
+	}
+
+	function enableAll(rConfirm = false) {
+		if (!rConfirm) {
+			new jBox("Confirm", {
+				confirmButton: "Enable",
+				cancelButton: "Cancel",
+				content: "Are you sure you want to enable all libraries?",
+				confirm: function() {
+					enableAll(true);
+				}
+			}).open();
+		} else {
+			$.getJSON("./api?action=enable_plex", function(data) {
+				$.toast("Libraries have been enabled.");
+			});
+		}
+	}
+
+	function killPlexSync(rConfirm = false) {
+		if (!rConfirm) {
+			new jBox("Confirm", {
+				confirmButton: "Kill",
+				cancelButton: "Cancel",
+				content: "Are you sure you want to kill all processes?",
+				confirm: function() {
+					killPlexSync(true);
+				}
+			}).open();
+		} else {
+			$.getJSON("./api?action=kill_plex", function(data) {
+				$.toast("Plex Sync processes have been killed.");
+			});
+		}
+	}
+
+	function api(rID, rType, rConfirm = false) {
+		if ((rType == "delete") && (!rConfirm)) {
+			new jBox("Confirm", {
+				confirmButton: "Delete",
+				cancelButton: "Cancel",
+				content: "Are you sure you want to delete this library?",
+				confirm: function() {
+					api(rID, rType, true);
+				}
+			}).open();
+		} else if ((rType == "force") && (!rConfirm)) {
+			new jBox("Confirm", {
+				confirmButton: "Run",
+				cancelButton: "Cancel",
+				content: "Are you sure you want to force this library to run now?",
+				confirm: function() {
+					api(rID, rType, true);
+				}
+			}).open();
+		} else {
+			rConfirm = true;
+		}
+		if (rConfirm) {
+			$.getJSON("./api?action=library&sub=" + rType + "&folder_id=" + rID, function(data) {
+				if (data.result === true) {
+					if (rType == "delete") {
+						if (rRow = findRowByID($("#datatable").DataTable(), 0, rID)) {
+							$("#datatable").DataTable().rows(rRow).remove().draw(false);
+						}
+						$.toast("Library successfully deleted.");
+					} else if (rType == "force") {
+						$.toast("Library has been forced to sync in the background.");
+					}
+				} else {
+					$.toast("An error occured while processing your request.");
+				}
+			});
+		}
+	}
+
+	$(document).ready(function() {
+		$("#datatable").DataTable({
+			language: {
+				paginate: {
+					previous: "<i class='mdi mdi-chevron-left'>",
+					next: "<i class='mdi mdi-chevron-right'>"
+				}
+			},
+			drawCallback: function() {
+				bindHref();
+				refreshTooltips();
+			},
+			order: [
+				[5, "desc"]
+			],
+			columnDefs: [{
+				"visible": false,
+				"targets": [0]
+			}],
+			responsive: false
+		});
+		$("#datatable").css("width", "100%");
+		$("form").submit(function(e) {
+			e.preventDefault();
+			$(':input[type="submit"]').prop('disabled', true);
+			submitForm(window.rCurrentPage, new FormData($("form")[0]));
+		});
+	});
+    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
+        $(document).ready(function() {
+            initSearch();
+        });
+    <?php endif; ?>
+</script>
+<script src="assets/js/listings.js"></script>
diff --git a/src/modules/plex/views/settings.php b/src/modules/plex/views/settings.php
new file mode 100644
index 00000000..f93b2923
--- /dev/null
+++ b/src/modules/plex/views/settings.php
@@ -0,0 +1,252 @@
+<div class="wrapper boxed-layout-ext"
+    <?php if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') {
+        echo '';
+    } else {
+        echo ' style="display: none;"';
+    } ?>>
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-12">
+                <div class="page-title-box">
+                    <div class="page-title-right">
+                        <?php include 'topbar.php'; ?>
+                    </div>
+                    <h4 class="page-title">Plex Settings</h4>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-xl-12">
+                <?php if (isset($_STATUS) && $_STATUS == STATUS_SUCCESS) : ?>
+                    <div class="alert alert-success alert-dismissible fade show" role="alert">
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        Plex settings successfully updated!
+                    </div>
+                <?php endif; ?>
+                <div class="card">
+                    <div class="card-body">
+                        <form action="#" method="POST">
+                            <div id="basicwizard">
+                                <ul class="nav nav-pills bg-light nav-justified form-wizard-header mb-4">
+                                    <li class="nav-item">
+                                        <a href="#setup" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
+                                            <i class="mdi mdi-account-card-details-outline mr-1"></i>
+                                            <span class="d-none d-sm-inline">Setup</span>
+                                        </a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a href="#categories" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
+                                            <i class="mdi mdi-movie mr-1"></i>
+                                            <span class="d-none d-sm-inline">Movie Categories</span>
+                                        </a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a href="#categories-tv" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
+                                            <i class="mdi mdi-youtube-tv mr-1"></i>
+                                            <span class="d-none d-sm-inline">TV Categories</span>
+                                        </a>
+                                    </li>
+                                </ul>
+                                <div class="tab-content b-0 mb-0 pt-0">
+                                    <div class="tab-pane" id="setup">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label"
+                                                        for="thread_count_movie">Movie Thread Count <i
+                                                            title="Number of threads to run simultaneously for movies."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input type="text" class="form-control text-center"
+                                                            id="thread_count_movie" name="thread_count_movie"
+                                                            value="<?= htmlspecialchars($rSettings['thread_count_movie']); ?>"
+                                                            required data-parsley-trigger="change">
+                                                    </div>
+                                                    <label class="col-md-4 col-form-label"
+                                                        for="thread_count_show">Series Thread Count <i
+                                                            title="Number of threads to run simultaneously for TV series. This should be lower as the series thread will be responsible for grabbing all episodes. So this is the number of TV series to scan at once rather than episodes. Try 1/10th of movie thread limit."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input type="text" class="form-control text-center"
+                                                            id="thread_count_show" name="thread_count_show"
+                                                            value="<?= htmlspecialchars($rSettings['thread_count_show']); ?>"
+                                                            required data-parsley-trigger="change">
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="scan_seconds">Scan
+                                                        Frequency <i title="Scan a library every X seconds."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input type="text" class="form-control text-center"
+                                                            id="scan_seconds" name="scan_seconds"
+                                                            value="<?= htmlspecialchars($rSettings['scan_seconds']); ?>"
+                                                            required data-parsley-trigger="change">
+                                                    </div>
+                                                    <label class="col-md-4 col-form-label" for="max_genres">Max
+                                                        Categories & Bouquets <i
+                                                            title="Maximum number of TMDb genres to convert into categories and bouquets. Enter 0 for unlimited."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input type="text" class="form-control text-center"
+                                                            id="max_genres" name="max_genres"
+                                                            value="<?= htmlspecialchars($rSettings['max_genres']); ?>"
+                                                            required data-parsley-trigger="change">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <ul class="list-inline wizard mb-0">
+                                            <li class="list-inline-item float-right">
+                                                <input name="submit_settings" type="submit" class="btn btn-primary"
+                                                    value="Save Changes" />
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <div class="tab-pane" id="categories">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <p class="sub-header">
+                                                    Select a Category and / or Bouquet to apply to each Genre.
+                                                </p>
+                                                <?php
+                                                $db->query('SELECT * FROM `watch_categories` WHERE `type` = 3 ORDER BY `genre` ASC;');
+                                                if ($db->num_rows() > 0) {
+                                                    foreach ($db->get_rows() as $rRow) {
+                                                ?>
+                                                        <div class="form-group row mb-4">
+                                                            <label class="col-md-2 col-form-label"
+                                                                for="genre_<?= $rRow['genre_id']; ?>"><?= $rRow['genre']; ?></label>
+                                                            <div class="col-md-4">
+                                                                <select name="genre_<?= $rRow['genre_id']; ?>"
+                                                                    id="genre_<?= $rRow['genre_id']; ?>"
+                                                                    class="form-control select2" data-toggle="select2">
+                                                                    <option value="0"
+                                                                        <?= intval($rRow['category_id']) == 0 ? 'selected' : ''; ?>>
+                                                                        Do Not Use</option>
+                                                                    <?php
+                                                                    foreach (getCategories('movie') as $rCategory) {
+                                                                    ?>
+                                                                        <option value="<?= $rCategory['id']; ?>"
+                                                                            <?= intval($rRow['category_id']) == intval($rCategory['id']) ? 'selected' : ''; ?>
+                                                                            >
+                                                                            <?= $rCategory['category_name']; ?>
+                                                                        </option>
+                                                                    <?php
+                                                                    }
+                                                                    ?>
+                                                                </select>
+                                                            </div>
+                                                            <label class="col-md-2 col-form-label"
+                                                                for="bouquet_<?= $rRow['genre_id']; ?>">Bouquets</label>
+                                                            <div class="col-md-4">
+                                                                <select name="bouquet_<?= $rRow['genre_id']; ?>[]"
+                                                                    id="bouquet_<?= $rRow['genre_id']; ?>"
+                                                                    class="form-control select2-multiple" data-toggle="select2"
+                                                                    multiple="multiple" data-placeholder="Choose...">
+                                                                    <?php
+                                                                    foreach ($rBouquets as $rBouquet) {
+                                                                    ?>
+                                                                        <option value="<?= $rBouquet['id']; ?>"
+                                                                            <?= in_array(intval($rBouquet['id']), json_decode($rRow['bouquets'], true)) ? 'selected' : ''; ?>
+                                                                            >
+                                                                            <?= $rBouquet['bouquet_name']; ?>
+                                                                        </option>
+                                                                    <?php
+                                                                    }
+                                                                    ?>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                <?php
+                                                    }
+                                                }
+                                                ?>
+                                            </div>
+                                        </div>
+                                        <ul class="list-inline wizard mb-0">
+                                            <li class="list-inline-item float-right">
+                                                <input name="submit_settings" type="submit" class="btn btn-primary"
+                                                    value="Save Changes" />
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <div class="tab-pane" id="categories-tv">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <p class="sub-header">
+                                                    Select a Category and / or Bouquet to apply to each Genre.
+                                                </p>
+                                                <?php
+                                                $db->query('SELECT * FROM `watch_categories` WHERE `type` = 4 ORDER BY `genre` ASC;');
+                                                if ($db->num_rows() > 0) {
+                                                    foreach ($db->get_rows() as $rRow) {
+                                                ?>
+                                                        <div class="form-group row mb-4">
+                                                            <label class="col-md-2 col-form-label"
+                                                                for="genretv_<?= $rRow['genre_id']; ?>"><?= $rRow['genre']; ?></label>
+                                                            <div class="col-md-4">
+                                                                <select name="genretv_<?= $rRow['genre_id']; ?>"
+                                                                    id="genretv_<?= $rRow['genre_id']; ?>"
+                                                                    class="form-control select2" data -toggle="select2">
+                                                                    <option value="0"
+                                                                        <?= intval($rRow['category_id']) == 0 ? 'selected' : ''; ?>>
+                                                                        Do Not Use</option>
+                                                                    <?php
+                                                                    foreach (getCategories('series') as $rCategory) {
+                                                                    ?>
+                                                                        <option value="<?= $rCategory['id']; ?>"
+                                                                            <?= intval($rRow['category_id']) == intval($rCategory['id']) ? 'selected' : ''; ?>
+                                                                            >
+                                                                            <?= $rCategory['category_name']; ?>
+                                                                        </option>
+                                                                    <?php
+                                                                    }
+                                                                    ?>
+                                                                </select>
+                                                            </div>
+                                                            <label class="col-md-2 col-form-label"
+                                                                for="bouquettv_<?= $rRow['genre_id']; ?>">Bouquets</label>
+                                                            <div class="col-md-4">
+                                                                <select name="bouquettv_<?= $rRow['genre_id']; ?>[]"
+                                                                    id="bouquettv_<?= $rRow['genre_id']; ?>"
+                                                                    class="form-control select2-multiple" data-toggle="select2"
+                                                                    multiple="multiple" data-placeholder="Choose...">
+                                                                    <?php
+                                                                    foreach ($rBouquets as $rBouquet) {
+                                                                    ?>
+                                                                        <option value="<?= $rBouquet['id']; ?>"
+                                                                            <?= in_array(intval($rBouquet['id']), json_decode($rRow['bouquets'], true)) ? 'selected' : ''; ?>
+                                                                            >
+                                                                            <?= $rBouquet['bouquet_name']; ?>
+                                                                        </option>
+                                                                    <?php
+                                                                    }
+                                                                    ?>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                <?php
+                                                    }
+                                                }
+                                                ?>
+                                            </div>
+                                        </div>
+                                        <ul class="list-inline wizard mb-0">
+                                            <li class="list-inline-item float-right">
+                                                <input name="submit_settings" type="submit" class="btn btn-primary"
+                                                    value="Save Changes" />
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/modules/plex/views/settings_scripts.php b/src/modules/plex/views/settings_scripts.php
new file mode 100644
index 00000000..59ea4bc2
--- /dev/null
+++ b/src/modules/plex/views/settings_scripts.php
@@ -0,0 +1,155 @@
+<script id="scripts">
+    var resizeObserver = new ResizeObserver(entries => $(window).scroll());
+    $(document).ready(function() {
+        resizeObserver.observe(document.body)
+        $("form").attr('autocomplete', 'off');
+        $(document).keypress(function(event) {
+            if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
+        });
+        $.fn.dataTable.ext.errMode = 'none';
+        var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
+        elems.forEach(function(html) {
+            var switchery = new Switchery(html, {
+                'color': '#414d5f'
+            });
+            window.rSwitches[$(html).attr("id")] = switchery;
+        });
+        setTimeout(pingSession, 30000);
+        <?php if (!$rMobile && $rSettings['header_stats']): ?>
+            headerStats();
+        <?php endif; ?>
+        bindHref();
+        refreshTooltips();
+        $(window).scroll(function() {
+            if ($(this).scrollTop() > 200) {
+                if ($(document).height() > $(window).height()) {
+                    $('#scrollToBottom').fadeOut();
+                }
+                $('#scrollToTop').fadeIn();
+            } else {
+                $('#scrollToTop').fadeOut();
+                if ($(document).height() > $(window).height()) {
+                    $('#scrollToBottom').fadeIn();
+                } else {
+                    $('#scrollToBottom').hide();
+                }
+            }
+        });
+        $("#scrollToTop").unbind("click");
+        $('#scrollToTop').click(function() {
+            $('html, body').animate({
+                scrollTop: 0
+            }, 800);
+            return false;
+        });
+        $("#scrollToBottom").unbind("click");
+        $('#scrollToBottom').click(function() {
+            $('html, body').animate({
+                scrollTop: $(document).height()
+            }, 800);
+            return false;
+        });
+        $(window).scroll();
+        $(".nextb").unbind("click");
+        $(".nextb").click(function() {
+            var rPos = 0;
+            var rActive = null;
+            $(".nav .nav-item").each(function() {
+                if ($(this).find(".nav-link").hasClass("active")) {
+                    rActive = rPos;
+                }
+                if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+                    $(this).find(".nav-link").trigger("click");
+                    return false;
+                }
+                rPos += 1;
+            });
+        });
+        $(".prevb").unbind("click");
+        $(".prevb").click(function() {
+            var rPos = 0;
+            var rActive = null;
+            $($(".nav .nav-item").get().reverse()).each(function() {
+                if ($(this).find(".nav-link").hasClass("active")) {
+                    rActive = rPos;
+                }
+                if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+                    $(this).find(".nav-link").trigger("click");
+                    return false;
+                }
+                rPos += 1;
+            });
+        });
+        (function($) {
+            $.fn.inputFilter = function(inputFilter) {
+                return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
+                    if (inputFilter(this.value)) {
+                        this.oldValue = this.value;
+                        this.oldSelectionStart = this.selectionStart;
+                        this.oldSelectionEnd = this.selectionEnd;
+                    } else if (this.hasOwnProperty("oldValue")) {
+                        this.value = this.oldValue;
+                        this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
+                    }
+                });
+            };
+        }(jQuery));
+        <?php if ($rSettings['js_navigate']): ?>
+            $(".navigation-menu li").mouseenter(function() {
+                $(this).find(".submenu").show();
+            });
+            delParam("status");
+            $(window).on("popstate", function() {
+                if (window.rRealURL) {
+                    if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
+                        navigate(window.location.href.split("/").reverse()[0]);
+                    }
+                }
+            });
+        <?php endif; ?>
+        $(document).keydown(function(e) {
+            if (e.keyCode == 16) {
+                window.rShiftHeld = true;
+            }
+        });
+        $(document).keyup(function(e) {
+            if (e.keyCode == 16) {
+                window.rShiftHeld = false;
+            }
+        });
+        document.onselectstart = function() {
+            if (window.rShiftHeld) {
+                return false;
+            }
+        }
+    });
+
+    $(document).ready(function() {
+        $("#scan_seconds").inputFilter(function(value) {
+            return /^\d*$/.test(value);
+        });
+        $("#max_items").inputFilter(function(value) {
+            return /^\d*$/.test(value);
+        });
+        $("#thread_count_movie").inputFilter(function(value) {
+            return /^\d*$/.test(value);
+        });
+        $("#thread_count_show").inputFilter(function(value) {
+            return /^\d*$/.test(value);
+        });
+        $('select').select2({
+            width: '100%'
+        });
+        $("form").submit(function(e) {
+            e.preventDefault();
+            $(':input[type="submit"]').prop('disabled', true);
+            submitForm(window.rCurrentPage, new FormData($("form")[0]));
+        });
+    });
+    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
+        $(document).ready(function() {
+            initSearch();
+        });
+    <?php endif; ?>
+</script>
+<script src="assets/js/listings.js"></script>
diff --git a/src/modules/theft-detection/TheftDetectionModule.php b/src/modules/theft-detection/TheftDetectionModule.php
new file mode 100644
index 00000000..131e8c11
--- /dev/null
+++ b/src/modules/theft-detection/TheftDetectionModule.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * XC_VM — Theft Detection Module
+ *
+ * Модуль обнаружения кражи VOD-контента.
+ * Мониторит паттерны просмотра VOD и выявляет потенциальное
+ * распространение/кражу контента через анализ количества просмотров.
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Что включает:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   Страницы:
+ *     - theft_detection — фильтрованная таблица просмотров VOD
+ *                         по пользователям (фильтр по диапазону)
+ *
+ *   Источник данных:
+ *     - cache_engine.php generateTheftDetection() — крон-задача ядра,
+ *       генерирует кеш-файл (igbinary) в CACHE_TMP_PATH/theft_detection
+ *
+ * @see admin/theft_detection.php
+ */
+
+class TheftDetectionModule implements ModuleInterface {
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName(): string {
+        return 'theft-detection';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVersion(): string {
+        return '1.0.0';
+    }
+
+    /**
+     * Регистрация сервисов модуля в DI-контейнере
+     *
+     * Theft Detection использует общую инфраструктуру admin-панели —
+     * отдельные сервисы не регистрируются.
+     *
+     * @param ServiceContainer $container
+     */
+    public function boot(ServiceContainer $container): void {
+        // Собственных сервисов нет — используется общая admin-инфраструктура
+    }
+
+    /**
+     * Регистрация маршрутов модуля
+     *
+     * Маршрутизация осуществляется через навигацию admin-панели
+     * (theft_detection.php загружается напрямую).
+     *
+     * @param Router $router
+     */
+    public function registerRoutes(Router $router): void {
+        // Маршрутизация — через admin page navigation (theft_detection.php)
+    }
+
+    /**
+     * Крон-задачи модуля
+     *
+     * Кеш theft_detection генерируется крон-задачей ядра
+     * (cache_engine.php → generateTheftDetection()), а не модулем.
+     *
+     * @return array
+     */
+    public function registerCrons(): array {
+        // Данные генерируются core cache_engine.php — модуль только отображает
+        return [];
+    }
+
+    /**
+     * Подписки на события ядра
+     *
+     * @return array
+     */
+    public function getEventSubscribers(): array {
+        return [];
+    }
+}
diff --git a/src/modules/theft-detection/module.json b/src/modules/theft-detection/module.json
new file mode 100644
index 00000000..1060bc8d
--- /dev/null
+++ b/src/modules/theft-detection/module.json
@@ -0,0 +1,7 @@
+{
+    "name": "theft-detection",
+    "version": "1.0.0",
+    "description": "VOD theft detection and usage monitoring",
+    "requires_core": ">=2.0",
+    "dependencies": []
+}
diff --git a/src/modules/tmdb/TmdbCron.php b/src/modules/tmdb/TmdbCron.php
new file mode 100644
index 00000000..df57706c
--- /dev/null
+++ b/src/modules/tmdb/TmdbCron.php
@@ -0,0 +1,629 @@
+<?php
+
+/**
+ * XC_VM — TmdbCron
+ *
+ * Крон обработки очереди TMDB (watch_refresh).
+ * Извлечён из crons/tmdb.php.
+ *
+ * Ответственность:
+ *   - Обработка очереди watch_refresh (фильмы, сериалы, эпизоды)
+ *   - Поиск совпадений в TMDB API
+ *   - Обновление метаданных в БД
+ */
+class TmdbCron
+{
+    /**
+     * Создать TMDB-клиент с корректным языком.
+     *
+     * Приоритет: язык потока → глобальная настройка → без языка.
+     *
+     * @param string|null $streamLang Язык потока (tmdb_language)
+     * @return TMDB
+     */
+    private static function createTmdbClient(?string $streamLang = null): TMDB
+    {
+        if (0 < strlen($streamLang)) {
+            return new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], $streamLang);
+        }
+        if (0 < strlen(CoreUtilities::$rSettings['tmdb_language'])) {
+            return new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], CoreUtilities::$rSettings['tmdb_language']);
+        }
+        return new TMDB(CoreUtilities::$rSettings['tmdb_api_key']);
+    }
+
+    /**
+     * Найти лучшее совпадение в TMDB по названию.
+     *
+     * Выполняет поиск дважды: сначала с годом, затем без.
+     * Возвращает TMDB ID или 0.
+     *
+     * @param TMDB        $tmdb       Инстанс клиента
+     * @param string      $title      Основной заголовок
+     * @param string|null $altTitle    Альтернативный заголовок
+     * @param string|null $year       Год выпуска
+     * @param string      $searchType 'movie' или 'tv'
+     * @return int TMDB ID (0 — не найден)
+     */
+    private static function findBestMatch(TMDB $tmdb, string $title, ?string $altTitle, ?string $year, string $searchType = 'movie'): int
+    {
+        $rMatch = null;
+        $rMatches = array();
+
+        foreach (range(0, 1) as $rIgnoreYear) {
+            if (!$rIgnoreYear) {
+            } else {
+                if ($year) {
+                    $year = null;
+                } else {
+                    break;
+                }
+            }
+
+            $rResults = ($searchType === 'movie')
+                ? $tmdb->searchMovie($title, $year)
+                : $tmdb->searchTVShow($title, $year);
+
+            foreach ($rResults as $rResultArr) {
+                $rPercentage = 0;
+                $rPercentageAlt = 0;
+
+                similar_text(
+                    strtoupper($title),
+                    strtoupper(($rResultArr->get('title') ?: $rResultArr->get('name'))),
+                    $rPercentage
+                );
+
+                if (!$altTitle) {
+                } else {
+                    similar_text(
+                        strtoupper($altTitle),
+                        strtoupper(($rResultArr->get('title') ?: $rResultArr->get('name'))),
+                        $rPercentageAlt
+                    );
+                }
+
+                if (!(CoreUtilities::$rSettings['percentage_match'] <= $rPercentage
+                    || CoreUtilities::$rSettings['percentage_match'] <= $rPercentageAlt)) {
+                } else {
+                    if ($year && !in_array(
+                        intval(substr(($rResultArr->get('release_date') ?: $rResultArr->get('first_air_date')), 0, 4)),
+                        range(intval($year) - 1, intval($year) + 1)
+                    )) {
+                    } else {
+                        if ($altTitle && strtolower(($rResultArr->get('title') ?: $rResultArr->get('name'))) == strtolower($altTitle)) {
+                            $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
+                            break;
+                        }
+                        if (strtolower(($rResultArr->get('title') ?: $rResultArr->get('name'))) == strtolower($title) && !$altTitle) {
+                            $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
+                            break;
+                        }
+                        $rMatches[] = array('percentage' => $rPercentage, 'data' => $rResultArr);
+                    }
+                }
+            }
+
+            if (0 >= count($rMatches)) {
+            } else {
+                break;
+            }
+        }
+
+        if (0 >= count($rMatches)) {
+            return 0;
+        }
+
+        $rMax = max(array_column($rMatches, 'percentage'));
+        $rKeys = array_filter(array_map(function ($rMatches) use ($rMax) {
+            return ($rMatches['percentage'] == $rMax ? $rMatches['data'] : null);
+        }, $rMatches));
+        list($rMatch) = array_values($rKeys);
+
+        return $rMatch ? intval($rMatch->get('id')) : 0;
+    }
+
+    /**
+     * Обработать обновление фильма (type=1).
+     *
+     * Ищет в TMDB по названию/файлу, загружает метаданные,
+     * обновляет streams и watch_refresh.
+     *
+     * @param array $row Строка из watch_refresh
+     */
+    private static function processMovie(array $row): void
+    {
+        global $db;
+
+        $db->query('SELECT * FROM `streams` WHERE `id` = ?;', $row['stream_id']);
+        if ($db->num_rows() != 1) {
+            $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
+            return;
+        }
+
+        $rStream = $db->get_row();
+        $rTMDB = self::createTmdbClient($rStream['tmdb_language']);
+
+        /* --- Определяем TMDB ID --- */
+        if ($rStream['tmdb_id']) {
+            $rTMDBID = $rStream['tmdb_id'];
+        } else {
+            if (0 < strlen($rStream['movie_properties'])) {
+                $rTMDBID = intval(json_decode($rStream['movie_properties'], true)['tmdb_id']);
+            } else {
+                $rTMDBID = 0;
+            }
+        }
+
+        /* --- Если TMDB ID неизвестен — ищем --- */
+        if ($rTMDBID == 0) {
+            $rFilename = pathinfo(json_decode($rStream['stream_source'], true)[0])['filename'];
+            foreach (array($rFilename, $rStream['stream_display_name']) as $rStreamTitle) {
+                $rRelease = parserelease($rStreamTitle);
+                $rTitle = $rRelease['title'];
+
+                if (!isset($rRelease['excess'])) {
+                } else {
+                    $rTitle = trim($rTitle, (is_array($rRelease['excess']) ? $rRelease['excess'][0] : $rRelease['excess']));
+                }
+
+                $rAltTitle = null;
+                if (isset($rRelease['group'])) {
+                    $rAltTitle = $rTitle . '-' . $rRelease['group'];
+                } else {
+                    if (!isset($rRelease['alternative_title'])) {
+                    } else {
+                        $rAltTitle = $rTitle . ' - ' . $rRelease['alternative_title'];
+                    }
+                }
+
+                if (!isset($rRelease['season'])) {
+                } else {
+                    $rTitle .= $rRelease['season'];
+                }
+
+                $rYear = $rRelease['year'];
+                if ($rTitle) {
+                } else {
+                    $rTitle = $rStreamTitle;
+                }
+
+                $rTMDBID = self::findBestMatch($rTMDB, $rTitle, $rAltTitle, $rYear, 'movie');
+                if ($rTMDBID > 0) {
+                    break;
+                }
+            }
+        }
+
+        /* --- Загружаем данные фильма --- */
+        if (0 < $rTMDBID) {
+            $rMovie = $rTMDB->getMovie($rTMDBID);
+            $rMovieData = json_decode($rMovie->getJSON(), true);
+            $rMovieData['trailer'] = $rMovie->getTrailer();
+
+            $rThumb = ($rMovieData['poster_path']
+                ? 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rMovieData['poster_path']
+                : '');
+            $rBG = ($rMovieData['backdrop_path']
+                ? 'https://image.tmdb.org/t/p/w1280' . $rMovieData['backdrop_path']
+                : '');
+
+            if (!CoreUtilities::$rSettings['download_images']) {
+            } else {
+                if (empty($rThumb)) {
+                } else {
+                    $rThumb = CoreUtilities::downloadImage($rThumb, 2);
+                }
+                if (empty($rBG)) {
+                } else {
+                    $rBG = CoreUtilities::downloadImage($rBG);
+                }
+            }
+
+            if (!$rBG) {
+            } else {
+                $rBG = array($rBG);
+            }
+
+            $rCast = array();
+            foreach ($rMovieData['credits']['cast'] as $rMember) {
+                if (count($rCast) >= 5) {
+                } else {
+                    $rCast[] = $rMember['name'];
+                }
+            }
+
+            $rDirectors = array();
+            foreach ($rMovieData['credits']['crew'] as $rMember) {
+                if (!(count($rDirectors) < 5
+                    && ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing'))
+                    || in_array($rMember['name'], $rDirectors)) {
+                } else {
+                    $rDirectors[] = $rMember['name'];
+                }
+            }
+
+            $rCountry = '';
+            if (!isset($rMovieData['production_countries'][0]['name'])) {
+            } else {
+                $rCountry = $rMovieData['production_countries'][0]['name'];
+            }
+
+            $rGenres = array();
+            foreach ($rMovieData['genres'] as $rGenre) {
+                if (count($rGenres) >= 3) {
+                } else {
+                    $rGenres[] = $rGenre['name'];
+                }
+            }
+
+            $rSeconds = intval($rMovieData['runtime']) * 60;
+
+            $rProperties = array(
+                'kinopoisk_url'        => 'https://www.themoviedb.org/movie/' . $rMovieData['id'],
+                'tmdb_id'              => $rMovieData['id'],
+                'name'                 => $rMovieData['title'],
+                'o_name'               => $rMovieData['original_title'],
+                'cover_big'            => $rThumb,
+                'movie_image'          => $rThumb,
+                'release_date'         => $rMovieData['release_date'],
+                'episode_run_time'     => $rMovieData['runtime'],
+                'youtube_trailer'      => $rMovieData['trailer'],
+                'director'             => implode(', ', $rDirectors),
+                'actors'               => implode(', ', $rCast),
+                'cast'                 => implode(', ', $rCast),
+                'description'          => $rMovieData['overview'],
+                'plot'                 => $rMovieData['overview'],
+                'age'                  => '',
+                'mpaa_rating'          => '',
+                'rating_count_kinopoisk' => 0,
+                'country'              => $rCountry,
+                'genre'                => implode(', ', $rGenres),
+                'backdrop_path'        => $rBG,
+                'duration_secs'        => $rSeconds,
+                'duration'             => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60),
+                'video'                => array(),
+                'audio'                => array(),
+                'bitrate'              => 0,
+                'rating'               => $rMovieData['vote_average'],
+            );
+
+            $rTitle   = $rMovieData['title'];
+            $rYear    = null;
+            $rRating  = ($rMovieData['vote_average'] ?: 0);
+
+            if (0 >= strlen($rMovieData['release_date'])) {
+            } else {
+                $rYear = intval(substr($rMovieData['release_date'], 0, 4));
+            }
+
+            $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $row['id']);
+            $db->query(
+                'UPDATE `streams` SET `stream_display_name` = ?, `year` = ?, `movie_properties` = ?, `rating` = ? WHERE `id` = ?;',
+                $rTitle,
+                $rYear,
+                json_encode($rProperties, JSON_UNESCAPED_UNICODE),
+                $rRating,
+                $row['stream_id']
+            );
+        } else {
+            $db->query('UPDATE `watch_refresh` SET `status` = -1 WHERE `id` = ?;', $row['id']);
+        }
+    }
+
+    /**
+     * Обработать обновление сериала (type=2).
+     *
+     * Ищет в TMDB по названию, загружает метаданные шоу,
+     * обновляет streams_series и watch_refresh.
+     *
+     * @param array $row           Строка из watch_refresh
+     * @param array &$updateSeries Массив ID сериалов для последующего updateSeries()
+     */
+    private static function processSeries(array $row, array &$updateSeries): void
+    {
+        global $db;
+
+        $db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $row['stream_id']);
+        if ($db->num_rows() != 1) {
+            $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
+            return;
+        }
+
+        $rStream = $db->get_row();
+        $rTMDB = self::createTmdbClient($rStream['tmdb_language']);
+        $rTMDBID = intval($rStream['tmdb_id']);
+
+        /* --- Если TMDB ID неизвестен — ищем --- */
+        if ($rTMDBID == 0) {
+            $rFilename = $rStream['title'];
+            $rRelease = parserelease($rFilename);
+            $rTitle = $rRelease['title'];
+
+            if (!isset($rRelease['excess'])) {
+            } else {
+                $rTitle = trim($rTitle, (is_array($rRelease['excess']) ? $rRelease['excess'][0] : $rRelease['excess']));
+            }
+
+            $rAltTitle = null;
+            if (isset($rRelease['group'])) {
+                $rAltTitle = $rTitle . '-' . $rRelease['group'];
+            } else {
+                if (!isset($rRelease['alternative_title'])) {
+                } else {
+                    $rAltTitle = $rTitle . ' - ' . $rRelease['alternative_title'];
+                }
+            }
+
+            $rYear = $rRelease['year'];
+            if ($rTitle) {
+            } else {
+                $rTitle = $rFilename;
+            }
+
+            $rTMDBID = self::findBestMatch($rTMDB, $rTitle, $rAltTitle, $rYear, 'tv');
+        }
+
+        /* --- Загружаем данные шоу --- */
+        if (0 < $rTMDBID) {
+            $rShow = $rTMDB->getTVShow($rTMDBID);
+            $rShowData = json_decode($rShow->getJSON(), true);
+
+            $rSeriesArray = $rStream;
+            $rSeriesArray['title']           = $rShowData['name'];
+            $rSeriesArray['tmdb_id']         = $rShowData['id'];
+            $rSeriesArray['plot']            = $rShowData['overview'];
+            $rSeriesArray['rating']          = $rShowData['vote_average'];
+            $rSeriesArray['release_date']    = $rShowData['first_air_date'];
+            $rSeriesArray['youtube_trailer'] = getSeriesTrailer($rShowData['id']);
+            $rSeriesArray['cover']           = ($rShowData['poster_path']
+                ? 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rShowData['poster_path']
+                : '');
+            $rSeriesArray['cover_big']       = $rSeriesArray['cover'];
+            $rSeriesArray['backdrop_path']   = array();
+
+            $rBG = ($rShowData['backdrop_path']
+                ? 'https://image.tmdb.org/t/p/w1280' . $rShowData['backdrop_path']
+                : '');
+
+            if (!CoreUtilities::$rSettings['download_images']) {
+            } else {
+                if (empty($rSeriesArray['cover'])) {
+                } else {
+                    $rSeriesArray['cover'] = CoreUtilities::downloadImage($rSeriesArray['cover'], 2);
+                }
+                if (empty($rBG)) {
+                } else {
+                    $rBG = CoreUtilities::downloadImage($rBG);
+                }
+            }
+
+            if (empty($rBG)) {
+            } else {
+                $rSeriesArray['backdrop_path'][] = $rBG;
+            }
+
+            $rCast = array();
+            foreach ($rShowData['credits']['cast'] as $rMember) {
+                if (count($rCast) >= 5) {
+                } else {
+                    $rCast[] = $rMember['name'];
+                }
+            }
+            $rSeriesArray['cast'] = implode(', ', $rCast);
+
+            $rDirectors = array();
+            foreach ($rShowData['credits']['crew'] as $rMember) {
+                if (!(count($rDirectors) < 5
+                    && ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing'))
+                    || in_array($rMember['name'], $rDirectors)) {
+                } else {
+                    $rDirectors[] = $rMember['name'];
+                }
+            }
+            $rSeriesArray['director'] = implode(', ', $rDirectors);
+
+            $rGenres = array();
+            foreach ($rShowData['genres'] as $rGenre) {
+                if (count($rGenres) >= 3) {
+                } else {
+                    $rGenres[] = $rGenre['name'];
+                }
+            }
+            $rSeriesArray['genre'] = implode(', ', $rGenres);
+
+            $rSeriesArray['episode_run_time'] = intval($rShowData['episode_run_time'][0]);
+
+            $rPrepare = prepareArray($rSeriesArray);
+            $rQuery = 'REPLACE INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+
+            if ($db->query($rQuery, ...$rPrepare['data'])) {
+                $rInsertID = $db->last_insert_id();
+                updateSeries(intval($rInsertID));
+                $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $row['id']);
+            } else {
+                $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
+            }
+        } else {
+            $db->query('UPDATE `watch_refresh` SET `status` = -1 WHERE `id` = ?;', $row['id']);
+        }
+    }
+
+    /**
+     * Обработать обновление эпизода (type=3).
+     *
+     * Получает данные сезона/эпизода из TMDB,
+     * обновляет streams, streams_episodes и watch_refresh.
+     *
+     * @param array $row           Строка из watch_refresh
+     * @param array &$updateSeries Массив ID сериалов для последующего updateSeries()
+     */
+    private static function processEpisode(array $row, array &$updateSeries): void
+    {
+        global $db;
+
+        $db->query('SELECT * FROM `streams` WHERE `id` = ?;', $row['stream_id']);
+        if ($db->num_rows() != 1) {
+            $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
+            return;
+        }
+        $rStream = $db->get_row();
+
+        $db->query('SELECT * FROM `streams_episodes` WHERE `stream_id` = ?;', $row['stream_id']);
+        if ($db->num_rows() != 1) {
+            $db->query('UPDATE `watch_refresh` SET `status` = -3 WHERE `id` = ?;', $row['id']);
+            return;
+        }
+        $rSeriesEpisode = $db->get_row();
+
+        $db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $rSeriesEpisode['series_id']);
+        if ($db->num_rows() != 1) {
+            $db->query('UPDATE `watch_refresh` SET `status` = -4 WHERE `id` = ?;', $row['id']);
+            return;
+        }
+        $rSeries = $db->get_row();
+
+        $rTMDB = self::createTmdbClient($rSeries['tmdb_language']);
+
+        if (!(0 < strlen($rSeries['tmdb_id']))) {
+            $db->query('UPDATE `watch_refresh` SET `status` = -5 WHERE `id` = ?;', $row['id']);
+            return;
+        }
+
+        $rShow = $rTMDB->getTVShow($rSeries['tmdb_id']);
+        $rShowData = json_decode($rShow->getJSON(), true);
+
+        if (!isset($rShowData['name'])) {
+            return;
+        }
+
+        $rFilename = pathinfo(json_decode($rStream['stream_source'], true)[0])['filename'];
+        $rRelease = parserelease($rFilename);
+        $rReleaseSeason = $rRelease['season'];
+
+        if (is_array($rRelease['episode'])) {
+            $rReleaseEpisode = $rRelease['episode'][0];
+        } else {
+            $rReleaseEpisode = $rRelease['episode'];
+        }
+
+        if ($rReleaseSeason && $rReleaseEpisode) {
+        } else {
+            $rReleaseSeason  = $rSeriesEpisode['season_num'];
+            $rReleaseEpisode = $rSeriesEpisode['episode_num'];
+        }
+
+        if (is_array($rRelease['episode']) && count($rRelease['episode']) == 2) {
+            $rTitle = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason))
+                . 'E' . sprintf('%02d', $rRelease['episode'][0])
+                . '-' . sprintf('%02d', $rRelease['episode'][1]);
+        } else {
+            $rTitle = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason))
+                . 'E' . sprintf('%02d', $rReleaseEpisode);
+        }
+
+        $rEpisodes  = json_decode($rTMDB->getSeason($rShowData['id'], intval($rReleaseSeason))->getJSON(), true);
+        $rProperties = array();
+
+        foreach ($rEpisodes['episodes'] as $rEpisode) {
+            if (intval($rEpisode['episode_number']) != $rReleaseEpisode) {
+            } else {
+                $rImage = null;
+                if (0 >= strlen($rEpisode['still_path'])) {
+                } else {
+                    $rImage = 'https://image.tmdb.org/t/p/w1280' . $rEpisode['still_path'];
+                    if (!CoreUtilities::$rSettings['download_images']) {
+                    } else {
+                        $rImage = CoreUtilities::downloadImage($rImage, 5);
+                    }
+                }
+
+                if (0 >= strlen($rEpisode['name'])) {
+                } else {
+                    $rTitle .= ' - ' . $rEpisode['name'];
+                }
+
+                $rSeconds = intval($rShowData['episode_run_time'][0]) * 60;
+
+                $rProperties = array(
+                    'tmdb_id'       => $rEpisode['id'],
+                    'release_date'  => $rEpisode['air_date'],
+                    'plot'          => $rEpisode['overview'],
+                    'duration_secs' => $rSeconds,
+                    'duration'      => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60),
+                    'movie_image'   => $rImage,
+                    'video'         => array(),
+                    'audio'         => array(),
+                    'bitrate'       => 0,
+                    'rating'        => $rEpisode['vote_average'],
+                    'season'        => $rReleaseSeason,
+                );
+
+                if (strlen($rProperties['movie_image'][0]) != 0) {
+                } else {
+                    unset($rProperties['movie_image']);
+                }
+
+                break;
+            }
+        }
+
+        $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $row['id']);
+        $db->query(
+            'UPDATE `streams` SET `stream_display_name` = ?, `movie_properties` = ? WHERE `id` = ?;',
+            $rTitle,
+            json_encode($rProperties, JSON_UNESCAPED_UNICODE),
+            $row['stream_id']
+        );
+        $db->query(
+            'UPDATE `streams_episodes` SET `season_num` = ?, `episode_num` = ? WHERE `stream_id` = ?;',
+            $rReleaseSeason,
+            $rReleaseEpisode,
+            $row['stream_id']
+        );
+
+        if (in_array($rSeries['id'], $updateSeries)) {
+        } else {
+            $updateSeries[] = $rSeries['id'];
+        }
+    }
+
+    /**
+     * Основная точка входа — обработка всей очереди watch_refresh.
+     *
+     * Подключает библиотеки TMDB, выбирает записи из очереди
+     * и делегирует обработку по типу.
+     */
+    public static function run(): void
+    {
+        global $db;
+
+        require INCLUDES_PATH . 'libs/tmdb.php';
+        require INCLUDES_PATH . 'libs/tmdb_release.php';
+
+        $rUpdateSeries = array();
+
+        $db->query('SELECT `id`, `type`, `stream_id` FROM `watch_refresh` WHERE `status` = 0 ORDER BY `stream_id` ASC;');
+
+        foreach ($db->get_rows() as $rRow) {
+            if ($rRow['type'] == 1) {
+                self::processMovie($rRow);
+            } else if ($rRow['type'] == 2) {
+                self::processSeries($rRow, $rUpdateSeries);
+            } else if ($rRow['type'] == 3) {
+                self::processEpisode($rRow, $rUpdateSeries);
+            } else {
+                /* type=4 — запрос на updateSeries */
+                if (in_array($rRow['stream_id'], $rUpdateSeries)) {
+                } else {
+                    $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $rRow['id']);
+                    $rUpdateSeries[] = intval($rRow['stream_id']);
+                }
+            }
+        }
+
+        foreach ($rUpdateSeries as $rSeriesID) {
+            updateSeries(intval($rSeriesID));
+        }
+    }
+}
diff --git a/src/modules/tmdb/TmdbModule.php b/src/modules/tmdb/TmdbModule.php
new file mode 100644
index 00000000..a6094450
--- /dev/null
+++ b/src/modules/tmdb/TmdbModule.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * XC_VM — TMDB Module
+ *
+ * Модуль интеграции с TheMovieDB.
+ * Регистрирует сервисы, API-действия и крон-задачи.
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Что включает:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   Сервисы:
+ *     - TmdbService       — поиск, получение деталей фильмов/сериалов
+ *     - TmdbCron          — крон обработки очереди watch_refresh
+ *     - TmdbPopularCron   — крон сбора популярных фильмов/сериалов
+ *
+ *   API-действия:
+ *     - tmdb_search       — поиск в TMDB (по тексту или ID)
+ *     - tmdb              — получение деталей фильма/сериала
+ *
+ *   Библиотека:
+ *     - includes/libs/tmdb.php      — TMDB API v3 PHP wrapper
+ *     - includes/libs/TMDb/         — модели (Movie, TVShow, Season, ...)
+ *     - includes/libs/tmdb_release.php — парсер release-имён
+ *
+ * @see TmdbService
+ * @see TmdbCron
+ * @see TmdbPopularCron
+ */
+
+class TmdbModule implements ModuleInterface {
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName(): string {
+        return 'tmdb';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVersion(): string {
+        return '1.0.0';
+    }
+
+    /**
+     * Регистрация сервисов модуля в DI-контейнере
+     *
+     * @param ServiceContainer $container
+     */
+    public function boot(ServiceContainer $container): void {
+        $container->set('tmdb.service', 'TmdbService');
+    }
+
+    /**
+     * Регистрация маршрутов модуля
+     *
+     * TMDB не имеет собственных страниц — только API-действия.
+     * Действия tmdb_search и tmdb пока остаются в admin/api.php
+     * (делегируют в TmdbService) и будут перенесены при рефакторинге api.php.
+     *
+     * @param Router $router
+     */
+    public function registerRoutes(Router $router): void {
+        // API-действия tmdb_search и tmdb остаются в api.php
+        // до рефакторинга god-объекта (Шаг 5.2 ARCHITECTURE.md)
+    }
+
+    /**
+     * Крон-задачи модуля
+     *
+     * @return array
+     */
+    public function registerCrons(): array {
+        return [
+            [
+                'class'    => TmdbCron::class,
+                'method'   => 'run',
+                'interval' => 3600,
+            ],
+            [
+                'class'    => TmdbPopularCron::class,
+                'method'   => 'run',
+                'interval' => 86400,
+            ],
+        ];
+    }
+
+    /**
+     * Подписки на события ядра
+     *
+     * @return array
+     */
+    public function getEventSubscribers(): array {
+        return [];
+    }
+}
diff --git a/src/modules/tmdb/TmdbPopularCron.php b/src/modules/tmdb/TmdbPopularCron.php
new file mode 100644
index 00000000..0ea71d01
--- /dev/null
+++ b/src/modules/tmdb/TmdbPopularCron.php
@@ -0,0 +1,220 @@
+<?php
+
+/**
+ * XC_VM — TmdbPopularCron
+ *
+ * Крон сбора популярных фильмов/сериалов из TMDB.
+ * Извлечён из crons/tmdb_popular.php.
+ *
+ * Ответственность:
+ *   - Сбор популярных фильмов и сериалов из TMDB API
+ *   - Сопоставление с локальной БД (streams, streams_series)
+ *   - Сбор «похожих» (similar) фильмов/сериалов
+ *   - Сбор популярных live-потоков по активности
+ *   - Запись результатов в файлы (tmdb_popular, live_popular)
+ */
+class TmdbPopularCron
+{
+    /**
+     * Собрать популярные фильмы и сериалы из TMDB.
+     *
+     * Сопоставляет TMDB ID с локальными записями.
+     *
+     * @param TMDB  $tmdb    Инстанс клиента
+     * @param array $tmdbIDs Маппинг tmdb_id => local_id
+     * @param int   $pages   Количество страниц для запроса
+     * @return array ['movies' => int[], 'series' => int[]]
+     */
+    private static function collectPopular(TMDB $tmdb, array $tmdbIDs, int $pages = 100): array
+    {
+        $rReturn = ['movies' => [], 'series' => []];
+
+        // Popular movies
+        foreach (range(1, $pages) as $rPage) {
+            foreach ($tmdb->getPopularMovies($rPage) as $rItem) {
+                $id = $rItem->getID();
+                if (isset($tmdbIDs[$id])) {
+                    $rReturn['movies'][] = $tmdbIDs[$id];
+                }
+            }
+        }
+
+        // Popular TV shows
+        foreach (range(1, $pages) as $rPage) {
+            foreach ($tmdb->getPopularTVShows($rPage) as $rItem) {
+                $id = $rItem->getID();
+                if (isset($tmdbIDs[$id])) {
+                    $rReturn['series'][] = $tmdbIDs[$id];
+                }
+            }
+        }
+
+        return $rReturn;
+    }
+
+    /**
+     * Заполнить поле `similar` для фильмов.
+     *
+     * @param TMDB $tmdb Инстанс клиента
+     */
+    private static function processSimilarMovies(TMDB $tmdb): void
+    {
+        global $db;
+
+        $db->query(
+            'SELECT COUNT(*) AS `count` FROM `streams`
+             WHERE `type` = 2 AND `similar` IS NULL AND `tmdb_id` > 0;'
+        );
+        $rCount = (int)($db->get_row()['count'] ?? 0);
+        if ($rCount <= 0) {
+            return;
+        }
+
+        $rSteps = $rCount >= 1000 ? range(0, $rCount, 1000) : [0];
+        foreach ($rSteps as $rStep) {
+            $db->query(
+                'SELECT `id`, `tmdb_id` FROM `streams`
+                 WHERE `type` = 2 AND `similar` IS NULL AND `tmdb_id` > 0
+                 LIMIT ' . $rStep . ', 1000;'
+            );
+            foreach ($db->get_rows() as $rRow) {
+                $rSimilar = [];
+                foreach (range(1, 3) as $rPage) {
+                    $items = $tmdb->getSimilarMovies($rRow['tmdb_id'], $rPage);
+                    foreach (json_decode(json_encode($items), true) as $rItem) {
+                        $rSimilar[] = (int)($rItem['_data']['id'] ?? 0);
+                    }
+                }
+                $db->query(
+                    'UPDATE `streams` SET `similar` = ? WHERE `id` = ?;',
+                    json_encode(array_values(array_unique($rSimilar))),
+                    $rRow['id']
+                );
+            }
+        }
+    }
+
+    /**
+     * Заполнить поле `similar` для сериалов.
+     *
+     * @param TMDB $tmdb Инстанс клиента
+     */
+    private static function processSimilarSeries(TMDB $tmdb): void
+    {
+        global $db;
+
+        $db->query(
+            'SELECT COUNT(*) AS `count` FROM `streams_series`
+             WHERE `similar` IS NULL AND `tmdb_id` > 0;'
+        );
+        $rCount = (int)($db->get_row()['count'] ?? 0);
+        if ($rCount <= 0) {
+            return;
+        }
+
+        $rSteps = $rCount >= 1000 ? range(0, $rCount, 1000) : [0];
+        foreach ($rSteps as $rStep) {
+            $db->query(
+                'SELECT `id`, `tmdb_id` FROM `streams_series`
+                 WHERE `similar` IS NULL AND `tmdb_id` > 0
+                 LIMIT ' . $rStep . ', 1000;'
+            );
+            foreach ($db->get_rows() as $rRow) {
+                $rSimilar = [];
+                foreach (range(1, 3) as $rPage) {
+                    $items = $tmdb->getSimilarSeries($rRow['tmdb_id'], $rPage);
+                    foreach (json_decode(json_encode($items), true) as $rItem) {
+                        $rSimilar[] = (int)($rItem['id'] ?? 0);
+                    }
+                }
+                $db->query(
+                    'UPDATE `streams_series` SET `similar` = ? WHERE `id` = ?;',
+                    json_encode(array_values(array_unique($rSimilar))),
+                    $rRow['id']
+                );
+            }
+        }
+    }
+
+    /**
+     * Собрать популярные live-потоки по активности за 28 дней.
+     */
+    private static function collectPopularLive(): void
+    {
+        global $db;
+
+        $rPopularLive = [];
+        $db->query(
+            'SELECT `stream_id`, COUNT(`activity_id`) AS `count`
+             FROM `lines_activity`
+             LEFT JOIN `streams` ON `streams`.`id` = `lines_activity`.`stream_id`
+             WHERE `type` = 1 AND `date_end` < UNIX_TIMESTAMP() - (86400*28)
+             GROUP BY `stream_id`
+             ORDER BY `count` DESC
+             LIMIT 500;'
+        );
+        foreach ($db->get_rows() as $rRow) {
+            $rPopularLive[] = $rRow['stream_id'];
+        }
+
+        file_put_contents(CONTENT_PATH . 'live_popular', igbinary_serialize($rPopularLive));
+    }
+
+    /**
+     * Главная точка входа крона.
+     *
+     * Выполняет:
+     *   1. Сбор популярных фильмов/сериалов из TMDB
+     *   2. Заполнение similar для фильмов
+     *   3. Заполнение similar для сериалов
+     *   4. Сбор популярных live-потоков
+     */
+    public static function run(): void
+    {
+        global $db;
+
+        require_once MAIN_HOME . 'includes/libs/tmdb.php';
+
+        if (strlen(CoreUtilities::$rSettings['tmdb_api_key'] ?? '') > 0) {
+            $lang = CoreUtilities::$rSettings['tmdb_language'] ?? '';
+            $rTMDB = $lang !== ''
+                ? new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], $lang)
+                : new TMDB(CoreUtilities::$rSettings['tmdb_api_key']);
+
+            $rPages = 100;
+            $rTMDBIDs = [];
+
+            // --- Movies
+            $db->query(
+                'SELECT `id`, `movie_properties` FROM `streams`
+                 WHERE `type` = 2 AND `movie_properties` IS NOT NULL AND LENGTH(`movie_properties`) > 0;'
+            );
+            foreach ($db->get_rows() as $rRow) {
+                $rProperties = json_decode($rRow['movie_properties'], true);
+                if (!empty($rProperties['tmdb_id'])) {
+                    $rTMDBIDs[$rProperties['tmdb_id']] = $rRow['id'];
+                }
+            }
+
+            // --- Series
+            $db->query(
+                'SELECT `id`, `tmdb_id` FROM `streams_series`
+                 WHERE `tmdb_id` IS NOT NULL AND LENGTH(`tmdb_id`) > 0;'
+            );
+            foreach ($db->get_rows() as $rRow) {
+                $rTMDBIDs[$rRow['tmdb_id']] = $rRow['id'];
+            }
+
+            // Collect & save popular
+            $rReturn = self::collectPopular($rTMDB, $rTMDBIDs, $rPages);
+            file_put_contents(CONTENT_PATH . 'tmdb_popular', igbinary_serialize($rReturn));
+
+            // Similar movies & series
+            self::processSimilarMovies($rTMDB);
+            self::processSimilarSeries($rTMDB);
+        }
+
+        // Popular live streams (always, regardless of TMDB key)
+        self::collectPopularLive();
+    }
+}
diff --git a/src/modules/tmdb/TmdbService.php b/src/modules/tmdb/TmdbService.php
new file mode 100644
index 00000000..3aa4a1b8
--- /dev/null
+++ b/src/modules/tmdb/TmdbService.php
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * XC_VM — TmdbService
+ *
+ * Сервис для работы с TMDB API.
+ * Извлечён из admin/api.php (действия: tmdb_search, tmdb).
+ *
+ * Ответственность:
+ *   - Создание экземпляра TMDB с правильной локализацией
+ *   - Поиск фильмов/сериалов по названию или TMDB ID
+ *   - Получение детальной информации (getMovie, getTVShow, getSeason)
+ *   - Трейлеры сериалов
+ *
+ * Зависимости:
+ *   - includes/libs/tmdb.php (класс TMDB)
+ *   - includes/libs/tmdb_release.php (parserelease)
+ *   - includes/admin.php (getSeriesTrailer)
+ */
+class TmdbService {
+
+    /**
+     * Создать экземпляр TMDB API-клиента
+     *
+     * @param string      $apiKey   TMDB API key
+     * @param string|null $language Язык запроса (приоритет: явный → настройка → default)
+     * @return TMDB
+     */
+    public static function createClient(string $apiKey, ?string $language = null): TMDB {
+        if ($language !== null && strlen($language) > 0) {
+            return new TMDB($apiKey, $language);
+        }
+
+        $settingsLang = CoreUtilities::$rSettings['tmdb_language'] ?? '';
+        if (strlen($settingsLang) > 0) {
+            return new TMDB($apiKey, $settingsLang);
+        }
+
+        return new TMDB($apiKey);
+    }
+
+    /**
+     * Поиск по TMDB (фильмы, сериалы, эпизоды)
+     *
+     * Поддерживает поиск:
+     *   - По числовому ID (прямой getMovie/getTVShow/getSeason)
+     *   - По текстовому запросу (searchMovie/searchTVShow)
+     *
+     * @param string      $term     Поисковый запрос или TMDB ID
+     * @param string      $type     Тип: movie|series|episode
+     * @param string|null $language Язык запроса
+     * @param int|null    $season   Номер сезона (для episode)
+     * @return array ['result' => bool, 'data' => array|null]
+     */
+    public static function search(string $term, string $type, ?string $language = null, ?int $season = null): array {
+        $apiKey = CoreUtilities::$rSettings['tmdb_api_key'] ?? '';
+        if (strlen($apiKey) === 0) {
+            return ['result' => false];
+        }
+
+        self::requireLibrary();
+        $rTMDB = self::createClient($apiKey, $language);
+
+        // Прямой поиск по числовому TMDB ID
+        if (is_numeric($term) && in_array($type, ['movie', 'series', 'episode'])) {
+            $rResult = self::fetchByID($rTMDB, $term, $type, $season);
+            if (is_array($rResult)) {
+                return ['result' => true, 'data' => $rResult];
+            }
+        }
+
+        // Текстовый поиск
+        $rRelease = parserelease($term);
+        $searchTerm = $rRelease['title'];
+        $rJSON = [];
+
+        if ($type === 'movie') {
+            foreach ($rTMDB->searchMovie($searchTerm) as $rResult) {
+                $rJSON[] = json_decode($rResult->getJSON(), true);
+            }
+        } elseif ($type === 'series') {
+            foreach ($rTMDB->searchTVShow($searchTerm) as $rResult) {
+                $rJSON[] = json_decode($rResult->getJSON(), true);
+            }
+        }
+
+        if (count($rJSON) > 0) {
+            return ['result' => true, 'data' => $rJSON];
+        }
+
+        return ['result' => false];
+    }
+
+    /**
+     * Получить детальную информацию о фильме/сериале по TMDB ID
+     *
+     * @param int         $id       TMDB ID
+     * @param string      $type     Тип: movie|series
+     * @param string|null $language Язык запроса
+     * @return array ['result' => bool, 'data' => array|null]
+     */
+    public static function getDetails(int $id, string $type, ?string $language = null): array {
+        $apiKey = CoreUtilities::$rSettings['tmdb_api_key'] ?? '';
+        if (strlen($apiKey) === 0) {
+            return ['result' => false];
+        }
+
+        self::requireLibrary();
+        $rTMDB = self::createClient($apiKey, $language);
+        $rResult = null;
+
+        if ($type === 'movie') {
+            $rMovie = $rTMDB->getMovie($id);
+            $rResult = json_decode($rMovie->getJSON(), true);
+            $rResult['trailer'] = $rMovie->getTrailer();
+        } elseif ($type === 'series') {
+            $rSeries = $rTMDB->getTVShow($id);
+            $rResult = json_decode($rSeries->getJSON(), true);
+            $settingsLang = CoreUtilities::$rSettings['tmdb_language'] ?? '';
+            $rResult['trailer'] = getSeriesTrailer($id, ($language ?: $settingsLang));
+        }
+
+        if (!$rResult) {
+            return ['result' => false];
+        }
+
+        return ['result' => true, 'data' => $rResult];
+    }
+
+    /**
+     * Получить данные по числовому ID
+     *
+     * @param TMDB     $tmdb   Экземпляр TMDB
+     * @param string   $id     TMDB ID
+     * @param string   $type   Тип: movie|series|episode
+     * @param int|null $season Номер сезона
+     * @return array|null
+     */
+    private static function fetchByID(TMDB $tmdb, string $id, string $type, ?int $season): ?array {
+        if ($type === 'movie') {
+            return [json_decode($tmdb->getMovie($id)->getJSON(), true)];
+        }
+
+        if ($type === 'series') {
+            return [json_decode($tmdb->getTVShow($id)->getJSON(), true)];
+        }
+
+        if ($type === 'episode' && $season !== null) {
+            $rResult = json_decode($tmdb->getSeason($id, $season)->getJSON(), true);
+            if (isset($rResult['tvshow_id']) && $rResult['tvshow_id'] == 0) {
+                return null;
+            }
+            return $rResult;
+        }
+
+        return null;
+    }
+
+    /**
+     * Подключить библиотеку TMDB (один раз)
+     */
+    private static function requireLibrary(): void {
+        static $loaded = false;
+        if (!$loaded) {
+            require_once INCLUDES_PATH . 'libs/tmdb.php';
+            $loaded = true;
+        }
+    }
+}
diff --git a/src/modules/tmdb/lib.php b/src/modules/tmdb/lib.php
new file mode 100644
index 00000000..d9dbeacb
--- /dev/null
+++ b/src/modules/tmdb/lib.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * XC_VM — TMDB Library Loader
+ *
+ * Прокси-файл для загрузки TMDB-библиотеки из includes/libs/.
+ *
+ * Библиотека TMDb (includes/libs/tmdb.php + includes/libs/TMDb/)
+ * остаётся на месте до полного перехода на автозагрузку.
+ * Этот файл обеспечивает единую точку входа из модуля.
+ *
+ * @see includes/libs/tmdb.php
+ * @see includes/libs/TMDb/
+ * @see includes/libs/tmdb_release.php
+ */
+
+require_once INCLUDES_PATH . 'libs/tmdb.php';
diff --git a/src/modules/tmdb/module.json b/src/modules/tmdb/module.json
new file mode 100644
index 00000000..65bfb6ee
--- /dev/null
+++ b/src/modules/tmdb/module.json
@@ -0,0 +1,7 @@
+{
+    "name": "tmdb",
+    "version": "1.0.0",
+    "description": "TMDB (The Movie Database) integration for metadata fetching",
+    "requires_core": ">=2.0",
+    "dependencies": []
+}
diff --git a/src/modules/watch/RecordingService.php b/src/modules/watch/RecordingService.php
new file mode 100644
index 00000000..f8ebc06b
--- /dev/null
+++ b/src/modules/watch/RecordingService.php
@@ -0,0 +1,25 @@
+<?php
+
+class RecordingService {
+	public static function schedule($db, $rData) {
+		if (empty($rData['title'])) {
+			return array('status' => STATUS_NO_TITLE);
+		}
+		if (empty($rData['source_id'])) {
+			return array('status' => STATUS_NO_SOURCE);
+		}
+
+		$rArray = verifyPostTable('recordings', $rData);
+		$rArray['bouquets'] = '[' . implode(',', array_map('intval', $rData['bouquets'])) . ']';
+		$rArray['category_id'] = '[' . implode(',', array_map('intval', $rData['category_id'])) . ']';
+		$rPrepare = prepareArray($rArray);
+		$rQuery = 'REPLACE INTO `recordings`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+
+		if ($db->query($rQuery, ...$rPrepare['data'])) {
+			$rInsertID = $db->last_insert_id();
+			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+		}
+
+		return array('status' => STATUS_FAILURE, 'data' => $rData);
+	}
+}
diff --git a/src/modules/watch/WatchController.php b/src/modules/watch/WatchController.php
new file mode 100644
index 00000000..cfd476fb
--- /dev/null
+++ b/src/modules/watch/WatchController.php
@@ -0,0 +1,256 @@
+<?php
+
+/**
+ * XC_VM — Watch Module Controller
+ *
+ * Обрабатывает все маршруты модуля Watch:
+ * - Список Watch Folder'ов (index)
+ * - Добавление/редактирование (add)
+ * - Настройки Watch (settings)
+ * - Логи Watch (output)
+ * - Запись (record)
+ * - API: enable/disable/kill/folder actions
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Заменяет:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   admin/watch.php          → index()
+ *   admin/watch_add.php      → add()
+ *   admin/settings_watch.php → settings()
+ *   admin/watch_output.php   → output()
+ *   admin/record.php         → record()
+ *   admin/api.php actions:
+ *     enable_watch  → apiEnable()
+ *     disable_watch → apiDisable()
+ *     kill_watch    → apiKill()
+ *     folder (sub=delete|force) → apiFolder()
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Использование (через Router):
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   $router->group('watch', function(Router $r) {
+ *       $r->get('',         [WatchController::class, 'index']);
+ *       $r->get('add',      [WatchController::class, 'add']);
+ *       $r->get('settings', [WatchController::class, 'settings']);
+ *       $r->get('output',   [WatchController::class, 'output']);
+ *       $r->get('record',   [WatchController::class, 'record']);
+ *   });
+ *
+ * @see WatchService
+ * @see RecordingService
+ * @see WatchModule
+ */
+
+class WatchController {
+
+    /**
+     * Путь к директории views модуля
+     * @var string
+     */
+    protected $viewsPath;
+
+    public function __construct() {
+        $this->viewsPath = dirname(__DIR__) . '/modules/watch/views';
+    }
+
+    // ───────────────────────────────────────────────────────────
+    //  Страницы (GET)
+    // ───────────────────────────────────────────────────────────
+
+    /**
+     * Список Watch Folder'ов
+     *
+     * Заменяет admin/watch.php
+     */
+    public function index() {
+        include $this->viewsPath . '/watch.php';
+    }
+
+    /**
+     * Форма добавления/редактирования Watch Folder
+     *
+     * Заменяет admin/watch_add.php
+     * Подготавливает данные: $rFolder (при edit), $rBouquets
+     */
+    public function add() {
+        global $db;
+
+        if (isset(CoreUtilities::$rRequest['id'])) {
+            $rFolder = getWatchFolder(CoreUtilities::$rRequest['id']);
+            if (!$rFolder) {
+                goHome();
+                return;
+            }
+        }
+
+        $rBouquets = getBouquets();
+        $_TITLE = isset($rFolder) ? 'Edit Folder' : 'Add Folder';
+
+        include 'header.php';
+        include $this->viewsPath . '/watch_add.php';
+    }
+
+    /**
+     * Настройки Watch Folder
+     *
+     * Заменяет admin/settings_watch.php
+     * Подготавливает: $rBouquets, категории
+     */
+    public function settings() {
+        $rBouquets = getBouquets();
+        $_TITLE = 'Watch Settings';
+
+        include 'header.php';
+        include $this->viewsPath . '/settings_watch.php';
+    }
+
+    /**
+     * Логи Watch Folder / Plex Sync
+     *
+     * Заменяет admin/watch_output.php
+     */
+    public function output() {
+        $_TITLE = 'Watch Folder Logs';
+
+        include 'header.php';
+        include $this->viewsPath . '/watch_output.php';
+    }
+
+    /**
+     * Форма записи (Recording)
+     *
+     * Заменяет admin/record.php
+     * Подготавливает: $rStream, $rProgramme, $rAvailableServers
+     */
+    public function record() {
+        global $db;
+
+        $rAvailableServers = $rServers = array();
+        $rStream = $rProgramme = null;
+
+        if (isset(CoreUtilities::$rRequest['id'])) {
+            $rStream = getStream(CoreUtilities::$rRequest['id']);
+            $rProgramme = CoreUtilities::getProgramme(
+                CoreUtilities::$rRequest['id'],
+                CoreUtilities::$rRequest['programme']
+            );
+            if (!$rStream || $rStream['type'] != 1 || !$rProgramme) {
+                goHome();
+                return;
+            }
+        } elseif (isset(CoreUtilities::$rRequest['archive'])) {
+            $rArchive = json_decode(base64_decode(CoreUtilities::$rRequest['archive']), true);
+            $rStream = getStream($rArchive['stream_id']);
+            $rProgramme = [
+                'start'       => $rArchive['start'],
+                'end'         => $rArchive['end'],
+                'title'       => $rArchive['title'],
+                'description' => $rArchive['description'],
+                'archive'     => true,
+            ];
+            if (!$rStream || $rStream['type'] != 1 || !$rProgramme) {
+                goHome();
+                return;
+            }
+        } elseif (isset(CoreUtilities::$rRequest['stream_id'])) {
+            $rStream = getStream(CoreUtilities::$rRequest['stream_id']);
+            $rProgramme = [
+                'start'       => strtotime(CoreUtilities::$rRequest['start_date']),
+                'end'         => strtotime(CoreUtilities::$rRequest['start_date']) + intval(CoreUtilities::$rRequest['duration']) * 60,
+                'title'       => '',
+                'description' => '',
+            ];
+            if (!$rStream || $rStream['type'] != 1 || !$rProgramme || $rProgramme['end'] < time()) {
+                header('Location: record');
+                return;
+            }
+        }
+
+        if ($rStream) {
+            $rBitrate = null;
+            $db->query('SELECT `server_id`, `bitrate` FROM `streams_servers` WHERE `stream_id` = ?;', $rStream['id']);
+            foreach ($db->get_rows() as $rRow) {
+                $rAvailableServers[] = $rRow['server_id'];
+                if ((!$rBitrate && $rRow['bitrate']) || ($rRow['bitrate'] && $rBitrate < $rRow['bitrate'])) {
+                    $rBitrate = $rRow['bitrate'];
+                }
+            }
+        }
+
+        $_TITLE = 'Schedule Recording';
+
+        include 'header.php';
+        include $this->viewsPath . '/record.php';
+    }
+
+    // ───────────────────────────────────────────────────────────
+    //  API-действия (JSON)
+    // ───────────────────────────────────────────────────────────
+
+    /**
+     * Включить все Watch Folder'ы
+     *
+     * Заменяет admin/api.php action=enable_watch
+     */
+    public function apiEnable() {
+        global $db;
+        WatchService::enableWatch($db);
+        echo json_encode(['result' => true]);
+        exit();
+    }
+
+    /**
+     * Отключить все Watch Folder'ы
+     *
+     * Заменяет admin/api.php action=disable_watch
+     */
+    public function apiDisable() {
+        global $db;
+        WatchService::disableWatch($db);
+        echo json_encode(['result' => true]);
+        exit();
+    }
+
+    /**
+     * Убить все процессы Watch Folder
+     *
+     * Заменяет admin/api.php action=kill_watch
+     */
+    public function apiKill() {
+        global $db;
+        WatchService::killWatch($db);
+        echo json_encode(['result' => true]);
+        exit();
+    }
+
+    /**
+     * Действия с отдельным Folder'ом (delete / force)
+     *
+     * Заменяет admin/api.php action=folder&sub=delete|force
+     */
+    public function apiFolder() {
+        global $db;
+        $rSub = CoreUtilities::$rRequest['sub'] ?? '';
+        $rFolderID = CoreUtilities::$rRequest['folder_id'] ?? 0;
+
+        if ($rSub === 'delete') {
+            deleteWatchFolder($rFolderID);
+            echo json_encode(['result' => true]);
+            exit();
+        }
+
+        if ($rSub === 'force') {
+            $rFolder = getWatchFolder($rFolderID);
+            if ($rFolder) {
+                WatchService::forceWatch($rFolder['server_id'], $rFolder['id']);
+                echo json_encode(['result' => true]);
+                exit();
+            }
+        }
+
+        echo json_encode(['result' => false]);
+        exit();
+    }
+}
diff --git a/src/modules/watch/WatchCron.php b/src/modules/watch/WatchCron.php
new file mode 100644
index 00000000..086a683e
--- /dev/null
+++ b/src/modules/watch/WatchCron.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * WatchCron — крон-задача Watch Folder.
+ *
+ * Извлечён из crons/watch.php (Фаза 5.2).
+ * Thread/Multithread вынесены в core/Process/ (Фаза 5 аудит).
+ */
+
+require_once __DIR__ . '/../../core/Process/Thread.php';
+require_once __DIR__ . '/../../core/Process/Multithread.php';
+
+class WatchCron {
+    /**
+     * Получить категории Watch из БД.
+     *
+     * @param int|null $rType Тип категории (1=movie, 2=series)
+     * @return array
+     */
+    public static function getWatchCategories($rType = null) {
+        global $db;
+        $rReturn = array();
+        if ($rType) {
+            $db->query('SELECT * FROM `watch_categories` WHERE `type` = ? ORDER BY `genre_id` ASC;', $rType);
+        } else {
+            $db->query('SELECT * FROM `watch_categories` ORDER BY `genre_id` ASC;');
+        }
+        foreach ($db->get_rows() as $rRow) {
+            $rReturn[$rRow['genre_id']] = $rRow;
+        }
+        return $rReturn;
+    }
+
+    /**
+     * Получить букет по ID.
+     *
+     * @param int $rID
+     * @return array|null
+     */
+    public static function getBouquet($rID) {
+        global $db;
+        $db->query('SELECT * FROM `bouquets` WHERE `id` = ?;', $rID);
+        if ($db->num_rows() != 1) {
+        } else {
+            return $db->get_row();
+        }
+    }
+
+    /**
+     * Обработать файлы букетов во временной директории.
+     */
+    public static function checkBouquets() {
+        global $db;
+        $a39a336ad3894348 = array();
+        $rBouquets = glob(WATCH_TMP_PATH . '*.bouquet');
+        foreach ($rBouquets as $D3e2134ebfab5c71) {
+            $rBouquet = json_decode(file_get_contents($D3e2134ebfab5c71), true);
+            if (isset($a39a336ad3894348[$rBouquet['bouquet_id']])) {
+            } else {
+                $a39a336ad3894348[$rBouquet['bouquet_id']] = array('movie' => array(), 'series' => array());
+            }
+            $a39a336ad3894348[$rBouquet['bouquet_id']][$rBouquet['type']][] = $rBouquet['id'];
+            unlink($D3e2134ebfab5c71);
+        }
+        foreach ($a39a336ad3894348 as $rBouquetID => $rBouquetData) {
+            $rBouquet = self::getBouquet($rBouquetID);
+            if (!$rBouquet) {
+            } else {
+                foreach (array('movie', 'series') as $rType) {
+                    if ($rType == 'movie') {
+                        $rColumn = 'bouquet_movies';
+                    } else {
+                        $rColumn = 'bouquet_series';
+                    }
+                    $rChannels = json_decode($rBouquet[$rColumn], true);
+                    foreach ($rBouquetData[$rType] as $rID) {
+                        if (0 >= intval($rID) || in_array($rID, $rChannels)) {
+                        } else {
+                            $rChannels[] = $rID;
+                        }
+                    }
+                    $db->query('UPDATE `bouquets` SET `' . $rColumn . '` = ? WHERE `id` = ?;', '[' . implode(',', array_map('intval', $rChannels)) . ']', $rBouquetID);
+                }
+            }
+        }
+    }
+
+    /**
+     * Основная точка входа крона Watch Folder.
+     * Заменяет loadCron().
+     */
+    public static function run() {
+        global $db;
+        global $rThreadCount;
+        global $rScanOffset;
+        global $F7fa29461a8a5ee2;
+        global $rForce;
+        $rWatchCategories = array(1 => self::getWatchCategories(1), 2 => self::getWatchCategories(2));
+        if (0 >= count(glob(WATCH_TMP_PATH . '*.bouquet'))) {
+        } else {
+            self::checkBouquets();
+        }
+        if (!$rForce) {
+            $db->query("SELECT * FROM `watch_folders` WHERE `type` <> 'plex' AND `server_id` = ? AND `active` = 1 AND (UNIX_TIMESTAMP() - `last_run` > ? OR `last_run` IS NULL) ORDER BY `id` ASC;", SERVER_ID, $rScanOffset);
+        } else {
+            $db->query("SELECT * FROM `watch_folders` WHERE `type` <> 'plex' AND `server_id` = ? AND `id` = ?;", SERVER_ID, $rForce);
+        }
+        $rRows = $db->get_rows();
+        if (0 >= count($rRows)) {
+        } else {
+            shell_exec('rm -f ' . WATCH_TMP_PATH . '*.wpid');
+            $rSeriesTMDB = $rStreamDatabase = array();
+            $rTMDBDatabase = array('movie' => array(), 'series' => array());
+            echo 'Generating cache...' . "\n";
+            $db->query('SELECT `id`, `tmdb_id` FROM `streams_series` WHERE `tmdb_id` IS NOT NULL AND `tmdb_id` > 0;');
+            foreach ($db->get_rows() as $rRow) {
+                $rSeriesTMDB[$rRow['id']] = $rRow['tmdb_id'];
+            }
+            $db->query('SELECT `streams`.`id`, `streams_episodes`.`series_id`, `streams_episodes`.`season_num`, `streams_episodes`.`episode_num`, `streams`.`stream_source` FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams_servers`.`server_id` = ?;', SERVER_ID);
+            foreach ($db->get_rows() as $rRow) {
+                $rStreamDatabase[] = $rRow['stream_source'];
+                $rTMDBID = $rSeriesTMDB[$rRow['series_id']];
+                if (!$rTMDBID) {
+                } else {
+                    list($rSource) = json_decode($rRow['stream_source'], true);
+                    $rTMDBDatabase['series'][$rTMDBID][$rRow['season_num'] . '_' . $rRow['episode_num']] = array('id' => $rRow['id'], 'source' => $rSource);
+                }
+            }
+            $db->query('SELECT `streams`.`id`, `streams`.`stream_source`, `streams`.`movie_properties` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`type` = 2 AND `streams_servers`.`server_id` = ?;', SERVER_ID);
+            foreach ($db->get_rows() as $rRow) {
+                $rStreamDatabase[] = $rRow['stream_source'];
+                $rTMDBID = (json_decode($rRow['movie_properties'], true)['tmdb_id'] ?: null);
+                if (!$rTMDBID) {
+                } else {
+                    list($rSource) = json_decode($rRow['stream_source'], true);
+                    $rTMDBDatabase['movie'][$rTMDBID] = array('id' => $rRow['id'], 'source' => $rSource);
+                }
+            }
+            exec('find ' . WATCH_TMP_PATH . ' -maxdepth 1 -name "*.cache" -print0 | xargs -0 rm');
+            foreach ($rTMDBDatabase['series'] as $rTMDBID => $rData) {
+                file_put_contents(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.cache', json_encode($rData));
+            }
+            foreach ($rTMDBDatabase['movie'] as $rTMDBID => $rData) {
+                file_put_contents(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.cache', json_encode($rData));
+            }
+            unset($rTMDBDatabase);
+            echo 'Finished generating cache!' . "\n";
+        }
+        foreach ($rRows as $rRow) {
+            $db->query('UPDATE `watch_folders` SET `last_run` = UNIX_TIMESTAMP() WHERE `id` = ?;', $rRow['id']);
+            $rExtensions = json_decode($rRow['allowed_extensions'], true);
+            if ($rExtensions) {
+            } else {
+                $rExtensions = array();
+            }
+            if (count($rExtensions) == 0) {
+                $rExtensions = array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'flv', 'wmv', 'mov', 'ts');
+            }
+            $rSubtitles = $rFiles = array();
+            if (0 < strlen($rRow['rclone_dir'])) {
+                $rCommand = 'rclone --config "' . CONFIG_PATH . 'rclone.conf" lsjson ' . escapeshellarg($rRow['rclone_dir']) . ' -R --fast-list --files-only';
+                exec($rCommand, $a364ed03b3639bd1, $Ee034ad5c6b0c8a3);
+                $rData = implode(' ', $a364ed03b3639bd1);
+                if (!substr($rData, 0, 1) != '[') {
+                } else {
+                    $rData = '[' . explode('[', $rData, 1)[1];
+                }
+                $a364ed03b3639bd1 = json_decode($rData, true);
+                foreach ($a364ed03b3639bd1 as $rFile) {
+                    $rFile['Path'] = rtrim($rRow['directory'], '/') . '/' . $rFile['Path'];
+                    if (!(count($rExtensions) == 0 || in_array(strtolower(pathinfo($rFile['Name'])['extension']), $rExtensions))) {
+                    } else {
+                        $rFiles[] = $rFile['Path'];
+                    }
+                    if (!isset($rRow['auto_subtitles'])) {
+                    } else {
+                        if (!in_array(strtolower(pathinfo($rFile['Path'])['extension']), array('srt', 'sub', 'sbv'))) {
+                        } else {
+                            $rSubtitles[] = $rFile['Path'];
+                        }
+                    }
+                }
+            } else {
+                if (0 < count($rExtensions)) {
+                    $rExtensions = escapeshellcmd(implode('|', $rExtensions));
+                    $rCommand = '/usr/bin/find "' . escapeshellcmd($rRow['directory']) . '" -regex ".*\\.\\(' . $rExtensions . '\\)"';
+                } else {
+                    $rCommand = '/usr/bin/find "' . escapeshellcmd($rRow['directory']) . '"';
+                }
+                exec($rCommand, $rFiles, $Ee034ad5c6b0c8a3);
+                if (isset($rRow['auto_subtitles'])) {
+                    $rExtensions = escapeshellcmd(implode('|', array('srt', 'sub', 'sbv')));
+                    $rCommand = '/usr/bin/find "' . escapeshellcmd($rRow['directory']) . '" -regex ".*\\.\\(' . $rExtensions . '\\)"';
+                    exec($rCommand, $rSubtitles, $Ee034ad5c6b0c8a3);
+                } else {
+                    $rSubtitles = array();
+                }
+            }
+            $rThreadData = array();
+            foreach ($rFiles as $rFile) {
+                if (time() - filemtime($rFile) >= 30) {
+                    if (in_array(json_encode(array('s:' . SERVER_ID . ':' . $rFile), JSON_UNESCAPED_UNICODE), $rStreamDatabase)) {
+                    } else {
+                        $rPathInfo = pathinfo($rFile);
+                        $d8c5b5dc1e354db6 = array();
+                        if (!isset($rRow['auto_subtitles'])) {
+                        } else {
+                            foreach (array('srt', 'sub', 'sbv') as $rExt) {
+                                $rSubtitle = $rPathInfo['dirname'] . '/' . $rPathInfo['filename'] . '.' . $rExt;
+                                if (!in_array($rSubtitle, $rSubtitles)) {
+                                } else {
+                                    $d8c5b5dc1e354db6 = array('files' => array($rSubtitle), 'names' => array('Subtitles'), 'charset' => array('UTF-8'), 'location' => SERVER_ID);
+                                    break;
+                                }
+                            }
+                        }
+                        $rThreadData[] = array('folder_id' => $rRow['id'], 'type' => $rRow['type'], 'directory' => $rRow['directory'], 'file' => $rFile, 'subtitles' => $d8c5b5dc1e354db6, 'category_id' => $rRow['category_id'], 'bouquets' => $rRow['bouquets'], 'disable_tmdb' => $rRow['disable_tmdb'], 'ignore_no_match' => $rRow['ignore_no_match'], 'fb_bouquets' => $rRow['fb_bouquets'], 'fb_category_id' => $rRow['fb_category_id'], 'language' => $rRow['language'], 'watch_categories' => $rWatchCategories, 'read_native' => $rRow['read_native'], 'movie_symlink' => $rRow['movie_symlink'], 'remove_subtitles' => $rRow['remove_subtitles'], 'auto_encode' => $rRow['auto_encode'], 'auto_upgrade' => $rRow['auto_upgrade'], 'fallback_title' => $rRow['fallback_title'], 'ffprobe_input' => $rRow['ffprobe_input'], 'transcode_profile_id' => $rRow['transcode_profile_id'], 'max_genres' => intval(CoreUtilities::$rSettings['max_genres']), 'duplicate_tmdb' => $rRow['duplicate_tmdb'], 'target_container' => $rRow['target_container'], 'alternative_titles' => CoreUtilities::$rSettings['alternative_titles'], 'fallback_parser' => CoreUtilities::$rSettings['fallback_parser']);
+                        if (!(0 < $F7fa29461a8a5ee2 && count($rThreadData) == $F7fa29461a8a5ee2)) {
+                        } else {
+                            break;
+                        }
+                    }
+                }
+            }
+            if (count($rThreadData) > 0) {
+                echo 'Scan complete! Adding ' . count($rThreadData) . ' files...' . "\n";
+            }
+            $cacheDataKey = array();
+            foreach ($rThreadData as $rData) {
+                $rCommand = '/usr/bin/timeout 60 ' . PHP_BIN . ' ' . INCLUDES_PATH . 'cli/watch_item.php "' . base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . '"';
+                $cacheDataKey[] = $rCommand;
+            }
+            $db->close_mysql();
+            if ($rThreadCount <= 1) {
+                foreach ($cacheDataKey as $rCommand) {
+                    shell_exec($rCommand);
+                }
+            } else {
+                $cacheMetadataKey = new Multithread($cacheDataKey, $rThreadCount);
+                $cacheMetadataKey->run();
+            }
+            $db->db_connect();
+            self::checkBouquets();
+        }
+    }
+}
diff --git a/src/modules/watch/WatchItem.php b/src/modules/watch/WatchItem.php
new file mode 100644
index 00000000..eb008068
--- /dev/null
+++ b/src/modules/watch/WatchItem.php
@@ -0,0 +1,980 @@
+<?php
+/**
+ * WatchItem — модуль обработки отдельного элемента Watch Folder (фильм/сериал).
+ *
+ * Извлечён из includes/cli/watch_item.php (Фаза 5.2).
+ */
+
+class WatchItem {
+    /**
+     * Подготовить имя колонки (только буквы, цифры, подчёркивание).
+     *
+     * @param string $rValue
+     * @return string
+     */
+    public static function prepareColumn($rValue) {
+        return strtolower(preg_replace('/[^a-z0-9_]+/i', '', $rValue));
+    }
+
+    /**
+     * Подготовить массив данных для SQL INSERT/UPDATE.
+     *
+     * @param array $rArray
+     * @return array
+     */
+    public static function prepareArray($rArray) {
+        $UpdateData = $rColumns = $rPlaceholder = $rData = array();
+        foreach (array_keys($rArray) as $rKey) {
+            $rColumns[] = '`' . self::prepareColumn($rKey) . '`';
+            $UpdateData[] = '`' . self::prepareColumn($rKey) . '` = ?';
+        }
+        foreach (array_values($rArray) as $rValue) {
+            if (is_array($rValue)) {
+                $rValue = json_encode($rValue, JSON_UNESCAPED_UNICODE);
+            }
+            $rPlaceholder[] = '?';
+            $rData[] = $rValue;
+        }
+        return array('placeholder' => implode(',', $rPlaceholder), 'columns' => implode(',', $rColumns), 'data' => $rData, 'update' => implode(',', $UpdateData));
+    }
+
+    /**
+     * Верифицировать данные по схеме таблицы.
+     *
+     * @param string $rTable
+     * @param array $rData
+     * @param bool $rOnlyExisting
+     * @return array
+     */
+    public static function verifyPostTable($rTable, $rData = array(), $rOnlyExisting = false) {
+        global $db;
+        $rReturn = array();
+        $db->query('SELECT `column_name`, `column_default`, `is_nullable`, `data_type` FROM `information_schema`.`columns` WHERE `table_schema` = (SELECT DATABASE()) AND `table_name` = ? ORDER BY `ordinal_position`;', $rTable);
+        foreach ($db->get_rows() as $rRow) {
+            if ($rRow['column_default'] == 'NULL') {
+                $rRow['column_default'] = null;
+            }
+            $rForceDefault = false;
+            if ($rRow['is_nullable'] != 'NO' || $rRow['column_default']) {
+            } else {
+                if (in_array($rRow['data_type'], array('int', 'float', 'tinyint', 'double', 'decimal', 'smallint', 'mediumint', 'bigint', 'bit'))) {
+                    $rRow['column_default'] = 0;
+                } else {
+                    $rRow['column_default'] = '';
+                }
+                $rForceDefault = true;
+            }
+            if (array_key_exists($rRow['column_name'], $rData)) {
+                if (empty($rData[$rRow['column_name']]) && !is_numeric($rData[$rRow['column_name']]) && is_null($rRow['column_default'])) {
+                    $rReturn[$rRow['column_name']] = ($rForceDefault ? $rRow['column_default'] : null);
+                } else {
+                    $rReturn[$rRow['column_name']] = $rData[$rRow['column_name']];
+                }
+            } else {
+                if (!$rOnlyExisting) {
+                    $rReturn[$rRow['column_name']] = $rRow['column_default'];
+                }
+            }
+        }
+        return $rReturn;
+    }
+
+    /**
+     * Добавить элемент в букет (файл или через БД при импорте).
+     *
+     * @param string $rType
+     * @param int $rBouquetID
+     * @param int $rID
+     */
+    public static function addToBouquet($rType, $rBouquetID, $rID) {
+        global $db;
+        global $rThreadData;
+        if ($rThreadData['import']) {
+            $rBouquet = self::getBouquet($rBouquetID);
+            if ($rBouquet) {
+                if ($rType == 'stream') {
+                    $rColumn = 'bouquet_channels';
+                } elseif ($rType == 'movie') {
+                    $rColumn = 'bouquet_movies';
+                } elseif ($rType == 'radio') {
+                    $rColumn = 'bouquet_radios';
+                } else {
+                    $rColumn = 'bouquet_series';
+                }
+                $rChannels = self::confirmIDs(json_decode($rBouquet[$rColumn], true));
+                if (0 >= intval($rID) || in_array($rID, $rChannels)) {
+                } else {
+                    $rChannels[] = $rID;
+                    if (count($rChannels) > 0) {
+                        $db->query('UPDATE `bouquets` SET `' . $rColumn . '` = ? WHERE `id` = ?;', '[' . implode(',', array_map('intval', $rChannels)) . ']', $rBouquetID);
+                    }
+                }
+            }
+        } else {
+            file_put_contents(WATCH_TMP_PATH . md5($rThreadData['file'] . '_' . $rType . '_' . $rBouquetID . '_' . $rID) . '.bouquet', json_encode(array('type' => $rType, 'bouquet_id' => $rBouquetID, 'id' => $rID)));
+        }
+    }
+
+    /**
+     * Распарсить имя релиза (guessit / ptn).
+     *
+     * @param string $rRelease
+     * @param string $rType
+     * @return array|null
+     */
+    public static function parserelease($rRelease, $rType = 'guessit') {
+        if ($rType == 'guessit') {
+            $rCommand = MAIN_HOME . 'bin/guess ' . escapeshellarg($rRelease . '.mkv');
+        } else {
+            $rCommand = '/usr/bin/python3 ' . MAIN_HOME . 'includes/python/release.py ' . escapeshellarg(str_replace('-', '_', $rRelease));
+        }
+        return json_decode(shell_exec($rCommand), true);
+    }
+
+    /**
+     * Получить фильм из кэша по TMDB ID.
+     *
+     * @param int $rTMDBID
+     * @return array|null
+     */
+    public static function getMovie($rTMDBID) {
+        if (file_exists(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.cache')) {
+            return json_decode(file_get_contents(WATCH_TMP_PATH . 'movie_' . $rTMDBID . '.cache'), true);
+        }
+    }
+
+    /**
+     * Получить эпизод из кэша по TMDB ID, сезону и номеру.
+     *
+     * @param int $rTMDBID
+     * @param int $rSeason
+     * @param int $rEpisode
+     * @return array|null
+     */
+    public static function getEpisode($rTMDBID, $rSeason, $rEpisode) {
+        if (file_exists(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.cache')) {
+            $rData = json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . $rTMDBID . '.cache'), true);
+            if (isset($rData[$rSeason . '_' . $rEpisode])) {
+                return $rData[$rSeason . '_' . $rEpisode];
+            }
+        }
+    }
+
+    /**
+     * Нормализовать заголовок для сравнения.
+     *
+     * @param string $rTitle
+     * @return string
+     */
+    public static function parseTitle($rTitle) {
+        return strtolower(preg_replace("/(?![.=\$'€%-])\\p{P}/u", '', $rTitle));
+    }
+
+    /**
+     * Проверить источник через ffprobe.
+     *
+     * @param string $rFilename
+     * @return array|null
+     */
+    public static function checksource($rFilename) {
+        $rCommand = 'timeout 10 ' . CoreUtilities::$rFFPROBE . ' -show_streams -show_format -v quiet ' . escapeshellarg($rFilename) . ' -of json';
+        return json_decode(shell_exec($rCommand), true);
+    }
+
+    /**
+     * Получить сериал по TMDB ID.
+     *
+     * @param int $rID
+     * @return array|null
+     */
+    public static function getSeriesByTMDB($rID) {
+        global $db;
+        if (!(file_exists(WATCH_TMP_PATH . 'series_' . intval($rID) . '.data') && time() - filemtime(WATCH_TMP_PATH . 'series_' . intval($rID) . '.data') < 360)) {
+            $db->query('SELECT * FROM `streams_series` WHERE `tmdb_id` = ?;', $rID);
+            if ($db->num_rows() == 1) {
+                return $db->get_row();
+            }
+        } else {
+            return json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . intval($rID) . '.data'), true);
+        }
+    }
+
+    /**
+     * Получить URL трейлера сериала с TMDB.
+     *
+     * @param int $rTMDBID
+     * @param string|null $rLanguage
+     * @return string
+     */
+    public static function getSeriesTrailer($rTMDBID, $rLanguage = null) {
+        $rURL = 'https://api.themoviedb.org/3/tv/' . intval($rTMDBID) . '/videos?api_key=' . urlencode(CoreUtilities::$rSettings['tmdb_api_key']);
+        if ($rLanguage) {
+            $rURL .= '&language=' . urlencode($rLanguage);
+        } else {
+            if (strlen(CoreUtilities::$rSettings['tmdb_language']) > 0) {
+                $rURL .= '&language=' . urlencode(CoreUtilities::$rSettings['tmdb_language']);
+            }
+        }
+        $rJSON = json_decode(file_get_contents($rURL), true);
+        foreach ($rJSON['results'] as $rVideo) {
+            if (strtolower($rVideo['type']) == 'trailer' && strtolower($rVideo['site']) == 'youtube') {
+                return $rVideo['key'];
+            }
+        }
+        return '';
+    }
+
+    /**
+     * Получить сериал по ID.
+     *
+     * @param int $rID
+     * @return array|null
+     */
+    public static function getSerie($rID) {
+        global $db;
+        $db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $rID);
+        if ($db->num_rows() == 1) {
+            return $db->get_row();
+        }
+    }
+
+    /**
+     * Получить следующий порядковый номер для streams.
+     *
+     * @return int
+     */
+    public static function getNextOrder() {
+        global $db;
+        $db->query('SELECT MAX(`order`) AS `order` FROM `streams`;');
+        if ($db->num_rows() != 1) {
+            return 0;
+        }
+        return intval($db->get_row()['order']) + 1;
+    }
+
+    /**
+     * Подтвердить ID (отфильтровать > 0).
+     *
+     * @param array $rIDs
+     * @return array
+     */
+    public static function confirmIDs($rIDs) {
+        $rReturn = array();
+        foreach ($rIDs as $rID) {
+            if (intval($rID) > 0) {
+                $rReturn[] = $rID;
+            }
+        }
+        return $rReturn;
+    }
+
+    /**
+     * Получить букет по ID.
+     *
+     * @param int $rID
+     * @return array|null
+     */
+    public static function getBouquet($rID) {
+        global $db;
+        $db->query('SELECT * FROM `bouquets` WHERE `id` = ?;', $rID);
+        if ($db->num_rows() == 1) {
+            return $db->get_row();
+        }
+    }
+
+    /**
+     * Основная точка входа обработки Watch Item.
+     * Заменяет loadcli().
+     */
+    public static function run() {
+        global $db;
+        global $rThreadData;
+        global $rTimeout;
+        if (strpos($rThreadData['file'], $rThreadData['directory']) === 0 || $rThreadData['import']) {
+            $rWatchCategories = $rThreadData['watch_categories'];
+            $rLanguage = null;
+            $rReleaseSeason = NULL;
+            $rReleaseEpisode = NULL;
+            $rYear = null;
+
+            if (!empty($rThreadData['language'])) {
+                $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], $rThreadData['language']);
+                $rLanguage = $rThreadData['language'];
+            } else {
+                if (!empty(CoreUtilities::$rSettings['tmdb_language'])) {
+                    $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key'], CoreUtilities::$rSettings['tmdb_language']);
+                } else {
+                    $rTMDB = new TMDB(CoreUtilities::$rSettings['tmdb_api_key']);
+                }
+            }
+            if ($rThreadData['type'] != 'movie') {
+                $rThreadData['extract_metadata'] = false;
+            }
+            $rImportArray = self::verifyPostTable('streams');
+            $rImportArray['type'] = array('movie' => 2, 'series' => 5)[$rThreadData['type']];
+            if ($rImportArray['type']) {
+                $rThreadType = array('movie' => 1, 'series' => 2)[$rThreadData['type']];
+                $rFile = $rThreadData['file'];
+                if ($rThreadData['import']) {
+                    $rImportArray['stream_source'] = json_encode(array($rFile), JSON_UNESCAPED_UNICODE);
+                } else {
+                    $rImportArray['stream_source'] = json_encode(array('s:' . SERVER_ID . ':' . $rFile), JSON_UNESCAPED_UNICODE);
+                    $db->query('DELETE FROM `watch_logs` WHERE `filename` = ? AND `type` = ? AND `server_id` = ?;', htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'), $rThreadType, SERVER_ID);
+                }
+                if ($rThreadData['target_container'] != 'auto' && $rThreadData['target_container']) {
+                    $rImportArray['target_container'] = $rThreadData['target_container'];
+                } else {
+                    $rImportArray['target_container'] = pathinfo(explode('?', $rFile)[0])['extension'];
+                }
+                if (empty($rImportArray['target_container'])) {
+                    $rImportArray['target_container'] = 'mp4';
+                }
+                $rSourceData = null;
+                if ($rThreadData['ffprobe_input'] || $rThreadData['extract_metadata']) {
+                    $rSourceData = self::checksource($rFile);
+                }
+                if (!$rThreadData['ffprobe_input'] || isset($rSourceData['streams'])) {
+                    $rMatch = $rPaths = null;
+                    $rMetaMatch = false;
+                    if ($rThreadData['extract_metadata'] && isset($rSourceData['format']) && $rSourceData['tags']['title']) {
+                        $rYear = (intval(explode('-', $rSourceData['tags']['date'])[0]));
+                        $rPaths = array($rSourceData['tags']['title']);
+                        $rMetaMatch = true;
+                    }
+                    if (!$rPaths) {
+                        if ($rThreadData['fallback_title']) {
+                            $rPaths = array(pathinfo($rFile)['filename'], basename(pathinfo($rFile)['dirname']));
+                        } else {
+                            $rPaths = array(pathinfo($rFile)['filename']);
+                        }
+                        $rMetaMatch = false;
+                    }
+                    foreach ($rPaths as $rFilename) {
+                        echo 'Scanning: ' . $rFilename . "\n";
+                        $rTitle = null;
+                        $rAltTitle = null;
+                        if ($rThreadData['import']) {
+                            $rFilename = $rThreadData['title'];
+                        }
+                        if ($rThreadData['fallback_parser'] && !$rThreadData['disable_tmdb'] && !$rMetaMatch) {
+                            $rParseTypes = array(CoreUtilities::$rSettings['parse_type'], (CoreUtilities::$rSettings['parse_type'] == 'guessit' ? 'ptn' : 'guessit'));
+                        } else {
+                            $rParseTypes = array(CoreUtilities::$rSettings['parse_type']);
+                        }
+                        foreach ($rParseTypes as $rParseType) {
+                            if ($rThreadData['disable_tmdb'] || $rMetaMatch) {
+                            } else {
+                                $rRelease = self::parserelease($rFilename, $rParseType);
+                                $rTitle = $rRelease['title'];
+                                if (isset($rRelease['excess'])) {
+                                    $rTitle = trim($rTitle, (is_array($rRelease['excess']) ? $rRelease['excess'][0] : $rRelease['excess']));
+                                }
+                                if (isset($rRelease['group'])) {
+                                    $rAltTitle = $rTitle . '-' . $rRelease['group'];
+                                } else {
+                                    if (isset($rRelease['alternative_title'])) {
+                                        $rAltTitle = $rTitle . ' - ' . $rRelease['alternative_title'];
+                                    }
+                                }
+                                if (isset($rRelease['year'])) {
+                                    if (!$rYear) {
+                                        $rYear = intval($rRelease['year']);
+                                    }
+                                }
+
+                                if ($rThreadData['type'] != 'movie') {
+                                    if ($rReleaseSeason == null && isset($rRelease['season'])) {
+                                        $rReleaseSeason = $rRelease['season'];
+                                    }
+                                    if ($rReleaseEpisode == null && isset($rRelease['episode'])) {
+                                        if (is_array($rRelease['episode'])) {
+                                            $rReleaseEpisode = $rRelease['episode'][0];
+                                        } else {
+                                            $rReleaseEpisode = $rRelease['episode'];
+                                        }
+                                    }
+                                }
+                            }
+                            if (!($rThreadData['type'] == 'series' && (!$rReleaseSeason || !$rReleaseEpisode))) {
+                                if (!$rTitle) {
+                                    $rTitle = $rFilename;
+                                }
+                                echo 'Title: ' . $rTitle . "\n";
+                                if (!$rThreadData['disable_tmdb']) {
+                                    $rMatches = array();
+                                    $rSearchYear = $rYear;
+                                    foreach (range(0, 1) as $rIgnoreYear) {
+                                        if ($rIgnoreYear) {
+                                            if ($rSearchYear) {
+                                                $rSearchYear = null;
+                                            } else {
+                                                break;
+                                            }
+                                        }
+                                        if ($rThreadData['type'] == 'movie') {
+                                            print_r('Searching Movie: ' . $rTitle . ' Year: ' . $rSearchYear . "\n");
+                                            $rResults = $rTMDB->searchMovie($rTitle, $rSearchYear);
+                                        } else {
+                                            print_r('Searching TV Show: ' . $rTitle . ' Year: ' . $rSearchYear . "\n");
+                                            $rResults = $rTMDB->searchTVShow($rTitle, $rSearchYear);
+                                        }
+                                        foreach ($rResults as $rResultArr) {
+                                            $tmdbTitles = [];
+
+                                            if ($rThreadData['type'] === 'movie') {
+                                                $tmdbTitles[] = $rResultArr->get('title');
+                                                $tmdbTitles[] = $rResultArr->get('original_title');
+                                            } else {
+                                                $tmdbTitles[] = $rResultArr->get('name');
+                                                $tmdbTitles[] = $rResultArr->get('original_name');
+                                            }
+
+                                            $tmdbTitles = array_filter($tmdbTitles);
+
+                                            $rPercentage = 0;
+                                            $rPercentageAlt = 0;
+
+                                            foreach ($tmdbTitles as $tmdbTitle) {
+                                                similar_text(self::parseTitle($rTitle), self::parseTitle($tmdbTitle), $p);
+                                                $rPercentage = max($rPercentage, $p);
+
+                                                if ($rAltTitle) {
+                                                    similar_text(self::parseTitle($rAltTitle), self::parseTitle($tmdbTitle), $pAlt);
+                                                    $rPercentageAlt = max($rPercentageAlt, $pAlt);
+                                                }
+                                            }
+
+
+                                            $rPercentageAlt = 0;
+                                            if ($rAltTitle) {
+                                                similar_text(self::parseTitle($rAltTitle), self::parseTitle(($rResultArr->get('title') ?: $rResultArr->get('name'))), $rPercentageAlt);
+                                            }
+                                            if (CoreUtilities::$rSettings['percentage_match'] <= $rPercentage || CoreUtilities::$rSettings['percentage_match'] <= $rPercentageAlt) {
+                                                if ($rSearchYear && !in_array(intval(substr(($rResultArr->get('release_date') ?: $rResultArr->get('first_air_date')), 0, 4)), range(intval($rSearchYear) - 1, intval($rSearchYear) + 1))) {
+                                                } else {
+                                                    if ($rAltTitle && self::parseTitle(($rResultArr->get('title') ?: $rResultArr->get('name'))) == self::parseTitle($rAltTitle)) {
+                                                        $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
+                                                        break;
+                                                    }
+                                                    foreach ($tmdbTitles as $tmdbTitle) {
+                                                        if ($rAltTitle && self::parseTitle($tmdbTitle) === self::parseTitle($rAltTitle)) {
+                                                            $rMatches = [['percentage' => 100, 'data' => $rResultArr]];
+                                                            break 2;
+                                                        }
+
+                                                        if (!$rAltTitle && self::parseTitle($tmdbTitle) === self::parseTitle($rTitle)) {
+                                                            $rMatches = [['percentage' => 100, 'data' => $rResultArr]];
+                                                            break 2;
+                                                        }
+                                                    }
+                                                    $rMatches[] = array('percentage' => $rPercentage, 'data' => $rResultArr);
+                                                }
+                                            } else {
+                                                if ($rThreadData['alternative_titles'] && in_array(intval(substr(($rResultArr->get('release_date') ?: $rResultArr->get('first_air_date')), 0, 4)), range(intval($rSearchYear) - 1, intval($rSearchYear) + 1))) {
+                                                    $rPartialMatch = false;
+
+                                                    foreach ($tmdbTitles as $tmdbTitle) {
+                                                        if (strpos(self::parseTitle($rTitle), self::parseTitle($tmdbTitle)) === 0) {
+                                                            $rPartialMatch = true;
+                                                            break;
+                                                        }
+
+                                                        if ($rAltTitle && strpos(self::parseTitle($rAltTitle), self::parseTitle($tmdbTitle)) === 0) {
+                                                            $rPartialMatch = true;
+                                                            break;
+                                                        }
+                                                    }
+                                                    if ($rPartialMatch) {
+                                                        if ($rThreadData['type'] == 'movie') {
+                                                            $rAlternativeTitles = $rTMDB->getMovieTitles($rResultArr->get('id'))['titles'];
+                                                        } else {
+                                                            $rAlternativeTitles = $rTMDB->getSeriesTitles($rResultArr->get('id'))['titles'];
+                                                        }
+                                                        foreach ($rAlternativeTitles as $rAlternativeTitle) {
+                                                            if ($rAltTitle && self::parseTitle($rAlternativeTitle['title']) == self::parseTitle($rAltTitle)) {
+                                                                $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
+                                                                break;
+                                                            }
+                                                            if (self::parseTitle($rAlternativeTitle['title']) != self::parseTitle($rTitle) || $rAltTitle) {
+                                                            } else {
+                                                                $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
+                                                                break;
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        if (count($rMatches) > 0) {
+                                            break;
+                                        }
+                                    }
+                                    if (count($rMatches) > 0) {
+                                        $rMax = max(array_column($rMatches, 'percentage'));
+                                        $rKeys = array_filter(array_map(function ($rMatches) use ($rMax) {
+                                            return ($rMatches['percentage'] == $rMax ? $rMatches['data'] : null);
+                                        }, $rMatches));
+                                        list($rMatch) = array_values($rKeys);
+                                    }
+                                }
+                                if ($rMatch) {
+                                    break;
+                                }
+                            } else {
+                                $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 4, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
+                                exit();
+                            }
+                        }
+                    }
+                    if (!$rMatch && !$rThreadData['ignore_no_match']) {
+                        echo 'No match!' . "\n";
+                        $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 4, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
+                        exit();
+                    }
+                    $rBouquetIDs = array();
+                    $rCategoryIDs = array();
+                    if (!empty($rThreadData['category_id'])) {
+                        if (is_array($rThreadData['category_id'])) {
+                            $rCategoryIDs = array_map('intval', $rThreadData['category_id']);
+                        } else {
+                            $rCategoryIDs = array(intval($rThreadData['category_id']));
+                        }
+                    }
+                    if (!empty($rThreadData['bouquets'])) {
+                        if (is_array($rThreadData['bouquets'])) {
+                            $rBouquetIDs = array_map('intval', $rThreadData['bouquets']);
+                        } else {
+                            $rBouquetIDs = json_decode($rThreadData['bouquets'], true);
+                        }
+                    }
+                    if ($rMatch) {
+                        if ($rThreadData['type'] == 'movie') {
+                            if ($rThreadData['duplicate_tmdb']) {
+                                $rUpgradeData = null;
+                            } else {
+                                $rUpgradeData = self::getMovie($rMatch->get('id'));
+                            }
+
+                            if ($rUpgradeData) {
+                                if ($rThreadData['auto_upgrade']) {
+                                    if (substr($rUpgradeData['source'], 0, 3 + strlen(strval(SERVER_ID))) != 's:' . SERVER_ID . ':') {
+                                        echo "Old file path doesn't match this server, don't upgrade." . "\n";
+                                        exit();
+                                    }
+                                    list(, $rActualPath) = explode('s:' . SERVER_ID . ':', $rUpgradeData['source']);
+                                    if (!file_exists($rActualPath) || filesize($rActualPath) < filesize($rFile)) {
+                                        echo 'Upgrade movie!' . "\n";
+                                        $db->query('UPDATE `streams` SET `stream_source` = ?, `target_container` = ? WHERE `id` = ?;', $rImportArray['stream_source'], $rImportArray['target_container'], $rUpgradeData['id']);
+                                        $db->query('UPDATE `streams_servers` SET `bitrate` = NULL, `current_source` = NULL, `to_analyze` = 0, `pid` = NULL, `stream_started` = NULL, `stream_info` = NULL, `compatible` = 0, `video_codec` = NULL, `audio_codec` = NULL, `resolution` = NULL, `stream_status` = 0 WHERE `stream_id` = ? AND `server_id` = ?', $rUpgradeData['id'], SERVER_ID);
+                                        if ($rThreadData['auto_encode']) {
+                                            CoreUtilities::queueMovie($rUpgradeData['id']);
+                                        }
+                                        $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 6, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
+                                        file_put_contents(WATCH_TMP_PATH . 'movie_' . $rMatch->get('id') . '.cache', json_encode(array('id' => $rUpgradeData['id'], 'source' => 's:' . SERVER_ID . ':' . $rFile)));
+                                        exit();
+                                    }
+                                    echo "File isn't a better source, don't upgrade." . "\n";
+                                    exit();
+                                }
+                                echo 'Upgrade disabled' . "\n";
+                                exit();
+                            }
+                            $rMovie = $rTMDB->getMovie($rMatch->get('id'));
+                            $rMovieData = json_decode($rMovie->getJSON(), true);
+                            $rMovieData['trailer'] = $rMovie->getTrailer();
+                            $rThumb = 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rMovieData['poster_path'];
+                            $rBG = 'https://image.tmdb.org/t/p/w1280' . $rMovieData['backdrop_path'];
+                            if (CoreUtilities::$rSettings['download_images']) {
+                                $rThumb = CoreUtilities::downloadImage($rThumb);
+                                $rBG = CoreUtilities::downloadImage($rBG);
+                            }
+                            $rCast = array();
+                            foreach ($rMovieData['credits']['cast'] as $rMember) {
+                                if (count($rCast) >= 5) {
+                                } else {
+                                    $rCast[] = $rMember['name'];
+                                }
+                            }
+                            $rDirectors = array();
+                            foreach ($rMovieData['credits']['crew'] as $rMember) {
+                                if (!(count($rDirectors) < 5 && ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing')) || in_array($rMember['name'], $rDirectors)) {
+                                } else {
+                                    $rDirectors[] = $rMember['name'];
+                                }
+                            }
+                            $rCountry = '';
+                            if (isset($rMovieData['production_countries'][0]['name'])) {
+                                $rCountry = $rMovieData['production_countries'][0]['name'];
+                            }
+                            $rGenres = array();
+                            foreach ($rMovieData['genres'] as $rGenre) {
+                                if (count($rGenres) >= 3) {
+                                } else {
+                                    $rGenres[] = $rGenre['name'];
+                                }
+                            }
+                            $rSeconds = intval($rMovieData['runtime']) * 60;
+                            $rImportArray['stream_display_name'] = $rMovieData['title'];
+                            if (strlen($rMovieData['release_date']) > 0) {
+                                $rImportArray['year'] = intval(substr($rMovieData['release_date'], 0, 4));
+                            }
+                            $rImportArray['tmdb_id'] = ($rMovieData['id'] ?: null);
+                            $rImportArray['movie_properties'] = array('kinopoisk_url' => 'https://www.themoviedb.org/movie/' . $rMovieData['id'], 'tmdb_id' => $rMovieData['id'], 'name' => $rMovieData['title'], 'o_name' => $rMovieData['original_title'], 'cover_big' => $rThumb, 'movie_image' => $rThumb, 'release_date' => $rMovieData['release_date'], 'episode_run_time' => $rMovieData['runtime'], 'youtube_trailer' => $rMovieData['trailer'], 'director' => implode(', ', $rDirectors), 'actors' => implode(', ', $rCast), 'cast' => implode(', ', $rCast), 'description' => $rMovieData['overview'], 'plot' => $rMovieData['overview'], 'age' => '', 'mpaa_rating' => '', 'rating_count_kinopoisk' => 0, 'country' => $rCountry, 'genre' => implode(', ', $rGenres), 'backdrop_path' => array($rBG), 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => $rMovieData['vote_average']);
+                            $rImportArray['rating'] = ($rImportArray['movie_properties']['rating'] ?: 0);
+                            $rImportArray['read_native'] = $rThreadData['read_native'];
+                            $rImportArray['movie_symlink'] = $rThreadData['movie_symlink'];
+                            $rImportArray['remove_subtitles'] = $rThreadData['remove_subtitles'];
+                            $rImportArray['transcode_profile_id'] = $rThreadData['transcode_profile_id'];
+                            if ($rThreadData['import']) {
+                                $rImportArray['direct_source'] = $rThreadData['direct_source'];
+                                $rImportArray['direct_proxy'] = $rThreadData['direct_proxy'];
+                            }
+                            $rImportArray['order'] = self::getNextOrder();
+                            $rImportArray['tmdb_language'] = $rLanguage;
+                            if (count($rCategoryIDs) == 0 && !empty($rMovieData['genres']) && is_array($rMovieData['genres'])) {
+                                if (0 < $rThreadData['max_genres']) {
+                                    $rParsed = array_slice($rMovieData['genres'], 0, (int) $rThreadData['max_genres']);
+                                } else {
+                                    $rParsed = $rMovieData['genres'];
+                                }
+
+                                foreach ($rParsed as $rGenre) {
+                                    $rGenreId = (int) ($rGenre['id'] ?? 0);
+                                    if ($rGenreId > 0 && isset($rWatchCategories[1][$rGenreId]['category_id'])) {
+                                        $rCategoryID = (int) $rWatchCategories[1][$rGenreId]['category_id'];
+                                        if ($rCategoryID > 0 && !in_array($rCategoryID, $rCategoryIDs, true)) {
+                                            $rCategoryIDs[] = $rCategoryID;
+                                        }
+                                    }
+                                }
+                            }
+                            if (count($rBouquetIDs) == 0) {
+                                if (0 < $rThreadData['max_genres']) {
+                                    $rParsed = array_slice($rMovieData['genres'], 0, $rThreadData['max_genres']);
+                                } else {
+                                    $rParsed = $rMovieData['genres'];
+                                }
+                                foreach ($rParsed as $rGenre) {
+                                    $rBouquets = json_decode($rWatchCategories[1][intval($rGenre['id'])]['bouquets'], true);
+                                    foreach ($rBouquets as $rBouquetID) {
+                                        if (!in_array($rBouquetID, $rBouquetIDs)) {
+                                            $rBouquetIDs[] = $rBouquetID;
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            $rShow = $rTMDB->getTVShow($rMatch->get('id'));
+                            if ($rThreadData['duplicate_tmdb']) {
+                                $rUpgradeData = null;
+                            } else {
+                                $rUpgradeData = self::getEpisode($rMatch->get('id'), $rReleaseSeason, $rReleaseEpisode);
+                            }
+                            if ($rUpgradeData) {
+                                if ($rThreadData['auto_upgrade']) {
+                                    if (substr($rUpgradeData['source'], 0, 3 + strlen(strval(SERVER_ID))) != 's:' . SERVER_ID . ':') {
+                                        echo "Old file path doesn't match this server, don't upgrade." . "\n";
+                                        exit();
+                                    }
+                                    list(, $rActualPath) = explode('s:' . SERVER_ID . ':', $rUpgradeData['source']);
+                                    if (!file_exists($rActualPath) || filesize($rActualPath) < filesize($rFile)) {
+                                        echo 'Upgrade episode!' . "\n";
+                                        $db->query('UPDATE `streams` SET `stream_source` = ?, `target_container` = ? WHERE `id` = ?;', $rImportArray['stream_source'], $rImportArray['target_container'], $rUpgradeData['id']);
+                                        $db->query('UPDATE `streams_servers` SET `bitrate` = NULL, `current_source` = NULL, `to_analyze` = 0, `pid` = NULL, `stream_started` = NULL, `stream_info` = NULL, `compatible` = 0, `video_codec` = NULL, `audio_codec` = NULL, `resolution` = NULL, `stream_status` = 0 WHERE `stream_id` = ? AND `server_id` = ?', $rUpgradeData['id'], SERVER_ID);
+                                        if ($rThreadData['auto_encode']) {
+                                            CoreUtilities::queueMovie($rUpgradeData['id']);
+                                        }
+                                        $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 6, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
+                                        $rCacheData = json_decode(file_get_contents(WATCH_TMP_PATH . 'series_' . $rMatch->get('id') . '.cache'), true);
+                                        $rCacheData[$rReleaseSeason . '_' . $rReleaseEpisode] = array('id' => $rUpgradeData['id'], 'source' => 's:' . SERVER_ID . ':' . $rFile);
+                                        file_put_contents(WATCH_TMP_PATH . 'series_' . $rMatch->get('id') . '.cache', json_encode($rCacheData));
+                                        exit();
+                                    }
+                                    echo "File isn't a better source, don't upgrade." . "\n";
+                                    exit();
+                                }
+                                echo 'Upgrade disabled' . "\n";
+                                exit();
+                            }
+                            $rShowData = json_decode($rShow->getJSON(), true);
+                            if ($rShowData['id']) {
+                                while (file_exists(WATCH_TMP_PATH . 'lock_' . intval($rShowData['id']))) {
+                                    if ($rTimeout >= time() - filemtime(WATCH_TMP_PATH . 'lock_' . intval($rShowData['id']))) {
+                                    } else {
+                                        unlink(WATCH_TMP_PATH . 'lock_' . intval($rShowData['id']));
+                                    }
+                                    usleep(100000);
+                                }
+                                $rFileLock = fopen(WATCH_TMP_PATH . 'lock_' . intval($rShowData['id']), 'w');
+                                while (!flock($rFileLock, LOCK_EX)) {
+                                    usleep(100000);
+                                }
+                                fwrite($rFileLock, time());
+                                $rSeasonData = array();
+                                foreach ($rShowData['seasons'] as $rSeason) {
+                                    $rSeason['cover'] = 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rSeason['poster_path'];
+                                    if (CoreUtilities::$rSettings['download_images']) {
+                                        $rSeason['cover'] = CoreUtilities::downloadImage($rSeason['cover'], 2);
+                                    }
+                                    $rSeason['cover_big'] = $rSeason['cover'];
+                                    unset($rSeason['poster_path']);
+                                    $rSeasonData[] = $rSeason;
+                                }
+                                $rSeries = self::getSeriesByTMDB($rShowData['id']);
+                                if (!$rSeries) {
+                                    $rSeriesArray = array('title' => $rShowData['name'], 'category_id' => array(), 'episode_run_time' => 0, 'tmdb_id' => $rShowData['id'], 'cover' => '', 'genre' => '', 'plot' => $rShowData['overview'], 'cast' => '', 'rating' => $rShowData['vote_average'], 'director' => '', 'release_date' => $rShowData['first_air_date'], 'last_modified' => time(), 'seasons' => $rSeasonData, 'backdrop_path' => array(), 'youtube_trailer' => '', 'year' => null);
+                                    $rSeriesArray['youtube_trailer'] = self::getSeriesTrailer($rShowData['id'], (!empty($rThreadData['language']) ? $rThreadData['language'] : CoreUtilities::$rSettings['tmdb_language']));
+                                    $rSeriesArray['cover'] = 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rShowData['poster_path'];
+                                    $rSeriesArray['cover_big'] = $rSeriesArray['cover'];
+                                    $rSeriesArray['backdrop_path'] = array('https://image.tmdb.org/t/p/w1280' . $rShowData['backdrop_path']);
+                                    if (CoreUtilities::$rSettings['download_images']) {
+                                        $rSeriesArray['cover'] = CoreUtilities::downloadImage($rSeriesArray['cover'], 2);
+                                        $rSeriesArray['backdrop_path'] = array(CoreUtilities::downloadImage($rSeriesArray['backdrop_path'][0]));
+                                    }
+                                    $rCast = array();
+                                    foreach ($rShowData['credits']['cast'] as $rMember) {
+                                        if (count($rCast) >= 5) {
+                                        } else {
+                                            $rCast[] = $rMember['name'];
+                                        }
+                                    }
+                                    $rSeriesArray['cast'] = implode(', ', $rCast);
+                                    $rDirectors = array();
+                                    foreach ($rShowData['credits']['crew'] as $rMember) {
+                                        if (!(count($rDirectors) < 5 && ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing')) || in_array($rMember['name'], $rDirectors)) {
+                                        } else {
+                                            $rDirectors[] = $rMember['name'];
+                                        }
+                                    }
+                                    $rSeriesArray['director'] = implode(', ', $rDirectors);
+                                    $rGenres = array();
+                                    foreach ($rShowData['genres'] as $rGenre) {
+                                        if (count($rGenres) >= $rThreadData['max_genres']) {
+                                        } else {
+                                            $rGenres[] = $rGenre['name'];
+                                        }
+                                    }
+                                    if ($rShowData['first_air_date']) {
+                                        $rSeriesArray['year'] = intval(substr($rShowData['first_air_date'], 0, 4));
+                                    }
+                                    $rSeriesArray['genre'] = implode(', ', $rGenres);
+                                    $rSeriesArray['episode_run_time'] = intval($rShowData['episode_run_time'][0]);
+                                    if (count($rCategoryIDs) == 0) {
+                                        if (0 < $rThreadData['max_genres']) {
+                                            $rParsed = array_slice($rShowData['genres'], 0, $rThreadData['max_genres']);
+                                        } else {
+                                            $rParsed = $rShowData['genres'];
+                                        }
+                                        foreach ($rParsed as $rGenre) {
+                                            $rCategoryID = intval($rWatchCategories[2][intval($rGenre['id'])]['category_id']);
+                                            if ($rCategoryID > 0) {
+                                                if (!in_array($rCategoryID, $rCategoryIDs)) {
+                                                    $rCategoryIDs[] = $rCategoryID;
+                                                }
+                                            }
+                                        }
+                                    }
+                                    if (count($rCategoryIDs) == 0 && !empty($rThreadData['fb_category_id'])) {
+                                        if (is_array($rThreadData['fb_category_id'])) {
+                                            $rCategoryIDs = array_map('intval', $rThreadData['fb_category_id']);
+                                        } else {
+                                            $rCategoryIDs = array(intval($rThreadData['fb_category_id']));
+                                        }
+                                    }
+                                    if (count($rBouquetIDs) == 0) {
+                                        if (0 < $rThreadData['max_genres']) {
+                                            $rParsed = array_slice($rShowData['genres'], 0, $rThreadData['max_genres']);
+                                        } else {
+                                            $rParsed = $rShowData['genres'];
+                                        }
+                                        foreach ($rParsed as $rGenre) {
+                                            $rBouquets = json_decode($rWatchCategories[2][intval($rGenre['id'])]['bouquets'], true);
+                                            foreach ($rBouquets as $rBouquetID) {
+                                                if (!in_array($rBouquetID, $rBouquetIDs)) {
+                                                    $rBouquetIDs[] = $rBouquetID;
+                                                }
+                                            }
+                                        }
+                                    }
+                                    if (count($rBouquetIDs) == 0 && !empty($rThreadData['fb_bouquets'])) {
+                                        if (is_array($rThreadData['fb_bouquets'])) {
+                                            $rBouquetIDs = array_map('intval', $rThreadData['fb_bouquets']);
+                                        } else {
+                                            $rBouquetIDs = json_decode($rThreadData['fb_bouquets'], true);
+                                        }
+                                    }
+                                    if (count($rCategoryIDs) != 0) {
+                                        $rSeriesArray['tmdb_language'] = $rLanguage;
+                                        $rSeriesArray['category_id'] = '[' . implode(',', array_map('intval', $rCategoryIDs)) . ']';
+                                        $rPrepare = self::prepareArray($rSeriesArray);
+                                        $rQuery = 'INSERT INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+                                        if ($db->query($rQuery, ...$rPrepare['data'])) {
+                                            $rInsertID = $db->last_insert_id();
+                                            $rSeries = self::getSerie($rInsertID);
+                                            file_put_contents(WATCH_TMP_PATH . 'series_' . intval($rShowData['id']), json_encode($rSeries));
+                                            foreach ($rBouquetIDs as $rBouquet) {
+                                                self::addToBouquet('series', $rBouquet, $rInsertID);
+                                            }
+                                        } else {
+                                            $rSeries = null;
+                                        }
+                                    } else {
+                                        $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 3, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
+                                        exit();
+                                    }
+                                } else {
+                                    $db->query('UPDATE `streams_series` SET `seasons` = ? WHERE `id` = ?;', json_encode($rSeasonData, JSON_UNESCAPED_UNICODE), $rSeries['id']);
+                                    if (file_exists(WATCH_TMP_PATH . 'series_' . intval($rShowData['id']))) {
+                                    } else {
+                                        file_put_contents(WATCH_TMP_PATH . 'series_' . intval($rShowData['id']), json_encode($rSeries));
+                                    }
+                                }
+                                flock($rFileLock, LOCK_UN);
+                                unlink(WATCH_TMP_PATH . 'lock_' . intval($rShowData['id']));
+                                $rImportArray['read_native'] = $rThreadData['read_native'];
+                                $rImportArray['movie_symlink'] = $rThreadData['movie_symlink'];
+                                $rImportArray['remove_subtitles'] = $rThreadData['remove_subtitles'];
+                                $rImportArray['transcode_profile_id'] = $rThreadData['transcode_profile_id'];
+                                if ($rThreadData['import']) {
+                                    $rImportArray['direct_source'] = $rThreadData['direct_source'];
+                                    $rImportArray['direct_proxy'] = $rThreadData['direct_proxy'];
+                                }
+                                $rImportArray['order'] = self::getNextOrder();
+                                if ($rReleaseSeason && $rReleaseEpisode) {
+                                    if (is_array($rRelease['episode']) && count($rRelease['episode']) == 2) {
+                                        $rImportArray['stream_display_name'] = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason)) . 'E' . sprintf('%02d', $rRelease['episode'][0]) . '-' . sprintf('%02d', $rRelease['episode'][1]);
+                                    } else {
+                                        $rImportArray['stream_display_name'] = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason)) . 'E' . sprintf('%02d', $rReleaseEpisode);
+                                    }
+                                    $rEpisodes = json_decode($rTMDB->getSeason($rShowData['id'], intval($rReleaseSeason))->getJSON(), true);
+                                    foreach ($rEpisodes['episodes'] as $rEpisode) {
+                                        if (intval($rEpisode['episode_number']) == $rReleaseEpisode) {
+                                            if (strlen($rEpisode['still_path']) > 0) {
+                                                $rImage = 'https://image.tmdb.org/t/p/w1280' . $rEpisode['still_path'];
+                                                if (CoreUtilities::$rSettings['download_images']) {
+                                                    $rImage = CoreUtilities::downloadImage($rImage, 5);
+                                                }
+                                            }
+                                            if (strlen($rEpisode['name']) > 0) {
+                                                $rImportArray['stream_display_name'] .= ' - ' . $rEpisode['name'];
+                                            }
+                                            $rSeconds = intval($rShowData['episode_run_time'][0]) * 60;
+                                            $rImportArray['movie_properties'] = array('tmdb_id' => $rEpisode['id'], 'release_date' => $rEpisode['air_date'], 'plot' => $rEpisode['overview'], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'movie_image' => $rImage, 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => $rEpisode['vote_average'], 'season' => $rReleaseSeason);
+                                            if (strlen($rImportArray['movie_properties']['movie_image'][0]) == 0) {
+                                                unset($rImportArray['movie_properties']['movie_image']);
+                                            }
+                                        }
+                                    }
+                                    if (strlen($rImportArray['stream_display_name']) == 0) {
+                                        $rImportArray['stream_display_name'] = 'No Episode Title';
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        if ($rThreadData['type'] == 'movie') {
+                            $rImportArray['stream_display_name'] = $rTitle;
+                            if ($rYear) {
+                                $rImportArray['year'] = $rYear;
+                            }
+                        } else {
+                            if ($rReleaseSeason && $rReleaseEpisode) {
+                                $rImportArray['stream_display_name'] = $rTitle . ' - S' . sprintf('%02d', intval($rReleaseSeason)) . 'E' . sprintf('%02d', $rReleaseEpisode) . ' - ';
+                            }
+                        }
+                        $rImportArray['read_native'] = $rThreadData['read_native'];
+                        $rImportArray['movie_symlink'] = $rThreadData['movie_symlink'];
+                        $rImportArray['remove_subtitles'] = $rThreadData['remove_subtitles'];
+                        $rImportArray['transcode_profile_id'] = $rThreadData['transcode_profile_id'];
+                        if ($rThreadData['import']) {
+                            $rImportArray['direct_source'] = $rThreadData['direct_source'];
+                            $rImportArray['direct_proxy'] = $rThreadData['direct_proxy'];
+                        }
+                        $rImportArray['order'] = self::getNextOrder();
+                        $rImportArray['tmdb_language'] = $rLanguage;
+                    }
+                    if ($rThreadData['type'] == 'movie') {
+                        if (count($rCategoryIDs) == 0 && !empty($rThreadData['fb_category_id'])) {
+                            if (is_array($rThreadData['fb_category_id'])) {
+                                $rCategoryIDs = array_map('intval', $rThreadData['fb_category_id']);
+                            } else {
+                                $rCategoryIDs = array(intval($rThreadData['fb_category_id']));
+                            }
+                        }
+                        if (count($rBouquetIDs) == 0 && !empty($rThreadData['fb_bouquets'])) {
+                            if (is_array($rThreadData['fb_bouquets'])) {
+                                $rBouquetIDs = array_map('intval', $rThreadData['fb_bouquets']);
+                            } else {
+                                $rBouquetIDs = json_decode($rThreadData['fb_bouquets'], true);
+                            }
+                        }
+                        $rImportArray['category_id'] = '[' . implode(',', array_map('intval', $rCategoryIDs)) . ']';
+                        if (count($rCategoryIDs) == 0) {
+                            $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 3, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
+                            exit();
+                        }
+                    } else {
+                        if ($rSeries) {
+                            $rImportArray['series_no'] = $rSeries['id'];
+                        } else {
+                            $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 4, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
+                            exit();
+                        }
+                    }
+                    if ($rThreadData['subtitles']) {
+                        $rImportArray['movie_subtitles'] = $rThreadData['subtitles'];
+                    }
+                    $rImportArray['added'] = time();
+                    $rPrepare = self::prepareArray($rImportArray);
+                    $rQuery = 'INSERT INTO `streams`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+                    if ($db->query($rQuery, ...$rPrepare['data'])) {
+                        $rInsertID = $db->last_insert_id();
+                        if ($rThreadData['import']) {
+                            foreach ($rThreadData['servers'] as $rServerID) {
+                                $db->query('INSERT INTO `streams_servers`(`stream_id`, `server_id`, `parent_id`) VALUES(?, ?, NULL);', $rInsertID, $rServerID);
+                            }
+                        } else {
+                            $db->query('INSERT INTO `streams_servers`(`stream_id`, `server_id`, `parent_id`) VALUES(?, ?, NULL);', $rInsertID, SERVER_ID);
+                        }
+                        if ($rThreadData['type'] == 'movie') {
+                            if (!$rMatch || $rThreadData['import']) {
+                            } else {
+                                file_put_contents(WATCH_TMP_PATH . 'movie_' . $rMatch->get('id') . '.cache', json_encode(array('id' => $rInsertID, 'source' => 's:' . SERVER_ID . ':' . $rFile)));
+                            }
+                            foreach ($rBouquetIDs as $rBouquet) {
+                                self::addToBouquet('movie', $rBouquet, $rInsertID);
+                            }
+                        } else {
+                            $db->query('INSERT INTO `streams_episodes`(`season_num`, `series_id`, `stream_id`, `episode_num`) VALUES(?, ?, ?, ?);', $rReleaseSeason, $rSeries['id'], $rInsertID, $rReleaseEpisode);
+                        }
+                        if ($rThreadData['auto_encode']) {
+                            if ($rThreadData['import']) {
+                                foreach ($rThreadData['servers'] as $rServerID) {
+                                    CoreUtilities::queueMovie($rInsertID, $rServerID);
+                                }
+                            } else {
+                                CoreUtilities::queueMovie($rInsertID);
+                            }
+                        }
+                        echo 'Success!' . "\n";
+                        $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 1, ?);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'), $rInsertID);
+                        exit();
+                    } else {
+                        echo 'Insert failed!' . "\n";
+                        $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 2, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
+                        exit();
+                    }
+                } else {
+                    echo 'File is broken!' . "\n";
+                    $db->query('INSERT INTO `watch_logs`(`type`, `server_id`, `filename`, `status`, `stream_id`) VALUES(?, ?, ?, 5, 0);', $rThreadType, SERVER_ID, htmlspecialchars($rFile, ENT_QUOTES, 'UTF-8'));
+                    exit();
+                }
+            } else {
+                exit();
+            }
+        } else {
+            echo 'Incorrect root directory!';
+            exit();
+        }
+    }
+}
diff --git a/src/modules/watch/WatchModule.php b/src/modules/watch/WatchModule.php
new file mode 100644
index 00000000..3f607c0a
--- /dev/null
+++ b/src/modules/watch/WatchModule.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * XC_VM — Watch Module
+ *
+ * Модуль Watch Folder / Recording.
+ * Регистрирует сервисы, маршруты, API-действия и крон-задачи.
+ *
+ * ──────────────────────────────────────────────────────────────────
+ * Что включает:
+ * ──────────────────────────────────────────────────────────────────
+ *
+ *   Сервисы:
+ *     - WatchService    — CRUD Watch Folder'ов, настройки, enable/disable/kill
+ *     - RecordingService — планирование записей (DVR)
+ *
+ *   Контроллер:
+ *     - WatchController — обработка HTTP-запросов и API
+ *
+ *   Страницы:
+ *     - watch          — список folder'ов
+ *     - watch/add      — добавление/редактирование
+ *     - watch/settings — настройки watch (settings_watch)
+ *     - watch/output   — логи (watch_output)
+ *     - watch/record   — планирование записи (record)
+ *
+ *   API-действия:
+ *     - enable_watch   — включить все folder'ы
+ *     - disable_watch  — отключить все folder'ы
+ *     - kill_watch     — убить процессы
+ *     - folder         — удалить/запустить folder
+ *
+ * @see WatchService
+ * @see RecordingService
+ * @see WatchController
+ */
+
+class WatchModule implements ModuleInterface {
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName(): string {
+        return 'watch';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVersion(): string {
+        return '1.0.0';
+    }
+
+    /**
+     * Регистрация сервисов модуля в DI-контейнере
+     *
+     * @param ServiceContainer $container
+     */
+    public function boot(ServiceContainer $container): void {
+        // WatchService и RecordingService — статические классы,
+        // регистрируем их имена для обнаружения
+        $container->set('watch.service', 'WatchService');
+        $container->set('watch.recording', 'RecordingService');
+        $container->set('watch.controller', function ($c) {
+            return new WatchController();
+        });
+    }
+
+    /**
+     * Регистрация маршрутов модуля
+     *
+     * Страницы:
+     *   GET watch              → WatchController::index
+     *   GET watch/add          → WatchController::add
+     *   GET settings/watch     → WatchController::settings
+     *   GET watch/output       → WatchController::output
+     *   GET watch/record       → WatchController::record (через record)
+     *
+     * API:
+     *   enable_watch           → WatchController::apiEnable
+     *   disable_watch          → WatchController::apiDisable
+     *   kill_watch             → WatchController::apiKill
+     *   folder                 → WatchController::apiFolder
+     *
+     * @param Router $router
+     */
+    public function registerRoutes(Router $router): void {
+        // ── Страницы ──────────────────────────────────────────
+        $router->group('watch', function (Router $r) {
+            $r->get('', [WatchController::class, 'index'], [
+                'permission' => ['adv', 'folder_watch'],
+            ]);
+            $r->get('add', [WatchController::class, 'add'], [
+                'permission' => ['adv', 'folder_watch'],
+            ]);
+            $r->get('output', [WatchController::class, 'output'], [
+                'permission' => ['adv', 'folder_watch'],
+            ]);
+        });
+
+        // settings_watch → settings/watch (через normalizePage)
+        $router->get('settings/watch', [WatchController::class, 'settings'], [
+            'permission' => ['adv', 'folder_watch_settings'],
+        ]);
+
+        // record → отдельная страница
+        $router->get('record', [WatchController::class, 'record'], [
+            'permission' => ['adv', 'folder_watch'],
+        ]);
+
+        // ── API-действия ──────────────────────────────────────
+        $router->api('enable_watch', [WatchController::class, 'apiEnable'], [
+            'permission' => ['adv', 'folder_watch_settings'],
+        ]);
+        $router->api('disable_watch', [WatchController::class, 'apiDisable'], [
+            'permission' => ['adv', 'folder_watch_settings'],
+        ]);
+        $router->api('kill_watch', [WatchController::class, 'apiKill'], [
+            'permission' => ['adv', 'folder_watch'],
+        ]);
+        $router->api('folder', [WatchController::class, 'apiFolder'], [
+            'permission' => ['adv', 'folder_watch'],
+        ]);
+    }
+
+    /**
+     * Крон-задачи модуля
+     *
+     * @return array
+     */
+    public function registerCrons(): array {
+        return [
+            [
+                'class'    => WatchCron::class,
+                'method'   => 'run',
+                'interval' => 60,
+            ],
+        ];
+    }
+
+    /**
+     * Подписки на события ядра
+     *
+     * @return array
+     */
+    public function getEventSubscribers(): array {
+        return [];
+    }
+}
diff --git a/src/modules/watch/WatchService.php b/src/modules/watch/WatchService.php
new file mode 100644
index 00000000..e58f6ce9
--- /dev/null
+++ b/src/modules/watch/WatchService.php
@@ -0,0 +1,150 @@
+<?php
+
+class WatchService {
+	public static function editWatchSettings($db, $rData, $clearSettingsCacheCallback = null) {
+		foreach ($rData as $rKey => $rValue) {
+			$rSplit = explode('_', $rKey);
+			if ($rSplit[0] == 'genre') {
+				$rBouquets = isset($rData['bouquet_' . $rSplit[1]]) ? '[' . implode(',', array_map('intval', $rData['bouquet_' . $rSplit[1]])) . ']' : '[]';
+				$db->query('UPDATE `watch_categories` SET `category_id` = ?, `bouquets` = ? WHERE `genre_id` = ? AND `type` = 1;', $rValue, $rBouquets, $rSplit[1]);
+			}
+		}
+
+		foreach ($rData as $rKey => $rValue) {
+			$rSplit = explode('_', $rKey);
+			if ($rSplit[0] == 'genretv') {
+				$rBouquets = isset($rData['bouquettv_' . $rSplit[1]]) ? '[' . implode(',', array_map('intval', $rData['bouquettv_' . $rSplit[1]])) . ']' : '[]';
+				$db->query('UPDATE `watch_categories` SET `category_id` = ?, `bouquets` = ? WHERE `genre_id` = ? AND `type` = 2;', $rValue, $rBouquets, $rSplit[1]);
+			}
+		}
+
+		$altTitles = isset($rData['alternative_titles']);
+		$fallbackParser = isset($rData['fallback_parser']);
+		$db->query('UPDATE `settings` SET `percentage_match` = ?, `scan_seconds` = ?, `thread_count` = ?, `max_genres` = ?, `max_items` = ?, `alternative_titles` = ?, `fallback_parser` = ?;', $rData['percentage_match'], $rData['scan_seconds'], $rData['thread_count'], $rData['max_genres'], $rData['max_items'], $altTitles, $fallbackParser);
+
+		if ($clearSettingsCacheCallback) {
+			call_user_func($clearSettingsCacheCallback);
+		}
+
+		return array('status' => STATUS_SUCCESS);
+	}
+
+	public static function processWatchFolder($db, $rData, $getWatchFolderCallback = null) {
+		if (isset($rData['edit'])) {
+			$rArray = overwriteData(call_user_func($getWatchFolderCallback, $rData['edit']), $rData);
+		} else {
+			$rArray = verifyPostTable('watch_folders', $rData);
+			unset($rArray['id']);
+		}
+
+		$rPath = $rData['selected_path'];
+		if (!(0 < strlen($rPath) && $rPath != '/')) {
+			return array('status' => STATUS_INVALID_DIR, 'data' => $rData);
+		}
+
+		if (isset($rData['edit'])) {
+			$db->query('SELECT COUNT(*) AS `count` FROM `watch_folders` WHERE `directory` = ? AND `server_id` = ? AND `type` = ? AND `id` <> ?;', $rPath, $rArray['server_id'], $rData['folder_type'], $rArray['id']);
+		} else {
+			$db->query('SELECT COUNT(*) AS `count` FROM `watch_folders` WHERE `directory` = ? AND `server_id` = ? AND `type` = ?;', $rPath, $rArray['server_id'], $rData['folder_type']);
+		}
+
+		if (0 < $db->get_row()['count']) {
+			return array('status' => STATUS_EXISTS_DIR, 'data' => $rData);
+		}
+
+		$bouquets = is_array($rData['bouquets'] ?? null) ? $rData['bouquets'] : array();
+		$fbBouquets = is_array($rData['fb_bouquets'] ?? null) ? $rData['fb_bouquets'] : array();
+
+		$rArray['type'] = $rData['folder_type'];
+		$rArray['directory'] = $rPath;
+		$rArray['bouquets'] = '[' . implode(',', array_map('intval', $bouquets)) . ']';
+		$rArray['fb_bouquets'] = '[' . implode(',', array_map('intval', $fbBouquets)) . ']';
+		$rArray['allowed_extensions'] = is_array($rData['allowed_extensions'] ?? null) && count($rData['allowed_extensions']) > 0 ? json_encode($rData['allowed_extensions']) : '[]';
+		$rArray['target_container'] = ($rData['target_container'] == 'auto' ? null : $rData['target_container']);
+		$rArray['category_id'] = intval($rData['category_id_' . $rData['folder_type']]);
+		$rArray['fb_category_id'] = intval($rData['fb_category_id_' . $rData['folder_type']]);
+
+		foreach (array('remove_subtitles', 'duplicate_tmdb', 'extract_metadata', 'fallback_title', 'disable_tmdb', 'ignore_no_match', 'auto_subtitles', 'auto_upgrade', 'read_native', 'movie_symlink', 'auto_encode', 'ffprobe_input', 'active') as $rKey) {
+			$rArray[$rKey] = isset($rData[$rKey]) ? 1 : 0;
+		}
+
+		$rPrepare = prepareArray($rArray);
+		$rQuery = 'REPLACE INTO `watch_folders`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+
+		if ($db->query($rQuery, ...$rPrepare['data'])) {
+			$rInsertID = $db->last_insert_id();
+			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+		}
+
+		return array('status' => STATUS_FAILURE, 'data' => $rData);
+	}
+
+	public static function getWatchFolders($db, $rType = null) {
+		if ($rType) {
+			$db->query("SELECT * FROM `watch_folders` WHERE `type` = ? AND `type` <> 'plex' ORDER BY `id` ASC;", $rType);
+		} else {
+			$db->query("SELECT * FROM `watch_folders` WHERE `type` <> 'plex' ORDER BY `id` ASC;");
+		}
+
+		return $db->get_rows();
+	}
+
+	public static function getWatchCategories($db, $rType = null) {
+		$rReturn = array();
+		if ($rType) {
+			$db->query('SELECT * FROM `watch_categories` WHERE `type` = ? ORDER BY `genre_id` ASC;', $rType);
+		} else {
+			$db->query('SELECT * FROM `watch_categories` ORDER BY `genre_id` ASC;');
+		}
+
+		foreach ($db->get_rows() as $rRow) {
+			$rReturn[$rRow['genre_id']] = $rRow;
+		}
+
+		return $rReturn;
+	}
+
+	public static function forceWatch($rServerID, $rWatchID, $requestCallback = 'systemapirequest') {
+		return call_user_func($requestCallback, $rServerID, array('action' => 'watch_force', 'id' => $rWatchID));
+	}
+
+	public static function enableWatch($db) {
+		return $db->query("UPDATE `watch_folders` SET `active` = 1 WHERE `type` <> 'plex';");
+	}
+
+	public static function disableWatch($db) {
+		return $db->query("UPDATE `watch_folders` SET `active` = 0 WHERE `type` <> 'plex';");
+	}
+
+	public static function killWatch($db, $requestCallback = 'systemapirequest') {
+		$db->query("SELECT DISTINCT(`server_id`) AS `server_id` FROM `watch_folders` WHERE `active` = 11 AND `type` <> 'plex';");
+		foreach ($db->get_rows() as $rRow) {
+			if (CoreUtilities::$rServers[$rRow['server_id']]['server_online']) {
+				call_user_func($requestCallback, $rRow['server_id'], array('action' => 'kill_watch'));
+			}
+		}
+		return true;
+	}
+
+	public static function getRecordings($db) {
+		$rRecordings = array();
+		$db->query('SELECT * FROM `recordings` ORDER BY `id` DESC;');
+		foreach ($db->get_rows() as $rRow) {
+			$rRecordings[] = $rRow;
+		}
+		return $rRecordings;
+	}
+
+	public static function deleteRecording($db, $rID, $deleteStreamCallback = 'deleteStream') {
+		$db->query('SELECT `created_id`, `source_id` FROM `recordings` WHERE `id` = ?;', $rID);
+		if ($db->num_rows() > 0) {
+			$rRecording = $db->get_row();
+			if ($rRecording['created_id']) {
+				call_user_func($deleteStreamCallback, $rRecording['created_id'], $rRecording['source_id'], true, true);
+			}
+			shell_exec("kill -9 `ps -ef | grep 'Record[" . intval($rID) . "]' | grep -v grep | awk '{print $2}'`");
+			$db->query('DELETE FROM `recordings` WHERE `id` = ?;', $rID);
+		}
+		return true;
+	}
+}
diff --git a/src/modules/watch/module.json b/src/modules/watch/module.json
new file mode 100644
index 00000000..efe5c666
--- /dev/null
+++ b/src/modules/watch/module.json
@@ -0,0 +1,7 @@
+{
+    "name": "watch",
+    "version": "1.0.0",
+    "description": "Watch Folder / Recording (DVR) module",
+    "requires_core": ">=2.0",
+    "dependencies": []
+}
diff --git a/src/modules/watch/views/record.php b/src/modules/watch/views/record.php
new file mode 100644
index 00000000..6834aace
--- /dev/null
+++ b/src/modules/watch/views/record.php
@@ -0,0 +1,196 @@
+<div class="wrapper boxed-layout"
+    <?php if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') {
+    } else {
+        echo ' style="display: none;"';
+    } ?>>
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-12">
+                <div class="page-title-box">
+                    <div class="page-title-right">
+                        <?php include 'topbar.php'; ?>
+                    </div>
+                    <h4 class="page-title">Record an Event</h4>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-xl-12">
+                <div class="card">
+                    <div class="card-body">
+                        <?php if ($rStream) {
+                        } else { ?>
+                            <form action="record" method="POST" data-parsley-validate="">
+                            <?php } ?>
+                            <table class="table table-borderless mb-0">
+                                <thead class="thead-light">
+                                    <tr>
+                                        <th>Channel</th>
+                                        <th class="text-center">Start</th>
+                                        <th class="text-center"><?php echo ($rStream ? 'Finish' : 'Minutes'); ?></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <?php if ($rStream) { ?>
+                                            <td><?php echo $rStream['stream_display_name']; ?></td>
+                                            <td class="text-center">
+                                                <?php echo date(CoreUtilities::$rSettings['date_format'], $rProgramme['start']); ?><br /><?php echo date('H:i', $rProgramme['start']); ?>
+                                            </td>
+                                            <td class="text-center">
+                                                <?php echo date(CoreUtilities::$rSettings['date_format'], $rProgramme['end']); ?><br /><?php echo date('H:i', $rProgramme['end']); ?>
+                                            </td>
+                                        <?php } else { ?>
+                                            <td><select id="stream_id" name="stream_id" class="form-control"
+                                                    data-toggle="select2"></select></td>
+                                            <td style="max-width:120px;" class="text-center"><input type="text"
+                                                    class="form-control text-center date" id="start_date" name="start_date"
+                                                    value="" data-toggle="date-picker" data-single-date-picker="true"></td>
+                                            <td style="max-width:40px;" class="text-center"><input type="text"
+                                                    class="form-control text-center" id="duration" name="duration"
+                                                    value="0"></td>
+                                        <?php } ?>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <?php if ($rStream) {
+                            } else { ?>
+                                <ul class="list-inline wizard mb-0">
+                                    <li class="list-inline-item float-right">
+                                        <input type="submit" class="btn btn-primary" value="Continue" />
+                                    </li>
+                                </ul>
+                            </form>
+                        <?php } ?>
+                    </div>
+                </div>
+            </div>
+            <?php if (!$rStream) {
+            } else { ?>
+                <div class="col-xl-12">
+                    <?php if ($rProgramme['archive'] || $rProgramme['start'] > time()) {
+                    } else { ?>
+                        <div class="alert alert-warning text-center" role="alert">
+                            The programme you are intending to record has already started!
+                        </div>
+                    <?php } ?>
+                    <div class="card">
+                        <div class="card-body">
+                            <form
+                                <?php if (!isset(CoreUtilities::$rRequest['import'])) {
+                                } else {
+                                    echo ' enctype="multipart/form-data"';
+                                } ?>
+                                action="#" method="POST" data-parsley-validate="">
+                                <input type="hidden" name="stream_id" value="<?php echo intval($rStream['id']); ?>" />
+                                <input type="hidden" name="start" value="<?php echo intval($rProgramme['start']); ?>" />
+                                <input type="hidden" name="end" value="<?php echo intval($rProgramme['end']); ?>" />
+                                <input type="hidden" name="archive"
+                                    value="<?php echo (isset($rProgramme['archive']) ? 1 : 0); ?>" />
+                                <div id="basicwizard">
+                                    <ul class="nav nav-pills bg-light nav-justified form-wizard-header mb-4">
+                                        <li class="nav-item">
+                                            <a href="#stream-details" data-toggle="tab"
+                                                class="nav-link rounded-0 pt-2 pb-2">
+                                                <i class="mdi mdi-account-card-details-outline mr-1"></i>
+                                                <span class="d-none d-sm-inline">Details</span>
+                                            </a>
+                                        </li>
+                                    </ul>
+                                    <div class="tab-content b-0 mb-0 pt-0">
+                                        <div class="tab-pane" id="stream-details">
+                                            <div class="row">
+                                                <div class="col-12">
+                                                    <div class="form-group row mb-4">
+                                                        <label class="col-md-4 col-form-label" for="title">Event
+                                                            Title</label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control" id="title" name="title"
+                                                                value="<?php echo str_replace('"', '&quot;', $rProgramme['title']); ?>"
+                                                                required data-parsley-trigger="change">
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group row mb-4">
+                                                        <label class="col-md-4 col-form-label" for="description">Event
+                                                            Description</label>
+                                                        <div class="col-md-8">
+                                                            <textarea rows="6" class="form-control" id="description"
+                                                                name="description"><?php echo htmlspecialchars($rProgramme['description']); ?></textarea>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group row mb-4">
+                                                        <label class="col-md-4 col-form-label" for="stream_icon">Poster
+                                                            URL</label>
+                                                        <div class="col-md-8 input-group">
+                                                            <input type="text" class="form-control" id="stream_icon"
+                                                                name="stream_icon" value="">
+                                                            <div class="input-group-append">
+                                                                <a href="javascript:void(0)" onClick="openImage(this)"
+                                                                    class="btn btn-primary waves-effect waves-light"><i
+                                                                        class="mdi mdi-eye"></i></a>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group row mb-4">
+                                                        <label class="col-md-4 col-form-label"
+                                                            for="category_id">Categories</label>
+                                                        <div class="col-md-8">
+                                                            <select name="category_id[]" id="category_id"
+                                                                class="form-control select2-multiple" data-toggle="select2"
+                                                                multiple="multiple" data-placeholder="Choose...">
+                                                                <?php foreach (getCategories('movie') as $rCategory) { ?>
+                                                                    <option value="<?php echo $rCategory['id']; ?>">
+                                                                        <?php echo $rCategory['category_name']; ?></option>
+                                                                <?php } ?>
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group row mb-4">
+                                                        <label class="col-md-4 col-form-label"
+                                                            for="bouquets">Bouquets</label>
+                                                        <div class="col-md-8">
+                                                            <select name="bouquets[]" id="bouquets"
+                                                                class="form-control select2-multiple" data-toggle="select2"
+                                                                multiple="multiple" data-placeholder="Choose...">
+                                                                <?php foreach (getBouquets() as $rBouquet) { ?>
+                                                                    <option value="<?php echo $rBouquet['id']; ?>">
+                                                                        <?php echo $rBouquet['bouquet_name']; ?></option>
+                                                                <?php } ?>
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group row mb-4">
+                                                        <label class="col-md-4 col-form-label" for="source_id">Recording
+                                                            Server</label>
+                                                        <div class="col-md-8">
+                                                            <select name="source_id" id="source_id" class="form-control"
+                                                                data-toggle="select2">
+                                                                <?php foreach ($rAvailableServers as $rServerID) { ?>
+                                                                    <option
+                                                                        value="<?php echo CoreUtilities::$rServers[$rServerID]['id']; ?>">
+                                                                        <?php echo CoreUtilities::$rServers[$rServerID]['server_name']; ?>
+                                                                        - <?php echo CoreUtilities::$rServers[$rServerID]['server_ip']; ?>
+                                                                    </option>
+                                                                <?php } ?>
+                                                            </select>
+                                                        </div>
+                                                    </div>
+
+                                                    <ul class="list-inline wizard mb-0">
+                                                        <li class="list-inline-item float-right">
+                                                            <input type="submit" class="btn btn-primary" value="Schedule" />
+                                                        </li>
+                                                    </ul>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            <?php } ?>
+        </div>
+    </div>
+</div>
diff --git a/src/modules/watch/views/record_scripts.php b/src/modules/watch/views/record_scripts.php
new file mode 100644
index 00000000..f12660af
--- /dev/null
+++ b/src/modules/watch/views/record_scripts.php
@@ -0,0 +1,203 @@
+<script id="scripts">
+			var resizeObserver = new ResizeObserver(entries => $(window).scroll());
+			$(document).ready(function() {
+				resizeObserver.observe(document.body)
+				$("form").attr('autocomplete', 'off');
+				$(document).keypress(function(event) {
+					if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
+				});
+				$.fn.dataTable.ext.errMode = 'none';
+				var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
+				elems.forEach(function(html) {
+					var switchery = new Switchery(html, {
+						'color': '#414d5f'
+					});
+					window.rSwitches[$(html).attr("id")] = switchery;
+				});
+				setTimeout(pingSession, 30000);
+				<?php if (!$rMobile && $rSettings['header_stats']): ?>
+					headerStats();
+				<?php endif; ?>
+				bindHref();
+				refreshTooltips();
+				$(window).scroll(function() {
+					if ($(this).scrollTop() > 200) {
+						if ($(document).height() > $(window).height()) {
+							$('#scrollToBottom').fadeOut();
+						}
+						$('#scrollToTop').fadeIn();
+					} else {
+						$('#scrollToTop').fadeOut();
+						if ($(document).height() > $(window).height()) {
+							$('#scrollToBottom').fadeIn();
+						} else {
+							$('#scrollToBottom').hide();
+						}
+					}
+				});
+				$("#scrollToTop").unbind("click");
+				$('#scrollToTop').click(function() {
+					$('html, body').animate({
+						scrollTop: 0
+					}, 800);
+					return false;
+				});
+				$("#scrollToBottom").unbind("click");
+				$('#scrollToBottom').click(function() {
+					$('html, body').animate({
+						scrollTop: $(document).height()
+					}, 800);
+					return false;
+				});
+				$(window).scroll();
+				$(".nextb").unbind("click");
+				$(".nextb").click(function() {
+					var rPos = 0;
+					var rActive = null;
+					$(".nav .nav-item").each(function() {
+						if ($(this).find(".nav-link").hasClass("active")) {
+							rActive = rPos;
+						}
+						if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+							$(this).find(".nav-link").trigger("click");
+							return false;
+						}
+						rPos += 1;
+					});
+				});
+				$(".prevb").unbind("click");
+				$(".prevb").click(function() {
+					var rPos = 0;
+					var rActive = null;
+					$($(".nav .nav-item").get().reverse()).each(function() {
+						if ($(this).find(".nav-link").hasClass("active")) {
+							rActive = rPos;
+						}
+						if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+							$(this).find(".nav-link").trigger("click");
+							return false;
+						}
+						rPos += 1;
+					});
+				});
+				(function($) {
+					$.fn.inputFilter = function(inputFilter) {
+						return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
+							if (inputFilter(this.value)) {
+								this.oldValue = this.value;
+								this.oldSelectionStart = this.selectionStart;
+								this.oldSelectionEnd = this.selectionEnd;
+							} else if (this.hasOwnProperty("oldValue")) {
+								this.value = this.oldValue;
+								this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
+							}
+						});
+					};
+				}(jQuery));
+				<?php if ($rSettings['js_navigate']): ?>
+					$(".navigation-menu li").mouseenter(function() {
+						$(this).find(".submenu").show();
+					});
+					delParam("status");
+					$(window).on("popstate", function() {
+						if (window.rRealURL) {
+							if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
+								navigate(window.location.href.split("/").reverse()[0]);
+							}
+						}
+					});
+				<?php endif; ?>
+				$(document).keydown(function(e) {
+					if (e.keyCode == 16) {
+						window.rShiftHeld = true;
+					}
+				});
+				$(document).keyup(function(e) {
+					if (e.keyCode == 16) {
+						window.rShiftHeld = false;
+					}
+				});
+				document.onselectstart = function() {
+					if (window.rShiftHeld) {
+						return false;
+					}
+				}
+			});
+
+        function openImage(elem) {
+			rPath = $(elem).parent().parent().find("input").val();
+			if (rPath) {
+                $.magnificPopup.open({
+                    items: {
+                        src: 'resize?maxw=512&maxh=512&url=' + encodeURIComponent(rPath),
+                        type: 'image'
+                    }
+                });
+			}
+		}
+        
+		$(document).ready(function() {
+            $('select').select2({width: '100%'});
+            $('#stream_id').select2({
+			  ajax: {
+				url: './api',
+				dataType: 'json',
+				data: function (params) {
+				  return {
+					search: params.term,
+					action: 'streamlist',
+					page: params.page
+				  };
+				},
+				processResults: function (data, params) {
+				  params.page = params.page || 1;
+				  return {
+					results: data.items,
+					pagination: {
+						more: (params.page * 100) < data.total_count
+					}
+				  };
+				},
+				cache: true,
+				width: "100%"
+			  },
+			  placeholder: 'Search for a stream...'
+			});
+            $('#start_date').daterangepicker({
+				singleDatePicker: true,
+				showDropdowns: true,
+				minDate: new Date(),
+                timePicker: true,
+				locale: {
+					format: 'YYYY-MM-DD HH:mm'
+				}
+			});
+            <?php if ($rStream) { ?>
+            $("form").submit(function(e){
+                e.preventDefault();
+                $(':input[type="submit"]').prop('disabled', true);
+                submitForm(window.rCurrentPage, new FormData($("form")[0]));
+            });
+            <?php } else { ?>
+            $("form").submit(function(e){
+                if (!$("#stream_id").val()) {
+                    $.toast("Please select a stream.");
+                    e.preventDefault();
+                } else if ($("#duration").val() <= 0) {
+                    $.toast("Please enter a duration in minutes.");
+                    e.preventDefault();
+                }
+            });
+            <?php } ?>
+            $("#duration").inputFilter(function(value) { return /^\d*$/.test(value); });
+		});
+    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
+        $(document).ready(function() {
+            initSearch();
+        });
+    <?php endif; ?>
+</script>
+<script src="assets/js/listings.js"></script>
+</body>
+
+</html>
diff --git a/src/modules/watch/views/settings_watch.php b/src/modules/watch/views/settings_watch.php
new file mode 100644
index 00000000..d0f5bbc6
--- /dev/null
+++ b/src/modules/watch/views/settings_watch.php
@@ -0,0 +1,284 @@
+<div class="wrapper boxed-layout-ext"
+    <?php if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') {
+    } else {
+        echo ' style="display: none;"';
+    } ?>>
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-12">
+                <div class="page-title-box">
+                    <div class="page-title-right">
+                        <?php include 'topbar.php'; ?>
+                    </div>
+                    <h4 class="page-title">Folder Watch Settings</h4>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-xl-12">
+                <?php if (isset($_STATUS) && $_STATUS == STATUS_SUCCESS) { ?>
+                    <div class="alert alert-success alert-dismissible fade show" role="alert">
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        Watch settings successfully updated!
+                    </div>
+                <?php } ?>
+                <div class="card">
+                    <div class="card-body">
+                        <form action="#" method="POST">
+                            <div id="basicwizard">
+                                <ul class="nav nav-pills bg-light nav-justified form-wizard-header mb-4">
+                                    <li class="nav-item">
+                                        <a href="#setup" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
+                                            <i class="mdi mdi-account-card-details-outline mr-1"></i>
+                                            <span class="d-none d-sm-inline">Setup</span>
+                                        </a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a href="#categories" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
+                                            <i class="mdi mdi-movie mr-1"></i>
+                                            <span class="d-none d-sm-inline">Movie Categories</span>
+                                        </a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a href="#categories-tv" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
+                                            <i class="mdi mdi-youtube-tv mr-1"></i>
+                                            <span class="d-none d-sm-inline">TV Categories</span>
+                                        </a>
+                                    </li>
+                                </ul>
+                                <div class="tab-content b-0 mb-0 pt-0">
+                                    <div class="tab-pane" id="setup">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="scan_seconds">Scan
+                                                        Frequency <i title="Scan a folder every X seconds."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input type="text" class="form-control text-center"
+                                                            id="scan_seconds" name="scan_seconds"
+                                                            value="<?php echo htmlspecialchars($rSettings['scan_seconds']); ?>"
+                                                            required data-parsley-trigger="change">
+                                                    </div>
+                                                    <label class="col-md-4 col-form-label" for="percentage_match">Match
+                                                        Percentage <i
+                                                            title="TMDb match tolerance. Will not accept match if below this percentage threshold."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input type="text" class="form-control text-center"
+                                                            id="percentage_match" name="percentage_match"
+                                                            value="<?php echo htmlspecialchars($rSettings['percentage_match']); ?>"
+                                                            required data-parsley-trigger="change">
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="thread_count">Thread
+                                                        Count <i title="Number of threads to run simultaneously."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input type="text" class="form-control text-center"
+                                                            id="thread_count" name="thread_count"
+                                                            value="<?php echo htmlspecialchars($rSettings['thread_count']); ?>"
+                                                            required data-parsley-trigger="change">
+                                                    </div>
+                                                    <label class="col-md-4 col-form-label" for="max_genres">Max
+                                                        Categories & Bouquets <i
+                                                            title="Maximum number of TMDb genres to convert into categories and bouquets. Enter 0 for unlimited."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+
+                                                    <div class="col-md-2">
+                                                        <input type="text" class="form-control text-center"
+                                                            id="max_genres" name="max_genres"
+                                                            value="<?php echo htmlspecialchars($rSettings['max_genres']); ?>"
+                                                            required data-parsley-trigger="change">
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label" for="max_items">Max Items <i
+                                                            title="Maximum number of items to add per folder per scan. Set this to 0 to scan everything."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input type="text" class="form-control text-center"
+                                                            id="max_items" name="max_items"
+                                                            value="<?php echo htmlspecialchars($rSettings['max_items']); ?>"
+                                                            required data-parsley-trigger="change">
+                                                    </div>
+                                                </div>
+                                                <div class="form-group row mb-4">
+                                                    <label class="col-md-4 col-form-label"
+                                                        for="alternative_titles">Check Alternative Titles <i
+                                                            title="If a title partially matches a TMDb result, check the alternative titles of that Movie or TV Show to see if any of those match the title."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input name="alternative_titles" id="alternative_titles"
+                                                            type="checkbox"
+                                                            <?php if ($rSettings['alternative_titles'] == 1) {
+                                                                echo 'checked';
+                                                            } ?>
+                                                            data-plugin="switchery" class="js-switch"
+                                                            data-color="#039cfd" />
+                                                    </div>
+                                                    <label class="col-md-4 col-form-label" for="fallback_parser">Use
+                                                        Fallback Parser <i
+                                                            title="If no match is found using your preferred title parser, fallback to the parser you didn't select and run again."
+                                                            class="tooltip text-secondary far fa-circle"></i></label>
+                                                    <div class="col-md-2">
+                                                        <input name="fallback_parser" id="fallback_parser"
+                                                            type="checkbox"
+                                                            <?php if ($rSettings['fallback_parser'] == 1) {
+                                                                echo 'checked';
+                                                            } ?>
+                                                            data-plugin="switchery" class="js-switch"
+                                                            data-color="#039cfd" />
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <ul class="list-inline wizard mb-0">
+                                            <li class="list-inline-item float-right">
+                                                <input name="submit_settings" type="submit" class="btn btn-primary"
+                                                    value="Save Changes" />
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <div class="tab-pane" id="categories">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <p class="sub-header">
+                                                    Select a Category and / or Bouquet to apply to each Genre.
+                                                </p>
+                                                <?php
+                                                $db->query('SELECT * FROM `watch_categories` WHERE `type` = 1 ORDER BY `genre` ASC;');
+                                                if ($db->num_rows() > 0) {
+                                                    foreach ($db->get_rows() as $rRow) {
+                                                ?>
+                                                        <div class="form-group row mb-4">
+                                                            <label class="col-md-2 col-form-label"
+                                                                for="genre_<?php echo $rRow['genre_id']; ?>"><?php echo $rRow['genre']; ?></label>
+                                                            <div class="col-md-4">
+                                                                <select name="genre_<?php echo $rRow['genre_id']; ?>"
+                                                                    id="genre_<?php echo $rRow['genre_id']; ?>"
+                                                                    class="form-control select2" data-toggle="select2">
+                                                                    <option
+                                                                        <?php if (intval($rRow['category_id']) == 0) {
+                                                                            echo 'selected';
+                                                                        } ?>
+                                                                        value="0">Do Not Use</option>
+                                                                    <?php foreach (getCategories('movie') as $rCategory) { ?>
+                                                                        <option
+                                                                            <?php if (intval($rRow['category_id']) == intval($rCategory['id'])) {
+                                                                                echo 'selected';
+                                                                            } ?>
+                                                                            value="<?php echo $rCategory['id']; ?>">
+                                                                            <?php echo $rCategory['category_name']; ?></option>
+                                                                    <?php } ?>
+                                                                </select>
+                                                            </div>
+                                                            <label class="col-md-2 col-form-label"
+                                                                for="bouquet_<?php echo $rRow['genre_id']; ?>">Bouquets</label>
+                                                            <div class="col-md-4">
+                                                                <select name="bouquet_<?php echo $rRow['genre_id']; ?>[]"
+                                                                    id="bouquet_<?php echo $rRow['genre_id']; ?>"
+                                                                    class="form-control select2-multiple" data-toggle="select2"
+                                                                    multiple="multiple" data-placeholder="Choose...">
+                                                                    <?php foreach ($rBouquets as $rBouquet) { ?>
+                                                                        <option
+                                                                            <?php if (in_array(intval($rBouquet['id']), json_decode($rRow['bouquets'], true))) {
+                                                                                echo 'selected';
+                                                                            } ?>
+                                                                            value="<?php echo $rBouquet['id']; ?>">
+                                                                            <?php echo $rBouquet['bouquet_name']; ?>
+                                                                        </option>
+                                                                    <?php } ?>
+                                                                </select>
+
+                                                            </div>
+                                                        </div>
+                                                <?php
+                                                    }
+                                                }
+                                                ?>
+                                            </div>
+                                        </div>
+                                        <ul class="list-inline wizard mb-0">
+                                            <li class="list-inline-item float-right">
+                                                <input name="submit_settings" type="submit" class="btn btn-primary"
+                                                    value="Save Changes" />
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <div class="tab-pane" id="categories-tv">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <p class="sub-header">
+                                                    Select a Category and / or Bouquet to apply to each Genre.
+                                                </p>
+                                                <?php
+                                                $db->query('SELECT * FROM `watch_categories` WHERE `type` = 2 ORDER BY `genre` ASC;');
+                                                if ($db->num_rows() > 0) {
+                                                    foreach ($db->get_rows() as $rRow) {
+                                                ?>
+                                                        <div class="form-group row mb-4">
+                                                            <label class="col-md-2 col-form-label"
+                                                                for="genretv_<?php echo $rRow['genre_id']; ?>"><?php echo $rRow['genre']; ?></label>
+                                                            <div class="col-md-4">
+                                                                <select name="genretv_<?php echo $rRow['genre_id']; ?>"
+                                                                    id="genretv_<?php echo $rRow['genre_id']; ?>"
+                                                                    class="form-control select2" data-toggle="select2">
+                                                                    <option
+                                                                        <?php if (intval($rRow['category_id']) == 0) {
+                                                                            echo 'selected';
+                                                                        } ?>
+                                                                        value="0">Do Not Use</option>
+                                                                    <?php foreach (getCategories('series') as $rCategory) { ?>
+                                                                        <option
+                                                                            <?php if (intval($rRow['category_id']) == intval($rCategory['id'])) {
+                                                                                echo 'selected';
+                                                                            } ?>
+                                                                            value="<?php echo $rCategory['id']; ?>">
+                                                                            <?php echo $rCategory['category_name']; ?></option>
+                                                                    <?php } ?>
+                                                                </select>
+                                                            </div>
+                                                            <label class="col-md-2 col-form-label"
+                                                                for="bouquettv_<?php echo $rRow['genre_id']; ?>">Bouquets</label>
+                                                            <div class="col-md-4">
+                                                                <select name="bouquettv_<?php echo $rRow['genre_id']; ?>[]"
+                                                                    id="bouquettv_<?php echo $rRow['genre_id']; ?>"
+                                                                    class="form-control select2-multiple" data-toggle="select2"
+                                                                    multiple="multiple" data-placeholder="Choose...">
+                                                                    <?php foreach ($rBouquets as $rBouquet) { ?>
+                                                                        <option
+                                                                            <?php if (in_array(intval($rBouquet['id']), json_decode($rRow['bouquets'], true))) {
+                                                                                echo 'selected';
+                                                                            } ?>
+                                                                            value="<?php echo $rBouquet['id']; ?>">
+                                                                            <?php echo $rBouquet['bouquet_name']; ?></option>
+                                                                    <?php } ?>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                <?php
+                                                    }
+                                                }
+                                                ?>
+                                            </div>
+                                        </div>
+                                        <ul class="list-inline wizard mb-0">
+                                            <li class="list-inline-item float-right">
+                                                <input name="submit_settings" type="submit" class="btn btn-primary"
+                                                    value="Save Changes" />
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/modules/watch/views/settings_watch_scripts.php b/src/modules/watch/views/settings_watch_scripts.php
new file mode 100644
index 00000000..fc6fd219
--- /dev/null
+++ b/src/modules/watch/views/settings_watch_scripts.php
@@ -0,0 +1,160 @@
+<script id="scripts">
+        var resizeObserver = new ResizeObserver(entries => $(window).scroll());
+        $(document).ready(function() {
+            resizeObserver.observe(document.body)
+            $("form").attr('autocomplete', 'off');
+            $(document).keypress(function(event) {
+                if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
+            });
+            $.fn.dataTable.ext.errMode = 'none';
+            var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
+            elems.forEach(function(html) {
+                var switchery = new Switchery(html, {
+                    'color': '#414d5f'
+                });
+                window.rSwitches[$(html).attr("id")] = switchery;
+            });
+            setTimeout(pingSession, 30000);
+            <?php if (!$rMobile && $rSettings['header_stats']): ?>
+                headerStats();
+            <?php endif; ?>
+            bindHref();
+            refreshTooltips();
+            $(window).scroll(function() {
+                if ($(this).scrollTop() > 200) {
+                    if ($(document).height() > $(window).height()) {
+                        $('#scrollToBottom').fadeOut();
+                    }
+                    $('#scrollToTop').fadeIn();
+                } else {
+                    $('#scrollToTop').fadeOut();
+                    if ($(document).height() > $(window).height()) {
+                        $('#scrollToBottom').fadeIn();
+                    } else {
+                        $('#scrollToBottom').hide();
+                    }
+                }
+            });
+            $("#scrollToTop").unbind("click");
+            $('#scrollToTop').click(function() {
+                $('html, body').animate({
+                    scrollTop: 0
+                }, 800);
+                return false;
+            });
+            $("#scrollToBottom").unbind("click");
+            $('#scrollToBottom').click(function() {
+                $('html, body').animate({
+                    scrollTop: $(document).height()
+                }, 800);
+                return false;
+            });
+            $(window).scroll();
+            $(".nextb").unbind("click");
+            $(".nextb").click(function() {
+                var rPos = 0;
+                var rActive = null;
+                $(".nav .nav-item").each(function() {
+                    if ($(this).find(".nav-link").hasClass("active")) {
+                        rActive = rPos;
+                    }
+                    if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+                        $(this).find(".nav-link").trigger("click");
+                        return false;
+                    }
+                    rPos += 1;
+                });
+            });
+            $(".prevb").unbind("click");
+            $(".prevb").click(function() {
+                var rPos = 0;
+                var rActive = null;
+                $($(".nav .nav-item").get().reverse()).each(function() {
+                    if ($(this).find(".nav-link").hasClass("active")) {
+                        rActive = rPos;
+                    }
+                    if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+                        $(this).find(".nav-link").trigger("click");
+                        return false;
+                    }
+                    rPos += 1;
+                });
+            });
+            (function($) {
+                $.fn.inputFilter = function(inputFilter) {
+                    return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
+                        if (inputFilter(this.value)) {
+                            this.oldValue = this.value;
+                            this.oldSelectionStart = this.selectionStart;
+                            this.oldSelectionEnd = this.selectionEnd;
+                        } else if (this.hasOwnProperty("oldValue")) {
+                            this.value = this.oldValue;
+                            this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
+                        }
+                    });
+                };
+            }(jQuery));
+            <?php if ($rSettings['js_navigate']): ?>
+                $(".navigation-menu li").mouseenter(function() {
+                    $(this).find(".submenu").show();
+                });
+                delParam("status");
+                $(window).on("popstate", function() {
+                    if (window.rRealURL) {
+                        if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
+                            navigate(window.location.href.split("/").reverse()[0]);
+                        }
+                    }
+                });
+            <?php endif; ?>
+            $(document).keydown(function(e) {
+                if (e.keyCode == 16) {
+                    window.rShiftHeld = true;
+                }
+            });
+            $(document).keyup(function(e) {
+                if (e.keyCode == 16) {
+                    window.rShiftHeld = false;
+                }
+            });
+            document.onselectstart = function() {
+                if (window.rShiftHeld) {
+                    return false;
+                }
+            }
+        });
+
+        <?php if (CoreUtilities::$rSettings['enable_search']): ?>
+            $(document).ready(function() {
+                initSearch();
+            });
+
+        <?php endif; ?>
+
+        $(document).ready(function() {
+            $("#scan_seconds").inputFilter(function(value) {
+                return /^\d*$/.test(value);
+            });
+            $("#percentage_match").inputFilter(function(value) {
+                return /^\d*$/.test(value);
+            });
+            $("#max_items").inputFilter(function(value) {
+                return /^\d*$/.test(value);
+            });
+            $("#thread_count").inputFilter(function(value) {
+                return /^\d*$/.test(value);
+            });
+            $('select').select2({
+                width: '100%'
+            });
+            $("form").submit(function(e) {
+                e.preventDefault();
+                $(':input[type="submit"]').prop('disabled', true);
+                submitForm(window.rCurrentPage, new FormData($("form")[0]));
+            });
+        });
+    </script>
+    <script src="assets/js/listings.js"></script>
+    </body>
+
+    </html>
diff --git a/src/modules/watch/views/watch.php b/src/modules/watch/views/watch.php
new file mode 100644
index 00000000..ecc2d90d
--- /dev/null
+++ b/src/modules/watch/views/watch.php
@@ -0,0 +1,71 @@
+<div class="wrapper boxed-layout-ext" <?php if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') { echo ' style="display: none;"'; } ?>>
+    <div class="container-fluid">
+		<div class="row">
+			<div class="col-12">
+				<div class="page-title-box">
+					<div class="page-title-right">
+                        <?php include 'topbar.php'; ?>
+					</div>
+					<h4 class="page-title">Watch Folder</h4>
+				</div>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-12">
+				<?php if (isset($_STATUS) && $_STATUS == STATUS_SUCCESS) : ?>
+					<div class="alert alert-success alert-dismissible fade show" role="alert">
+						<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+							<span aria-hidden="true">&times;</span>
+						</button>
+						The folder is now being watched. It will be scanned during the next Watch Folder run.
+					</div>
+				<?php endif; ?>
+
+				<div class="card">
+					<div class="card-body" style="overflow-x:auto;">
+						<table id="datatable" class="table table-striped table-borderless dt-responsive nowrap">
+							<thead>
+								<tr>
+									<th class="text-center">ID</th>
+									<th class="text-center">Status</th>
+									<th>Type</th>
+									<th>Server Name</th>
+									<th>Directory</th>
+									<th class="text-center">Last Run</th>
+									<th class="text-center">Actions</th>
+								</tr>
+							</thead>
+							<tbody>
+								<?php foreach (getWatchFolders() as $rFolder) :
+									$rDate = ($rFolder['last_run'] > 0) ? date('Y-m-d H:i:s', $rFolder['last_run']) : 'Never';
+								?>
+								<tr id="folder-<?= intval($rFolder['id']); ?>">
+									<td class="text-center"><?= intval($rFolder['id']); ?></td>
+									<td class="text-center">
+										<?php if ($rFolder['active']) : ?>
+											<i class="text-success fas fa-square"></i>
+										<?php else : ?>
+											<i class="text-secondary fas fa-square"></i>
+										<?php endif; ?>
+									</td>
+									<td><?= array('movie' => 'Movies', 'series' => 'Series')[$rFolder['type']]; ?></td>
+									<td><?= $rServers[$rFolder['server_id']]['server_name']; ?></td>
+									<td><?= $rFolder['directory']; ?></td>
+									<td class="text-center"><?= $rDate; ?></td>
+									<td class="text-center">
+										<div class="btn-group">
+											<a href="./watch_add?id=<?= intval($rFolder['id']); ?>"><button type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-pencil-outline"></i></button></a>
+											<button type="button" class="btn btn-light waves-effect waves-light btn-xs" onClick="api(<?= intval($rFolder['id']); ?>, 'force');"><i class="mdi mdi-refresh"></i></button>
+											<button type="button" class="btn btn-light waves-effect waves-light btn-xs" onClick="api(<?= intval($rFolder['id']); ?>, 'delete');"><i class="mdi mdi-close"></i></button>
+										</div>
+									</td>
+								</tr>
+								<?php endforeach; ?>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/modules/watch/views/watch_add.php b/src/modules/watch/views/watch_add.php
new file mode 100644
index 00000000..95323fb6
--- /dev/null
+++ b/src/modules/watch/views/watch_add.php
@@ -0,0 +1,324 @@
+<div class="wrapper boxed-layout" <?php if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') { echo ' style="display: none;"'; } ?>>
+	<div class="container-fluid">
+		<div class="row">
+			<div class="col-12">
+				<div class="page-title-box">
+					<div class="page-title-right">
+						<?php include 'topbar.php'; ?>
+					</div>
+					<h4 class="page-title"><?= isset($rFolder) ? 'Edit' : 'Add'; ?> Folder</h4>
+				</div>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-xl-12">
+				<div class="card">
+					<div class="card-body">
+						<form action="#" method="POST" data-parsley-validate="">
+							<?php if (isset($rFolder)) : ?>
+								<input type="hidden" name="edit" value="<?= intval($rFolder['id']); ?>" />
+							<?php endif; ?>
+							<div id="basicwizard">
+								<ul class="nav nav-pills bg-light nav-justified form-wizard-header mb-4">
+									<li class="nav-item">
+										<a href="#folder-details" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
+											<i class="mdi mdi-account-card-details-outline mr-1"></i>
+											<span class="d-none d-sm-inline">Details</span>
+										</a>
+									</li>
+									<li class="nav-item">
+										<a href="#settings" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
+											<i class="mdi mdi-wrench mr-1"></i>
+											<span class="d-none d-sm-inline">Settings</span>
+										</a>
+									</li>
+									<li class="nav-item">
+										<a href="#override" data-toggle="tab" class="nav-link rounded-0 pt-2 pb-2">
+											<i class="mdi mdi-movie mr-1"></i>
+											<span class="d-none d-sm-inline">Overrides</span>
+										</a>
+									</li>
+								</ul>
+								<div class="tab-content b-0 mb-0 pt-0">
+									<!-- Tab 1: Details -->
+									<div class="tab-pane" id="folder-details">
+										<div class="row">
+											<div class="col-12">
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="folder_type">Folder Type</label>
+													<div class="col-md-8">
+														<select id="folder_type" name="folder_type" class="form-control" data-toggle="select2">
+															<?php foreach (array('movie' => 'Movies', 'series' => 'TV Series') as $rKey => $rType) : ?>
+																<option value="<?= $rKey; ?>"<?php if (isset($rFolder) && $rFolder['type'] == $rKey) echo ' selected'; ?>><?= $rType; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="server_id">Server Name</label>
+													<div class="col-md-8">
+														<select id="server_id" name="server_id" class="form-control" data-toggle="select2">
+															<?php foreach (getStreamingServers() as $rServer) : ?>
+																<option value="<?= $rServer['id']; ?>"<?php if (isset($rFolder) && $rFolder['server_id'] == $rServer['id']) echo ' selected'; ?>><?= $rServer['server_name']; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="selected_path">Selected Path</label>
+													<div class="col-md-8 input-group">
+														<input type="text" id="selected_path" name="selected_path" class="form-control" value="<?= isset($rFolder) ? $rFolder['directory'] : '/'; ?>" required data-parsley-trigger="change">
+														<div class="input-group-append">
+															<button class="btn btn-primary waves-effect waves-light" type="button" id="changeDir"><i class="mdi mdi-chevron-right"></i></button>
+														</div>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="rclone_dir">Rclone Path <i title="Enter the Rclone path here to scan the folder using the Rclone API, would be quicker for remote drives.<br/><br/>You need to modify the rclone.conf file in the config folder with the correct mount information for this to work." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-8">
+														<input type="text" id="rclone_dir" name="rclone_dir" class="form-control" value="<?= isset($rFolder) ? $rFolder['rclone_dir'] : ''; ?>">
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="active">Enabled</label>
+													<div class="col-md-2">
+														<input name="active" id="active" type="checkbox" <?php if (!isset($rFolder) || $rFolder['active']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<div class="col-md-6">
+														<table id="datatable" class="table">
+															<thead>
+																<tr>
+																	<th width="20px"></th>
+																	<th>Directory</th>
+																</tr>
+															</thead>
+															<tbody></tbody>
+														</table>
+													</div>
+													<div class="col-md-6">
+														<table id="datatable-files" class="table">
+															<thead>
+																<tr>
+																	<th width="20px"></th>
+																	<th>Filename</th>
+																</tr>
+															</thead>
+															<tbody></tbody>
+														</table>
+													</div>
+												</div>
+											</div>
+										</div>
+										<ul class="list-inline wizard mb-0">
+											<li class="nextb list-inline-item float-right">
+												<a href="javascript: void(0);" class="btn btn-secondary">Next</a>
+											</li>
+										</ul>
+									</div>
+									<!-- Tab 2: Settings -->
+									<div class="tab-pane" id="settings">
+										<div class="row">
+											<div class="col-12">
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="disable_tmdb">Disable TMDb <i title="Do not use TMDb to match the content." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="disable_tmdb" id="disable_tmdb" type="checkbox" <?php if (isset($rFolder) && $rFolder['disable_tmdb']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+													<label class="col-md-4 col-form-label" for="ignore_no_match">Ignore No Match <i title="Add to database even if no TMDb match is found." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="ignore_no_match" id="ignore_no_match" type="checkbox" <?php if (isset($rFolder) && $rFolder['ignore_no_match']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="read_native">Native Frames <i title="Read input video at native frame rate." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="read_native" id="read_native" type="checkbox" <?php if (isset($rFolder) && $rFolder['read_native']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+													<label class="col-md-4 col-form-label" for="movie_symlink">Create Symlink <i title="Generate a symlink to the original file instead of encoding. File needs to exist on all selected servers." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="movie_symlink" id="movie_symlink" type="checkbox" <?php if (isset($rFolder) && $rFolder['movie_symlink']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="auto_encode">Auto-Encode <i title="Start encoding as soon as the movie is added." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="auto_encode" id="auto_encode" type="checkbox" <?php if (!isset($rFolder) || $rFolder['auto_encode']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+													<label class="col-md-4 col-form-label" for="ffprobe_input">Probe Input <i title="Use ffmpeg to probe input files to ensure broken / incomplete files aren't added. Will increase load." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="ffprobe_input" id="ffprobe_input" type="checkbox" <?php if (!isset($rFolder) || $rFolder['ffprobe_input']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="auto_subtitles">Auto-Add Subtitles <i title="Automatically embed subtitles of the same name in the same folder." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="auto_subtitles" id="auto_subtitles" type="checkbox" <?php if (isset($rFolder) && $rFolder['auto_subtitles']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+													<label class="col-md-4 col-form-label" for="auto_upgrade">Auto-Upgrade Quality <i title="Automatically upgrade quality if the system finds a new file with better quality that has the same TMDb ID." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="auto_upgrade" id="auto_upgrade" type="checkbox" <?php if (isset($rFolder) && $rFolder['auto_upgrade']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="extract_metadata">Extract Metadata <i title="Use ffprobe to extract metadata information of the file and use that instead of the filename for matching against TMDb." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="extract_metadata" id="extract_metadata" type="checkbox" <?php if (isset($rFolder) && $rFolder['extract_metadata']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+													<label class="col-md-4 col-form-label" for="duplicate_tmdb">Allow TMDb Duplicates <i title="Disable checks for duplicates using the TMDb ID. Turn this on if you want to add duplicates based on different file locations. Auto-upgrade won't work if you enable this." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="duplicate_tmdb" id="duplicate_tmdb" type="checkbox" <?php if (isset($rFolder) && $rFolder['duplicate_tmdb']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="remove_subtitles">Remove Existing Subtitles <i title="Remove existing subtitles from file before encoding. You can't remove hardcoded subtitles using this method." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="remove_subtitles" id="remove_subtitles" type="checkbox" <?php if (isset($rFolder) && $rFolder['remove_subtitles']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+													<label class="col-md-4 col-form-label" for="target_container"><?= $language::get('target_container'); ?> <i title="Which container to use when transcoding files." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<select name="target_container" id="target_container" class="form-control" data-toggle="select2">
+															<?php foreach (array('auto', 'mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts') as $rContainer) : ?>
+																<option <?php if (isset($rFolder) && $rFolder['target_container'] == $rContainer) echo 'selected '; ?>value="<?= $rContainer; ?>"><?= $rContainer; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="transcode_profile_id">Transcoding Profile <i title="Select a transcoding profile to autoamtically encode videos." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-8">
+														<select name="transcode_profile_id" id="transcode_profile_id" class="form-control" data-toggle="select2">
+															<option <?php if (isset($rFolder) && intval($rFolder['transcode_profile_id']) == 0) echo 'selected '; ?>value="0">Transcoding Disabled</option>
+															<?php foreach (getTranscodeProfiles() as $rProfile) : ?>
+																<option <?php if (isset($rFolder) && intval($rFolder['transcode_profile_id']) == intval($rProfile['profile_id'])) echo 'selected '; ?>value="<?= $rProfile['profile_id']; ?>"><?= $rProfile['profile_name']; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+											</div>
+										</div>
+										<ul class="list-inline wizard mb-0">
+											<li class="prevb list-inline-item">
+												<a href="javascript: void(0);" class="btn btn-secondary">Previous</a>
+											</li>
+											<li class="nextb list-inline-item float-right">
+												<a href="javascript: void(0);" class="btn btn-secondary">Next</a>
+											</li>
+										</ul>
+									</div>
+									<!-- Tab 3: Overrides -->
+									<div class="tab-pane" id="override">
+										<div class="row">
+											<div class="col-12">
+												<div class="form-group row mb-4" id="category_movie"<?php if (isset($rFolder) && $rFolder['type'] != 'movie') echo ' style="display: none;"'; ?>>
+													<label class="col-md-4 col-form-label" for="category_id_movie">Override Category <i title="Ignore category allocation and force category allocation." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-8">
+														<select name="category_id_movie" id="category_id_movie" class="form-control select2" data-toggle="select2">
+															<option <?php if (isset($rFolder) && intval($rFolder['category_id']) == 0) echo 'selected '; ?>value="0">Do Not Use</option>
+															<?php foreach (getCategories('movie') as $rCategory) : ?>
+																<option <?php if (isset($rFolder) && intval($rFolder['category_id']) == intval($rCategory['id'])) echo 'selected '; ?>value="<?= intval($rCategory['id']); ?>"><?= $rCategory['category_name']; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+												<div class="form-group row mb-4" id="category_series"<?php if (!isset($rFolder) || $rFolder['type'] != 'series') echo ' style="display: none;"'; ?>>
+													<label class="col-md-4 col-form-label" for="category_id_series">Override Category <i title="Ignore category allocation and force category allocation." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-8">
+														<select name="category_id_series" id="category_id_series" class="form-control select2" data-toggle="select2">
+															<option <?php if (isset($rFolder) && intval($rFolder['category_id']) == 0) echo 'selected '; ?>value="0">Do Not Use</option>
+															<?php foreach (getCategories('series') as $rCategory) : ?>
+																<option <?php if (isset($rFolder) && intval($rFolder['category_id']) == intval($rCategory['id'])) echo 'selected '; ?>value="<?= intval($rCategory['id']); ?>"><?= $rCategory['category_name']; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="bouquets">Override Bouquets <i title="Ignore category allocation and force bouquet allocation." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-8">
+														<select name="bouquets[]" id="bouquets" class="form-control select2-multiple" data-toggle="select2" multiple="multiple" data-placeholder="Choose...">
+															<?php foreach ($rBouquets as $rBouquet) : ?>
+																<option <?php if (isset($rFolder) && in_array(intval($rBouquet['id']), json_decode($rFolder['bouquets'], true))) echo 'selected '; ?>value="<?= intval($rBouquet['id']); ?>"><?= $rBouquet['bouquet_name']; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+												<div class="form-group row mb-4" id="fb_category_movie"<?php if (isset($rFolder) && $rFolder['type'] != 'movie') echo ' style="display: none;"'; ?>>
+													<label class="col-md-4 col-form-label" for="fb_category_id_movie">Fallback Category <i title="Add to this category if the Genre isn't found in the category allocation list." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-8">
+														<select name="fb_category_id_movie" id="fb_category_id_movie" class="form-control select2" data-toggle="select2">
+															<option <?php if (isset($rFolder) && intval($rFolder['fb_category_id']) == 0) echo 'selected '; ?>value="0">Do Not Use</option>
+															<?php foreach (getCategories('movie') as $rCategory) : ?>
+																<option <?php if (isset($rFolder) && intval($rFolder['fb_category_id']) == intval($rCategory['id'])) echo 'selected '; ?>value="<?= intval($rCategory['id']); ?>"><?= $rCategory['category_name']; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+												<div class="form-group row mb-4" id="fb_category_series"<?php if (!isset($rFolder) || $rFolder['type'] != 'series') echo ' style="display: none;"'; ?>>
+													<label class="col-md-4 col-form-label" for="fb_category_id_series">Fallback Category <i title="Add to this category if the Genre isn't found in the category allocation list." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-8">
+														<select name="fb_category_id_series" id="fb_category_id_series" class="form-control select2" data-toggle="select2">
+															<option <?php if (isset($rFolder) && intval($rFolder['fb_category_id']) == 0) echo 'selected '; ?>value="0">Do Not Use</option>
+															<?php foreach (getCategories('series') as $rCategory) : ?>
+																<option <?php if (isset($rFolder) && intval($rFolder['fb_category_id']) == intval($rCategory['id'])) echo 'selected '; ?>value="<?= intval($rCategory['id']); ?>"><?= $rCategory['category_name']; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="fb_bouquets">Fallback Bouquets <i title="Add to these bouquets if the Genre isn't found in the category allocation list." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-8">
+														<select name="fb_bouquets[]" id="fb_bouquets" class="form-control select2-multiple" data-toggle="select2" multiple="multiple" data-placeholder="Choose...">
+															<?php foreach ($rBouquets as $rBouquet) : ?>
+																<option <?php if (isset($rFolder) && in_array(intval($rBouquet['id']), json_decode($rFolder['fb_bouquets'], true))) echo 'selected '; ?>value="<?= intval($rBouquet['id']); ?>"><?= $rBouquet['bouquet_name']; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="fallback_title">Fallback to Folder Name <i title="If the title of the file isn't matched with TMDb, try to match the folder name instead." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-2">
+														<input name="fallback_title" id="fallback_title" type="checkbox" <?php if (isset($rFolder) && $rFolder['fallback_title']) echo 'checked '; ?>data-plugin="switchery" class="js-switch" data-color="#039cfd"/>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="allowed_extensions">Allowed Extensions <i title="Allow scanning of the following extensions only. An empty list will allow all extensions." class="tooltip text-secondary far fa-circle"></i></label>
+													<div class="col-md-8">
+														<select name="allowed_extensions[]" id="allowed_extensions" class="form-control select2-multiple" data-toggle="select2" multiple="multiple" data-placeholder="Choose...">
+															<?php foreach (array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts') as $rExtension) : ?>
+																<option <?php if (isset($rFolder) && in_array($rExtension, json_decode($rFolder['allowed_extensions'], true))) echo 'selected '; ?>value="<?= $rExtension; ?>"><?= $rExtension; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+												<div class="form-group row mb-4">
+													<label class="col-md-4 col-form-label" for="language">Force TMDB Language</label>
+													<div class="col-md-8">
+														<select name="language" id="language" class="form-control" data-toggle="select2">
+															<option value="">Do Not Force</option>
+															<?php foreach (array_slice($rTMDBLanguages, 1, count($rTMDBLanguages) - 1) as $rKey => $rLanguage) : ?>
+																<option<?php if (isset($rFolder) && $rFolder['language'] == $rKey) echo ' selected'; ?> value="<?= $rKey; ?>"><?= $rLanguage; ?></option>
+															<?php endforeach; ?>
+														</select>
+													</div>
+												</div>
+											</div>
+										</div>
+										<ul class="list-inline wizard mb-0">
+											<li class="prevb list-inline-item">
+												<a href="javascript: void(0);" class="btn btn-secondary">Previous</a>
+											</li>
+											<li class="list-inline-item float-right">
+												<input name="submit_folder" type="submit" class="btn btn-primary" value="<?= isset($rFolder) ? 'Edit' : 'Add'; ?>" />
+											</li>
+										</ul>
+									</div>
+								</div>
+							</div>
+						</form>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/modules/watch/views/watch_add_scripts.php b/src/modules/watch/views/watch_add_scripts.php
new file mode 100644
index 00000000..5e2e4672
--- /dev/null
+++ b/src/modules/watch/views/watch_add_scripts.php
@@ -0,0 +1,252 @@
+<script id="scripts">
+	var resizeObserver = new ResizeObserver(entries => $(window).scroll());
+	$(document).ready(function() {
+		resizeObserver.observe(document.body)
+		$("form").attr('autocomplete', 'off');
+		$(document).keypress(function(event) {
+			if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
+		});
+		$.fn.dataTable.ext.errMode = 'none';
+		var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
+		elems.forEach(function(html) {
+			var switchery = new Switchery(html, {
+				'color': '#414d5f'
+			});
+			window.rSwitches[$(html).attr("id")] = switchery;
+		});
+		setTimeout(pingSession, 30000);
+		<?php if (!$rMobile && $rSettings['header_stats']): ?>
+			headerStats();
+		<?php endif; ?>
+		bindHref();
+		refreshTooltips();
+		$(window).scroll(function() {
+			if ($(this).scrollTop() > 200) {
+				if ($(document).height() > $(window).height()) {
+					$('#scrollToBottom').fadeOut();
+				}
+				$('#scrollToTop').fadeIn();
+			} else {
+				$('#scrollToTop').fadeOut();
+				if ($(document).height() > $(window).height()) {
+					$('#scrollToBottom').fadeIn();
+				} else {
+					$('#scrollToBottom').hide();
+				}
+			}
+		});
+		$("#scrollToTop").unbind("click");
+		$('#scrollToTop').click(function() {
+			$('html, body').animate({
+				scrollTop: 0
+			}, 800);
+			return false;
+		});
+		$("#scrollToBottom").unbind("click");
+		$('#scrollToBottom').click(function() {
+			$('html, body').animate({
+				scrollTop: $(document).height()
+			}, 800);
+			return false;
+		});
+		$(window).scroll();
+		$(".nextb").unbind("click");
+		$(".nextb").click(function() {
+			var rPos = 0;
+			var rActive = null;
+			$(".nav .nav-item").each(function() {
+				if ($(this).find(".nav-link").hasClass("active")) {
+					rActive = rPos;
+				}
+				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+					$(this).find(".nav-link").trigger("click");
+					return false;
+				}
+				rPos += 1;
+			});
+		});
+		$(".prevb").unbind("click");
+		$(".prevb").click(function() {
+			var rPos = 0;
+			var rActive = null;
+			$($(".nav .nav-item").get().reverse()).each(function() {
+				if ($(this).find(".nav-link").hasClass("active")) {
+					rActive = rPos;
+				}
+				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+					$(this).find(".nav-link").trigger("click");
+					return false;
+				}
+				rPos += 1;
+			});
+		});
+		(function($) {
+			$.fn.inputFilter = function(inputFilter) {
+				return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
+					if (inputFilter(this.value)) {
+						this.oldValue = this.value;
+						this.oldSelectionStart = this.selectionStart;
+						this.oldSelectionEnd = this.selectionEnd;
+					} else if (this.hasOwnProperty("oldValue")) {
+						this.value = this.oldValue;
+						this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
+					}
+				});
+			};
+		}(jQuery));
+		<?php if ($rSettings['js_navigate']): ?>
+			$(".navigation-menu li").mouseenter(function() {
+				$(this).find(".submenu").show();
+			});
+			delParam("status");
+			$(window).on("popstate", function() {
+				if (window.rRealURL) {
+					if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
+						navigate(window.location.href.split("/").reverse()[0]);
+					}
+				}
+			});
+		<?php endif; ?>
+		$(document).keydown(function(e) {
+			if (e.keyCode == 16) {
+				window.rShiftHeld = true;
+			}
+		});
+		$(document).keyup(function(e) {
+			if (e.keyCode == 16) {
+				window.rShiftHeld = false;
+			}
+		});
+		document.onselectstart = function() {
+			if (window.rShiftHeld) {
+				return false;
+			}
+		}
+	});
+	
+	function selectDirectory(elem) {
+		window.currentDirectory += elem + "/";
+		$("#selected_path").val(window.currentDirectory);
+		$("#changeDir").click();
+	}
+
+	function selectParent() {
+		$("#selected_path").val(window.currentDirectory.split("/").slice(0, -2).join("/") + "/");
+		$("#changeDir").click();
+	}
+
+	$(document).ready(function() {
+		$('select').select2({
+			width: '100%'
+		});
+		$("#datatable").DataTable({
+			responsive: false,
+			paging: false,
+			bInfo: false,
+			searching: false,
+			scrollY: "250px",
+			drawCallback: function() {
+				bindHref();
+				refreshTooltips();
+			},
+			columnDefs: [{
+				"className": "dt-center",
+				"targets": [0]
+			}, ],
+			"language": {
+				"emptyTable": ""
+			}
+		});
+		$("#datatable-files").DataTable({
+			responsive: false,
+			paging: false,
+			bInfo: false,
+			searching: true,
+			scrollY: "250px",
+			drawCallback: function() {
+				bindHref();
+				refreshTooltips();
+			},
+			columnDefs: [{
+				"className": "dt-center",
+				"targets": [0]
+			}, ],
+			"language": {
+				"emptyTable": "No compatible files found"
+			}
+		});
+		$("#select_folder").click(function() {
+			$("#import_folder").val("s:" + $("#server_id").val() + ":" + window.currentDirectory);
+			$.magnificPopup.close();
+		});
+		$("#changeDir").click(function() {
+			window.currentDirectory = $("#selected_path").val();
+			if (window.currentDirectory.substr(-1) != "/") {
+				window.currentDirectory += "/";
+			}
+			$("#selected_path").val(window.currentDirectory);
+			$("#datatable").DataTable().clear();
+			$("#datatable").DataTable().row.add(["", "Loading..."]);
+			$("#datatable").DataTable().draw(true);
+			$("#datatable-files").DataTable().clear();
+			$("#datatable-files").DataTable().row.add(["", "Please wait..."]);
+			$("#datatable-files").DataTable().draw(true);
+			$.getJSON("./api?action=listdir&dir=" + window.currentDirectory + "&server=" + $("#server_id").val() + "&filter=video", function(data) {
+				$("#datatable").DataTable().clear();
+				$("#datatable-files").DataTable().clear();
+				if (window.currentDirectory != "/") {
+					$("#datatable").DataTable().row.add(["<i class='mdi mdi-subdirectory-arrow-left'></i>", "Parent Directory"]);
+				}
+				if (data.result == true) {
+					$(data.data.dirs).each(function(id, dir) {
+						$("#datatable").DataTable().row.add(["<i class='mdi mdi-folder-open-outline'></i>", dir]);
+					});
+					$("#datatable").DataTable().draw(true);
+					$(data.data.files).each(function(id, dir) {
+						$("#datatable-files").DataTable().row.add(["<i class='mdi mdi-file-video'></i>", dir]);
+					});
+					$("#datatable-files").DataTable().draw(true);
+				}
+			});
+		});
+		$('#datatable').on('click', 'tbody > tr', function() {
+			if ($(this).find("td").eq(1).html() == "Parent Directory") {
+				selectParent();
+			} else {
+				selectDirectory($(this).find("td").eq(1).html());
+			}
+		});
+		$("#server_id").change(function() {
+			$("#selected_path").val("/");
+			$("#changeDir").click();
+		});
+		$("#changeDir").click();
+		$("#folder_type").change(function() {
+			if ($(this).val() == "movie") {
+				$("#category_movie").show();
+				$("#category_series").hide();
+				$("#fb_category_movie").show();
+				$("#fb_category_series").hide();
+			} else {
+				$("#category_movie").hide();
+				$("#category_series").show();
+				$("#fb_category_movie").hide();
+				$("#fb_category_series").show();
+			}
+		});
+		$("form").submit(function(e) {
+			e.preventDefault();
+			$(':input[type="submit"]').prop('disabled', true);
+			submitForm(window.rCurrentPage, new FormData($("form")[0]));
+		});
+	});
+    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
+        $(document).ready(function() {
+            initSearch();
+        });
+    <?php endif; ?>
+</script>
+<script src="assets/js/listings.js"></script>
+</body>
+
+</html>
diff --git a/src/modules/watch/views/watch_output.php b/src/modules/watch/views/watch_output.php
new file mode 100644
index 00000000..3e0eaa45
--- /dev/null
+++ b/src/modules/watch/views/watch_output.php
@@ -0,0 +1,75 @@
+<div class="wrapper" <?php if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') { echo ' style="display: none;"'; } ?>>
+    <div class="container-fluid">
+		<div class="row">
+			<div class="col-12">
+				<div class="page-title-box">
+					<div class="page-title-right">
+                        <?php include 'topbar.php'; ?>
+					</div>
+					<h4 class="page-title">Folder Watch / Plex Sync Output</h4>
+				</div>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-12">
+				<div class="card">
+					<div class="card-body" style="overflow-x:auto;">
+						<form id="series_form">
+							<div class="form-group row mb-4">
+								<div class="col-md-3">
+									<input type="text" class="form-control" id="result_search" value="" placeholder="Search Results...">
+								</div>
+								<div class="col-md-2">
+									<select id="result_server" class="form-control" data-toggle="select2">
+										<option value="" selected>All Servers</option>
+										<?php foreach ($rServers as $rServer) : ?>
+											<option value="<?= $rServer['id']; ?>"><?= $rServer['server_name']; ?></option>
+										<?php endforeach; ?>
+									</select>
+								</div>
+								<div class="col-md-2">
+									<select id="result_type" class="form-control" data-toggle="select2">
+										<option value="" selected>All Types</option>
+										<?php foreach (array(1 => 'Movies', 2 => 'Series') as $rID => $rType) : ?>
+											<option value="<?= $rID; ?>"><?= $rType; ?></option>
+										<?php endforeach; ?>
+									</select>
+								</div>
+								<div class="col-md-2">
+									<select id="result_status" class="form-control" data-toggle="select2">
+										<option value="" selected>All Statuses</option>
+										<?php foreach (array(1 => 'Added', 2 => 'SQL Error', 3 => 'No Category', 4 => 'No Match', 5 => 'Invalid File') as $rID => $rType) : ?>
+											<option value="<?= $rID; ?>"><?= $rType; ?></option>
+										<?php endforeach; ?>
+									</select>
+								</div>
+								<label class="col-md-1 col-form-label text-center" for="result_show_entries">Show</label>
+								<div class="col-md-2">
+									<select id="result_show_entries" class="form-control" data-toggle="select2">
+										<?php foreach (array(10, 25, 50, 250, 500, 1000) as $rShow) : ?>
+											<option<?php if ($rSettings['default_entries'] == $rShow) echo ' selected'; ?> value="<?= $rShow; ?>"><?= $rShow; ?></option>
+										<?php endforeach; ?>
+									</select>
+								</div>
+							</div>
+						</form>
+						<table id="datatable-md1" class="table table-striped table-borderless dt-responsive nowrap font-normal">
+							<thead>
+								<tr>
+									<th class="text-center">ID</th>
+									<th>Type</th>
+									<th>Server</th>
+									<th>Filename</th>
+									<th class="text-center">Status</th>
+									<th class="text-center">Date Added</th>
+									<th class="text-center">Actions</th>
+								</tr>
+							</thead>
+							<tbody></tbody>
+						</table>
+					</div> 
+				</div> 
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/modules/watch/views/watch_output_scripts.php b/src/modules/watch/views/watch_output_scripts.php
new file mode 100644
index 00000000..a338f5bd
--- /dev/null
+++ b/src/modules/watch/views/watch_output_scripts.php
@@ -0,0 +1,296 @@
+<script id="scripts">
+			var resizeObserver = new ResizeObserver(entries => $(window).scroll());
+			$(document).ready(function() {
+				resizeObserver.observe(document.body)
+				$("form").attr('autocomplete', 'off');
+				$(document).keypress(function(event) {
+					if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
+				});
+				$.fn.dataTable.ext.errMode = 'none';
+				var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
+				elems.forEach(function(html) {
+					var switchery = new Switchery(html, {
+						'color': '#414d5f'
+					});
+					window.rSwitches[$(html).attr("id")] = switchery;
+				});
+				setTimeout(pingSession, 30000);
+				<?php if (!$rMobile && $rSettings['header_stats']): ?>
+					headerStats();
+				<?php endif; ?>
+				bindHref();
+				refreshTooltips();
+				$(window).scroll(function() {
+					if ($(this).scrollTop() > 200) {
+						if ($(document).height() > $(window).height()) {
+							$('#scrollToBottom').fadeOut();
+						}
+						$('#scrollToTop').fadeIn();
+					} else {
+						$('#scrollToTop').fadeOut();
+						if ($(document).height() > $(window).height()) {
+							$('#scrollToBottom').fadeIn();
+						} else {
+							$('#scrollToBottom').hide();
+						}
+					}
+				});
+				$("#scrollToTop").unbind("click");
+				$('#scrollToTop').click(function() {
+					$('html, body').animate({
+						scrollTop: 0
+					}, 800);
+					return false;
+				});
+				$("#scrollToBottom").unbind("click");
+				$('#scrollToBottom').click(function() {
+					$('html, body').animate({
+						scrollTop: $(document).height()
+					}, 800);
+					return false;
+				});
+				$(window).scroll();
+				$(".nextb").unbind("click");
+				$(".nextb").click(function() {
+					var rPos = 0;
+					var rActive = null;
+					$(".nav .nav-item").each(function() {
+						if ($(this).find(".nav-link").hasClass("active")) {
+							rActive = rPos;
+						}
+						if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+							$(this).find(".nav-link").trigger("click");
+							return false;
+						}
+						rPos += 1;
+					});
+				});
+				$(".prevb").unbind("click");
+				$(".prevb").click(function() {
+					var rPos = 0;
+					var rActive = null;
+					$($(".nav .nav-item").get().reverse()).each(function() {
+						if ($(this).find(".nav-link").hasClass("active")) {
+							rActive = rPos;
+						}
+						if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+							$(this).find(".nav-link").trigger("click");
+							return false;
+						}
+						rPos += 1;
+					});
+				});
+				(function($) {
+					$.fn.inputFilter = function(inputFilter) {
+						return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
+							if (inputFilter(this.value)) {
+								this.oldValue = this.value;
+								this.oldSelectionStart = this.selectionStart;
+								this.oldSelectionEnd = this.selectionEnd;
+							} else if (this.hasOwnProperty("oldValue")) {
+								this.value = this.oldValue;
+								this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
+							}
+						});
+					};
+				}(jQuery));
+				<?php if ($rSettings['js_navigate']): ?>
+					$(".navigation-menu li").mouseenter(function() {
+						$(this).find(".submenu").show();
+					});
+					delParam("status");
+					$(window).on("popstate", function() {
+						if (window.rRealURL) {
+							if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
+								navigate(window.location.href.split("/").reverse()[0]);
+							}
+						}
+					});
+				<?php endif; ?>
+				$(document).keydown(function(e) {
+					if (e.keyCode == 16) {
+						window.rShiftHeld = true;
+					}
+				});
+				$(document).keyup(function(e) {
+					if (e.keyCode == 16) {
+						window.rShiftHeld = false;
+					}
+				});
+				document.onselectstart = function() {
+					if (window.rShiftHeld) {
+						return false;
+					}
+				}
+			});
+
+		var rClearing = false;
+
+		function api(rID, rType, rConfirm=false) {
+            if ((rType == "delete") && (!rConfirm)) {
+                new jBox("Confirm", {
+                    confirmButton: "Delete",
+                    cancelButton: "Cancel",
+                    content: "Are you sure you want to delete this record?",
+                    confirm: function () {
+                        api(rID, rType, true);
+                    }
+                }).open();
+			} else {
+                rConfirm = true;
+            }
+            if (rConfirm) {
+                $.getJSON("./api?action=watch_output&sub=" + rType + "&result_id=" + rID, function(data) {
+                    if (data.result == true) {
+                        if (rType == "delete") {
+                            $.toast("Record successfully deleted.");
+                        }
+                        $("#datatable-md1").DataTable().ajax.reload( null, false );
+                    } else {
+                        $.toast("An error occured while processing your request.");
+                    }
+                }).fail(function() {
+                    $.toast("An error occured while processing your request.");
+                });
+            }
+		}
+		function getServer() {
+			return $("#result_server").val();
+		}
+		function getType() {
+			return $("#result_type").val();
+		}
+		function getStatus() {
+			return $("#result_status").val();
+		}
+		function clearFilters() {
+			window.rClearing = true;
+			$("#result_search").val("").trigger('change');
+			$('#result_server').val("").trigger('change');
+			$('#result_type').val("").trigger('change');
+			$('#result_status').val("").trigger('change');
+			$('#result_show_entries').val("<?= intval($rSettings['default_entries']) ?: 10; ?>").trigger('change');
+			window.rClearing = false;
+			$('#datatable-md1').DataTable().search($("#result_search").val());
+			$('#datatable-md1').DataTable().page.len($('#result_show_entries').val());
+			$("#datatable-md1").DataTable().page(0).draw('page');
+			$("#datatable-md1").DataTable().ajax.reload( null, false );
+		}
+		$(document).ready(function() {
+			$('select').select2({width: '100%'});
+			$("#datatable-md1").DataTable({
+				language: {
+					paginate: {
+						previous: "<i class='mdi mdi-chevron-left'>",
+						next: "<i class='mdi mdi-chevron-right'>"
+					}
+				},
+				drawCallback: function() {
+					bindHref(); refreshTooltips();
+				},
+				responsive: false,
+				processing: true,
+				serverSide: true,
+				ajax: {
+					url: "./table",
+					"data": function(d) {
+						d.id = "watch_output";
+						d.server = getServer();
+						d.type = getType();
+						d.status = getStatus();
+					}
+				},
+				columnDefs: [
+					{"className": "dt-center", "targets": [0,4,5,6]},
+					{"orderable": false, "targets": [6]}
+				],
+				order: [[ 5, "desc" ]],
+				pageLength: <?= intval($rSettings['default_entries']) ?: 10; ?>
+			});
+			$("#datatable-md1").css("width", "100%");
+			$('#result_search').keyup(function(){
+				if (!window.rClearing) {
+					$('#datatable-md1').DataTable().search($(this).val()).draw();
+				}
+			})
+			$('#result_show_entries').change(function(){
+				if (!window.rClearing) {
+					$('#datatable-md1').DataTable().page.len($(this).val()).draw();
+				}
+			})
+			$('#result_server').change(function(){
+				if (!window.rClearing) {
+					$("#datatable-md1").DataTable().ajax.reload( null, false );
+				}
+			})
+			$('#result_type').change(function(){
+				if (!window.rClearing) {
+					$("#datatable-md1").DataTable().ajax.reload( null, false );
+				}
+			})
+			$('#result_status').change(function(){
+				if (!window.rClearing) {
+					$("#datatable-md1").DataTable().ajax.reload( null, false );
+				}
+			})
+			$('#datatable-md1').DataTable().search($(this).val()).draw();
+			$('#range_clear_to').daterangepicker({
+				singleDatePicker: true,
+				showDropdowns: true,
+				locale: {
+					format: 'YYYY-MM-DD'
+				},
+				autoUpdateInput: false
+			}).val("");
+			$('#range_clear_from').daterangepicker({
+				singleDatePicker: true,
+				showDropdowns: true,
+				locale: {
+					format: 'YYYY-MM-DD'
+				},
+				autoUpdateInput: false
+			}).val("");
+			$('#range_clear_from').on('apply.daterangepicker', function(ev, picker) {
+				$(this).val(picker.startDate.format('YYYY-MM-DD'));
+			});
+			$('#range_clear_from').on('cancel.daterangepicker', function(ev, picker) {
+				$(this).val('');
+			});
+			$('#range_clear_to').on('apply.daterangepicker', function(ev, picker) {
+				$(this).val(picker.startDate.format('YYYY-MM-DD'));
+			});
+			$('#range_clear_to').on('cancel.daterangepicker', function(ev, picker) {
+				$(this).val('');
+			});
+			$("#btn-clear-logs").click(function() {
+				$(".bs-logs-modal-center").modal("show");
+			});
+            $("#clear_logs").click(function() {
+                new jBox("Confirm", {
+                    confirmButton: "Delete",
+                    cancelButton: "Cancel",
+                    content: "<?= $language::get('clear_confirm'); ?>",
+                    confirm: function () {
+                        $(".bs-logs-modal-center").modal("hide");
+                        $.getJSON("./api?action=clear_logs&type=watch_logs&from=" + encodeURIComponent($("#range_clear_from").val()) + "&to=" + encodeURIComponent($("#range_clear_to").val()), function(data) {
+                            $.toast("Logs have been cleared.");
+                            $("#datatable-activity").DataTable().ajax.reload( null, false );
+                        });
+                    }
+                }).open();
+			});
+            $("#btn-export-csv").click(function() {
+                $.toast("Generating CSV report...");
+                window.location.href = "api?action=report&params=" + encodeURIComponent(JSON.stringify($("#datatable-md1").DataTable().ajax.params()));
+			});
+		});
+    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
+        $(document).ready(function() {
+            initSearch();
+        });
+    <?php endif; ?>
+</script>
+<script src="assets/js/listings.js"></script>
+</body>
+
+</html>
diff --git a/src/modules/watch/views/watch_scripts.php b/src/modules/watch/views/watch_scripts.php
new file mode 100644
index 00000000..14eaa9fb
--- /dev/null
+++ b/src/modules/watch/views/watch_scripts.php
@@ -0,0 +1,255 @@
+<script id="scripts">
+	var resizeObserver = new ResizeObserver(entries => $(window).scroll());
+	$(document).ready(function() {
+		resizeObserver.observe(document.body)
+		$("form").attr('autocomplete', 'off');
+		$(document).keypress(function(event) {
+			if (event.which == 13 && event.target.nodeName != "TEXTAREA") return false;
+		});
+		$.fn.dataTable.ext.errMode = 'none';
+		var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
+		elems.forEach(function(html) {
+			var switchery = new Switchery(html, {
+				'color': '#414d5f'
+			});
+			window.rSwitches[$(html).attr("id")] = switchery;
+		});
+		setTimeout(pingSession, 30000);
+		<?php if (!$rMobile && $rSettings['header_stats']): ?>
+			headerStats();
+		<?php endif; ?>
+		bindHref();
+		refreshTooltips();
+		$(window).scroll(function() {
+			if ($(this).scrollTop() > 200) {
+				if ($(document).height() > $(window).height()) {
+					$('#scrollToBottom').fadeOut();
+				}
+				$('#scrollToTop').fadeIn();
+			} else {
+				$('#scrollToTop').fadeOut();
+				if ($(document).height() > $(window).height()) {
+					$('#scrollToBottom').fadeIn();
+				} else {
+					$('#scrollToBottom').hide();
+				}
+			}
+		});
+		$("#scrollToTop").unbind("click");
+		$('#scrollToTop').click(function() {
+			$('html, body').animate({
+				scrollTop: 0
+			}, 800);
+			return false;
+		});
+		$("#scrollToBottom").unbind("click");
+		$('#scrollToBottom').click(function() {
+			$('html, body').animate({
+				scrollTop: $(document).height()
+			}, 800);
+			return false;
+		});
+		$(window).scroll();
+		$(".nextb").unbind("click");
+		$(".nextb").click(function() {
+			var rPos = 0;
+			var rActive = null;
+			$(".nav .nav-item").each(function() {
+				if ($(this).find(".nav-link").hasClass("active")) {
+					rActive = rPos;
+				}
+				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+					$(this).find(".nav-link").trigger("click");
+					return false;
+				}
+				rPos += 1;
+			});
+		});
+		$(".prevb").unbind("click");
+		$(".prevb").click(function() {
+			var rPos = 0;
+			var rActive = null;
+			$($(".nav .nav-item").get().reverse()).each(function() {
+				if ($(this).find(".nav-link").hasClass("active")) {
+					rActive = rPos;
+				}
+				if (rActive !== null && rPos > rActive && !$(this).find("a").hasClass("disabled") && $(this).is(":visible")) {
+					$(this).find(".nav-link").trigger("click");
+					return false;
+				}
+				rPos += 1;
+			});
+		});
+		(function($) {
+			$.fn.inputFilter = function(inputFilter) {
+				return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function() {
+					if (inputFilter(this.value)) {
+						this.oldValue = this.value;
+						this.oldSelectionStart = this.selectionStart;
+						this.oldSelectionEnd = this.selectionEnd;
+					} else if (this.hasOwnProperty("oldValue")) {
+						this.value = this.oldValue;
+						this.setSelectionRange(this.oldSelectionStart, this.oldSelectionEnd);
+					}
+				});
+			};
+		}(jQuery));
+		<?php if ($rSettings['js_navigate']): ?>
+			$(".navigation-menu li").mouseenter(function() {
+				$(this).find(".submenu").show();
+			});
+			delParam("status");
+			$(window).on("popstate", function() {
+				if (window.rRealURL) {
+					if (window.rRealURL.split("/").reverse()[0].split("?")[0].split(".")[0] != window.location.href.split("/").reverse()[0].split("?")[0].split(".")[0]) {
+						navigate(window.location.href.split("/").reverse()[0]);
+					}
+				}
+			});
+		<?php endif; ?>
+		$(document).keydown(function(e) {
+			if (e.keyCode == 16) {
+				window.rShiftHeld = true;
+			}
+		});
+		$(document).keyup(function(e) {
+			if (e.keyCode == 16) {
+				window.rShiftHeld = false;
+			}
+		});
+		document.onselectstart = function() {
+			if (window.rShiftHeld) {
+				return false;
+			}
+		}
+	});
+
+	function disableAll(rConfirm = false) {
+		if (!rConfirm) {
+			new jBox("Confirm", {
+				confirmButton: "Disable",
+				cancelButton: "Cancel",
+				content: "Are you sure you want to disable all folders?",
+				confirm: function() {
+					disableAll(true);
+				}
+			}).open();
+		} else {
+			$.getJSON("./api?action=disable_watch", function(data) {
+				$.toast("Folders have been disabled.");
+			});
+		}
+	}
+
+	function enableAll(rConfirm = false) {
+		if (!rConfirm) {
+			new jBox("Confirm", {
+				confirmButton: "Enable",
+				cancelButton: "Cancel",
+				content: "Are you sure you want to enable all folders?",
+				confirm: function() {
+					enableAll(true);
+				}
+			}).open();
+		} else {
+			$.getJSON("./api?action=enable_watch", function(data) {
+				$.toast("Folders have been enabled.");
+			});
+		}
+	}
+
+	function killWatchFolder(rConfirm = false) {
+		if (!rConfirm) {
+			new jBox("Confirm", {
+				confirmButton: "Kill",
+				cancelButton: "Cancel",
+				content: "Are you sure you want to kill all processes?",
+				confirm: function() {
+					killWatchFolder(true);
+				}
+			}).open();
+		} else {
+			$.getJSON("./api?action=kill_watch", function(data) {
+				$.toast("Watch folder processes have been killed.");
+			});
+		}
+	}
+
+	function api(rID, rType, rConfirm = false) {
+		if ((rType == "delete") && (!rConfirm)) {
+			new jBox("Confirm", {
+				confirmButton: "Delete",
+				cancelButton: "Cancel",
+				content: "Are you sure you want to delete this folder?",
+				confirm: function() {
+					api(rID, rType, true);
+				}
+			}).open();
+		} else if ((rType == "force") && (!rConfirm)) {
+			new jBox("Confirm", {
+				confirmButton: "Run",
+				cancelButton: "Cancel",
+				content: "Are you sure you want to force this folder to run now?",
+				confirm: function() {
+					api(rID, rType, true);
+				}
+			}).open();
+		} else {
+			rConfirm = true;
+		}
+		if (rConfirm) {
+			$.getJSON("./api?action=folder&sub=" + rType + "&folder_id=" + rID, function(data) {
+				if (data.result === true) {
+					if (rType == "delete") {
+						if (rRow = findRowByID($("#datatable").DataTable(), 0, rID)) {
+							$("#datatable").DataTable().rows(rRow).remove().draw(false);
+						}
+						$.toast("Folder successfully deleted.");
+					} else if (rType == "force") {
+						$.toast("Folder has been forced to run in the background.");
+					}
+				} else {
+					$.toast("An error occured while processing your request.");
+				}
+			});
+		}
+	}
+
+	$(document).ready(function() {
+		$("#datatable").DataTable({
+			language: {
+				paginate: {
+					previous: "<i class='mdi mdi-chevron-left'>",
+					next: "<i class='mdi mdi-chevron-right'>"
+				}
+			},
+			drawCallback: function() {
+				bindHref();
+				refreshTooltips();
+			},
+			order: [
+				[5, "desc"]
+			],
+			columnDefs: [{
+				"visible": false,
+				"targets": [0]
+			}],
+			responsive: false
+		});
+		$("#datatable").css("width", "100%");
+		$("form").submit(function(e) {
+			e.preventDefault();
+			$(':input[type="submit"]').prop('disabled', true);
+			submitForm(window.rCurrentPage, new FormData($("form")[0]));
+		});
+	});
+    <?php if (CoreUtilities::$rSettings['enable_search']): ?>
+        $(document).ready(function() {
+            initSearch();
+        });
+    <?php endif; ?>
+</script>
+<script src="assets/js/listings.js"></script>
+</body>
+
+</html>
diff --git a/src/resources/langs/.gitkeep b/src/resources/langs/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/resources/libs/.gitkeep b/src/resources/libs/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/streaming/Auth/DeviceLock.php b/src/streaming/Auth/DeviceLock.php
new file mode 100644
index 00000000..79923b3c
--- /dev/null
+++ b/src/streaming/Auth/DeviceLock.php
@@ -0,0 +1,7 @@
+<?php
+
+class DeviceLock {
+	public static function normalizeIdentifier($rIdentifier) {
+		return trim((string) $rIdentifier);
+	}
+}
diff --git a/src/streaming/Auth/StreamAuth.php b/src/streaming/Auth/StreamAuth.php
new file mode 100644
index 00000000..77217f31
--- /dev/null
+++ b/src/streaming/Auth/StreamAuth.php
@@ -0,0 +1,91 @@
+<?php
+
+class StreamAuth {
+	public static function checkAccess($rServers, $rSettings, $rUserInfo, $rUserIP, $rCountryCode, $rUserISP = '', $rGetCapacityCallback = null) {
+		$rAvailableServers = array();
+		foreach ($rServers as $rServerID => $rServerInfo) {
+			if ($rServerInfo['server_online'] && $rServerInfo['server_type'] == 0) {
+				$rAvailableServers[] = $rServerID;
+			}
+		}
+
+		if (empty($rAvailableServers)) {
+			return false;
+		}
+
+		shuffle($rAvailableServers);
+		$rServerCapacity = call_user_func($rGetCapacityCallback);
+		$rAcceptServers = array();
+
+		foreach ($rAvailableServers as $rServerID) {
+			$rOnlineClients = (isset($rServerCapacity[$rServerID]['online_clients']) ? $rServerCapacity[$rServerID]['online_clients'] : 0);
+			if ($rOnlineClients == 0) {
+				$rServerCapacity[$rServerID]['capacity'] = 0;
+			}
+			$rAcceptServers[$rServerID] = (0 < $rServers[$rServerID]['total_clients'] && $rOnlineClients < $rServers[$rServerID]['total_clients'] ? $rServerCapacity[$rServerID]['capacity'] : false);
+		}
+
+		$rAcceptServers = array_filter($rAcceptServers, 'is_numeric');
+		if (empty($rAcceptServers)) {
+			return false;
+		}
+
+		$rKeys = array_keys($rAcceptServers);
+		$rValues = array_values($rAcceptServers);
+		array_multisort($rValues, SORT_ASC, $rKeys, SORT_ASC);
+		$rAcceptServers = array_combine($rKeys, $rValues);
+
+		if ($rUserInfo['force_server_id'] != 0 && array_key_exists($rUserInfo['force_server_id'], $rAcceptServers)) {
+			return $rUserInfo['force_server_id'];
+		}
+
+		$rPriorityServers = array();
+		$rRedirectID = null;
+		foreach (array_keys($rAcceptServers) as $rServerID) {
+			if ($rServers[$rServerID]['enable_geoip'] == 1) {
+				if (in_array($rCountryCode, $rServers[$rServerID]['geoip_countries'])) {
+					$rRedirectID = $rServerID;
+					break;
+				}
+				if ($rServers[$rServerID]['geoip_type'] == 'strict') {
+					unset($rAcceptServers[$rServerID]);
+				} else {
+					$rPriorityServers[$rServerID] = ($rServers[$rServerID]['geoip_type'] == 'low_priority' ? 1 : 2);
+				}
+			} else {
+				if ($rServers[$rServerID]['enable_isp'] == 1) {
+					if (in_array($rUserISP, $rServers[$rServerID]['isp_names'])) {
+						$rRedirectID = $rServerID;
+						break;
+					}
+					if ($rServers[$rServerID]['isp_type'] == 'strict') {
+						unset($rAcceptServers[$rServerID]);
+					} else {
+						$rPriorityServers[$rServerID] = ($rServers[$rServerID]['isp_type'] == 'low_priority' ? 1 : 2);
+					}
+				} else {
+					$rPriorityServers[$rServerID] = 1;
+				}
+			}
+		}
+
+		if (empty($rPriorityServers) && empty($rRedirectID)) {
+			return false;
+		}
+
+		return (empty($rRedirectID) ? array_search(min($rPriorityServers), $rPriorityServers) : $rRedirectID);
+	}
+
+	public static function validateConnections($rUserInfo, $rIsHMAC = false, $rIdentifier = '', $rIP = null, $rUserAgent = null, $rCloseConnectionsCallback = null) {
+		if ($rUserInfo['max_connections'] != 0) {
+			if (!$rIsHMAC) {
+				if (!empty($rUserInfo['pair_id'])) {
+					call_user_func($rCloseConnectionsCallback, $rUserInfo['pair_id'], $rUserInfo['max_connections'], null, '', $rIP, $rUserAgent);
+				}
+				call_user_func($rCloseConnectionsCallback, $rUserInfo['id'], $rUserInfo['max_connections'], null, '', $rIP, $rUserAgent);
+			} else {
+				call_user_func($rCloseConnectionsCallback, null, $rUserInfo['max_connections'], $rIsHMAC, $rIdentifier, $rIP, $rUserAgent);
+			}
+		}
+	}
+}
diff --git a/src/streaming/Auth/TokenAuth.php b/src/streaming/Auth/TokenAuth.php
new file mode 100644
index 00000000..03337b5d
--- /dev/null
+++ b/src/streaming/Auth/TokenAuth.php
@@ -0,0 +1,7 @@
+<?php
+
+class TokenAuth {
+	public static function validateHMAC($db, $rSettings, $rCached, $rHMAC, $rExpiry, $rStreamID, $rExtension, $rIP = '', $rMACIP = '', $rIdentifier = '', $rMaxConnections = 0, $rDecryptCallback = null) {
+		return HMACValidator::validate($db, $rSettings, $rCached, $rHMAC, $rExpiry, $rStreamID, $rExtension, $rIP, $rMACIP, $rIdentifier, $rMaxConnections, $rDecryptCallback);
+	}
+}
diff --git a/src/streaming/Balancer/ProxySelector.php b/src/streaming/Balancer/ProxySelector.php
new file mode 100644
index 00000000..43b1e46b
--- /dev/null
+++ b/src/streaming/Balancer/ProxySelector.php
@@ -0,0 +1,59 @@
+<?php
+
+class ProxySelector {
+	public static function availableProxy($rServers, $rProxies, $rCountryCode, $rUserISP = '', $rGetCapacityCallback = null) {
+		if (empty($rProxies)) {
+			return null;
+		}
+		$rServerCapacity = call_user_func($rGetCapacityCallback, true);
+		$rAcceptServers = array();
+		foreach ($rProxies as $rServerID) {
+			$rOnlineClients = (isset($rServerCapacity[$rServerID]['online_clients']) ? $rServerCapacity[$rServerID]['online_clients'] : 0);
+			if ($rOnlineClients == 0) {
+				$rServerCapacity[$rServerID]['capacity'] = 0;
+			}
+			$rAcceptServers[$rServerID] = (0 < $rServers[$rServerID]['total_clients'] && $rOnlineClients < $rServers[$rServerID]['total_clients'] ? $rServerCapacity[$rServerID]['capacity'] : false);
+		}
+		$rAcceptServers = array_filter($rAcceptServers, 'is_numeric');
+		if (empty($rAcceptServers)) {
+			return null;
+		}
+		$rKeys = array_keys($rAcceptServers);
+		$rValues = array_values($rAcceptServers);
+		array_multisort($rValues, SORT_ASC, $rKeys, SORT_ASC);
+		$rAcceptServers = array_combine($rKeys, $rValues);
+		$rPriorityServers = array();
+		foreach (array_keys($rAcceptServers) as $rServerID) {
+			if ($rServers[$rServerID]['enable_geoip'] == 1) {
+				if (in_array($rCountryCode, $rServers[$rServerID]['geoip_countries'])) {
+					$rRedirectID = $rServerID;
+					break;
+				}
+				if ($rServers[$rServerID]['geoip_type'] == 'strict') {
+					unset($rAcceptServers[$rServerID]);
+				} else {
+					$rPriorityServers[$rServerID] = ($rServers[$rServerID]['geoip_type'] == 'low_priority' ? 1 : 2);
+				}
+			} else {
+				if ($rServers[$rServerID]['enable_isp'] == 1) {
+					if (in_array($rUserISP, $rServers[$rServerID]['isp_names'])) {
+						$rRedirectID = $rServerID;
+						break;
+					}
+					if ($rServers[$rServerID]['isp_type'] == 'strict') {
+						unset($rAcceptServers[$rServerID]);
+					} else {
+						$rPriorityServers[$rServerID] = ($rServers[$rServerID]['isp_type'] == 'low_priority' ? 1 : 2);
+					}
+				} else {
+					$rPriorityServers[$rServerID] = 1;
+				}
+			}
+		}
+		if (!(empty($rPriorityServers) && empty($rRedirectID))) {
+			$rRedirectID = (empty($rRedirectID) ? array_search(min($rPriorityServers), $rPriorityServers) : $rRedirectID);
+			return $rRedirectID;
+		}
+		return null;
+	}
+}
diff --git a/src/streaming/Codec/FFmpegCommand.php b/src/streaming/Codec/FFmpegCommand.php
new file mode 100644
index 00000000..0b8484f0
--- /dev/null
+++ b/src/streaming/Codec/FFmpegCommand.php
@@ -0,0 +1,7 @@
+<?php
+
+class FFmpegCommand {
+	public static function createChannelItem($db, $rSettings, $rServers, $rFFMPEG_CPU, $rFFMPEG_GPU, $rStreamID, $rSource) {
+		return StreamProcess::createChannelItem($db, $rSettings, $rServers, $rFFMPEG_CPU, $rFFMPEG_GPU, $rStreamID, $rSource);
+	}
+}
diff --git a/src/streaming/Codec/FFprobeRunner.php b/src/streaming/Codec/FFprobeRunner.php
new file mode 100644
index 00000000..effb4dd9
--- /dev/null
+++ b/src/streaming/Codec/FFprobeRunner.php
@@ -0,0 +1,56 @@
+<?php
+
+class FFprobeRunner {
+	public static function probeStream($rSettings, $rFFPROBE, $rSourceURL, $rFetchArguments = array(), $rPrepend = '', $rParse = true, $rParseCallback = null) {
+		$rAnalyseDuration = abs(intval($rSettings['stream_max_analyze']));
+		$rProbesize = abs(intval($rSettings['probesize']));
+		$rTimeout = intval($rAnalyseDuration / 1000000) + $rSettings['probe_extra_wait'];
+		if (!is_array($rFetchArguments)) {
+			$rFetchArguments = !empty($rFetchArguments) ? [$rFetchArguments] : [];
+		}
+		$rCommand = $rPrepend . 'timeout ' . $rTimeout . ' ' . $rFFPROBE . ' -probesize ' . $rProbesize . ' -analyzeduration ' . $rAnalyseDuration . ' ' . implode(' ', $rFetchArguments) . ' -i "' . $rSourceURL . '" -v quiet -print_format json -show_streams -show_format';
+		exec($rCommand, $rReturn);
+		$result = implode("\n", $rReturn);
+		if ($rParse) {
+			return call_user_func($rParseCallback, json_decode($result, true));
+		}
+		return json_decode($result, true);
+	}
+
+	public static function parseFFProbe($rCodecs) {
+		if (empty($rCodecs)) {
+			return false;
+		}
+		if (empty($rCodecs['codecs'])) {
+			$rOutput = array();
+			$rOutput['codecs']['video'] = '';
+			$rOutput['codecs']['audio'] = '';
+			$rOutput['container'] = $rCodecs['format']['format_name'];
+			$rOutput['filename'] = $rCodecs['format']['filename'];
+			$rOutput['bitrate'] = (!empty($rCodecs['format']['bit_rate']) ? $rCodecs['format']['bit_rate'] : null);
+			$rOutput['of_duration'] = (!empty($rCodecs['format']['duration']) ? $rCodecs['format']['duration'] : 'N/A');
+			$rOutput['duration'] = (!empty($rCodecs['format']['duration']) ? gmdate('H:i:s', intval($rCodecs['format']['duration'])) : 'N/A');
+			foreach ($rCodecs['streams'] as $rCodec) {
+				if (isset($rCodec['codec_type']) && !($rCodec['codec_type'] != 'audio' && $rCodec['codec_type'] != 'video' && $rCodec['codec_type'] != 'subtitle')) {
+					if ($rCodec['codec_type'] == 'audio' || $rCodec['codec_type'] == 'video') {
+						if (!empty($rOutput['codecs'][$rCodec['codec_type']])) {
+						} else {
+							$rOutput['codecs'][$rCodec['codec_type']] = $rCodec;
+						}
+					} else {
+						if ($rCodec['codec_type'] != 'subtitle') {
+						} else {
+							if (isset($rOutput['codecs'][$rCodec['codec_type']])) {
+							} else {
+								$rOutput['codecs'][$rCodec['codec_type']] = array();
+							}
+							$rOutput['codecs'][$rCodec['codec_type']][] = $rCodec;
+						}
+					}
+				}
+			}
+			return $rOutput;
+		}
+		return $rCodecs;
+	}
+}
diff --git a/src/streaming/Codec/SubtitleExtractor.php b/src/streaming/Codec/SubtitleExtractor.php
new file mode 100644
index 00000000..dc4c7c07
--- /dev/null
+++ b/src/streaming/Codec/SubtitleExtractor.php
@@ -0,0 +1,17 @@
+<?php
+
+class SubtitleExtractor {
+	public static function extractSubtitle($rFFMPEG_CPU, $rSettings, $rStreamID, $rSourceURL, $rIndex) {
+		$rTimeout = 10;
+		$rCommand = 'timeout ' . $rTimeout . ' ' . $rFFMPEG_CPU . ' -y -nostdin -hide_banner -loglevel ' . (($rSettings['ffmpeg_warnings'] ? 'warning' : 'error')) . ' -err_detect ignore_err -i "' . $rSourceURL . '" -map 0:s:' . intval($rIndex) . ' ' . VOD_PATH . intval($rStreamID) . '_' . intval($rIndex) . '.srt';
+		exec($rCommand, $rOutput);
+		if (file_exists(VOD_PATH . intval($rStreamID) . '_' . intval($rIndex) . '.srt')) {
+			if (filesize(VOD_PATH . intval($rStreamID) . '_' . intval($rIndex) . '.srt') != 0) {
+				return true;
+			}
+			unlink(VOD_PATH . intval($rStreamID) . '_' . intval($rIndex) . '.srt');
+			return false;
+		}
+		return false;
+	}
+}
diff --git a/src/streaming/Delivery/HLSGenerator.php b/src/streaming/Delivery/HLSGenerator.php
new file mode 100644
index 00000000..022ed6d0
--- /dev/null
+++ b/src/streaming/Delivery/HLSGenerator.php
@@ -0,0 +1,46 @@
+<?php
+
+class HLSGenerator {
+	public static function generateHLS($rSettings, $rM3U8, $rUsername, $rPassword, $rStreamID, $rUUID, $rIP, $rIsHMAC = null, $rIdentifier = '', $rVideoCodec = 'h264', $rOnDemand = 0, $rServerID = null, $rProxyID = null, $rEncryptDataCallback = null) {
+		if (!file_exists($rM3U8)) {
+			return false;
+		}
+		$rSource = file_get_contents($rM3U8);
+		if ($rSettings['encrypt_hls']) {
+			$rKeyToken = call_user_func($rEncryptDataCallback, $rIP . '/' . $rStreamID, $rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+			$rSource = "#EXTM3U\n#EXT-X-KEY:METHOD=AES-128,URI=\"" . (($rProxyID ? '/' . md5($rProxyID . '_' . $rServerID . '_' . OPENSSL_EXTRA) : '')) . '/key/' . $rKeyToken . "\",IV=0x" . bin2hex(file_get_contents(STREAMS_PATH . $rStreamID . '_.iv')) . "\n" . substr($rSource, 8, strlen($rSource) - 8);
+		}
+
+		if (preg_match('/#EXT-X-MAP:URI="(.*?)"/', $rSource, $rInitMatch)) {
+			$rInitSegment = $rInitMatch[1];
+			if ($rIsHMAC) {
+				$rInitToken = call_user_func($rEncryptDataCallback, 'HMAC#' . $rIsHMAC . '/' . $rIdentifier . '/' . $rIP . '/' . $rStreamID . '/' . $rInitSegment . '/' . $rUUID . '/' . SERVER_ID . '/' . $rVideoCodec . '/' . $rOnDemand, $rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+			} else {
+				$rInitToken = call_user_func($rEncryptDataCallback, $rUsername . '/' . $rPassword . '/' . $rIP . '/' . $rStreamID . '/' . $rInitSegment . '/' . $rUUID . '/' . SERVER_ID . '/' . $rVideoCodec . '/' . $rOnDemand, $rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+			}
+			if ($rSettings['allow_cdn_access']) {
+				$rSource = str_replace('URI="' . $rInitSegment . '"', 'URI="' . (($rProxyID ? '/' . md5($rProxyID . '_' . $rServerID . '_' . OPENSSL_EXTRA) : '')) . '/hls/' . $rInitSegment . '?token=' . $rInitToken . '"', $rSource);
+			} else {
+				$rSource = str_replace('URI="' . $rInitSegment . '"', 'URI="' . (($rProxyID ? '/' . md5($rProxyID . '_' . $rServerID . '_' . OPENSSL_EXTRA) : '')) . '/hls/' . $rInitToken . '"', $rSource);
+			}
+		}
+
+		if (preg_match_all('/(.*?)\.(ts|m4s)/', $rSource, $rMatches)) {
+			foreach ($rMatches[0] as $rMatch) {
+				if ($rIsHMAC) {
+					$rToken = call_user_func($rEncryptDataCallback, 'HMAC#' . $rIsHMAC . '/' . $rIdentifier . '/' . $rIP . '/' . $rStreamID . '/' . $rMatch . '/' . $rUUID . '/' . SERVER_ID . '/' . $rVideoCodec . '/' . $rOnDemand, $rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+				} else {
+					$rToken = call_user_func($rEncryptDataCallback, $rUsername . '/' . $rPassword . '/' . $rIP . '/' . $rStreamID . '/' . $rMatch . '/' . $rUUID . '/' . SERVER_ID . '/' . $rVideoCodec . '/' . $rOnDemand, $rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+				}
+				if ($rSettings['allow_cdn_access']) {
+					$rSource = str_replace($rMatch, (($rProxyID ? '/' . md5($rProxyID . '_' . $rServerID . '_' . OPENSSL_EXTRA) : '')) . '/hls/' . $rMatch . '?token=' . $rToken, $rSource);
+				} else {
+					$rSource = str_replace($rMatch, (($rProxyID ? '/' . md5($rProxyID . '_' . $rServerID . '_' . OPENSSL_EXTRA) : '')) . '/hls/' . $rToken, $rSource);
+				}
+			}
+			return $rSource;
+		}
+
+		return false;
+	}
+}
diff --git a/src/streaming/Delivery/OffAirHandler.php b/src/streaming/Delivery/OffAirHandler.php
new file mode 100644
index 00000000..c7eebc27
--- /dev/null
+++ b/src/streaming/Delivery/OffAirHandler.php
@@ -0,0 +1,97 @@
+<?php
+
+class OffAirHandler {
+	public static function getOffAirVideo($rSettings, $rPathKey) {
+		if (!(isset($rSettings[$rPathKey]) && 0 < strlen($rSettings[$rPathKey]))) {
+			switch ($rPathKey) {
+				case 'connected_video_path':
+					if (file_exists(VIDEO_PATH . 'connected.ts')) {
+						return VIDEO_PATH . 'connected.ts';
+					}
+					break;
+				case 'expired_video_path':
+					if (file_exists(VIDEO_PATH . 'expired.ts')) {
+						return VIDEO_PATH . 'expired.ts';
+					}
+					break;
+				case 'banned_video_path':
+					if (file_exists(VIDEO_PATH . 'banned.ts')) {
+						return VIDEO_PATH . 'banned.ts';
+					}
+					break;
+				case 'not_on_air_video_path':
+					if (file_exists(VIDEO_PATH . 'offline.ts')) {
+						return VIDEO_PATH . 'offline.ts';
+					}
+					break;
+				case 'expiring_video_path':
+					if (file_exists(VIDEO_PATH . 'expiring.ts')) {
+						return VIDEO_PATH . 'expiring.ts';
+					}
+					break;
+			}
+		} else {
+			return $rSettings[$rPathKey];
+		}
+	}
+
+	public static function showVideoServer($rSettings, $rServers, $rShowOptionKey, $rVideoPathKey, $rExtension, $rUserInfo, $rIP, $rCountryCode, $rISP, $rServerID = null, $rProxyID = null, $rSelectServerCallback = null, $rGetProxiesCallback = null, $rSelectProxyCallback = null, $rEncryptDataCallback = null) {
+		$rVideoPath = self::getOffAirVideo($rSettings, $rVideoPathKey);
+		if (!(!$rUserInfo['is_restreamer'] && $rSettings[$rShowOptionKey] && 0 < strlen($rVideoPath))) {
+			switch ($rShowOptionKey) {
+				case 'show_expired_video':
+					generateError('EXPIRED');
+					break;
+				case 'show_banned_video':
+					generateError('BANNED');
+					break;
+				case 'show_not_on_air_video':
+					generateError('STREAM_OFFLINE');
+					break;
+				default:
+					generate404();
+					break;
+			}
+		}
+		if (!$rServerID) {
+			$rServerID = call_user_func($rSelectServerCallback, $rUserInfo, $rIP, $rCountryCode, $rISP);
+		}
+		if (!$rServerID) {
+			$rServerID = SERVER_ID;
+		}
+		$rOriginatorID = null;
+		if ($rServers[$rServerID]['enable_proxy'] && (!$rUserInfo['is_restreamer'] || !$rSettings['restreamer_bypass_proxy'])) {
+			$rProxies = call_user_func($rGetProxiesCallback, $rServerID);
+			$rProxyID = call_user_func($rSelectProxyCallback, array_keys($rProxies), $rCountryCode, $rUserInfo['con_isp_name']);
+			if (!$rProxyID) {
+				generate404();
+			}
+			$rOriginatorID = $rServerID;
+			$rServerID = $rProxyID;
+		}
+		if ($rServers[$rServerID]['random_ip'] && 0 < count($rServers[$rServerID]['domains']['urls'])) {
+			$rURL = $rServers[$rServerID]['domains']['protocol'] . '://' . $rServers[$rServerID]['domains']['urls'][array_rand($rServers[$rServerID]['domains']['urls'])] . ':' . $rServers[$rServerID]['domains']['port'];
+		} else {
+			$rURL = rtrim($rServers[$rServerID]['site_url'], '/');
+		}
+		if ($rOriginatorID && !$rServers[$rOriginatorID]['is_main']) {
+			$rURL .= '/' . md5($rServerID . '_' . $rOriginatorID . '_' . OPENSSL_EXTRA);
+		}
+		$rTokenData = array('expires' => time() + 10, 'video_path' => $rVideoPath);
+		$rToken = call_user_func($rEncryptDataCallback, json_encode($rTokenData), $rSettings['live_streaming_pass'], OPENSSL_EXTRA);
+		if ($rExtension == 'm3u8') {
+			$segmentDuration = 10;
+			$sequence = intval(time() / $segmentDuration);
+			$rM3U8 = "#EXTM3U\n#EXT-X-VERSION:3\n#EXT-X-MEDIA-SEQUENCE:{$sequence}\n#EXT-X-ALLOW-CACHE:NO\n#EXT-X-TARGETDURATION:{$segmentDuration}\n#EXT-X-PLAYLIST-TYPE:EVENT\n";
+			for ($i = 0; $i < 3; $i++) {
+				$rM3U8 .= "#EXTINF:{$segmentDuration}.0,\n" . $rURL . '/auth/' . $rToken . "\n";
+			}
+			header('Content-Type: application/x-mpegurl');
+			header('Content-Length: ' . strlen($rM3U8));
+			echo $rM3U8;
+			exit();
+		}
+		header('Location: ' . $rURL . '/auth/' . $rToken);
+		exit();
+	}
+}
diff --git a/src/streaming/Delivery/SegmentReader.php b/src/streaming/Delivery/SegmentReader.php
new file mode 100644
index 00000000..506cdfe3
--- /dev/null
+++ b/src/streaming/Delivery/SegmentReader.php
@@ -0,0 +1,37 @@
+<?php
+
+class SegmentReader {
+	public static function getLLODSegments($rStreamID, $rPlaylist, $rPrebuffer = 1) {
+		$rPrebuffer++;
+		$rSegments = $rKeySegments = array();
+		if (!file_exists($rPlaylist)) {
+			return null;
+		}
+		$rSource = file_get_contents($rPlaylist);
+		if (!preg_match_all('/(.*?).ts((#\\w+)+|#?)/', $rSource, $rMatches)) {
+			return null;
+		}
+		if (0 >= count($rMatches[1])) {
+			return null;
+		}
+		$rLastKey = null;
+		for ($i = 0; $i < count($rMatches[1]); $i++) {
+			$rFilename = $rMatches[1][$i];
+			list($rSID, $rSegmentID) = explode('_', $rFilename);
+			if (!empty($rMatches[2][$i])) {
+				$rKeySegments[$rSegmentID] = array();
+				$rLastKey = $rSegmentID;
+			}
+			if ($rLastKey) {
+				$rKeySegments[$rLastKey][] = $rSegmentID;
+			}
+		}
+		$rKeySegments = array_slice($rKeySegments, count($rKeySegments) - $rPrebuffer, $rPrebuffer, true);
+		foreach ($rKeySegments as $rKeySegment => $rSubSegments) {
+			foreach ($rSubSegments as $rSegmentID) {
+				$rSegments[] = $rStreamID . '_' . $rSegmentID . '.ts';
+			}
+		}
+		return (!empty($rSegments) ? $rSegments : null);
+	}
+}
diff --git a/src/streaming/Delivery/SignalSender.php b/src/streaming/Delivery/SignalSender.php
new file mode 100644
index 00000000..a4d91ef6
--- /dev/null
+++ b/src/streaming/Delivery/SignalSender.php
@@ -0,0 +1,21 @@
+<?php
+
+class SignalSender {
+	public static function sendSignal($rFFMPEG_CPU, $rSignalData, $rSegmentFile, $rCodec = 'h264', $rReturn = false) {
+		if (empty($rSignalData['xy_offset'])) {
+			$x = rand(150, 380);
+			$y = rand(110, 250);
+		} else {
+			list($x, $y) = explode('x', $rSignalData['xy_offset']);
+		}
+		if ($rReturn) {
+			$rOutput = SIGNALS_TMP_PATH . $rSignalData['activity_id'] . '_' . $rSegmentFile;
+			shell_exec($rFFMPEG_CPU . ' -copyts -vsync 0 -nostats -nostdin -hide_banner -loglevel quiet -y -i ' . escapeshellarg(STREAMS_PATH . $rSegmentFile) . ' -filter_complex "drawtext=fontfile=' . FFMPEG_FONT . ":text='" . escapeshellcmd($rSignalData['message']) . "':fontsize=" . escapeshellcmd($rSignalData['font_size']) . ':x=' . intval($x) . ':y=' . intval($y) . ':fontcolor=' . escapeshellcmd($rSignalData['font_color']) . '" -map 0 -vcodec ' . $rCodec . ' -preset ultrafast -acodec copy -scodec copy -mpegts_flags +initial_discontinuity -mpegts_copyts 1 -f mpegts ' . escapeshellarg($rOutput));
+			$rData = file_get_contents($rOutput);
+			unlink($rOutput);
+			return $rData;
+		}
+		passthru($rFFMPEG_CPU . ' -copyts -vsync 0 -nostats -nostdin -hide_banner -loglevel quiet -y -i ' . escapeshellarg(STREAMS_PATH . $rSegmentFile) . ' -filter_complex "drawtext=fontfile=' . FFMPEG_FONT . ":text='" . escapeshellcmd($rSignalData['message']) . "':fontsize=" . escapeshellcmd($rSignalData['font_size']) . ':x=' . intval($x) . ':y=' . intval($y) . ':fontcolor=' . escapeshellcmd($rSignalData['font_color']) . '" -map 0 -vcodec ' . $rCodec . ' -preset ultrafast -acodec copy -scodec copy -mpegts_flags +initial_discontinuity -mpegts_copyts 1 -f mpegts -');
+		return true;
+	}
+}
diff --git a/src/streaming/Delivery/StreamRedirector.php b/src/streaming/Delivery/StreamRedirector.php
new file mode 100644
index 00000000..b0ec82cd
--- /dev/null
+++ b/src/streaming/Delivery/StreamRedirector.php
@@ -0,0 +1,162 @@
+<?php
+
+class StreamRedirector {
+	public static function redirectStream($rCached, $rSettings, $rServers, $rStreamID, $rExtension, $rUserInfo, $rCountryCode, $rUserISP = '', $rType = '', $rGetBouquetMapCallback = null, $rGetStreamDataCallback = null, $rGetCapacityCallback = null) {
+		if ($rCached) {
+			$rStream = (igbinary_unserialize(file_get_contents(STREAMS_TMP_PATH . 'stream_' . $rStreamID)) ?: null);
+			$rStream['bouquets'] = call_user_func($rGetBouquetMapCallback, $rStreamID);
+		} else {
+			$rStream = call_user_func($rGetStreamDataCallback, $rStreamID);
+		}
+		if (!$rStream) {
+			return false;
+		}
+
+		$rStream['info']['bouquets'] = $rStream['bouquets'];
+		$rAvailableServers = array();
+		if ($rType == 'archive') {
+			if (0 < $rStream['info']['tv_archive_duration'] && 0 < $rStream['info']['tv_archive_server_id'] && array_key_exists($rStream['info']['tv_archive_server_id'], $rServers)) {
+				$rAvailableServers = array($rStream['info']['tv_archive_server_id']);
+			}
+		} else {
+			if (!($rStream['info']['direct_source'] == 1 && $rStream['info']['direct_proxy'] == 0)) {
+				foreach ($rServers as $rServerID => $rServerInfo) {
+					if (!array_key_exists($rServerID, $rStream['servers']) || !$rServerInfo['server_online'] || $rServerInfo['server_type'] != 0) {
+						continue;
+					}
+					if (!isset($rStream['servers'][$rServerID])) {
+						continue;
+					}
+					if ($rType == 'movie') {
+						if ((!empty($rStream['servers'][$rServerID]['pid']) && $rStream['servers'][$rServerID]['to_analyze'] == 0 && $rStream['servers'][$rServerID]['stream_status'] == 0 || $rStream['info']['direct_source'] == 1 && $rStream['info']['direct_proxy'] == 1) && ($rStream['info']['target_container'] == $rExtension || $rExtension == 'srt' || $rExtension == 'm3u8' || $rExtension == 'ts') && $rServerInfo['timeshift_only'] == 0) {
+							$rAvailableServers[] = $rServerID;
+						}
+					} else {
+						if (($rStream['servers'][$rServerID]['on_demand'] == 1 && $rStream['servers'][$rServerID]['stream_status'] != 1 || 0 < $rStream['servers'][$rServerID]['pid'] && $rStream['servers'][$rServerID]['stream_status'] == 0) && $rStream['servers'][$rServerID]['to_analyze'] == 0 && (int) $rStream['servers'][$rServerID]['delay_available_at'] <= time() && $rServerInfo['timeshift_only'] == 0 || $rStream['info']['direct_source'] == 1 && $rStream['info']['direct_proxy'] == 1) {
+							$rAvailableServers[] = $rServerID;
+						}
+					}
+				}
+			} else {
+				header('Location: ' . str_replace(' ', '%20', json_decode($rStream['info']['stream_source'], true)[0]));
+				exit();
+			}
+		}
+
+		if (empty($rAvailableServers)) {
+			return false;
+		}
+
+		shuffle($rAvailableServers);
+		$rServerCapacity = call_user_func($rGetCapacityCallback);
+		$rAcceptServers = array();
+		foreach ($rAvailableServers as $rServerID) {
+			$rOnlineClients = (isset($rServerCapacity[$rServerID]['online_clients']) ? $rServerCapacity[$rServerID]['online_clients'] : 0);
+			if ($rOnlineClients == 0) {
+				$rServerCapacity[$rServerID]['capacity'] = 0;
+			}
+			$rAcceptServers[$rServerID] = (0 < $rServers[$rServerID]['total_clients'] && $rOnlineClients < $rServers[$rServerID]['total_clients'] ? $rServerCapacity[$rServerID]['capacity'] : false);
+		}
+		$rAcceptServers = array_filter($rAcceptServers, 'is_numeric');
+		if (empty($rAcceptServers)) {
+			if ($rType == 'archive') {
+				return null;
+			}
+			return array();
+		}
+		$rKeys = array_keys($rAcceptServers);
+		$rValues = array_values($rAcceptServers);
+		array_multisort($rValues, SORT_ASC, $rKeys, SORT_ASC);
+		$rAcceptServers = array_combine($rKeys, $rValues);
+		if ($rExtension == 'rtmp' && array_key_exists(SERVER_ID, $rAcceptServers)) {
+			$rRedirectID = SERVER_ID;
+		} else {
+			if (isset($rUserInfo) && $rUserInfo['force_server_id'] != 0 && array_key_exists($rUserInfo['force_server_id'], $rAcceptServers)) {
+				$rRedirectID = $rUserInfo['force_server_id'];
+			} else {
+				$rPriorityServers = array();
+				foreach (array_keys($rAcceptServers) as $rServerID) {
+					if ($rServers[$rServerID]['enable_geoip'] == 1) {
+						if (in_array($rCountryCode, $rServers[$rServerID]['geoip_countries'])) {
+							$rRedirectID = $rServerID;
+							break;
+						}
+						if ($rServers[$rServerID]['geoip_type'] == 'strict') {
+							unset($rAcceptServers[$rServerID]);
+						} else {
+							if (isset($rStream) && !$rSettings['ondemand_balance_equal'] && $rStream['servers'][$rServerID]['on_demand']) {
+								$rPriorityServers[$rServerID] = ($rServers[$rServerID]['geoip_type'] == 'low_priority' ? 3 : 2);
+							} else {
+								$rPriorityServers[$rServerID] = ($rServers[$rServerID]['geoip_type'] == 'low_priority' ? 2 : 1);
+							}
+						}
+					} else {
+						if ($rServers[$rServerID]['enable_isp'] == 1) {
+							if (in_array(strtolower(trim(preg_replace('/[^A-Za-z0-9 ]/', '', $rUserISP))), $rServers[$rServerID]['isp_names'])) {
+								$rRedirectID = $rServerID;
+								break;
+							}
+							if ($rServers[$rServerID]['isp_type'] == 'strict') {
+								unset($rAcceptServers[$rServerID]);
+							} else {
+								if (isset($rStream) && !$rSettings['ondemand_balance_equal'] && $rStream['servers'][$rServerID]['on_demand']) {
+									$rPriorityServers[$rServerID] = ($rServers[$rServerID]['isp_type'] == 'low_priority' ? 3 : 2);
+								} else {
+									$rPriorityServers[$rServerID] = ($rServers[$rServerID]['isp_type'] == 'low_priority' ? 2 : 1);
+								}
+							}
+						} else {
+							if (isset($rStream) && !$rSettings['ondemand_balance_equal'] && $rStream['servers'][$rServerID]['on_demand']) {
+								$rPriorityServers[$rServerID] = 2;
+							} else {
+								$rPriorityServers[$rServerID] = 1;
+							}
+						}
+					}
+				}
+				if (empty($rPriorityServers) && empty($rRedirectID)) {
+					return false;
+				}
+				$rRedirectID = (empty($rRedirectID) ? array_search(min($rPriorityServers), $rPriorityServers) : $rRedirectID);
+			}
+		}
+		if ($rType == 'archive') {
+			return $rRedirectID;
+		}
+		$rStream['info']['redirect_id'] = $rRedirectID;
+		$fc4c58c5d1cd68d1 = $rRedirectID;
+		return array_merge($rStream['info'], $rStream['servers'][$fc4c58c5d1cd68d1]);
+	}
+
+	public static function getStreamingURL($rSettings, $rServers, $rServerID = null, $rOriginatorID = null, $rForceHTTP = false) {
+		if (!isset($rServerID)) {
+			$rServerID = SERVER_ID;
+		}
+		if ($rForceHTTP) {
+			$rProtocol = 'http';
+		} else {
+			if ($rSettings['keep_protocol']) {
+				$rProtocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443 ? 'https' : 'http');
+			} else {
+				$rProtocol = $rServers[$rServerID]['server_protocol'];
+			}
+		}
+		$rDomain = null;
+		if (0 < strlen(HOST) && in_array(strtolower(HOST), array_map('strtolower', $rServers[$rServerID]['domains']['urls']))) {
+			$rDomain = HOST;
+		} else {
+			if ($rServers[$rServerID]['random_ip'] && 0 < count($rServers[$rServerID]['domains']['urls'])) {
+				$rDomain = $rServers[$rServerID]['domains']['urls'][array_rand($rServers[$rServerID]['domains']['urls'])];
+			}
+		}
+		if ($rDomain) {
+			$rURL = $rProtocol . '://' . $rDomain . ':' . $rServers[$rServerID][$rProtocol . '_broadcast_port'];
+		} else {
+			$rURL = rtrim($rServers[$rServerID][$rProtocol . '_url'], '/');
+		}
+		if ($rServers[$rServerID]['server_type'] == 1 && $rOriginatorID && $rServers[$rOriginatorID]['is_main'] == 0) {
+			$rURL .= '/' . md5($rServerID . '_' . $rOriginatorID . '_' . OPENSSL_EXTRA);
+		}
+		return $rURL;
+	}
+}
diff --git a/src/streaming/Health/HealthChecker.php b/src/streaming/Health/HealthChecker.php
new file mode 100644
index 00000000..653586a9
--- /dev/null
+++ b/src/streaming/Health/HealthChecker.php
@@ -0,0 +1,15 @@
+<?php
+
+class HealthChecker {
+	public static function isRunning() {
+		$rNginx = 0;
+		exec('ps -fp $(pgrep -u xc_vm)', $rOutput, $rReturnVar);
+		foreach ($rOutput as $rProcess) {
+			$rSplit = explode(' ', preg_replace('!\\s+!', ' ', trim($rProcess)));
+			if ($rSplit[8] == 'nginx:' && $rSplit[9] == 'master') {
+				$rNginx++;
+			}
+		}
+		return 0 < $rNginx;
+	}
+}
diff --git a/src/streaming/Health/ProcessChecker.php b/src/streaming/Health/ProcessChecker.php
new file mode 100644
index 00000000..cb90b7e0
--- /dev/null
+++ b/src/streaming/Health/ProcessChecker.php
@@ -0,0 +1,52 @@
+<?php
+
+class ProcessChecker {
+	public static function isPIDsRunning($rServers, $rServerIDS, $rPIDs, $rEXE, $rServerRequestCallback = null) {
+		if (!is_array($rServerIDS)) {
+			$rServerIDS = array(intval($rServerIDS));
+		}
+		$rPIDs = array_map('intval', $rPIDs);
+		$rOutput = array();
+		foreach ($rServerIDS as $rServerID) {
+			if (is_array($rServers) && array_key_exists($rServerID, $rServers)) {
+				$rResponse = call_user_func($rServerRequestCallback, $rServerID, $rServers[$rServerID]['api_url_ip'] . '&action=pidsAreRunning', array('program' => $rEXE, 'pids' => $rPIDs));
+				if ($rResponse) {
+					$rDecoded = json_decode($rResponse, true);
+					if (is_array($rDecoded)) {
+						$rOutput[$rServerID] = array_map('trim', $rDecoded);
+					} else {
+						$rOutput[$rServerID] = false;
+					}
+				} else {
+					$rOutput[$rServerID] = false;
+				}
+			}
+		}
+		return $rOutput;
+	}
+
+	public static function isPIDRunning($rServers, $rServerID, $rPID, $rEXE, $rIsPIDsRunningCallback = null) {
+		if (!is_null($rPID) && is_numeric($rPID) && is_array($rServers) && array_key_exists($rServerID, $rServers)) {
+			if (!($rOutput = call_user_func($rIsPIDsRunningCallback, $rServerID, array($rPID), $rEXE))) {
+				return false;
+			}
+			return $rOutput[$rServerID][$rPID];
+		}
+		return false;
+	}
+
+	public static function checkPID($rPID, $rSearch) {
+		if (!is_array($rSearch)) {
+			$rSearch = array($rSearch);
+		}
+		if (file_exists('/proc/' . $rPID)) {
+			$rCommand = trim(file_get_contents('/proc/' . $rPID . '/cmdline'));
+			foreach ($rSearch as $rTerm) {
+				if (stristr($rCommand, $rTerm)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/streaming/Health/WatchdogMonitor.php b/src/streaming/Health/WatchdogMonitor.php
new file mode 100644
index 00000000..e28cf14d
--- /dev/null
+++ b/src/streaming/Health/WatchdogMonitor.php
@@ -0,0 +1,14 @@
+<?php
+
+class WatchdogMonitor {
+	public static function getWatchdog($db, $rID, $rLimit = 86400) {
+		$rReturn = array();
+		$db->query('SELECT * FROM `servers_stats` WHERE `server_id` = ? AND UNIX_TIMESTAMP() - `time` <= ? ORDER BY `time` DESC;', $rID, $rLimit);
+		if (0 < $db->num_rows()) {
+			foreach ($db->get_rows() as $rRow) {
+				$rReturn[] = $rRow;
+			}
+		}
+		return $rReturn;
+	}
+}
diff --git a/src/streaming/Protection/ConnectionLimiter.php b/src/streaming/Protection/ConnectionLimiter.php
new file mode 100644
index 00000000..d2b0ad31
--- /dev/null
+++ b/src/streaming/Protection/ConnectionLimiter.php
@@ -0,0 +1,191 @@
+<?php
+
+class ConnectionLimiter {
+	public static function closeConnections($db, $redis, $rSettings, $rServers, $rUserID, $rMaxConnections, $rIsHMAC = null, $rIdentifier = '', $rIP = null, $rUserAgent = null, $rGetConnectionsCallback = null, $rGetUserIPCallback = null, $rCloseConnectionCallback = null, $rRemoveFromQueueCallback = null) {
+		if ($rSettings['redis_handler']) {
+			$rConnections = array();
+			$rKeys = call_user_func($rGetConnectionsCallback, $rUserID, true, true);
+			$rToKill = count($rKeys) - $rMaxConnections;
+			if ($rToKill > 0) {
+				foreach (array_map('igbinary_unserialize', $redis->mGet($rKeys)) as $rConnection) {
+					if (is_array($rConnection)) {
+						$rConnections[] = $rConnection;
+					}
+				}
+				unset($rKeys);
+				$rDate = array_column($rConnections, 'date_start');
+				array_multisort($rDate, SORT_ASC, $rConnections);
+			} else {
+				return null;
+			}
+		} else {
+			if ($rIsHMAC) {
+				$db->query('SELECT `lines_live`.*, `on_demand` FROM `lines_live` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `lines_live`.`stream_id` AND `streams_servers`.`server_id` = `lines_live`.`server_id` WHERE `lines_live`.`hmac_id` = ? AND `lines_live`.`hls_end` = 0 AND `lines_live`.`hmac_identifier` = ? ORDER BY `lines_live`.`activity_id` ASC', $rIsHMAC, $rIdentifier);
+			} else {
+				$db->query('SELECT `lines_live`.*, `on_demand` FROM `lines_live` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `lines_live`.`stream_id` AND `streams_servers`.`server_id` = `lines_live`.`server_id` WHERE `lines_live`.`user_id` = ? AND `lines_live`.`hls_end` = 0 ORDER BY `lines_live`.`activity_id` ASC', $rUserID);
+			}
+			$rConnectionCount = $db->num_rows();
+			$rToKill = $rConnectionCount - $rMaxConnections;
+			if ($rToKill > 0) {
+				$rConnections = $db->get_rows();
+			} else {
+				return null;
+			}
+		}
+
+		$rIP = call_user_func($rGetUserIPCallback);
+		$rKilled = 0;
+		$rDelSID = $rDelUUID = $rIDs = array();
+		if ($rIP && $rUserAgent) {
+			$rKillTypes = array(2, 1, 0);
+		} else {
+			if ($rIP) {
+				$rKillTypes = array(1, 0);
+			} else {
+				$rKillTypes = array(0);
+			}
+		}
+
+		foreach ($rKillTypes as $rKillOwnIP) {
+			$i = 0;
+			while ($i < count($rConnections) && $rKilled < $rToKill) {
+				if ($rKilled != $rToKill) {
+					if ($rConnections[$i]['pid'] != getmypid()) {
+						if ($rConnections[$i]['user_ip'] == $rIP && $rConnections[$i]['user_agent'] == $rUserAgent && $rKillOwnIP == 2 || $rConnections[$i]['user_ip'] == $rIP && $rKillOwnIP == 1 || $rKillOwnIP == 0) {
+							if (call_user_func($rCloseConnectionCallback, $rConnections[$i])) {
+								$rKilled++;
+								if ($rConnections[$i]['container'] != 'hls') {
+									if ($rSettings['redis_handler']) {
+										$rIDs[] = $rConnections[$i];
+									} else {
+										$rIDs[] = intval($rConnections[$i]['activity_id']);
+									}
+									$rDelUUID[] = $rConnections[$i]['uuid'];
+									$rDelSID[$rConnections[$i]['stream_id']][] = $rDelUUID;
+								}
+								if ($rConnections[$i]['on_demand'] && $rConnections[$i]['server_id'] == SERVER_ID && $rSettings['on_demand_instant_off']) {
+									call_user_func($rRemoveFromQueueCallback, $rConnections[$i]['stream_id'], $rConnections[$i]['pid']);
+								}
+							}
+						}
+					}
+					$i++;
+				} else {
+					break;
+				}
+			}
+		}
+
+		if (!empty($rIDs)) {
+			if ($rSettings['redis_handler']) {
+				$rUUIDs = array();
+				$rRedis = $redis->multi();
+				foreach ($rIDs as $rConnection) {
+					$rRedis->zRem('LINE#' . $rConnection['identity'], $rConnection['uuid']);
+					$rRedis->zRem('LINE_ALL#' . $rConnection['identity'], $rConnection['uuid']);
+					$rRedis->zRem('STREAM#' . $rConnection['stream_id'], $rConnection['uuid']);
+					$rRedis->zRem('SERVER#' . $rConnection['server_id'], $rConnection['uuid']);
+					if ($rConnection['user_id']) {
+						$rRedis->zRem('SERVER_LINES#' . $rConnection['server_id'], $rConnection['uuid']);
+					}
+					if ($rConnection['proxy_id']) {
+						$rRedis->zRem('PROXY#' . $rConnection['proxy_id'], $rConnection['uuid']);
+					}
+					$rRedis->del($rConnection['uuid']);
+					$rUUIDs[] = $rConnection['uuid'];
+				}
+				$rRedis->zRem('CONNECTIONS', ...$rUUIDs);
+				$rRedis->zRem('LIVE', ...$rUUIDs);
+				$rRedis->sRem('ENDED', ...$rUUIDs);
+				$rRedis->exec();
+			} else {
+				$db->query('DELETE FROM `lines_live` WHERE `activity_id` IN (' . implode(',', array_map('intval', $rIDs)) . ')');
+			}
+
+			foreach ($rDelUUID as $rUUID) {
+				@unlink(CONS_TMP_PATH . $rUUID);
+			}
+			foreach ($rDelSID as $rStreamID => $rUUIDs) {
+				foreach ($rUUIDs as $rUUID) {
+					@unlink(CONS_TMP_PATH . $rStreamID . '/' . $rUUID);
+				}
+			}
+		}
+
+		return $rKilled;
+	}
+
+	public static function closeConnection($db, $redis, $rSettings, $rServers, $rActivityInfo, $rUpdateConnectionCallback = null, $rRedisSignalCallback = null, $rWriteOfflineActivityCallback = null) {
+		if (empty($rActivityInfo)) {
+			return false;
+		}
+
+		if (!is_array($rActivityInfo)) {
+			if (!$rSettings['redis_handler']) {
+				if (strlen(strval($rActivityInfo)) == 32) {
+					$db->query('SELECT * FROM `lines_live` WHERE `uuid` = ?', $rActivityInfo);
+				} else {
+					$db->query('SELECT * FROM `lines_live` WHERE `activity_id` = ?', $rActivityInfo);
+				}
+				$rActivityInfo = $db->get_row();
+			} else {
+				$rActivityInfo = igbinary_unserialize($redis->get($rActivityInfo));
+			}
+		}
+
+		if (!is_array($rActivityInfo)) {
+			return false;
+		}
+
+		if ($rActivityInfo['container'] == 'rtmp') {
+			if ($rActivityInfo['server_id'] == SERVER_ID) {
+				shell_exec('wget --timeout=2 -O /dev/null -o /dev/null "' . $rServers[SERVER_ID]['rtmp_mport_url'] . 'control/drop/client?clientid=' . intval($rActivityInfo['pid']) . '" >/dev/null 2>/dev/null &');
+			} else {
+				if ($rSettings['redis_handler']) {
+					call_user_func($rRedisSignalCallback, $rActivityInfo['pid'], $rActivityInfo['server_id'], 1);
+				} else {
+					$db->query('INSERT INTO `signals` (`pid`,`server_id`,`rtmp`,`time`) VALUES(?,?,?,UNIX_TIMESTAMP())', $rActivityInfo['pid'], $rActivityInfo['server_id'], 1);
+				}
+			}
+		} else {
+			if ($rActivityInfo['container'] == 'hls' || $rActivityInfo['container'] == 'm3u8') {
+				if ($rSettings['redis_handler']) {
+					call_user_func($rUpdateConnectionCallback, $rActivityInfo, array(), 'close');
+				} else {
+					$db->query('UPDATE `lines_live` SET `hls_end` = 1 WHERE `activity_id` = ?', $rActivityInfo['activity_id']);
+				}
+			} else {
+				if ($rActivityInfo['server_id'] == SERVER_ID) {
+					if ($rActivityInfo['pid'] != getmypid() && is_numeric($rActivityInfo['pid']) && 0 < $rActivityInfo['pid']) {
+						posix_kill(intval($rActivityInfo['pid']), 9);
+					}
+				} else {
+					if ($rSettings['redis_handler']) {
+						call_user_func($rRedisSignalCallback, $rActivityInfo['pid'], $rActivityInfo['server_id'], 0);
+					} else {
+						$db->query('INSERT INTO `signals` (`pid`,`server_id`,`time`) VALUES(?,?,UNIX_TIMESTAMP())', $rActivityInfo['pid'], $rActivityInfo['server_id']);
+					}
+				}
+			}
+		}
+
+		call_user_func($rWriteOfflineActivityCallback, $rActivityInfo['server_id'], $rActivityInfo['proxy_id'], $rActivityInfo['user_id'], $rActivityInfo['stream_id'], $rActivityInfo['date_start'], $rActivityInfo['user_agent'], $rActivityInfo['user_ip'], $rActivityInfo['container'], $rActivityInfo['geoip_country_code'], $rActivityInfo['isp'], $rActivityInfo['external_device'], $rActivityInfo['divergence'], $rActivityInfo['hmac_id'], $rActivityInfo['hmac_identifier']);
+		return true;
+	}
+
+	public static function closeRTMP($db, $rPID, $rWriteOfflineActivityCallback = null) {
+		if (empty($rPID)) {
+			return false;
+		}
+
+		$db->query("SELECT * FROM `lines_live` WHERE `container` = 'rtmp' AND `pid` = ? AND `server_id` = ?", $rPID, SERVER_ID);
+		if (0 >= $db->num_rows()) {
+			return false;
+		}
+
+		$rActivityInfo = $db->get_row();
+		$db->query('DELETE FROM `lines_live` WHERE `activity_id` = ?', $rActivityInfo['activity_id']);
+		call_user_func($rWriteOfflineActivityCallback, $rActivityInfo['server_id'], $rActivityInfo['proxy_id'], $rActivityInfo['user_id'], $rActivityInfo['stream_id'], $rActivityInfo['date_start'], $rActivityInfo['user_agent'], $rActivityInfo['user_ip'], $rActivityInfo['container'], $rActivityInfo['geoip_country_code'], $rActivityInfo['isp'], $rActivityInfo['external_device'], $rActivityInfo['divergence'], $rActivityInfo['hmac_id'], $rActivityInfo['hmac_identifier']);
+		return true;
+	}
+}
diff --git a/src/streaming/StreamingBootstrap.php b/src/streaming/StreamingBootstrap.php
new file mode 100644
index 00000000..4678f043
--- /dev/null
+++ b/src/streaming/StreamingBootstrap.php
@@ -0,0 +1,23 @@
+<?php
+
+class StreamingBootstrap {
+	public static function bootstrap($rFilename, $rSettings) {
+		$rProbeEndpoints = array('probe', 'player_api');
+		$rDefaultEndpoints = array('live', 'thumb', 'subtitle', 'timeshift', 'vod', 'status');
+		$rPrivilegedEndpoints = array('rtmp', 'portal');
+
+		if (!in_array($rFilename, array_merge($rProbeEndpoints, $rDefaultEndpoints, $rPrivilegedEndpoints), true)) {
+			return null;
+		}
+
+		require_once INCLUDES_PATH . 'libs/AsyncFileOperations.php';
+		require_once MAIN_HOME . 'core/Database/DatabaseHandler.php';
+		require_once INCLUDES_PATH . 'StreamingUtilities.php';
+
+		StreamingUtilities::$rSettings = $rSettings;
+		StreamingUtilities::$rAccess = $rFilename;
+		StreamingUtilities::init();
+
+		return StreamingUtilities::$db;
+	}
+}
diff --git a/src/www/stream/init.php b/src/www/stream/init.php
index e44199c9..a6053046 100644
--- a/src/www/stream/init.php
+++ b/src/www/stream/init.php
@@ -128,47 +128,6 @@ if (isset($rSettings['exit']) && $rFilename != 'status') {
 	generate404();
 }
 
-require_once INCLUDES_PATH . 'libs/AsyncFileOperations.php';
-require_once MAIN_HOME . 'core/Database/DatabaseHandler.php';
-
-switch ($rFilename) {
-	case 'probe':
-	case 'player_api':
-		require_once INCLUDES_PATH . 'StreamingUtilities.php';
-		StreamingUtilities::$rSettings = $rSettings;
-		StreamingUtilities::$rAccess = $rFilename;
-		StreamingUtilities::init(false);
-		$db = &StreamingUtilities::$db;
-
-		if ($rSettings['enable_cache']) {
-		} else {
-			StreamingUtilities::connectDatabase();
-			$db = &StreamingUtilities::$db;
-		}
-
-		break;
-
-	case 'live':
-	case 'thumb':
-	case 'subtitle':
-	case 'timeshift':
-	case 'vod':
-	case 'status':
-		require_once INCLUDES_PATH . 'StreamingUtilities.php';
-		StreamingUtilities::$rSettings = $rSettings;
-		StreamingUtilities::$rAccess = $rFilename;
-		StreamingUtilities::init(false);
-		$db = &StreamingUtilities::$db;
-
-		break;
-
-	case 'rtmp':
-	case 'portal':
-		require_once INCLUDES_PATH . 'StreamingUtilities.php';
-		StreamingUtilities::$rSettings = $rSettings;
-		StreamingUtilities::$rAccess = $rFilename;
-		StreamingUtilities::init();
-		$db = &StreamingUtilities::$db;
-
-		break;
+if (in_array($rFilename, array('probe', 'player_api', 'live', 'thumb', 'subtitle', 'timeshift', 'vod', 'status', 'rtmp', 'portal'))) {
+	$db = StreamingBootstrap::bootstrap($rFilename, $rSettings);
 }